WordPoints / hooks-api

src/includes/classes/entity.php

Spacing +35 added lines, -35 removed lines

@@ -106,11 +106,11 @@ 
 	 *
 	 * @return mixed The entity, or false if not found.
 	 */
-	protected function get_entity( $id ) {
+	protected function get_entity($id) {
 
-		$entity = call_user_func( $this->getter, $id );
+		$entity = call_user_func($this->getter, $id);
 
-		if ( ! $this->is_entity( $entity ) ) {
+		if ( ! $this->is_entity($entity)) {
 			return false;
 		}
 
@@ -126,13 +126,13 @@ 
 	 *
 	 * @return bool Whether the passed value is an entity.
 	 */
-	protected function is_entity( $entity ) {
+	protected function is_entity($entity) {
 
-		if ( ! is_object( $entity ) && ! is_array( $entity ) ) {
+		if ( ! is_object($entity) && ! is_array($entity)) {
 			return false;
 		}
 
-		return (bool) $this->get_entity_id( $entity );
+		return (bool) $this->get_entity_id($entity);
 	}
 
 	/**
@@ -145,14 +145,14 @@ 
 	 *
 	 * @return mixed The value of the attribute of the entity.
 	 */
-	protected function get_attr_value( $entity, $attr ) {
+	protected function get_attr_value($entity, $attr) {
 
-		if ( is_array( $entity ) ) {
-			if ( isset( $entity[ $attr ] ) ) {
-				return $entity[ $attr ];
+		if (is_array($entity)) {
+			if (isset($entity[$attr])) {
+				return $entity[$attr];
 			}
 		} else {
-			if ( isset( $entity->{$attr} ) ) {
+			if (isset($entity->{$attr} )) {
 				return $entity->{$attr};
 			}
 		}
@@ -169,8 +169,8 @@ 
 	 *
 	 * @return mixed The ID of the entity.
 	 */
-	protected function get_entity_id( $entity ) {
-		return $this->get_attr_value( $entity, $this->get_id_field() );
+	protected function get_entity_id($entity) {
+		return $this->get_attr_value($entity, $this->get_id_field());
 	}
 
 	/**
@@ -186,8 +186,8 @@ 
 	 *
 	 * @return mixed The human ID of the entity.
 	 */
-	protected function get_entity_human_id( $entity ) {
-		return $this->get_attr_value( $entity, $this->human_id_field );
+	protected function get_entity_human_id($entity) {
+		return $this->get_attr_value($entity, $this->human_id_field);
 	}
 
 	//
@@ -231,15 +231,15 @@ 
 	 *
 	 * @return string|int|float|false The human identifier for the entity, or false.
 	 */
-	public function get_human_id( $id ) {
+	public function get_human_id($id) {
 
-		$entity = $this->get_entity( $id );
+		$entity = $this->get_entity($id);
 
-		if ( ! $entity ) {
+		if ( ! $entity) {
 			return false;
 		}
 
-		return $this->get_entity_human_id( $entity );
+		return $this->get_entity_human_id($entity);
 	}
 
 	/**
@@ -251,8 +251,8 @@ 
 	 *
 	 * @return bool Whether or not an entity with that ID exists.
 	 */
-	public function exists( $id ) {
-		return (bool) $this->get_entity( $id );
+	public function exists($id) {
+		return (bool) $this->get_entity($id);
 	}
 
 	/**
@@ -267,17 +267,17 @@ 
 	 *
 	 * @return WordPoints_Entityish|false The child's object, or false if not found.
 	 */
-	public function get_child( $child_slug ) {
+	public function get_child($child_slug) {
 
 		$children = wordpoints_entities()->children;
 
-		$child = $children->get( $this->slug, $child_slug );
+		$child = $children->get($this->slug, $child_slug);
 
 		if (
-			isset( $this->the_value )
+			isset($this->the_value)
 			&& $child instanceof WordPoints_Entity_ChildI
 		) {
-			$child->set_the_value_from_entity( $this );
+			$child->set_the_value_from_entity($this);
 		}
 
 		return $child;
@@ -299,20 +299,20 @@ 
 	 *
 	 * @return bool Whether the value was set.
 	 */
-	public function set_the_value( $value ) {
+	public function set_the_value($value) {
 
 		$this->the_value = $this->the_entity = $this->the_context = null;
 
-		if ( $this->is_entity( $value ) ) {
+		if ($this->is_entity($value)) {
 
 			$entity = $value;
-			$value = $this->get_entity_id( $value );
+			$value = $this->get_entity_id($value);
 
 		} else {
 
-			$entity = $this->get_entity( $value );
+			$entity = $this->get_entity($value);
 
-			if ( ! $entity ) {
+			if ( ! $entity) {
 				return false;
 			}
 		}
@@ -335,8 +335,8 @@ 
 	 *
 	 * @return mixed The value of the attribute.
 	 */
-	public function get_the_attr_value( $attr ) {
-		return $this->get_attr_value( $this->the_entity, $attr );
+	public function get_the_attr_value($attr) {
+		return $this->get_attr_value($this->the_entity, $attr);
 	}
 
 	/**
@@ -360,7 +360,7 @@ 
 	 * @return string|int|float|null The human identifier for the entity, or null.
 	 */
 	public function get_the_human_id() {
-		return $this->get_entity_human_id( $this->the_entity );
+		return $this->get_entity_human_id($this->the_entity);
 	}
 
 	/**
@@ -394,11 +394,11 @@ 
 
 		$guid = $this->get_the_context();
 
-		if ( ! is_array( $guid ) ) {
+		if ( ! is_array($guid)) {
 			return $guid;
 		}
 
-		$guid = array( $this->slug => $this->get_the_id() ) + $guid;
+		$guid = array($this->slug => $this->get_the_id()) + $guid;
 
 		return $guid;
 	}

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

Spacing +77 added lines, -77 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
 				);
 			}
 
@@ -175,18 +175,18 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function should_hit( WordPoints_Hook_Fire $fire ) {
+	public function should_hit(WordPoints_Hook_Fire $fire) {
 
-		$periods = $fire->reaction->get_meta( 'periods' );
+		$periods = $fire->reaction->get_meta('periods');
 
-		if ( empty( $periods ) ) {
+		if (empty($periods)) {
 			return true;
 		}
 
 		$this->event_args = $fire->event_args;
 
-		foreach ( $periods as $period ) {
-			if ( ! $this->has_period_ended( $period, $fire->reaction ) ) {
+		foreach ($periods as $period) {
+			if ( ! $this->has_period_ended($period, $fire->reaction)) {
 				return false;
 			}
 		}
@@ -210,24 +210,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->date, $now );
+		$now = current_time('timestamp');
+		$hit_time = strtotime($period->date, $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'])
 			);
 		}
 	}
@@ -241,24 +241,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;
 	}
@@ -272,11 +272,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;
 
@@ -293,7 +293,7 @@ 
 				)
 			);
 
-			if ( ! $period ) {
+			if ( ! $period) {
 				return false;
 			}
 
@@ -303,7 +303,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;
@@ -327,14 +327,14 @@ 
 
 		$reaction_guid = $reaction->get_guid();
 
-		$cache_key = wp_json_encode( $reaction_guid ) . "-{$signature}";
+		$cache_key = wp_json_encode($reaction_guid)."-{$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;
@@ -358,17 +358,17 @@ 
 				, $signature
 				, $reaction_guid['reactor']
 				, $reaction_guid['group']
-				, wp_json_encode( $reaction_guid['context_id'] )
+				, wp_json_encode($reaction_guid['context_id'])
 				, $reaction_guid['id']
 			)
 		);
 
-		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;
 	}
@@ -376,20 +376,20 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function after_hit( WordPoints_Hook_Fire $fire ) {
+	public function after_hit(WordPoints_Hook_Fire $fire) {
 
-		$periods = $fire->reaction->get_meta( 'periods' );
+		$periods = $fire->reaction->get_meta('periods');
 
-		if ( empty( $periods ) ) {
+		if (empty($periods)) {
 			return;
 		}
 
 		$this->event_args = $fire->event_args;
 
-		foreach ( $periods as $settings ) {
+		foreach ($periods as $settings) {
 
 			$this->add_period(
-				$this->get_period_signature( $settings, $fire->reaction )
+				$this->get_period_signature($settings, $fire->reaction)
 				, $fire
 			);
 		}
@@ -414,14 +414,14 @@ 
 		WordPoints_Hook_ReactionI $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))
 		);
 	}
 
@@ -435,7 +435,7 @@ 
 	 *
 	 * @return false|object The period data, or false if not found.
 	 */
-	protected function add_period( $signature, WordPoints_Hook_Fire $fire ) {
+	protected function add_period($signature, WordPoints_Hook_Fire $fire) {
 
 		global $wpdb;
 
@@ -445,17 +445,17 @@ 
 				'hit_id' => $fire->hit_id,
 				'signature' => $signature,
 			)
-			, array( '%d', '%s' )
+			, array('%d', '%s')
 		);
 
-		if ( ! $inserted ) {
+		if ( ! $inserted) {
 			return false;
 		}
 
 		$period_id = $wpdb->insert_id;
 
 		wp_cache_set(
-			wp_json_encode( $fire->reaction->get_guid() ) . "-{$signature}"
+			wp_json_encode($fire->reaction->get_guid())."-{$signature}"
 			, $period_id
 			, 'wordpoints_hook_period_ids'
 		);

src/includes/classes/hook/fire.php

Spacing +7 added lines, -7 removed lines

@@ -84,7 +84,7 @@ 
 		$this->firer      = $firer;
 		$this->event_args = $event_args;
 		$this->reaction   = $reaction;
-		$this->hit_logger = new WordPoints_Hook_Hit_Logger( $this );
+		$this->hit_logger = new WordPoints_Hook_Hit_Logger($this);
 		$this->supersedes = $supersedes;
 	}
 
@@ -97,11 +97,11 @@ 
 	 */
 	public function hit() {
 
-		if ( ! $this->hit_id ) {
+		if ( ! $this->hit_id) {
 
 			$this->hit_id = $this->hit_logger->log_hit();
 
-			if ( ! $this->hit_id ) {
+			if ( ! $this->hit_id) {
 				return false;
 			}
 		}
@@ -120,7 +120,7 @@ 
 	 */
 	public function get_superseded_hit() {
 
-		if ( isset( $this->supersedes ) ) {
+		if (isset($this->supersedes)) {
 			return $this->supersedes;
 		}
 
@@ -141,16 +141,16 @@ 
 					AND `superseded_by` IS NULL
 				"
 				, $this->firer->get_slug()
-				, wordpoints_hooks_get_event_primary_arg_guid_json( $this->event_args )
+				, wordpoints_hooks_get_event_primary_arg_guid_json($this->event_args)
 				, $this->reaction->get_event_slug()
 				, $this->reaction->get_reactor_slug()
 				, $this->reaction->get_storage_group_slug()
-				, wp_json_encode( $this->reaction->get_context_id() )
+				, wp_json_encode($this->reaction->get_context_id())
 				, $this->reaction->ID
 			)
 		);
 
-		$this->supersedes = ( $hit ) ? $hit : false;
+		$this->supersedes = ($hit) ? $hit : false;
 
 		return $this->supersedes;
 	}

src/includes/classes/hook/firer/reverse.php

Spacing +15 added lines, -15 removed lines

@@ -17,42 +17,42 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function do_event( $event_slug, WordPoints_Hook_Event_Args $event_args ) {
+	public function do_event($event_slug, WordPoints_Hook_Event_Args $event_args) {
 
 		$hooks = wordpoints_hooks();
 
-		foreach ( $this->get_hits( $event_slug, $event_args ) as $hit ) {
+		foreach ($this->get_hits($event_slug, $event_args) as $hit) {
 
-			$reactor = $hooks->reactors->get( $hit->reactor );
+			$reactor = $hooks->reactors->get($hit->reactor);
 
-			if ( ! $reactor instanceof WordPoints_Hook_Reactor ) {
+			if ( ! $reactor instanceof WordPoints_Hook_Reactor) {
 				continue;
 			}
 
-			$reactions = $reactor->get_reaction_group( $hit->reaction_type );
+			$reactions = $reactor->get_reaction_group($hit->reaction_type);
 
 			if (
 				! $reactions
-				|| wp_json_encode( $reactions->get_context_id() ) !== $hit->reaction_context_id
+				|| wp_json_encode($reactions->get_context_id()) !== $hit->reaction_context_id
 			) {
 				continue;
 			}
 
-			$reaction = $reactions->get_reaction( $hit->reaction_id );
+			$reaction = $reactions->get_reaction($hit->reaction_id);
 
-			if ( ! $reaction ) {
+			if ( ! $reaction) {
 				continue;
 			}
 
-			$fire = new WordPoints_Hook_Fire( $this, $event_args, $reaction, $hit );
+			$fire = new WordPoints_Hook_Fire($this, $event_args, $reaction, $hit);
 
 			$fire->hit();
 
-			$reactor->reverse_hit( $fire );
+			$reactor->reverse_hit($fire);
 
 			/** @var WordPoints_Hook_Extension $extension */
-			foreach ( $hooks->extensions->get_all() as $extension ) {
-				$extension->after_reverse( $fire );
+			foreach ($hooks->extensions->get_all() as $extension) {
+				$extension->after_reverse($fire);
 			}
 		}
 	}
@@ -67,7 +67,7 @@ 
 	 *
 	 * @return object[] The data for each hit from the hit logs database table.
 	 */
-	protected function get_hits( $event_slug, WordPoints_Hook_Event_Args $event_args ) {
+	protected function get_hits($event_slug, WordPoints_Hook_Event_Args $event_args) {
 
 		global $wpdb;
 
@@ -81,12 +81,12 @@ 
 					AND `event` = %s
 					AND `superseded_by` IS NULL
 				"
-				, wordpoints_hooks_get_event_primary_arg_guid_json( $event_args )
+				, wordpoints_hooks_get_event_primary_arg_guid_json($event_args)
 				, $event_slug
 			)
 		);
 
-		if ( ! is_array( $hits ) ) {
+		if ( ! is_array($hits)) {
 			return array();
 		}
 

src/includes/classes/hook/hit/logger.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @param WordPoints_Hook_Fire $fire The fire that might be logged as a hit.
 	 */
-	public function __construct( WordPoints_Hook_Fire $fire ) {
+	public function __construct(WordPoints_Hook_Fire $fire) {
 
 		$this->fire = $fire;
 	}
@@ -42,7 +42,7 @@ 
 
 		global $wpdb;
 
-		$signature = wordpoints_hooks_get_event_primary_arg_guid_json( $this->fire->event_args );
+		$signature = wordpoints_hooks_get_event_primary_arg_guid_json($this->fire->event_args);
 
 		$inserted = $wpdb->insert(
 			$wpdb->wordpoints_hook_hits
@@ -52,13 +52,13 @@ 
 				'event' => $this->fire->reaction->get_event_slug(),
 				'reactor' => $this->fire->reaction->get_reactor_slug(),
 				'reaction_type' => $this->fire->reaction->get_storage_group_slug(),
-				'reaction_context_id' => wp_json_encode( $this->fire->reaction->get_context_id() ),
+				'reaction_context_id' => wp_json_encode($this->fire->reaction->get_context_id()),
 				'reaction_id' => $this->fire->reaction->ID,
-				'date' => current_time( 'mysql' ),
+				'date' => current_time('mysql'),
 			)
 		);
 
-		if ( ! $inserted ) {
+		if ( ! $inserted) {
 			return false;
 		}
 
@@ -66,13 +66,13 @@ 
 
 		$supersedes = $this->fire->get_superseded_hit();
 
-		if ( $supersedes ) {
+		if ($supersedes) {
 			$wpdb->update(
 				$wpdb->wordpoints_hook_hits
-				, array( 'superseded_by' => $hit_id )
-				, array( 'id' => $supersedes->id )
-				, array( '%d' )
-				, array( '%d' )
+				, array('superseded_by' => $hit_id)
+				, array('id' => $supersedes->id)
+				, array('%d')
+				, array('%d')
 			);
 		}
 

src/includes/functions.php

Spacing +121 added lines, -121 removed lines

@@ -33,9 +33,9 @@ 
  *
  * @param WordPoints_Class_Registry_Persistent $reactors The reactors registry.
  */
-function wordpoints_hook_reactors_init( $reactors ) {
+function wordpoints_hook_reactors_init($reactors) {
 
-	$reactors->register( 'points', 'WordPoints_Hook_Reactor_Points' );
+	$reactors->register('points', 'WordPoints_Hook_Reactor_Points');
 }
 
 /**
@@ -47,7 +47,7 @@ 
  *
  * @param WordPoints_Class_Registry_Children $reaction_groups The group registry.
  */
-function wordpoints_hook_reaction_groups_init( $reaction_groups ) {
+function wordpoints_hook_reaction_groups_init($reaction_groups) {
 
 	$reaction_groups->register(
 		'points'
@@ -55,7 +55,7 @@ 
 		, 'WordPoints_Hook_Reaction_Storage_Options'
 	);
 
-	if ( is_wordpoints_network_active() ) {
+	if (is_wordpoints_network_active()) {
 		$reaction_groups->register(
 			'points'
 			, 'network'
@@ -73,10 +73,10 @@ 
  *
  * @param WordPoints_Class_Registry_Persistent $extensions The extension registry.
  */
-function wordpoints_hook_extension_init( $extensions ) {
+function wordpoints_hook_extension_init($extensions) {
 
-	$extensions->register( 'conditions', 'WordPoints_Hook_Extension_Conditions' );
-	$extensions->register( 'periods', 'WordPoints_Hook_Extension_Periods' );
+	$extensions->register('conditions', 'WordPoints_Hook_Extension_Conditions');
+	$extensions->register('periods', 'WordPoints_Hook_Extension_Periods');
 }
 
 /**
@@ -88,7 +88,7 @@ 
  *
  * @param WordPoints_Class_Registry_Children $conditions The conditions registry.
  */
-function wordpoints_hook_conditions_init( $conditions ) {
+function wordpoints_hook_conditions_init($conditions) {
 
 	$conditions->register(
 		'text'
@@ -124,7 +124,7 @@ 
  *
  * @param WordPoints_Hook_Actions $actions The action registry.
  */
-function wordpoints_hook_actions_init( $actions ) {
+function wordpoints_hook_actions_init($actions) {
 
 	$actions->register(
 		'comment_approve'
@@ -132,8 +132,8 @@ 
 		, array(
 			'action' => 'transition_comment_status',
 			'data'   => array(
-				'arg_index'    => array( 'comment' => 2 ),
-				'requirements' => array( 0 => 'approved' ),
+				'arg_index'    => array('comment' => 2),
+				'requirements' => array(0 => 'approved'),
 			),
 		)
 	);
@@ -144,7 +144,7 @@ 
 		, array(
 			'action' => 'wp_insert_comment',
 			'data'   => array(
-				'arg_index' => array( 'comment' => 1 ),
+				'arg_index' => array('comment' => 1),
 			),
 		)
 	);
@@ -155,8 +155,8 @@ 
 		, array(
 			'action' => 'transition_comment_status',
 			'data'   => array(
-				'arg_index' => array( 'comment' => 2 ),
-				'requirements' => array( 1 => 'approved' ),
+				'arg_index' => array('comment' => 2),
+				'requirements' => array(1 => 'approved'),
 			),
 		)
 	);
@@ -168,8 +168,8 @@ 
 		, array(
 			'action' => 'transition_post_status',
 			'data'   => array(
-				'arg_index' => array( 'post' => 2 ),
-				'requirements' => array( 0 => 'publish' ),
+				'arg_index' => array('post' => 2),
+				'requirements' => array(0 => 'publish'),
 			),
 		)
 	);
@@ -180,7 +180,7 @@ 
 		, array(
 			'action' => 'add_attachment',
 			'data'   => array(
-				'arg_index' => array( 'post\attachment' => 0 ),
+				'arg_index' => array('post\attachment' => 0),
 			),
 		)
 	);
@@ -191,7 +191,7 @@ 
 		, array(
 			'action' => 'post_delete',
 			'data'   => array(
-				'arg_index' => array( 'post' => 0 ),
+				'arg_index' => array('post' => 0),
 			),
 		)
 	);
@@ -202,7 +202,7 @@ 
 		, array(
 			'action' => 'user_register',
 			'data'   => array(
-				'arg_index' => array( 'user' => 0 ),
+				'arg_index' => array('user' => 0),
 			),
 		)
 	);
@@ -213,7 +213,7 @@ 
 		, array(
 			'action' => is_multisite() ? 'wpmu_delete_user' : 'delete_user',
 			'data'   => array(
-				'arg_index' => array( 'user' => 0 ),
+				'arg_index' => array('user' => 0),
 			),
 		)
 	);
@@ -236,7 +236,7 @@ 
  *
  * @param WordPoints_Hook_Events $events The event registry.
  */
-function wordpoints_hook_events_init( $events ) {
+function wordpoints_hook_events_init($events) {
 
 	$events->register(
 		'user_register'
@@ -266,7 +266,7 @@ 
 	);
 
 	// Register events for all of the public post types.
-	$post_types = get_post_types( array( 'public' => true ) );
+	$post_types = get_post_types(array('public' => true));
 
 	/**
 	 * Filter which post types to register hook events for.
@@ -275,20 +275,20 @@ 
 	 *
 	 * @param string[] The post type slugs ("names").
 	 */
-	$post_types = apply_filters( 'wordpoints_register_hook_events_for_post_types', $post_types );
+	$post_types = apply_filters('wordpoints_register_hook_events_for_post_types', $post_types);
 
-	foreach ( $post_types as $slug ) {
-		wordpoints_register_post_type_hook_events( $slug );
+	foreach ($post_types as $slug) {
+		wordpoints_register_post_type_hook_events($slug);
 	}
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 
 		$event_slugs = array(
 			'user_visit',
 			'user_register',
 		);
 
-		foreach ( $event_slugs as $event_slug ) {
+		foreach ($event_slugs as $event_slug) {
 			// TODO network hooks
 			$events->args->register(
 				$event_slug
@@ -308,10 +308,10 @@ 
  *
  * @param WordPoints_Class_Registry_Persistent $firers The firer registry.
  */
-function wordpoints_hook_firers_init( $firers ) {
+function wordpoints_hook_firers_init($firers) {
 
-	$firers->register( 'fire', 'WordPoints_Hook_Firer' );
-	$firers->register( 'reverse', 'WordPoints_Hook_Firer_Reverse' );
+	$firers->register('fire', 'WordPoints_Hook_Firer');
+	$firers->register('reverse', 'WordPoints_Hook_Firer_Reverse');
 }
 
 /**
@@ -323,10 +323,10 @@ 
  *
  * @param WordPoints_App_Registry $entities The entities app.
  */
-function wordpoints_entities_app_init( $entities ) {
+function wordpoints_entities_app_init($entities) {
 
-	$entities->sub_apps->register( 'children', 'WordPoints_Class_Registry_Children' );
-	$entities->sub_apps->register( 'contexts', 'WordPoints_Class_Registry' );
+	$entities->sub_apps->register('children', 'WordPoints_Class_Registry_Children');
+	$entities->sub_apps->register('contexts', 'WordPoints_Class_Registry');
 }
 
 /**
@@ -338,10 +338,10 @@ 
  *
  * @param WordPoints_Class_Registry $contexts The entity context registry.
  */
-function wordpoints_entity_contexts_init( $contexts ) {
+function wordpoints_entity_contexts_init($contexts) {
 
-	$contexts->register( 'network', 'WordPoints_Entity_Context_Network' );
-	$contexts->register( 'site', 'WordPoints_Entity_Context_Site' );
+	$contexts->register('network', 'WordPoints_Entity_Context_Network');
+	$contexts->register('site', 'WordPoints_Entity_Context_Site');
 }
 
 /**
@@ -353,18 +353,18 @@ 
  *
  * @param WordPoints_App_Registry $entities The entities app.
  */
-function wordpoints_entities_init( $entities ) {
+function wordpoints_entities_init($entities) {
 
 	$children = $entities->children;
 
-	$entities->register( 'user', 'WordPoints_Entity_User' );
-	$children->register( 'user', 'roles', 'WordPoints_Entity_User_Roles' );
+	$entities->register('user', 'WordPoints_Entity_User');
+	$children->register('user', 'roles', 'WordPoints_Entity_User_Roles');
 
-	$entities->register( 'user_role', 'WordPoints_Entity_User_Role' );
-	$children->register( 'user_role', 'name', 'WordPoints_Entity_User_Role_Name' );
+	$entities->register('user_role', 'WordPoints_Entity_User_Role');
+	$children->register('user_role', 'name', 'WordPoints_Entity_User_Role_Name');
 
 	// Register entities for all of the public post types.
-	$post_types = get_post_types( array( 'public' => true ) );
+	$post_types = get_post_types(array('public' => true));
 
 	/**
 	 * Filter which post types to register entities for.
@@ -373,14 +373,14 @@ 
 	 *
 	 * @param string[] The post type slugs ("names").
 	 */
-	$post_types = apply_filters( 'wordpoints_register_entities_for_post_types', $post_types );
+	$post_types = apply_filters('wordpoints_register_entities_for_post_types', $post_types);
 
-	foreach ( $post_types as $slug ) {
-		wordpoints_register_post_type_entities( $slug );
+	foreach ($post_types as $slug) {
+		wordpoints_register_post_type_entities($slug);
 	}
 
 	// Register entities for all of the public taxonomies.
-	$taxonomies = get_taxonomies( array( 'public' => true ) );
+	$taxonomies = get_taxonomies(array('public' => true));
 
 	/**
 	 * Filter which taxonomies to register entities for.
@@ -389,10 +389,10 @@ 
 	 *
 	 * @param string[] The taxonomy slugs.
 	 */
-	$taxonomies = apply_filters( 'wordpoints_register_entities_for_taxonomies', $taxonomies );
+	$taxonomies = apply_filters('wordpoints_register_entities_for_taxonomies', $taxonomies);
 
-	foreach ( $taxonomies as $slug ) {
-		wordpoints_register_taxonomy_entities( $slug );
+	foreach ($taxonomies as $slug) {
+		wordpoints_register_taxonomy_entities($slug);
 	}
 }
 
@@ -403,28 +403,28 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_register_post_type_entities( $slug ) {
+function wordpoints_register_post_type_entities($slug) {
 
 	$entities = wordpoints_entities();
 	$children = $entities->children;
 
-	$entities->register( "post\\{$slug}", 'WordPoints_Entity_Post' );
-	$children->register( "post\\{$slug}", 'author', 'WordPoints_Entity_Post_Author' );
+	$entities->register("post\\{$slug}", 'WordPoints_Entity_Post');
+	$children->register("post\\{$slug}", 'author', 'WordPoints_Entity_Post_Author');
 
-	$supports = get_all_post_type_supports( $slug );
+	$supports = get_all_post_type_supports($slug);
 
-	if ( isset( $supports['editor'] ) ) {
-		$children->register( "post\\{$slug}", 'content', 'WordPoints_Entity_Post_Content' );
+	if (isset($supports['editor'])) {
+		$children->register("post\\{$slug}", 'content', 'WordPoints_Entity_Post_Content');
 	}
 
-	if ( isset( $supports['comments'] ) ) {
-		$entities->register( "comment\\{$slug}", 'WordPoints_Entity_Comment' );
-		$children->register( "comment\\{$slug}", "post\\{$slug}", 'WordPoints_Entity_Comment_Post' );
-		$children->register( "comment\\{$slug}", 'author', 'WordPoints_Entity_Comment_Author' );
+	if (isset($supports['comments'])) {
+		$entities->register("comment\\{$slug}", 'WordPoints_Entity_Comment');
+		$children->register("comment\\{$slug}", "post\\{$slug}", 'WordPoints_Entity_Comment_Post');
+		$children->register("comment\\{$slug}", 'author', 'WordPoints_Entity_Comment_Author');
 	}
 
-	foreach ( get_object_taxonomies( $slug ) as $taxonomy_slug ) {
-		$children->register( "post\\{$slug}", "terms\\{$taxonomy_slug}", 'WordPoints_Entity_Post_Terms' );
+	foreach (get_object_taxonomies($slug) as $taxonomy_slug) {
+		$children->register("post\\{$slug}", "terms\\{$taxonomy_slug}", 'WordPoints_Entity_Post_Terms');
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 *
 	 * @param string $slug The slug ("name") of the post type.
 	 */
-	do_action( 'wordpoints_register_post_type_entities', $slug );
+	do_action('wordpoints_register_post_type_entities', $slug);
 }
 
 /**
@@ -444,13 +444,13 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_register_post_type_hook_events( $slug ) {
+function wordpoints_register_post_type_hook_events($slug) {
 
 	$event_slugs = array();
 
 	$events = wordpoints_hooks()->events;
 
-	if ( 'attachment' === $slug ) {
+	if ('attachment' === $slug) {
 
 		$event_slugs[] = 'media_upload';
 
@@ -487,7 +487,7 @@ 
 		);
 	}
 
-	if ( post_type_supports( $slug, 'comments' ) ) {
+	if (post_type_supports($slug, 'comments')) {
 
 		$event_slugs[] = "comment_leave\\{$slug}";
 
@@ -496,7 +496,7 @@ 
 			, 'WordPoints_Hook_Event_Comment_Leave'
 			, array(
 				'actions' => array(
-					'fire' => array( 'comment_approve', 'comment_new' ),
+					'fire' => array('comment_approve', 'comment_new'),
 					'reverse' => 'comment_deapprove',
 				),
 				'args' => array(
@@ -506,8 +506,8 @@ 
 		);
 	}
 
-	if ( is_multisite() ) {
-		foreach ( $event_slugs as $event_slug ) {
+	if (is_multisite()) {
+		foreach ($event_slugs as $event_slug) {
 			$events->args->register(
 				$event_slug
 				, 'current:site'
@@ -523,7 +523,7 @@ 
 	 *
 	 * @param string $slug The slug ("name") of the post type.
 	 */
-	do_action( 'wordpoints_register_post_type_hook_events', $slug );
+	do_action('wordpoints_register_post_type_hook_events', $slug);
 }
 
 /**
@@ -533,13 +533,13 @@ 
  *
  * @param string $slug The slug of the taxonomy.
  */
-function wordpoints_register_taxonomy_entities( $slug ) {
+function wordpoints_register_taxonomy_entities($slug) {
 
 	$entities = wordpoints_entities();
 	$children = $entities->children;
 
-	$entities->register( "term\\{$slug}", 'WordPoints_Entity_Term' );
-	$children->register( "term\\{$slug}", 'id', 'WordPoints_Entity_Term_Id' );
+	$entities->register("term\\{$slug}", 'WordPoints_Entity_Term');
+	$children->register("term\\{$slug}", 'id', 'WordPoints_Entity_Term_Id');
 
 	/**
 	 * Fired when registering the entities for a taxonomy.
@@ -548,7 +548,7 @@ 
 	 *
 	 * @param string $slug The taxonomy's slug.
 	 */
-	do_action( 'wordpoints_register_taxonomy_entities', $slug );
+	do_action('wordpoints_register_taxonomy_entities', $slug);
 }
 
 /**
@@ -560,10 +560,10 @@ 
  *
  * @param WordPoints_Class_RegistryI $data_types The data types registry.
  */
-function wordpoints_data_types_init( $data_types ) {
+function wordpoints_data_types_init($data_types) {
 
-	$data_types->register( 'integer', 'WordPoints_Data_Type_Integer' );
-	$data_types->register( 'text', 'WordPoints_Data_Type_Text' );
+	$data_types->register('integer', 'WordPoints_Data_Type_Integer');
+	$data_types->register('text', 'WordPoints_Data_Type_Text');
 }
 
 /**
@@ -578,9 +578,9 @@ 
  *
  * @return bool Whether the user can view the points log.
  */
-function wordpoints_hooks_user_can_view_points_log( $can_view, $log ) {
+function wordpoints_hooks_user_can_view_points_log($can_view, $log) {
 
-	if ( ! $can_view ) {
+	if ( ! $can_view) {
 		return $can_view;
 	}
 
@@ -589,11 +589,11 @@ 
 	$event_slug = $log->log_type;
 
 	/** @var WordPoints_Hook_Arg $arg */
-	foreach ( wordpoints_hooks()->events->args->get_children( $event_slug ) as $slug => $arg ) {
+	foreach (wordpoints_hooks()->events->args->get_children($event_slug) as $slug => $arg) {
 
-		$value = wordpoints_get_points_log_meta( $log->id, $slug, true );
+		$value = wordpoints_get_points_log_meta($log->id, $slug, true);
 
-		if ( ! $value ) {
+		if ( ! $value) {
 			continue;
 		}
 
@@ -603,7 +603,7 @@ 
 			, $value
 		);
 
-		if ( ! $can_view ) {
+		if ( ! $can_view) {
 			break;
 		}
 	}
@@ -622,20 +622,20 @@ 
  *
  * @return bool Whether the user can view this entity.
  */
-function wordpoints_entity_user_can_view( $user_id, $entity_slug, $entity_id ) {
+function wordpoints_entity_user_can_view($user_id, $entity_slug, $entity_id) {
 
-	$entity = wordpoints_entities()->get( $entity_slug );
+	$entity = wordpoints_entities()->get($entity_slug);
 
 	// If this entity type is not found, we have no way of determining whether it is
 	// safe for the user to view it.
-	if ( ! ( $entity instanceof WordPoints_Entity ) ) {
+	if ( ! ($entity instanceof WordPoints_Entity)) {
 		return false;
 	}
 
 	$can_view = true;
 
-	if ( $entity instanceof WordPoints_Entity_Restricted_VisibilityI ) {
-		$can_view = $entity->user_can_view( $user_id, $entity_id );
+	if ($entity instanceof WordPoints_Entity_Restricted_VisibilityI) {
+		$can_view = $entity->user_can_view($user_id, $entity_id);
 	}
 
 	/**
@@ -666,8 +666,8 @@ 
  */
 function wordpoints_apps() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
-		WordPoints_App::$main = new WordPoints_App( 'apps' );
+	if ( ! isset(WordPoints_App::$main)) {
+		WordPoints_App::$main = new WordPoints_App('apps');
 	}
 
 	return WordPoints_App::$main;
@@ -682,7 +682,7 @@ 
  */
 function wordpoints_hooks() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
@@ -698,7 +698,7 @@ 
  */
 function wordpoints_entities() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
@@ -714,13 +714,13 @@ 
  *
  * @param WordPoints_App $app The main apps app.
  */
-function wordpoints_apps_init( $app ) {
+function wordpoints_apps_init($app) {
 
 	$apps = $app->sub_apps;
 
-	$apps->register( 'hooks', 'WordPoints_Hooks' );
-	$apps->register( 'entities', 'WordPoints_App_Registry' );
-	$apps->register( 'data_types', 'WordPoints_Class_Registry' );
+	$apps->register('hooks', 'WordPoints_Hooks');
+	$apps->register('entities', 'WordPoints_App_Registry');
+	$apps->register('data_types', 'WordPoints_Class_Registry');
 }
 
 /**
@@ -733,19 +733,19 @@ 
  *
  * @return object|false The constructed object, or false if to many args were passed.
  */
-function wordpoints_construct_class_with_args( $class_name, array $args ) {
+function wordpoints_construct_class_with_args($class_name, array $args) {
 
-	switch ( count( $args ) ) {
+	switch (count($args)) {
 		case 0:
 			return new $class_name();
 		case 1:
-			return new $class_name( $args[0] );
+			return new $class_name($args[0]);
 		case 2:
-			return new $class_name( $args[0], $args[1] );
+			return new $class_name($args[0], $args[1]);
 		case 3:
-			return new $class_name( $args[0], $args[1], $args[2] );
+			return new $class_name($args[0], $args[1], $args[2]);
 		case 4:
-			return new $class_name( $args[0], $args[1], $args[2], $args[3] );
+			return new $class_name($args[0], $args[1], $args[2], $args[3]);
 		default:
 			return false;
 	}
@@ -767,13 +767,13 @@ 
  * @return array The slug parsed into the 'generic' and 'dynamic' portions. If the
  *               slug is not dynamic, the value of each of those keys will be false.
  */
-function wordpoints_parse_dynamic_slug( $slug ) {
+function wordpoints_parse_dynamic_slug($slug) {
 
-	$parsed = array( 'dynamic' => false, 'generic' => false );
+	$parsed = array('dynamic' => false, 'generic' => false);
 
-	$parts = explode( '\\', $slug, 2 );
+	$parts = explode('\\', $slug, 2);
 
-	if ( isset( $parts[1] ) ) {
+	if (isset($parts[1])) {
 		$parsed['dynamic'] = $parts[1];
 		$parsed['generic'] = $parts[0];
 	}
@@ -812,28 +812,28 @@ 
  *                     contexts, indexed by context slug, or false if any of the
  *                     contexts isn't current.
  */
-function wordpoints_entities_get_current_context_id( $slug ) {
+function wordpoints_entities_get_current_context_id($slug) {
 
 	$current_context = array();
 
 	/** @var WordPoints_Class_Registry $contexts */
 	$contexts = wordpoints_entities()->contexts;
 
-	while ( $slug ) {
+	while ($slug) {
 
-		$context = $contexts->get( $slug );
+		$context = $contexts->get($slug);
 
-		if ( ! $context instanceof WordPoints_Entity_Context ) {
+		if ( ! $context instanceof WordPoints_Entity_Context) {
 			return false;
 		}
 
 		$id = $context->get_current_id();
 
-		if ( false === $id ) {
+		if (false === $id) {
 			return false;
 		}
 
-		$current_context[ $slug ] = $id;
+		$current_context[$slug] = $id;
 
 		$slug = $context->get_parent_slug();
 	}
@@ -854,18 +854,18 @@ 
  */
 function wordpoints_is_network_context() {
 
-	if ( is_network_admin() ) {
+	if (is_network_admin()) {
 		return true;
 	}
 
 	// See https://core.trac.wordpress.org/ticket/22589
 	if (
-		defined( 'DOING_AJAX' )
+		defined('DOING_AJAX')
 		&& DOING_AJAX
-		&& isset( $_SERVER['HTTP_REFERER'] )
+		&& isset($_SERVER['HTTP_REFERER'])
 		&& preg_match(
-			'#^' . preg_quote( network_admin_url(), '#' ) . '#i'
-			, esc_url_raw( wp_unslash( $_SERVER['HTTP_REFERER'] ) )
+			'#^'.preg_quote(network_admin_url(), '#').'#i'
+			, esc_url_raw(wp_unslash($_SERVER['HTTP_REFERER']))
 		)
 	) {
 		return true;
@@ -878,7 +878,7 @@ 
 	 *
 	 * @param bool $in_network_context Whether we are in network context.
 	 */
-	return apply_filters( 'wordpoints_is_network_context', false );
+	return apply_filters('wordpoints_is_network_context', false);
 }
 
 /**
@@ -892,21 +892,21 @@ 
  *
  * @return string The primary arg's GUID, JSON encoded.
  */
-function wordpoints_hooks_get_event_primary_arg_guid_json( WordPoints_Hook_Event_Args $event_args ) {
+function wordpoints_hooks_get_event_primary_arg_guid_json(WordPoints_Hook_Event_Args $event_args) {
 
 	$entity = $event_args->get_primary_arg();
 
-	if ( ! $entity ) {
+	if ( ! $entity) {
 		return '';
 	}
 
 	$the_guid = $entity->get_the_guid();
 
-	if ( ! $the_guid ) {
+	if ( ! $the_guid) {
 		return '';
 	}
 
-	return wp_json_encode( $the_guid );
+	return wp_json_encode($the_guid);
 }
 
 // EOF