WordPoints / hooks-api

src/admin/includes/classes/screen/points/types.php

Spacing +106 added lines, -106 removed lines

@@ -56,7 +56,7 @@ 
 	 * @since 1.0.0
 	 */
 	protected function get_title() {
-		return _x( 'Points Types', 'page title', 'wordpoints' );
+		return _x('Points Types', 'page title', 'wordpoints');
 	}
 
 	/**
@@ -66,8 +66,8 @@ 
 
 		parent::hooks();
 
-		add_action( 'add_meta_boxes', array( $this, 'add_points_settings_meta_box' ) );
-		add_action( 'add_meta_boxes', array( $this, 'add_event_meta_boxes' ) );
+		add_action('add_meta_boxes', array($this, 'add_points_settings_meta_box'));
+		add_action('add_meta_boxes', array($this, 'add_event_meta_boxes'));
 	}
 
 	/**
@@ -75,9 +75,9 @@ 
 	 */
 	public function enqueue_scripts() {
 
-		wp_enqueue_style( 'wordpoints-hooks-admin' );
+		wp_enqueue_style('wordpoints-hooks-admin');
 
-		wp_enqueue_script( 'postbox' );
+		wp_enqueue_script('postbox');
 
 		wordpoints_hooks_ui_setup_script_data();
 	}
@@ -97,7 +97,7 @@ 
 					.addClass( 'closed' );
 
 				postboxes.add_postbox_toggles(
-					<?php echo wp_json_encode( $this->id ); ?>
+					<?php echo wp_json_encode($this->id); ?>
 				);
 			} );
 		</script>
@@ -112,14 +112,14 @@ 
 	 */
 	public function add_points_settings_meta_box() {
 
-		if ( ! current_user_can( 'manage_wordpoints_points_types' ) ) {
+		if ( ! current_user_can('manage_wordpoints_points_types')) {
 			return;
 		}
 
 		add_meta_box(
 			'settings'
-			, __( 'Settings', 'wordpoints' )
-			, array( $this, 'display_points_settings_meta_box' )
+			, __('Settings', 'wordpoints')
+			, array($this, 'display_points_settings_meta_box')
 			, $this->id
 			, 'side'
 			, 'default'
@@ -133,7 +133,7 @@ 
 	 */
 	public function display_points_settings_meta_box() {
 
-		if ( ! current_user_can( 'manage_wordpoints_points_types' ) ) {
+		if ( ! current_user_can('manage_wordpoints_points_types')) {
 			return;
 		}
 
@@ -141,12 +141,12 @@ 
 
 		$add_new = 0;
 
-		$points_type = wordpoints_get_points_type( $slug );
+		$points_type = wordpoints_get_points_type($slug);
 
-		if ( ! $points_type ) {
+		if ( ! $points_type) {
 
 			$points_type = array();
-			$add_new     = wp_create_nonce( 'wordpoints_add_new_points_type' );
+			$add_new     = wp_create_nonce('wordpoints_add_new_points_type');
 		}
 
 		$points_type = array_merge(
@@ -161,15 +161,15 @@ 
 		?>
 
 		<form method="post">
-			<?php if ( $slug ) : ?>
+			<?php if ($slug) : ?>
 				<p>
 					<span class="wordpoints-points-slug">
 						<em>
-							<?php echo esc_html( sprintf( __( 'Slug: %s', 'wordpoints' ), $slug ) ); ?>
+							<?php echo esc_html(sprintf(__('Slug: %s', 'wordpoints'), $slug)); ?>
 						</em>
 					</span>
 				</p>
-				<?php wp_nonce_field( "wordpoints_update_points_type-$slug", 'update_points_type' ); ?>
+				<?php wp_nonce_field("wordpoints_update_points_type-$slug", 'update_points_type'); ?>
 			<?php endif; ?>
 
 			<?php
@@ -183,45 +183,45 @@ 
 			 *
 			 * @param string $points_type The slug of the points type.
 			 */
-			do_action( 'wordpoints_points_type_form_top', $slug );
+			do_action('wordpoints_points_type_form_top', $slug);
 
-			if ( $add_new ) {
+			if ($add_new) {
 
 				// Mark the prefix and suffix optional on the add new form.
-				$prefix = _x( 'Prefix (optional):', 'points type', 'wordpoints' );
-				$suffix = _x( 'Suffix (optional):', 'points type', 'wordpoints' );
+				$prefix = _x('Prefix (optional):', 'points type', 'wordpoints');
+				$suffix = _x('Suffix (optional):', 'points type', 'wordpoints');
 
 			} else {
 
-				$prefix = _x( 'Prefix:', 'points type', 'wordpoints' );
-				$suffix = _x( 'Suffix:', 'points type', 'wordpoints' );
+				$prefix = _x('Prefix:', 'points type', 'wordpoints');
+				$suffix = _x('Suffix:', 'points type', 'wordpoints');
 			}
 
 			?>
 
 			<p>
 				<label
-					for="points-name-<?php echo esc_attr( $slug ); ?>"><?php echo esc_html_x( 'Name:', 'points type', 'wordpoints' ); ?></label>
+					for="points-name-<?php echo esc_attr($slug); ?>"><?php echo esc_html_x('Name:', 'points type', 'wordpoints'); ?></label>
 				<input class="widefat" type="text"
-				       id="points-name-<?php echo esc_attr( $slug ); ?>"
+				       id="points-name-<?php echo esc_attr($slug); ?>"
 				       name="points-name"
-				       value="<?php echo esc_attr( $points_type['name'] ); ?>"/>
+				       value="<?php echo esc_attr($points_type['name']); ?>"/>
 			</p>
 			<p>
 				<label
-					for="points-prefix-<?php echo esc_attr( $slug ); ?>"><?php echo esc_html( $prefix ); ?></label>
+					for="points-prefix-<?php echo esc_attr($slug); ?>"><?php echo esc_html($prefix); ?></label>
 				<input class="widefat" type="text"
-				       id="points-prefix-<?php echo esc_attr( $slug ); ?>"
+				       id="points-prefix-<?php echo esc_attr($slug); ?>"
 				       name="points-prefix"
-				       value="<?php echo esc_attr( $points_type['prefix'] ); ?>"/>
+				       value="<?php echo esc_attr($points_type['prefix']); ?>"/>
 			</p>
 			<p>
 				<label
-					for="points-suffix-<?php echo esc_attr( $slug ); ?>"><?php echo esc_html( $suffix ); ?></label>
+					for="points-suffix-<?php echo esc_attr($slug); ?>"><?php echo esc_html($suffix); ?></label>
 				<input class="widefat" type="text"
-				       id="points-suffix-<?php echo esc_attr( $slug ); ?>"
+				       id="points-suffix-<?php echo esc_attr($slug); ?>"
 				       name="points-suffix"
-				       value="<?php echo esc_attr( $points_type['suffix'] ); ?>"/>
+				       value="<?php echo esc_attr($points_type['suffix']); ?>"/>
 			</p>
 
 			<?php
@@ -235,28 +235,28 @@ 
 			 *
 			 * @param string $points_type The slug of the points type.
 			 */
-			do_action( 'wordpoints_points_type_form_bottom', $slug );
+			do_action('wordpoints_points_type_form_bottom', $slug);
 
 			?>
 
 			<input type="hidden" name="points-slug"
-			       value="<?php echo esc_attr( $slug ); ?>"/>
+			       value="<?php echo esc_attr($slug); ?>"/>
 			<input type="hidden" name="add_new" class="add_new"
-			       value="<?php echo esc_attr( $add_new ); ?>"/>
+			       value="<?php echo esc_attr($add_new); ?>"/>
 
 			<div class="hook-control-actions">
 				<div class="alignleft">
 					<?php
 
-					if ( ! $add_new ) {
-						wp_nonce_field( "wordpoints_delete_points_type-{$slug}", 'delete-points-type-nonce' );
-						submit_button( _x( 'Delete', 'points type', 'wordpoints' ), 'delete', 'delete-points-type', false, array( 'id' => "delete_points_type-{$slug}" ) );
+					if ( ! $add_new) {
+						wp_nonce_field("wordpoints_delete_points_type-{$slug}", 'delete-points-type-nonce');
+						submit_button(_x('Delete', 'points type', 'wordpoints'), 'delete', 'delete-points-type', false, array('id' => "delete_points_type-{$slug}"));
 					}
 
 					?>
 				</div>
 				<div class="alignright">
-					<?php submit_button( _x( 'Save', 'points type', 'wordpoints' ), 'button-primary hook-control-save right', 'save-points-type', false, array( 'id' => "points-{$slug}-save" ) ); ?>
+					<?php submit_button(_x('Save', 'points type', 'wordpoints'), 'button-primary hook-control-save right', 'save-points-type', false, array('id' => "points-{$slug}-save")); ?>
 					<span class="spinner"></span>
 				</div>
 				<br class="clear"/>
@@ -273,17 +273,17 @@ 
 	 */
 	public function add_event_meta_boxes() {
 
-		if ( ! $this->current_points_type ) {
+		if ( ! $this->current_points_type) {
 			return;
 		}
 
 		/** @var WordPoints_Hook_EventI $event */
-		foreach ( $this->hooks->events->get_all() as $slug => $event ) {
+		foreach ($this->hooks->events->get_all() as $slug => $event) {
 
 			add_meta_box(
 				"{$this->current_points_type}-{$slug}"
 				, $event->get_title()
-				, array( $this, 'display_event_meta_box' )
+				, array($this, 'display_event_meta_box')
 				, $this->id
 				, 'events'
 				, 'default'
@@ -304,55 +304,55 @@ 
 	 * @param array $points_type The points type this meta-box relates to.
 	 * @param array $meta_box    The data the meta-box was created with.
 	 */
-	public function display_event_meta_box( $points_type, $meta_box ) {
+	public function display_event_meta_box($points_type, $meta_box) {
 
 		$event_slug = $meta_box['args']['slug'];
 
 		/** @var WordPoints_Hook_Reactor $points_reactor */
-		$points_reactor = $this->hooks->reactors->get( 'points' );
+		$points_reactor = $this->hooks->reactors->get('points');
 
 		$data = array();
 
-		foreach ( $points_reactor->reactions->get_reactions_to_event( $event_slug ) as $id => $reaction ) {
-			if ( $reaction->get_meta( 'points_type' ) === $this->current_points_type ) {
+		foreach ($points_reactor->reactions->get_reactions_to_event($event_slug) as $id => $reaction) {
+			if ($reaction->get_meta('points_type') === $this->current_points_type) {
 				$data[] = WordPoints_Admin_Ajax_Hooks::prepare_hook_reaction(
 					$reaction
 				);
 			}
 		}
 
-		$args = $this->hooks->events->args->get_children( $event_slug );
+		$args = $this->hooks->events->args->get_children($event_slug);
 
-		$event_data = array( 'args' => array() );
+		$event_data = array('args' => array());
 
-		foreach ( $args as $slug => $arg ) {
+		foreach ($args as $slug => $arg) {
 
-			$event_data['args'][ $slug ] = array(
+			$event_data['args'][$slug] = array(
 				'slug' => $slug,
 			);
 
-			if ( $arg instanceof WordPoints_Hook_Arg ) {
-				$event_data['args'][ $slug ]['title'] = $arg->get_title();
-				$event_data['args'][ $slug ]['is_stateful'] = $arg->is_stateful();
+			if ($arg instanceof WordPoints_Hook_Arg) {
+				$event_data['args'][$slug]['title'] = $arg->get_title();
+				$event_data['args'][$slug]['is_stateful'] = $arg->is_stateful();
 			}
 		}
 
 		?>
 
 		<script>
-			WordPointsHooksAdminData.events[<?php echo wp_json_encode( $event_slug ); ?>] = <?php echo wp_json_encode( $event_data ); ?>;
-			WordPointsHooksAdminData.reactions[<?php echo wp_json_encode( $event_slug ); ?>] = <?php echo wp_json_encode( $data ); ?>;
+			WordPointsHooksAdminData.events[<?php echo wp_json_encode($event_slug); ?>] = <?php echo wp_json_encode($event_data); ?>;
+			WordPointsHooksAdminData.reactions[<?php echo wp_json_encode($event_slug); ?>] = <?php echo wp_json_encode($data); ?>;
 		</script>
 
 		<div class="wordpoints-hook-reaction-group-container">
 			<p class="description wordpoints-hook-reaction-group-description">
-				<?php echo esc_html( $meta_box['args']['event']->get_description() ); ?>
+				<?php echo esc_html($meta_box['args']['event']->get_description()); ?>
 			</p>
 
 			<div class="wordpoints-hook-reaction-group"
-				data-wordpoints-hooks-hook-event="<?php echo esc_attr( $event_slug ); ?>"
-				data-wordpoints-hooks-points-type="<?php echo esc_attr( $this->current_points_type ); ?>"
-				data-wordpoints-hooks-create-nonce="<?php echo esc_attr( wp_create_nonce( 'wordpoints_create_hook_reaction|points' ) ); ?>"
+				data-wordpoints-hooks-hook-event="<?php echo esc_attr($event_slug); ?>"
+				data-wordpoints-hooks-points-type="<?php echo esc_attr($this->current_points_type); ?>"
+				data-wordpoints-hooks-create-nonce="<?php echo esc_attr(wp_create_nonce('wordpoints_create_hook_reaction|points')); ?>"
 				data-wordpoints-hooks-reactor="points">
 			</div>
 
@@ -366,7 +366,7 @@ 
 
 			<div class="controls">
 				<button type="button" class="button-primary add-reaction">
-					<?php esc_html_e( 'Add New', 'wordpoints' ); ?>
+					<?php esc_html_e('Add New', 'wordpoints'); ?>
 				</button>
 			</div>
 		</div>
@@ -386,19 +386,19 @@ 
 		// Show a tab for each points type.
 		$tabs = array();
 
-		foreach ( $points_types as $slug => $settings ) {
-			$tabs[ $slug ] = $settings['name'];
+		foreach ($points_types as $slug => $settings) {
+			$tabs[$slug] = $settings['name'];
 		}
 
-		$tabs['add-new'] = __( 'Add New', 'wordpoints' );
+		$tabs['add-new'] = __('Add New', 'wordpoints');
 
-		$tab = wordpoints_admin_get_current_tab( $tabs );
+		$tab = wordpoints_admin_get_current_tab($tabs);
 
-		if ( 'add-new' !== $tab ) {
+		if ('add-new' !== $tab) {
 			$this->current_points_type = $tab;
 		}
 
-		do_action( 'add_meta_boxes', $this->id );
+		do_action('add_meta_boxes', $this->id);
 
 		$this->tabs = $tabs;
 	}
@@ -410,7 +410,7 @@ 
 	 */
 	public function save_points_type() {
 
-		if ( ! current_user_can( 'manage_wordpoints_points_types' ) ) {
+		if ( ! current_user_can('manage_wordpoints_points_types')) {
 			return;
 		}
 
@@ -425,43 +425,43 @@ 
 
 			$settings = array();
 
-			$settings['name']   = trim( sanitize_text_field( wp_unslash( $_POST['points-name'] ) ) ); // WPCS: CSRF OK
-			$settings['prefix'] = ltrim( sanitize_text_field( wp_unslash( $_POST['points-prefix'] ) ) ); // WPCS: CSRF OK
-			$settings['suffix'] = rtrim( sanitize_text_field( wp_unslash( $_POST['points-suffix'] ) ) ); // WPCS: CSRF OK
+			$settings['name']   = trim(sanitize_text_field(wp_unslash($_POST['points-name']))); // WPCS: CSRF OK
+			$settings['prefix'] = ltrim(sanitize_text_field(wp_unslash($_POST['points-prefix']))); // WPCS: CSRF OK
+			$settings['suffix'] = rtrim(sanitize_text_field(wp_unslash($_POST['points-suffix']))); // WPCS: CSRF OK
 
 			if (
-				isset( $_POST['points-slug'] )
-				&& wordpoints_verify_nonce( 'update_points_type', 'wordpoints_update_points_type-%s', array( 'points-slug' ), 'post' )
+				isset($_POST['points-slug'])
+				&& wordpoints_verify_nonce('update_points_type', 'wordpoints_update_points_type-%s', array('points-slug'), 'post')
 			) {
 
 				// - We are updating an existing points type.
 
-				$points_type = sanitize_key( $_POST['points-slug'] );
+				$points_type = sanitize_key($_POST['points-slug']);
 
-				$old_settings = wordpoints_get_points_type( $points_type );
+				$old_settings = wordpoints_get_points_type($points_type);
 
-				if ( false === $old_settings ) {
+				if (false === $old_settings) {
 
 					add_settings_error(
 						''
 						, 'wordpoints_points_type_update'
-						, __( 'Error: failed updating points type.', 'wordpoints' )
+						, __('Error: failed updating points type.', 'wordpoints')
 						, 'updated'
 					);
 
 					return;
 				}
 
-				if ( is_array( $old_settings ) ) {
-					$settings = array_merge( $old_settings, $settings );
+				if (is_array($old_settings)) {
+					$settings = array_merge($old_settings, $settings);
 				}
 
-				if ( ! wordpoints_update_points_type( $points_type, $settings ) ) {
+				if ( ! wordpoints_update_points_type($points_type, $settings)) {
 
 					add_settings_error(
 						''
 						, 'wordpoints_points_type_update'
-						, __( 'Error: failed updating points type.', 'wordpoints' )
+						, __('Error: failed updating points type.', 'wordpoints')
 						, 'updated'
 					);
 
@@ -470,23 +470,23 @@ 
 					add_settings_error(
 						''
 						, 'wordpoints_points_type_update'
-						, __( 'Points type updated.', 'wordpoints' )
+						, __('Points type updated.', 'wordpoints')
 						, 'updated'
 					);
 				}
 
-			} elseif ( wordpoints_verify_nonce( 'add_new', 'wordpoints_add_new_points_type', null, 'post' ) ) {
+			} elseif (wordpoints_verify_nonce('add_new', 'wordpoints_add_new_points_type', null, 'post')) {
 
 				// - We are creating a new points type.
 
-				$slug = wordpoints_add_points_type( $settings );
+				$slug = wordpoints_add_points_type($settings);
 
-				if ( ! $slug ) {
+				if ( ! $slug) {
 
 					add_settings_error(
 						''
 						, 'wordpoints_points_type_create'
-						, __( 'Please choose a unique name for this points type.', 'wordpoints' )
+						, __('Please choose a unique name for this points type.', 'wordpoints')
 					);
 
 				} else {
@@ -496,26 +496,26 @@ 
 					add_settings_error(
 						''
 						, 'wordpoints_points_type_create'
-						, __( 'Points type created.', 'wordpoints' )
+						, __('Points type created.', 'wordpoints')
 						, 'updated'
 					);
 				}
 			}
 
 		} elseif (
-			! empty( $_POST['delete-points-type'] )
-			&& isset( $_POST['points-slug'] )
-			&& wordpoints_verify_nonce( 'delete-points-type-nonce', 'wordpoints_delete_points_type-%s', array( 'points-slug' ), 'post' )
+			! empty($_POST['delete-points-type'])
+			&& isset($_POST['points-slug'])
+			&& wordpoints_verify_nonce('delete-points-type-nonce', 'wordpoints_delete_points_type-%s', array('points-slug'), 'post')
 		) {
 
 			// - We are deleting a points type.
 
-			if ( wordpoints_delete_points_type( sanitize_key( $_POST['points-slug'] ) ) ) {
+			if (wordpoints_delete_points_type(sanitize_key($_POST['points-slug']))) {
 
 				add_settings_error(
 					''
 					, 'wordpoints_points_type_delete'
-					, __( 'Points type deleted.', 'wordpoints' )
+					, __('Points type deleted.', 'wordpoints')
 					, 'updated'
 				);
 
@@ -524,7 +524,7 @@ 
 				add_settings_error(
 					''
 					, 'wordpoints_points_type_delete'
-					, __( 'Error while deleting.', 'wordpoints' )
+					, __('Error while deleting.', 'wordpoints')
 				);
 			}
 		}
@@ -540,25 +540,25 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		do_action( 'wordpoints_admin_points_events_head' );
+		do_action('wordpoints_admin_points_events_head');
 
-		if ( is_network_admin() ) {
-			$title = __( 'Network Events', 'wordpoints' );
-			$description = __( 'Award points when various events happen on this network.', 'wordpoints' );
+		if (is_network_admin()) {
+			$title = __('Network Events', 'wordpoints');
+			$description = __('Award points when various events happen on this network.', 'wordpoints');
 		} else {
-			$title = __( 'Events', 'wordpoints' );
-			$description = __( 'Award points when various events happen on this site.', 'wordpoints' );
+			$title = __('Events', 'wordpoints');
+			$description = __('Award points when various events happen on this site.', 'wordpoints');
 		}
 
-		$points_type = wordpoints_get_points_type( $this->current_points_type );
+		$points_type = wordpoints_get_points_type($this->current_points_type);
 
 		?>
 
 		<div class="wordpoints-points-type-meta-box-wrap">
 
 				<form>
-					<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-					<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+					<?php wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false); ?>
+					<?php wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false); ?>
 				</form>
 
 				<div id="poststuff">
@@ -566,17 +566,17 @@ 
 					<div id="post-body" class="metabox-holder columns-<?php echo 1 === (int) get_current_screen()->get_columns() ? '1' : '2'; ?>">
 
 						<div id="postbox-container-1" class="postbox-container">
-							<?php do_meta_boxes( $this->id, 'side', $points_type ); ?>
+							<?php do_meta_boxes($this->id, 'side', $points_type); ?>
 						</div>
 
-						<?php if ( isset( $this->current_points_type ) ) : ?>
+						<?php if (isset($this->current_points_type)) : ?>
 							<div class="wordpoints-hook-events-heading">
-								<h2><?php echo esc_html( $title ); ?></h2>
-								<p class="description"><?php echo esc_html( $description ); ?></p>
+								<h2><?php echo esc_html($title); ?></h2>
+								<p class="description"><?php echo esc_html($description); ?></p>
 							</div>
 
 							<div id="postbox-container-2" class="postbox-container">
-								<?php do_meta_boxes( $this->id, 'events', $points_type ); ?>
+								<?php do_meta_boxes($this->id, 'events', $points_type); ?>
 							</div>
 						<?php endif; ?>
 
@@ -595,7 +595,7 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		do_action( 'wordpoints_admin_points_events_foot' );
+		do_action('wordpoints_admin_points_events_foot');
 	}
 }
 

src/includes/classes/hook/event/args.php

Spacing +22 added lines, -22 removed lines

@@ -54,20 +54,20 @@ 
 	 *
 	 * @param WordPoints_Hook_Arg[] $args The hook args.
 	 */
-	public function __construct( array $args ) {
+	public function __construct(array $args) {
 
 		parent::__construct();
 
-		foreach ( $args as $arg ) {
+		foreach ($args as $arg) {
 
 			$entity = $arg->get_entity();
 
-			if ( $entity instanceof WordPoints_Entity ) {
-				$this->entities[ $arg->get_slug() ] = $entity;
+			if ($entity instanceof WordPoints_Entity) {
+				$this->entities[$arg->get_slug()] = $entity;
 			}
 
 			// If any of the args aren't stateful the event isn't repeatable.
-			if ( $this->is_repeatable && ! $arg->is_stateful() ) {
+			if ($this->is_repeatable && ! $arg->is_stateful()) {
 				$this->is_repeatable = false;
 			}
 		}
@@ -99,54 +99,54 @@ 
 	 *
 	 * @param WordPoints_Hook_Reaction_Validator $validator The validator.
 	 */
-	public function set_validator( WordPoints_Hook_Reaction_Validator $validator ) {
+	public function set_validator(WordPoints_Hook_Reaction_Validator $validator) {
 		$this->validator = $validator;
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	public function descend( $child_slug ) {
+	public function descend($child_slug) {
 
-		$result = parent::descend( $child_slug );
+		$result = parent::descend($child_slug);
 
 		// Just in case no validator has been set.
-		if ( ! $this->validator ) {
+		if ( ! $this->validator) {
 			return $result;
 		}
 
-		if ( ! $result ) {
+		if ( ! $result) {
 
-			if ( ! isset( $this->current ) ) {
+			if ( ! isset($this->current)) {
 
 				$this->validator->add_error(
 					sprintf(
-						__( 'The %s arg is not registered for this event.', 'wordpoints' ) // TODO message
+						__('The %s arg is not registered for this event.', 'wordpoints') // TODO message
 						, $child_slug
 					)
 				);
 
-			} elseif ( ! ( $this->current instanceof WordPoints_Entity_ParentI ) ) {
+			} elseif ( ! ($this->current instanceof WordPoints_Entity_ParentI)) {
 
 				$this->validator->add_error(
-					__( 'Cannot get descendant of %s: not a parent.', 'wordpoints' ) // TODO message
+					__('Cannot get descendant of %s: not a parent.', 'wordpoints') // TODO message
 				);
 
 			} else {
 
-				$child_arg = $this->current->get_child( $child_slug );
+				$child_arg = $this->current->get_child($child_slug);
 
-				if ( ! $child_arg ) {
+				if ( ! $child_arg) {
 					$this->validator->add_error(
-						__( '%s does not have a child "%s".', 'wordpoints' ) // TODO message
+						__('%s does not have a child "%s".', 'wordpoints') // TODO message
 						, $this->push_on_descend ? $child_slug : null
 					);
 				}
 			}
 
-		} elseif ( $this->push_on_descend ) {
+		} elseif ($this->push_on_descend) {
 
-			$this->validator->push_field( $child_slug );
+			$this->validator->push_field($child_slug);
 		}
 
 		return $result;
@@ -159,7 +159,7 @@ 
 
 		$ascended = parent::ascend();
 
-		if ( $ascended && $this->validator ) {
+		if ($ascended && $this->validator) {
 			$this->validator->pop_field();
 		}
 
@@ -169,10 +169,10 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function get_from_hierarchy( array $hierarchy ) {
+	public function get_from_hierarchy(array $hierarchy) {
 
 		$this->push_on_descend = false;
-		$entityish = parent::get_from_hierarchy( $hierarchy );
+		$entityish = parent::get_from_hierarchy($hierarchy);
 		$this->push_on_descend = true;
 
 		return $entityish;

src/includes/classes/hook/extension/periods.php

Spacing +72 added lines, -72 removed lines

@@ -25,11 +25,11 @@ 
 	public function get_ui_script_data() {
 
 		$periods = array(
-			MINUTE_IN_SECONDS   => __( 'Minute', 'wordpoints' ),
-			HOUR_IN_SECONDS     => __( 'Hour',   'wordpoints' ),
-			DAY_IN_SECONDS      => __( 'Day',    'wordpoints' ),
-			WEEK_IN_SECONDS     => __( 'Week',   'wordpoints' ),
-			30 * DAY_IN_SECONDS => __( 'Month',  'wordpoints' ),
+			MINUTE_IN_SECONDS   => __('Minute', 'wordpoints'),
+			HOUR_IN_SECONDS     => __('Hour', 'wordpoints'),
+			DAY_IN_SECONDS      => __('Day', 'wordpoints'),
+			WEEK_IN_SECONDS     => __('Week', 'wordpoints'),
+			30 * DAY_IN_SECONDS => __('Month', 'wordpoints'),
 		);
 
 		/**
@@ -39,13 +39,13 @@ 
 		 *
 		 * @param string[] $periods The period titles, indexed by length in seconds.
 		 */
-		$periods = apply_filters( 'wordpoints_hooks_ui_data_periods', $periods );
+		$periods = apply_filters('wordpoints_hooks_ui_data_periods', $periods);
 
 		return array(
 			'periods' => $periods,
 			'l10n' => array(
 				// TODO this should be supplied per-reactor
-				'label' => __( 'Award each user no more than once per:', 'wordpoints' ),
+				'label' => __('Award each user no more than once per:', 'wordpoints'),
 			),
 		);
 	}
@@ -59,25 +59,25 @@ 
 	 *
 	 * @return array The validated periods.
 	 */
-	protected function validate_periods( $periods ) {
+	protected function validate_periods($periods) {
 
-		if ( ! is_array( $periods ) ) {
+		if ( ! is_array($periods)) {
 
 			$this->validator->add_error(
-				__( 'Periods do not match expected format.', 'wordpoints' )
+				__('Periods do not match expected format.', 'wordpoints')
 			);
 
 			return array();
 		}
 
-		foreach ( $periods as $index => $period ) {
+		foreach ($periods as $index => $period) {
 
-			$this->validator->push_field( $index );
+			$this->validator->push_field($index);
 
-			$period = $this->validate_period( $period );
+			$period = $this->validate_period($period);
 
-			if ( $period ) {
-				$periods[ $index ] = $period;
+			if ($period) {
+				$periods[$index] = $period;
 			}
 
 			$this->validator->pop_field();
@@ -95,30 +95,30 @@ 
 	 *
 	 * @return array|false The validated period, or false if invalid.
 	 */
-	protected function validate_period( $period ) {
+	protected function validate_period($period) {
 
-		if ( ! is_array( $period ) ) {
+		if ( ! is_array($period)) {
 			$this->validator->add_error(
-				__( 'Period does not match expected format.', 'wordpoints' )
+				__('Period does not match expected format.', 'wordpoints')
 			);
 
 			return false;
 		}
 
-		if ( isset( $period['args'] ) ) {
-			$this->validate_period_args( $period['args'] );
+		if (isset($period['args'])) {
+			$this->validate_period_args($period['args']);
 		}
 
-		if ( ! isset( $period['length'] ) ) {
+		if ( ! isset($period['length'])) {
 
 			$this->validator->add_error(
-				__( 'Period length setting is missing.', 'wordpoints' )
+				__('Period length setting is missing.', 'wordpoints')
 			);
 
-		} elseif ( false === wordpoints_posint( $period['length'] ) ) {
+		} elseif (false === wordpoints_posint($period['length'])) {
 
 			$this->validator->add_error(
-				__( 'Period length must be a positive integer.', 'wordpoints' )
+				__('Period length must be a positive integer.', 'wordpoints')
 				, 'length'
 			);
 
@@ -135,34 +135,34 @@ 
 	 *
 	 * @param mixed $args The args the period is related to.
 	 */
-	protected function validate_period_args( $args ) {
+	protected function validate_period_args($args) {
 
-		if ( ! is_array( $args ) ) {
+		if ( ! is_array($args)) {
 
 			$this->validator->add_error(
-				__( 'Period does not match expected format.', 'wordpoints' )
+				__('Period does not match expected format.', 'wordpoints')
 				, 'args'
 			);
 
 			return;
 		}
 
-		$this->validator->push_field( 'args' );
+		$this->validator->push_field('args');
 
-		foreach ( $args as $index => $hierarchy ) {
+		foreach ($args as $index => $hierarchy) {
 
-			$this->validator->push_field( $index );
+			$this->validator->push_field($index);
 
-			if ( ! is_array( $hierarchy ) ) {
+			if ( ! is_array($hierarchy)) {
 
 				$this->validator->add_error(
-					__( 'Period does not match expected format.', 'wordpoints' )
+					__('Period does not match expected format.', 'wordpoints')
 				);
 
-			} elseif ( ! $this->event_args->get_from_hierarchy( $hierarchy ) ) {
+			} elseif ( ! $this->event_args->get_from_hierarchy($hierarchy)) {
 
 				$this->validator->add_error(
-					__( 'Invalid period.', 'wordpoints' ) // TODO better error message
+					__('Invalid period.', 'wordpoints') // TODO better error message
 				);
 			}
 
@@ -180,16 +180,16 @@ 
 		WordPoints_Hook_Event_Args $event_args
 	) {
 
-		$periods = $reaction->get_meta( 'periods' );
+		$periods = $reaction->get_meta('periods');
 
-		if ( empty( $periods ) ) {
+		if (empty($periods)) {
 			return true;
 		}
 
 		$this->event_args = $event_args;
 
-		foreach ( $periods as $period ) {
-			if ( ! $this->has_period_ended( $period, $reaction ) ) {
+		foreach ($periods as $period) {
+			if ( ! $this->has_period_ended($period, $reaction)) {
 				return false;
 			}
 		}
@@ -213,24 +213,24 @@ 
 	) {
 
 		$period = $this->get_period_by_reaction(
-			$this->get_period_signature( $settings, $reaction )
+			$this->get_period_signature($settings, $reaction)
 			, $reaction
 		);
 
 		// If the period isn't found, we know that we can still fire.
-		if ( ! $period ) {
+		if ( ! $period) {
 			return true;
 		}
 
-		$now = current_time( 'timestamp' );
-		$hit_time = strtotime( $period->hit_time, $now );
+		$now = current_time('timestamp');
+		$hit_time = strtotime($period->hit_time, $now);
 
-		if ( ! empty( $settings['relative'] ) ) {
-			return ( $hit_time < $now - $settings['length'] );
+		if ( ! empty($settings['relative'])) {
+			return ($hit_time < $now - $settings['length']);
 		} else {
 			return (
-				(int) ( $hit_time / $settings['length'] )
-				< (int) ( $now / $settings['length'] )
+				(int) ($hit_time / $settings['length'])
+				< (int) ($now / $settings['length'])
 			);
 		}
 	}
@@ -244,24 +244,24 @@ 
 	 *
 	 * @return array The arg values.
 	 */
-	protected function get_arg_values( array $period_args ) {
+	protected function get_arg_values(array $period_args) {
 
 		$values = array();
 
-		foreach ( $period_args as $arg_hierarchy ) {
+		foreach ($period_args as $arg_hierarchy) {
 
 			$arg = $this->event_args->get_from_hierarchy(
 				$arg_hierarchy
 			);
 
-			if ( ! $arg instanceof WordPoints_EntityishI ) {
+			if ( ! $arg instanceof WordPoints_EntityishI) {
 				continue;
 			}
 
-			$values[ implode( '.', $arg_hierarchy ) ] = $arg->get_the_value();
+			$values[implode('.', $arg_hierarchy)] = $arg->get_the_value();
 		}
 
-		ksort( $values );
+		ksort($values);
 
 		return $values;
 	}
@@ -275,11 +275,11 @@ 
 	 *
 	 * @return object|false The period data, or false if not found.
 	 */
-	protected function get_period( $period_id ) {
+	protected function get_period($period_id) {
 
-		$period = wp_cache_get( $period_id, 'wordpoints_hook_period' );
+		$period = wp_cache_get($period_id, 'wordpoints_hook_period');
 
-		if ( ! $period ) {
+		if ( ! $period) {
 
 			global $wpdb;
 
@@ -294,7 +294,7 @@ 
 				)
 			);
 
-			if ( ! $period ) {
+			if ( ! $period) {
 				return false;
 			}
 
@@ -304,7 +304,7 @@ 
 				, 'wordpoints_hook_period_ids'
 			);
 
-			wp_cache_set( $period->id, $period, 'wordpoints_hook_periods' );
+			wp_cache_set($period->id, $period, 'wordpoints_hook_periods');
 		}
 
 		return $period;
@@ -331,11 +331,11 @@ 
 		$cache_key = "{$reaction_id}-{$signature}";
 
 		// Before we run the query, we try to lookup the ID in the cache.
-		$period_id = wp_cache_get( $cache_key, 'wordpoints_hook_period_ids' );
+		$period_id = wp_cache_get($cache_key, 'wordpoints_hook_period_ids');
 
 		// If we found it, we can retrieve the period by ID instead.
-		if ( $period_id ) {
-			return $this->get_period( $period_id );
+		if ($period_id) {
+			return $this->get_period($period_id);
 		}
 
 		global $wpdb;
@@ -356,12 +356,12 @@ 
 			)
 		);
 
-		if ( ! $period ) {
+		if ( ! $period) {
 			return false;
 		}
 
-		wp_cache_set( $cache_key, $period->id, 'wordpoints_hook_period_ids' );
-		wp_cache_set( $period->id, $period, 'wordpoints_hook_periods' );
+		wp_cache_set($cache_key, $period->id, 'wordpoints_hook_period_ids');
+		wp_cache_set($period->id, $period, 'wordpoints_hook_periods');
 
 		return $period;
 	}
@@ -374,18 +374,18 @@ 
 		WordPoints_Hook_Event_Args $event_args
 	) {
 
-		$periods = $reaction->get_meta( 'periods' );
+		$periods = $reaction->get_meta('periods');
 
-		if ( empty( $periods ) ) {
+		if (empty($periods)) {
 			return;
 		}
 
 		$this->event_args = $event_args;
 
-		foreach ( $periods as $settings ) {
+		foreach ($periods as $settings) {
 
 			$this->add_period(
-				$this->get_period_signature( $settings, $reaction )
+				$this->get_period_signature($settings, $reaction)
 				, $reaction
 			);
 		}
@@ -410,14 +410,14 @@ 
 		WordPoints_Hook_Reaction_Validator $reaction
 	) {
 
-		if ( isset( $settings['args'] ) ) {
+		if (isset($settings['args'])) {
 			$period_args = $settings['args'];
 		} else {
-			$period_args = array( $reaction->get_meta( 'target' ) );
+			$period_args = array($reaction->get_meta('target'));
 		}
 
 		return wordpoints_hash(
-			wp_json_encode( $this->get_arg_values( $period_args ) )
+			wp_json_encode($this->get_arg_values($period_args))
 		);
 	}
 
@@ -445,12 +445,12 @@ 
 			, array(
 				'reaction_id' => $reaction_id,
 				'signature'   => $signature,
-				'hit_time'    => current_time( 'mysql' ),
+				'hit_time'    => current_time('mysql'),
 			)
-			, array( '%d', '%s', '%s' )
+			, array('%d', '%s', '%s')
 		);
 
-		if ( ! $inserted ) {
+		if ( ! $inserted) {
 			return false;
 		}