WordPoints / hooks-api

src/includes/classes/hook/extension.php

Spacing +21 added lines, -21 removed lines

@@ -65,14 +65,14 @@ 
 		WordPoints_Hook_Event_Args $event_args
 	) {
 
-		if ( ! isset( $settings[ $this->slug ] ) ) {
+		if ( ! isset($settings[$this->slug])) {
 			return $settings;
 		}
 
-		if ( ! is_array( $settings[ $this->slug ] ) ) {
+		if ( ! is_array($settings[$this->slug])) {
 
 			$validator->add_error(
-				__( 'Invalid settings format.', 'wordpoints' )
+				__('Invalid settings format.', 'wordpoints')
 				, $this->slug
 			);
 
@@ -82,18 +82,18 @@ 
 		$this->validator = $validator;
 		$this->event_args = $event_args;
 
-		$this->validator->push_field( $this->slug );
+		$this->validator->push_field($this->slug);
 
-		foreach ( $settings[ $this->slug ] as $firer => $firer_settings ) {
+		foreach ($settings[$this->slug] as $firer => $firer_settings) {
 
-			if ( ! wordpoints_hooks()->firers->is_registered( $firer ) ) {
-				$this->validator->add_error( __( 'Unknown hook firer.', 'wordpoints' ), $firer );
+			if ( ! wordpoints_hooks()->firers->is_registered($firer)) {
+				$this->validator->add_error(__('Unknown hook firer.', 'wordpoints'), $firer);
 				continue;
 			}
 
-			$this->validator->push_field( $firer );
+			$this->validator->push_field($firer);
 
-			$settings[ $this->slug ][ $firer ] = $this->validate_firer_settings(
+			$settings[$this->slug][$firer] = $this->validate_firer_settings(
 				$firer_settings
 			);
 
@@ -108,12 +108,12 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function update_settings( WordPoints_Hook_ReactionI $reaction, array $settings ) {
+	public function update_settings(WordPoints_Hook_ReactionI $reaction, array $settings) {
 
-		if ( isset( $settings[ $this->slug ] ) ) {
-			$reaction->update_meta( $this->slug, $settings[ $this->slug ] );
+		if (isset($settings[$this->slug])) {
+			$reaction->update_meta($this->slug, $settings[$this->slug]);
 		} else {
-			$reaction->delete_meta( $this->slug );
+			$reaction->delete_meta($this->slug);
 		}
 	}
 
@@ -126,7 +126,7 @@ 
 	 *
 	 * @return mixed The validated settings.
 	 */
-	protected function validate_firer_settings( $settings ) {}
+	protected function validate_firer_settings($settings) {}
 
 	/**
 	 * Get the extension settings from the fire object.
@@ -141,17 +141,17 @@ 
 	 *
 	 * @return mixed The settings for the extension, or false if none.
 	 */
-	protected function get_settings_from_fire( WordPoints_Hook_Fire $fire ) {
+	protected function get_settings_from_fire(WordPoints_Hook_Fire $fire) {
 
 		$firer_slug = $fire->firer->get_slug();
-		$settings   = $fire->reaction->get_meta( $this->slug );
+		$settings   = $fire->reaction->get_meta($this->slug);
 
-		if ( ! is_array( $settings ) ) {
+		if ( ! is_array($settings)) {
 			return $settings;
 		}
 
-		if ( isset( $settings[ $firer_slug ] ) ) {
-			return $settings[ $firer_slug ];
+		if (isset($settings[$firer_slug])) {
+			return $settings[$firer_slug];
 		} else {
 			return false;
 		}
@@ -166,7 +166,7 @@ 
 	 *
 	 * @return bool Whether the target should be hit by this hook firing.
 	 */
-	abstract public function should_hit( WordPoints_Hook_Fire $fire );
+	abstract public function should_hit(WordPoints_Hook_Fire $fire);
 
 	/**
 	 * After a reaction has hit the target.
@@ -175,7 +175,7 @@ 
 	 *
 	 * @param WordPoints_Hook_Fire $fire The hook fire object.
 	 */
-	public function after_hit( WordPoints_Hook_Fire $fire ) {}
+	public function after_hit(WordPoints_Hook_Fire $fire) {}
 
 	/**
 	 * Get the data the scripts need for the UI.

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

Spacing +53 added lines, -53 removed lines

@@ -42,14 +42,14 @@ 
 
 		$conditions_data = array();
 
-		foreach ( $this->conditions->get_all() as $data_type => $conditions ) {
-			foreach ( $conditions as $slug => $condition ) {
+		foreach ($this->conditions->get_all() as $data_type => $conditions) {
+			foreach ($conditions as $slug => $condition) {
 
-				if ( ! ( $condition instanceof WordPoints_Hook_Condition ) ) {
+				if ( ! ($condition instanceof WordPoints_Hook_Condition)) {
 					continue;
 				}
 
-				$conditions_data[ $data_type ][ $slug ] = array(
+				$conditions_data[$data_type][$slug] = array(
 					'slug'      => $slug,
 					'data_type' => $data_type,
 					'title'     => $condition->get_title(),
@@ -58,14 +58,14 @@ 
 			}
 		}
 
-		return array( 'conditions' => $conditions_data );
+		return array('conditions' => $conditions_data);
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	protected function validate_firer_settings( $settings ) {
-		return $this->validate_conditions( $settings );
+	protected function validate_firer_settings($settings) {
+		return $this->validate_conditions($settings);
 	}
 
 	/**
@@ -77,31 +77,31 @@ 
 	 *
 	 * @return array The validated settings.
 	 */
-	protected function validate_conditions( $args ) {
+	protected function validate_conditions($args) {
 
-		if ( ! is_array( $args ) ) {
+		if ( ! is_array($args)) {
 
 			$this->validator->add_error(
-				__( 'Conditions do not match expected format.', 'wordpoints' )
+				__('Conditions do not match expected format.', 'wordpoints')
 			);
 
 			return array();
 		}
 
-		foreach ( $args as $arg_slug => $sub_args ) {
+		foreach ($args as $arg_slug => $sub_args) {
 
-			if ( '_conditions' === $arg_slug ) {
+			if ('_conditions' === $arg_slug) {
 
-				$this->validator->push_field( $arg_slug );
+				$this->validator->push_field($arg_slug);
 
-				foreach ( $sub_args as $index => $settings ) {
+				foreach ($sub_args as $index => $settings) {
 
-					$this->validator->push_field( $index );
+					$this->validator->push_field($index);
 
-					$condition = $this->validate_condition( $settings );
+					$condition = $this->validate_condition($settings);
 
-					if ( $condition ) {
-						$sub_args[ $index ] = $condition;
+					if ($condition) {
+						$sub_args[$index] = $condition;
 					}
 
 					$this->validator->pop_field();
@@ -111,18 +111,18 @@ 
 
 			} else {
 
-				if ( ! $this->event_args->descend( $arg_slug ) ) {
+				if ( ! $this->event_args->descend($arg_slug)) {
 					continue;
 				}
 
-				$sub_args = $this->validate_firer_settings( $sub_args );
+				$sub_args = $this->validate_firer_settings($sub_args);
 
-				$args[ $arg_slug ] = $sub_args;
+				$args[$arg_slug] = $sub_args;
 
 				$this->event_args->ascend();
 			}
 
-			$args[ $arg_slug ] = $sub_args;
+			$args[$arg_slug] = $sub_args;
 		}
 
 		return $args;
@@ -138,32 +138,32 @@ 
 	 * @return array|false The validated conditions settings, or false if unable to
 	 *                     validate.
 	 */
-	protected function validate_condition( $settings ) {
+	protected function validate_condition($settings) {
 
-		if ( ! isset( $settings['type'] ) ) {
-			$this->validator->add_error( __( 'Condition type is missing.', 'wordpoints' ) );
+		if ( ! isset($settings['type'])) {
+			$this->validator->add_error(__('Condition type is missing.', 'wordpoints'));
 			return false;
 		}
 
 		$arg = $this->event_args->get_current();
 
-		$data_type = $this->get_data_type( $arg );
+		$data_type = $this->get_data_type($arg);
 
-		if ( ! $data_type ) {
+		if ( ! $data_type) {
 			$this->validator->add_error(
-				__( 'This type of condition does not work for the selected attribute.', 'wordpoints' )
+				__('This type of condition does not work for the selected attribute.', 'wordpoints')
 			);
 
 			return false;
 		}
 
-		$condition = wordpoints_hooks()->conditions->get( $data_type, $settings['type'] );
+		$condition = wordpoints_hooks()->conditions->get($data_type, $settings['type']);
 
-		if ( ! $condition ) {
+		if ( ! $condition) {
 
 			$this->validator->add_error(
 				sprintf(
-					__( 'Unknown condition type “%s”.', 'wordpoints' )
+					__('Unknown condition type “%s”.', 'wordpoints')
 					, $settings['type']
 				)
 				, 'type'
@@ -172,17 +172,17 @@ 
 			return false;
 		}
 
-		if ( ! isset( $settings['settings'] ) ) {
-			$this->validator->add_error( __( 'Condition settings are missing.', 'wordpoints' ) );
+		if ( ! isset($settings['settings'])) {
+			$this->validator->add_error(__('Condition settings are missing.', 'wordpoints'));
 			return false;
 		}
 
-		$this->validator->push_field( 'settings' );
+		$this->validator->push_field('settings');
 
 		// The condition may call this object's validate_settings() method to
 		// validate some sub-conditions. When that happens, these properties will be
 		// reset, so we need to back up their values and then restore them below.
-		$backup = array( $this->validator, $this->event_args );
+		$backup = array($this->validator, $this->event_args);
 
 		$settings['settings'] = $condition->validate_settings(
 			$arg
@@ -190,7 +190,7 @@ 
 			, $this->validator
 		);
 
-		list( $this->validator, $this->event_args ) = $backup;
+		list($this->validator, $this->event_args) = $backup;
 
 		$this->validator->pop_field();
 
@@ -200,11 +200,11 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function should_hit( WordPoints_Hook_Fire $fire ) {
+	public function should_hit(WordPoints_Hook_Fire $fire) {
 
-		$conditions = $this->get_settings_from_fire( $fire );
+		$conditions = $this->get_settings_from_fire($fire);
 
-		if ( $conditions && ! $this->conditions_are_met( $conditions, $fire->event_args ) ) {
+		if ($conditions && ! $this->conditions_are_met($conditions, $fire->event_args)) {
 			return false;
 		}
 
@@ -226,35 +226,35 @@ 
 		WordPoints_Hook_Event_Args $event_args
 	) {
 
-		foreach ( $conditions as $arg_slug => $sub_args ) {
+		foreach ($conditions as $arg_slug => $sub_args) {
 
-			$event_args->descend( $arg_slug );
+			$event_args->descend($arg_slug);
 
-			if ( isset( $sub_args['_conditions'] ) ) {
+			if (isset($sub_args['_conditions'])) {
 
-				foreach ( $sub_args['_conditions'] as $settings ) {
+				foreach ($sub_args['_conditions'] as $settings) {
 
 					$condition = $this->conditions->get(
-						$this->get_data_type( $event_args->get_current() )
+						$this->get_data_type($event_args->get_current())
 						, $settings['type']
 					);
 
-					$is_met = $condition->is_met( $settings['settings'], $event_args );
+					$is_met = $condition->is_met($settings['settings'], $event_args);
 
-					if ( ! $is_met ) {
+					if ( ! $is_met) {
 						$event_args->ascend();
 						return false;
 					}
 				}
 
-				unset( $sub_args['_conditions'] );
+				unset($sub_args['_conditions']);
 			}
 
-			$are_met = $this->conditions_are_met( $sub_args, $event_args );
+			$are_met = $this->conditions_are_met($sub_args, $event_args);
 
 			$event_args->ascend();
 
-			if ( ! $are_met ) {
+			if ( ! $are_met) {
 				return false;
 			}
 		}
@@ -271,13 +271,13 @@ 
 	 *
 	 * @return string|false The data type, or false.
 	 */
-	protected function get_data_type( $arg ) {
+	protected function get_data_type($arg) {
 
-		if ( $arg instanceof WordPoints_Entity_Attr ) {
+		if ($arg instanceof WordPoints_Entity_Attr) {
 			$data_type = $arg->get_data_type();
-		} elseif ( $arg instanceof WordPoints_Entity_Array ) {
+		} elseif ($arg instanceof WordPoints_Entity_Array) {
 			$data_type = 'entity_array';
-		} elseif ( $arg instanceof WordPoints_Entity ) {
+		} elseif ($arg instanceof WordPoints_Entity) {
 			$data_type = 'entity';
 		} else {
 			$data_type = false;

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,12 +39,12 @@ 
 		 *
 		 * @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(
-				'label' => __( 'Trigger reaction no more than once per:', 'wordpoints' ),
+				'label' => __('Trigger reaction no more than once per:', 'wordpoints'),
 			),
 		);
 	}
@@ -58,25 +58,25 @@ 
 	 *
 	 * @return array The validated periods.
 	 */
-	protected function validate_firer_settings( $periods ) {
+	protected function validate_firer_settings($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();
@@ -94,30 +94,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'
 			);
 
@@ -134,34 +134,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
 				);
 			}
 
@@ -174,18 +174,18 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function should_hit( WordPoints_Hook_Fire $fire ) {
+	public function should_hit(WordPoints_Hook_Fire $fire) {
 
-		$periods = $this->get_settings_from_fire( $fire );
+		$periods = $this->get_settings_from_fire($fire);
 
-		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;
 			}
 		}
@@ -209,24 +209,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'])
 			);
 		}
 	}
@@ -240,24 +240,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;
 	}
@@ -271,11 +271,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_periods' );
+		$period = wp_cache_get($period_id, 'wordpoints_hook_periods');
 
-		if ( ! $period ) {
+		if ( ! $period) {
 
 			global $wpdb;
 
@@ -292,11 +292,11 @@ 
 				)
 			);
 
-			if ( ! $period ) {
+			if ( ! $period) {
 				return false;
 			}
 
-			wp_cache_set( $period->id, $period, 'wordpoints_hook_periods' );
+			wp_cache_set($period->id, $period, 'wordpoints_hook_periods');
 		}
 
 		return $period;
@@ -320,14 +320,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_by_reaction' );
+		$period_id = wp_cache_get($cache_key, 'wordpoints_hook_period_ids_by_reaction');
 
 		// 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;
@@ -351,17 +351,17 @@ 
 				, $signature
 				, $reaction_guid['reactor']
 				, $reaction_guid['store']
-				, 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_by_reaction' );
-		wp_cache_set( $period->id, $period, 'wordpoints_hook_periods' );
+		wp_cache_set($cache_key, $period->id, 'wordpoints_hook_period_ids_by_reaction');
+		wp_cache_set($period->id, $period, 'wordpoints_hook_periods');
 
 		return $period;
 	}
@@ -369,20 +369,20 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function after_hit( WordPoints_Hook_Fire $fire ) {
+	public function after_hit(WordPoints_Hook_Fire $fire) {
 
-		$periods = $this->get_settings_from_fire( $fire );
+		$periods = $this->get_settings_from_fire($fire);
 
-		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
 			);
 		}
@@ -407,14 +407,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))
 		);
 	}
 
@@ -428,7 +428,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;
 
@@ -438,17 +438,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_by_reaction'
 		);

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

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	 *
 	 * @return bool Whether the hit should be reversed or not.
 	 */
-	public function should_reverse( WordPoints_Hook_Fire $fire );
+	public function should_reverse(WordPoints_Hook_Fire $fire);
 
 	/**
 	 * Called after a reverse action is called.
@@ -32,7 +32,7 @@ 
 	 *
 	 * @param WordPoints_Hook_Fire $fire The reverse fire object.
 	 */
-	public function after_reverse( WordPoints_Hook_Fire $fire );
+	public function after_reverse(WordPoints_Hook_Fire $fire);
 }
 
 // EOF

src/includes/classes/hook/reactor.php

Spacing +26 added lines, -26 removed lines

@@ -53,9 +53,9 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function __get( $var ) {
+	public function __get($var) {
 
-		if ( 'reactions' !== $var ) {
+		if ('reactions' !== $var) {
 			return null;
 		}
 
@@ -63,7 +63,7 @@ 
 			wordpoints_hooks()->get_current_mode()
 		);
 
-		if ( ! $reaction_store ) {
+		if ( ! $reaction_store) {
 			return null;
 		}
 
@@ -79,20 +79,20 @@ 
 	 *
 	 * @return WordPoints_Hook_Reaction_StoreI|false The reaction storage object.
 	 */
-	public function get_reaction_store( $slug ) {
+	public function get_reaction_store($slug) {
 
 		$reaction_store = wordpoints_hooks()->reaction_stores->get(
 			$this->slug
 			, $slug
-			, array( $this )
+			, array($this)
 		);
 
-		if ( ! $reaction_store instanceof WordPoints_Hook_Reaction_StoreI ) {
+		if ( ! $reaction_store instanceof WordPoints_Hook_Reaction_StoreI) {
 			return false;
 		}
 
 		// Allowing access to stores out-of-context would lead to strange behavior.
-		if ( false === $reaction_store->get_context_id() ) {
+		if (false === $reaction_store->get_context_id()) {
 			return false;
 		}
 
@@ -145,7 +145,7 @@ 
 			'slug'      => $this->get_slug(),
 			'fields'    => $this->get_settings_fields(),
 			'arg_types' => $this->get_arg_types(),
-			'firers'    => array( 'fire' ),
+			'firers'    => array('fire'),
 		);
 	}
 
@@ -183,7 +183,7 @@ 
 	 *
 	 * @return WordPoints_Hook_ReactionI[] All of the reaction objects.
 	 */
-	public function get_all_reactions_to_event( $event_slug ) {
+	public function get_all_reactions_to_event($event_slug) {
 
 		$reactions = array();
 
@@ -191,17 +191,17 @@ 
 			$this->slug
 		);
 
-		foreach ( $slugs as $slug ) {
+		foreach ($slugs as $slug) {
 
-			$store = $this->get_reaction_store( $slug );
+			$store = $this->get_reaction_store($slug);
 
-			if ( ! $store ) {
+			if ( ! $store) {
 				continue;
 			}
 
 			$reactions = array_merge(
 				$reactions
-				, $store->get_reactions_to_event( $event_slug )
+				, $store->get_reactions_to_event($event_slug)
 			);
 		}
 
@@ -230,15 +230,15 @@ 
 			$this->slug
 		);
 
-		foreach ( $slugs as $slug ) {
+		foreach ($slugs as $slug) {
 
-			$store = $this->get_reaction_store( $slug );
+			$store = $this->get_reaction_store($slug);
 
-			if ( ! $store ) {
+			if ( ! $store) {
 				continue;
 			}
 
-			$reactions = array_merge( $reactions, $store->get_reactions() );
+			$reactions = array_merge($reactions, $store->get_reactions());
 		}
 
 		return $reactions;
@@ -254,21 +254,21 @@ 
 	) {
 
 		if (
-			empty( $settings['target'] )
-			|| ! is_array( $settings['target'] )
+			empty($settings['target'])
+			|| ! is_array($settings['target'])
 		) {
 
-			$validator->add_error( __( 'Invalid target.', 'wordpoints' ), 'target' );
+			$validator->add_error(__('Invalid target.', 'wordpoints'), 'target');
 
 		} else {
 
-			$target = $event_args->get_from_hierarchy( $settings['target'] );
+			$target = $event_args->get_from_hierarchy($settings['target']);
 
 			if (
 				! $target instanceof WordPoints_Entity
-				|| ! in_array( $target->get_slug(), (array) $this->arg_types )
+				|| ! in_array($target->get_slug(), (array) $this->arg_types)
 			) {
-				$validator->add_error( __( 'Invalid target.', 'wordpoints' ), 'target' );
+				$validator->add_error(__('Invalid target.', 'wordpoints'), 'target');
 			}
 		}
 
@@ -278,8 +278,8 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function update_settings( WordPoints_Hook_ReactionI $reaction, array $settings ) {
-		$reaction->update_meta( 'target', $settings['target'] );
+	public function update_settings(WordPoints_Hook_ReactionI $reaction, array $settings) {
+		$reaction->update_meta('target', $settings['target']);
 	}
 
 	/**
@@ -289,7 +289,7 @@ 
 	 *
 	 * @param WordPoints_Hook_Fire $fire The hook fire object.
 	 */
-	abstract public function hit( WordPoints_Hook_Fire $fire );
+	abstract public function hit(WordPoints_Hook_Fire $fire);
 }
 
 // EOF

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

Spacing +23 added lines, -23 removed lines

@@ -17,67 +17,67 @@ 
 	/**
 	 * @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();
 
-		$hits = $this->get_hits( $event_slug, $event_args );
+		$hits = $this->get_hits($event_slug, $event_args);
 		$reverse_hit_ids = array();
 
-		foreach ( $hits as $hit ) {
+		foreach ($hits as $hit) {
 
 			/** @var WordPoints_Hook_Reactor $reactor */
-			$reactor = $hooks->reactors->get( $hit->reactor );
+			$reactor = $hooks->reactors->get($hit->reactor);
 
-			if ( ! $reactor instanceof WordPoints_Hook_Reactor_ReverseI ) {
+			if ( ! $reactor instanceof WordPoints_Hook_Reactor_ReverseI) {
 				continue;
 			}
 
-			$reactions = $reactor->get_reaction_store( $hit->reaction_store );
+			$reactions = $reactor->get_reaction_store($hit->reaction_store);
 
 			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 );
+			$fire = new WordPoints_Hook_Fire($this, $event_args, $reaction);
 
-			foreach ( $hooks->extensions->get_all() as $extension ) {
+			foreach ($hooks->extensions->get_all() as $extension) {
 
-				if ( ! $extension instanceof WordPoints_Hook_Extension_ReverseI ) {
+				if ( ! $extension instanceof WordPoints_Hook_Extension_ReverseI) {
 					continue;
 				}
 
-				if ( ! $extension->should_reverse( $fire ) ) {
+				if ( ! $extension->should_reverse($fire)) {
 					continue 2;
 				}
 			}
 
-			$reverse_hit_ids[ $hit->id ] = $fire->hit();
+			$reverse_hit_ids[$hit->id] = $fire->hit();
 
-			$reactor->reverse_hit( $fire );
+			$reactor->reverse_hit($fire);
 
-			foreach ( $hooks->extensions->get_all() as $extension ) {
-				if ( $extension instanceof WordPoints_Hook_Extension_ReverseI ) {
-					$extension->after_reverse( $fire );
+			foreach ($hooks->extensions->get_all() as $extension) {
+				if ($extension instanceof WordPoints_Hook_Extension_ReverseI) {
+					$extension->after_reverse($fire);
 				}
 			}
 		}
 
 		// Set the reversed_by meta key for all hits so that we know that they have
 		// been reverse fired, even if they didn't hit.
-		foreach ( $hits as $hit ) {
+		foreach ($hits as $hit) {
 
-			if ( isset( $reverse_hit_ids[ $hit->id ] ) ) {
-				$reversed_by = $reverse_hit_ids[ $hit->id ];
+			if (isset($reverse_hit_ids[$hit->id])) {
+				$reversed_by = $reverse_hit_ids[$hit->id];
 			} else {
 				$reversed_by = 0;
 			}
@@ -102,7 +102,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) {
 
 		$query = new WordPoints_Hook_Hit_Query(
 			array(
@@ -118,7 +118,7 @@ 
 
 		$hits = $query->get();
 
-		if ( ! is_array( $hits ) ) {
+		if ( ! is_array($hits)) {
 			return array();
 		}
 

src/includes/classes/hook/condition/entity/array/contains.php

Spacing +36 added lines, -36 removed lines

@@ -56,7 +56,7 @@ 
 	 * @since 1.0.0
 	 */
 	public function get_title() {
-		return __( 'Contains', 'wordpoints' );
+		return __('Contains', 'wordpoints');
 	}
 
 	/**
@@ -66,13 +66,13 @@ 
 		return array(
 			'min' => array(
 				'slug'    => 'min',
-				'label'   => __( 'Minimum number of items', 'wordpoints' ),
+				'label'   => __('Minimum number of items', 'wordpoints'),
 				'type'    => 'number',
 				'default' => 1,
 			),
 			'max' => array(
 				'slug'  => 'max',
-				'label' => __( 'Maximum number of items', 'wordpoints' ),
+				'label' => __('Maximum number of items', 'wordpoints'),
 				'type'  => 'number',
 			),
 		);
@@ -92,8 +92,8 @@ 
 
 		$this->validate_count();
 
-		if ( isset( $settings['conditions'] ) ) {
-			$this->validate_conditions( $arg );
+		if (isset($settings['conditions'])) {
+			$this->validate_conditions($arg);
 		}
 
 		return $this->settings;
@@ -107,31 +107,31 @@ 
 	protected function validate_count() {
 
 		if (
-			! empty( $this->settings['max'] )
-			&& ! wordpoints_posint( $this->settings['max'] )
+			! empty($this->settings['max'])
+			&& ! wordpoints_posint($this->settings['max'])
 		) {
 			$this->validator->add_error(
-				__( 'The maximum must be a positive integer.', 'wordpoints' )
+				__('The maximum must be a positive integer.', 'wordpoints')
 				, 'max'
 			);
 		}
 
-		if ( ! empty( $this->settings['min'] ) ) {
+		if ( ! empty($this->settings['min'])) {
 
-			if ( ! wordpoints_posint( $this->settings['min'] ) ) {
+			if ( ! wordpoints_posint($this->settings['min'])) {
 
 				$this->validator->add_error(
-					__( 'The minimum must be a positive integer.', 'wordpoints' )
+					__('The minimum must be a positive integer.', 'wordpoints')
 					, 'min'
 				);
 
 			} elseif (
-				! empty( $this->settings['max'] )
+				! empty($this->settings['max'])
 				&& $this->settings['max'] < $this->settings['min']
 			) {
 
 				$this->validator->add_error(
-					__( 'The minimum must be less than the maximum.', 'wordpoints' )
+					__('The minimum must be less than the maximum.', 'wordpoints')
 					, 'min'
 				);
 			}
@@ -145,39 +145,39 @@ 
 	 *
 	 * @param WordPoints_EntityishI $current_arg The current arg.
 	 */
-	protected function validate_conditions( $current_arg ) {
+	protected function validate_conditions($current_arg) {
 
-		$args = new WordPoints_Hook_Event_Args( array() );
+		$args = new WordPoints_Hook_Event_Args(array());
 
-		if ( $current_arg instanceof WordPoints_Entity_Array ) {
+		if ($current_arg instanceof WordPoints_Entity_Array) {
 
 			$entity = wordpoints_entities()->get(
 				$current_arg->get_entity_slug()
 			);
 
-			if ( $entity instanceof WordPoints_Entity ) {
-				$args->add_entity( $entity );
+			if ($entity instanceof WordPoints_Entity) {
+				$args->add_entity($entity);
 			}
 		}
 
-		$args->set_validator( $this->validator );
+		$args->set_validator($this->validator);
 
 		$firer_slugs = wordpoints_hooks()->firers->get_all_slugs();
-		$firer_slug  = array_shift( $firer_slugs );
+		$firer_slug  = array_shift($firer_slugs);
 
 		$conditions = $this->conditions_extension->validate_settings(
-			array( 'conditions' => array( $firer_slug => $this->settings['conditions'] ) )
+			array('conditions' => array($firer_slug => $this->settings['conditions']))
 			, $this->validator
 			, $args
 		);
 
-		$this->settings['conditions'] = $conditions['conditions'][ $firer_slug ];
+		$this->settings['conditions'] = $conditions['conditions'][$firer_slug];
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	public function is_met( array $settings, WordPoints_Hook_Event_Args $args ) {
+	public function is_met(array $settings, WordPoints_Hook_Event_Args $args) {
 
 		$this->settings = $settings;
 
@@ -185,16 +185,16 @@ 
 
 		$entities = array();
 
-		if ( $arg instanceof WordPoints_Entity_Array ) {
+		if ($arg instanceof WordPoints_Entity_Array) {
 
 			$entities = $arg->get_the_entities();
 
-			if ( isset( $this->settings['conditions'] ) ) {
-				$entities = $this->filter_entities( $entities );
+			if (isset($this->settings['conditions'])) {
+				$entities = $this->filter_entities($entities);
 			}
 		}
 
-		return $this->check_count( count( $entities ) );
+		return $this->check_count(count($entities));
 	}
 
 	/**
@@ -206,20 +206,20 @@ 
 	 *
 	 * @return WordPoints_Entity[] The entities that matched the sub-conditions.
 	 */
-	protected function filter_entities( $entities ) {
+	protected function filter_entities($entities) {
 
-		foreach ( $entities as $index => $entity ) {
+		foreach ($entities as $index => $entity) {
 
-			$event_args = new WordPoints_Hook_Event_Args( array() );
-			$event_args->add_entity( $entity );
+			$event_args = new WordPoints_Hook_Event_Args(array());
+			$event_args->add_entity($entity);
 
 			$matches = $this->conditions_extension->conditions_are_met(
 				$this->settings['conditions']
 				, $event_args
 			);
 
-			if ( ! $matches ) {
-				unset( $entities[ $index ] );
+			if ( ! $matches) {
+				unset($entities[$index]);
 			}
 		}
 
@@ -235,13 +235,13 @@ 
 	 *
 	 * @return bool Whether the count met the requirements.
 	 */
-	protected function check_count( $count ) {
+	protected function check_count($count) {
 
-		if ( isset( $this->settings['max'] ) && $count > $this->settings['max'] ) {
+		if (isset($this->settings['max']) && $count > $this->settings['max']) {
 			return false;
 		}
 
-		if ( isset( $this->settings['min'] ) && $count < $this->settings['min'] ) {
+		if (isset($this->settings['min']) && $count < $this->settings['min']) {
 			return false;
 		}
 

src/includes/classes/index.php

Spacing +106 added lines, -106 removed lines

@@ -10,112 +10,112 @@
  */
 
 // auto-generated {
-require_once( dirname( __FILE__ ) . 'app.php' );
-require_once( dirname( __FILE__ ) . 'app/registry.php' );
-require_once( dirname( __FILE__ ) . 'class/autoloader.php' );
-require_once( dirname( __FILE__ ) . 'class/registry.php' );
-require_once( dirname( __FILE__ ) . 'class/registry/children.php' );
-require_once( dirname( __FILE__ ) . 'class/registry/childreni.php' );
-require_once( dirname( __FILE__ ) . 'class/registry/persistent.php' );
-require_once( dirname( __FILE__ ) . 'class/registryi.php' );
-require_once( dirname( __FILE__ ) . 'data/type.php' );
-require_once( dirname( __FILE__ ) . 'data/type/integer.php' );
-require_once( dirname( __FILE__ ) . 'data/type/text.php' );
-require_once( dirname( __FILE__ ) . 'data/typei.php' );
-require_once( dirname( __FILE__ ) . 'db/query.php' );
-require_once( dirname( __FILE__ ) . 'entity.php' );
-require_once( dirname( __FILE__ ) . 'entity/array.php' );
-require_once( dirname( __FILE__ ) . 'entity/attr.php' );
-require_once( dirname( __FILE__ ) . 'entity/childi.php' );
-require_once( dirname( __FILE__ ) . 'entity/comment.php' );
-require_once( dirname( __FILE__ ) . 'entity/comment/author.php' );
-require_once( dirname( __FILE__ ) . 'entity/comment/post.php' );
-require_once( dirname( __FILE__ ) . 'entity/context.php' );
-require_once( dirname( __FILE__ ) . 'entity/context/network.php' );
-require_once( dirname( __FILE__ ) . 'entity/context/site.php' );
-require_once( dirname( __FILE__ ) . 'entity/enumerablei.php' );
-require_once( dirname( __FILE__ ) . 'entity/hierarchy.php' );
-require_once( dirname( __FILE__ ) . 'entity/hierarchyi.php' );
-require_once( dirname( __FILE__ ) . 'entity/parenti.php' );
-require_once( dirname( __FILE__ ) . 'entity/post.php' );
-require_once( dirname( __FILE__ ) . 'entity/post/author.php' );
-require_once( dirname( __FILE__ ) . 'entity/post/content.php' );
-require_once( dirname( __FILE__ ) . 'entity/post/terms.php' );
-require_once( dirname( __FILE__ ) . 'entity/post/type.php' );
-require_once( dirname( __FILE__ ) . 'entity/post/type/name.php' );
-require_once( dirname( __FILE__ ) . 'entity/post/type/relationship.php' );
-require_once( dirname( __FILE__ ) . 'entity/relationship.php' );
-require_once( dirname( __FILE__ ) . 'entity/relationship/dynamic.php' );
-require_once( dirname( __FILE__ ) . 'entity/restricted/visibilityi.php' );
-require_once( dirname( __FILE__ ) . 'entity/site.php' );
-require_once( dirname( __FILE__ ) . 'entity/term.php' );
-require_once( dirname( __FILE__ ) . 'entity/term/id.php' );
-require_once( dirname( __FILE__ ) . 'entity/user.php' );
-require_once( dirname( __FILE__ ) . 'entity/user/role.php' );
-require_once( dirname( __FILE__ ) . 'entity/user/role/name.php' );
-require_once( dirname( __FILE__ ) . 'entity/user/roles.php' );
-require_once( dirname( __FILE__ ) . 'entityish.php' );
-require_once( dirname( __FILE__ ) . 'entityishi.php' );
-require_once( dirname( __FILE__ ) . 'hierarchy.php' );
-require_once( dirname( __FILE__ ) . 'hook/action.php' );
-require_once( dirname( __FILE__ ) . 'hook/action/comment/new.php' );
-require_once( dirname( __FILE__ ) . 'hook/action/post/publish.php' );
-require_once( dirname( __FILE__ ) . 'hook/actioni.php' );
-require_once( dirname( __FILE__ ) . 'hook/actions.php' );
-require_once( dirname( __FILE__ ) . 'hook/arg.php' );
-require_once( dirname( __FILE__ ) . 'hook/arg/current/post.php' );
-require_once( dirname( __FILE__ ) . 'hook/arg/current/site.php' );
-require_once( dirname( __FILE__ ) . 'hook/arg/current/user.php' );
-require_once( dirname( __FILE__ ) . 'hook/arg/dynamic.php' );
-require_once( dirname( __FILE__ ) . 'hook/condition.php' );
-require_once( dirname( __FILE__ ) . 'hook/condition/entity/array/contains.php' );
-require_once( dirname( __FILE__ ) . 'hook/condition/equals.php' );
-require_once( dirname( __FILE__ ) . 'hook/condition/string/contains.php' );
-require_once( dirname( __FILE__ ) . 'hook/conditioni.php' );
-require_once( dirname( __FILE__ ) . 'hook/event.php' );
-require_once( dirname( __FILE__ ) . 'hook/event/args.php' );
-require_once( dirname( __FILE__ ) . 'hook/event/comment/leave.php' );
-require_once( dirname( __FILE__ ) . 'hook/event/dynamic.php' );
-require_once( dirname( __FILE__ ) . 'hook/event/media/upload.php' );
-require_once( dirname( __FILE__ ) . 'hook/event/post/publish.php' );
-require_once( dirname( __FILE__ ) . 'hook/event/user/register.php' );
-require_once( dirname( __FILE__ ) . 'hook/event/user/visit.php' );
-require_once( dirname( __FILE__ ) . 'hook/eventi.php' );
-require_once( dirname( __FILE__ ) . 'hook/events.php' );
-require_once( dirname( __FILE__ ) . 'hook/extension.php' );
-require_once( dirname( __FILE__ ) . 'hook/extension/conditions.php' );
-require_once( dirname( __FILE__ ) . 'hook/extension/periods.php' );
-require_once( dirname( __FILE__ ) . 'hook/extension/reversei.php' );
-require_once( dirname( __FILE__ ) . 'hook/fire.php' );
-require_once( dirname( __FILE__ ) . 'hook/firer.php' );
-require_once( dirname( __FILE__ ) . 'hook/firer/reverse.php' );
-require_once( dirname( __FILE__ ) . 'hook/fireri.php' );
-require_once( dirname( __FILE__ ) . 'hook/hit/logger.php' );
-require_once( dirname( __FILE__ ) . 'hook/hit/query.php' );
-require_once( dirname( __FILE__ ) . 'hook/reaction.php' );
-require_once( dirname( __FILE__ ) . 'hook/reaction/options.php' );
-require_once( dirname( __FILE__ ) . 'hook/reaction/store.php' );
-require_once( dirname( __FILE__ ) . 'hook/reaction/store/options.php' );
-require_once( dirname( __FILE__ ) . 'hook/reaction/store/options/network.php' );
-require_once( dirname( __FILE__ ) . 'hook/reaction/storei.php' );
-require_once( dirname( __FILE__ ) . 'hook/reaction/validator.php' );
-require_once( dirname( __FILE__ ) . 'hook/reactioni.php' );
-require_once( dirname( __FILE__ ) . 'hook/reactor.php' );
-require_once( dirname( __FILE__ ) . 'hook/reactor/points.php' );
-require_once( dirname( __FILE__ ) . 'hook/reactor/reversei.php' );
-require_once( dirname( __FILE__ ) . 'hook/retroactive/conditions.php' );
-require_once( dirname( __FILE__ ) . 'hook/retroactive/query.php' );
-require_once( dirname( __FILE__ ) . 'hook/retroactive/query/modifieri.php' );
-require_once( dirname( __FILE__ ) . 'hook/retroactive/queryable.php' );
-require_once( dirname( __FILE__ ) . 'hook/retroactive/queryi.php' );
-require_once( dirname( __FILE__ ) . 'hook/router.php' );
-require_once( dirname( __FILE__ ) . 'hook/settings.php' );
-require_once( dirname( __FILE__ ) . 'hook/settingsi.php' );
-require_once( dirname( __FILE__ ) . 'hook/validator/exception.php' );
-require_once( dirname( __FILE__ ) . 'hooks.php' );
-require_once( dirname( __FILE__ ) . 'query/builder/db/mysql.php' );
-require_once( dirname( __FILE__ ) . 'spec.php' );
-require_once( dirname( __FILE__ ) . 'specedi.php' );
+require_once(dirname(__FILE__).'app.php');
+require_once(dirname(__FILE__).'app/registry.php');
+require_once(dirname(__FILE__).'class/autoloader.php');
+require_once(dirname(__FILE__).'class/registry.php');
+require_once(dirname(__FILE__).'class/registry/children.php');
+require_once(dirname(__FILE__).'class/registry/childreni.php');
+require_once(dirname(__FILE__).'class/registry/persistent.php');
+require_once(dirname(__FILE__).'class/registryi.php');
+require_once(dirname(__FILE__).'data/type.php');
+require_once(dirname(__FILE__).'data/type/integer.php');
+require_once(dirname(__FILE__).'data/type/text.php');
+require_once(dirname(__FILE__).'data/typei.php');
+require_once(dirname(__FILE__).'db/query.php');
+require_once(dirname(__FILE__).'entity.php');
+require_once(dirname(__FILE__).'entity/array.php');
+require_once(dirname(__FILE__).'entity/attr.php');
+require_once(dirname(__FILE__).'entity/childi.php');
+require_once(dirname(__FILE__).'entity/comment.php');
+require_once(dirname(__FILE__).'entity/comment/author.php');
+require_once(dirname(__FILE__).'entity/comment/post.php');
+require_once(dirname(__FILE__).'entity/context.php');
+require_once(dirname(__FILE__).'entity/context/network.php');
+require_once(dirname(__FILE__).'entity/context/site.php');
+require_once(dirname(__FILE__).'entity/enumerablei.php');
+require_once(dirname(__FILE__).'entity/hierarchy.php');
+require_once(dirname(__FILE__).'entity/hierarchyi.php');
+require_once(dirname(__FILE__).'entity/parenti.php');
+require_once(dirname(__FILE__).'entity/post.php');
+require_once(dirname(__FILE__).'entity/post/author.php');
+require_once(dirname(__FILE__).'entity/post/content.php');
+require_once(dirname(__FILE__).'entity/post/terms.php');
+require_once(dirname(__FILE__).'entity/post/type.php');
+require_once(dirname(__FILE__).'entity/post/type/name.php');
+require_once(dirname(__FILE__).'entity/post/type/relationship.php');
+require_once(dirname(__FILE__).'entity/relationship.php');
+require_once(dirname(__FILE__).'entity/relationship/dynamic.php');
+require_once(dirname(__FILE__).'entity/restricted/visibilityi.php');
+require_once(dirname(__FILE__).'entity/site.php');
+require_once(dirname(__FILE__).'entity/term.php');
+require_once(dirname(__FILE__).'entity/term/id.php');
+require_once(dirname(__FILE__).'entity/user.php');
+require_once(dirname(__FILE__).'entity/user/role.php');
+require_once(dirname(__FILE__).'entity/user/role/name.php');
+require_once(dirname(__FILE__).'entity/user/roles.php');
+require_once(dirname(__FILE__).'entityish.php');
+require_once(dirname(__FILE__).'entityishi.php');
+require_once(dirname(__FILE__).'hierarchy.php');
+require_once(dirname(__FILE__).'hook/action.php');
+require_once(dirname(__FILE__).'hook/action/comment/new.php');
+require_once(dirname(__FILE__).'hook/action/post/publish.php');
+require_once(dirname(__FILE__).'hook/actioni.php');
+require_once(dirname(__FILE__).'hook/actions.php');
+require_once(dirname(__FILE__).'hook/arg.php');
+require_once(dirname(__FILE__).'hook/arg/current/post.php');
+require_once(dirname(__FILE__).'hook/arg/current/site.php');
+require_once(dirname(__FILE__).'hook/arg/current/user.php');
+require_once(dirname(__FILE__).'hook/arg/dynamic.php');
+require_once(dirname(__FILE__).'hook/condition.php');
+require_once(dirname(__FILE__).'hook/condition/entity/array/contains.php');
+require_once(dirname(__FILE__).'hook/condition/equals.php');
+require_once(dirname(__FILE__).'hook/condition/string/contains.php');
+require_once(dirname(__FILE__).'hook/conditioni.php');
+require_once(dirname(__FILE__).'hook/event.php');
+require_once(dirname(__FILE__).'hook/event/args.php');
+require_once(dirname(__FILE__).'hook/event/comment/leave.php');
+require_once(dirname(__FILE__).'hook/event/dynamic.php');
+require_once(dirname(__FILE__).'hook/event/media/upload.php');
+require_once(dirname(__FILE__).'hook/event/post/publish.php');
+require_once(dirname(__FILE__).'hook/event/user/register.php');
+require_once(dirname(__FILE__).'hook/event/user/visit.php');
+require_once(dirname(__FILE__).'hook/eventi.php');
+require_once(dirname(__FILE__).'hook/events.php');
+require_once(dirname(__FILE__).'hook/extension.php');
+require_once(dirname(__FILE__).'hook/extension/conditions.php');
+require_once(dirname(__FILE__).'hook/extension/periods.php');
+require_once(dirname(__FILE__).'hook/extension/reversei.php');
+require_once(dirname(__FILE__).'hook/fire.php');
+require_once(dirname(__FILE__).'hook/firer.php');
+require_once(dirname(__FILE__).'hook/firer/reverse.php');
+require_once(dirname(__FILE__).'hook/fireri.php');
+require_once(dirname(__FILE__).'hook/hit/logger.php');
+require_once(dirname(__FILE__).'hook/hit/query.php');
+require_once(dirname(__FILE__).'hook/reaction.php');
+require_once(dirname(__FILE__).'hook/reaction/options.php');
+require_once(dirname(__FILE__).'hook/reaction/store.php');
+require_once(dirname(__FILE__).'hook/reaction/store/options.php');
+require_once(dirname(__FILE__).'hook/reaction/store/options/network.php');
+require_once(dirname(__FILE__).'hook/reaction/storei.php');
+require_once(dirname(__FILE__).'hook/reaction/validator.php');
+require_once(dirname(__FILE__).'hook/reactioni.php');
+require_once(dirname(__FILE__).'hook/reactor.php');
+require_once(dirname(__FILE__).'hook/reactor/points.php');
+require_once(dirname(__FILE__).'hook/reactor/reversei.php');
+require_once(dirname(__FILE__).'hook/retroactive/conditions.php');
+require_once(dirname(__FILE__).'hook/retroactive/query.php');
+require_once(dirname(__FILE__).'hook/retroactive/query/modifieri.php');
+require_once(dirname(__FILE__).'hook/retroactive/queryable.php');
+require_once(dirname(__FILE__).'hook/retroactive/queryi.php');
+require_once(dirname(__FILE__).'hook/router.php');
+require_once(dirname(__FILE__).'hook/settings.php');
+require_once(dirname(__FILE__).'hook/settingsi.php');
+require_once(dirname(__FILE__).'hook/validator/exception.php');
+require_once(dirname(__FILE__).'hooks.php');
+require_once(dirname(__FILE__).'query/builder/db/mysql.php');
+require_once(dirname(__FILE__).'spec.php');
+require_once(dirname(__FILE__).'specedi.php');
 // }
 
 // EOF

src/includes/classes/db/query.php

Spacing +111 added lines, -111 removed lines

@@ -214,8 +214,8 @@ 
 	 *        @type array        $meta_query          See WP_Meta_Query.
 	 * }
 	 */
-	public function __construct( $args = array() ) {
-		$this->args = array_merge( $this->defaults, $args );
+	public function __construct($args = array()) {
+		$this->args = array_merge($this->defaults, $args);
 	}
 
 	/**
@@ -227,10 +227,10 @@ 
 	 *
 	 * @return mixed|null The query arg's value, or null if it isn't set.
 	 */
-	public function get_arg( $arg ) {
+	public function get_arg($arg) {
 
-		if ( isset( $this->args[ $arg ] ) ) {
-			return $this->args[ $arg ];
+		if (isset($this->args[$arg])) {
+			return $this->args[$arg];
 		} else {
 			return null;
 		}
@@ -246,9 +246,9 @@ 
 	 *
 	 * @param array $args A list of arguments to set and their values.
 	 */
-	public function set_args( array $args ) {
+	public function set_args(array $args) {
 
-		$this->args = array_merge( $this->args, $args );
+		$this->args = array_merge($this->args, $args);
 
 		$this->is_query_ready = false;
 	}
@@ -269,7 +269,7 @@ 
 
 		global $wpdb;
 
-		$count = (int) $wpdb->get_var( $this->get_sql( 'SELECT COUNT' ) ); // WPCS: unprepared SQL, cache OK
+		$count = (int) $wpdb->get_var($this->get_sql('SELECT COUNT')); // WPCS: unprepared SQL, cache OK
 
 		return $count;
 	}
@@ -284,20 +284,20 @@ 
 	 *
 	 * @return mixed The results of the query, or false on failure.
 	 */
-	public function get( $method = 'results' ) {
+	public function get($method = 'results') {
 
 		global $wpdb;
 
-		$methods = array( 'results', 'row', 'col', 'var' );
+		$methods = array('results', 'row', 'col', 'var');
 
-		if ( ! in_array( $method, $methods ) ) {
+		if ( ! in_array($method, $methods)) {
 
-			_doing_it_wrong( __METHOD__, esc_html( sprintf( 'WordPoints Debug Error: invalid get method %s, possible values are %s', $method, implode( ', ', $methods ) ) ), '1.0.0' );
+			_doing_it_wrong(__METHOD__, esc_html(sprintf('WordPoints Debug Error: invalid get method %s, possible values are %s', $method, implode(', ', $methods))), '1.0.0');
 
 			return false;
 		}
 
-		$result = $wpdb->{"get_{$method}"}( $this->get_sql() );
+		$result = $wpdb->{"get_{$method}"}($this->get_sql());
 
 		return $result;
 	}
@@ -317,11 +317,11 @@ 
 	 *
 	 * @return string The SQL for the query.
 	 */
-	public function get_sql( $select_type = 'SELECT' ) {
+	public function get_sql($select_type = 'SELECT') {
 
 		$this->prepare_query();
 
-		$select = ( 'SELECT COUNT' === $select_type )
+		$select = ('SELECT COUNT' === $select_type)
 			? $this->select_count
 			: $this->select;
 
@@ -349,12 +349,12 @@ 
 	 *
 	 * @return string[] The valid columns.
 	 */
-	public function date_query_valid_columns_filter( $valid_columns ) {
+	public function date_query_valid_columns_filter($valid_columns) {
 
 		$valid_columns = array_merge(
 			$valid_columns
 			, array_keys(
-				wp_list_filter( $this->columns, array( 'is_date' => true ) )
+				wp_list_filter($this->columns, array('is_date' => true))
 			)
 		);
 
@@ -372,7 +372,7 @@ 
 	 */
 	protected function prepare_query() {
 
-		if ( ! $this->is_query_ready ) {
+		if ( ! $this->is_query_ready) {
 
 			$this->prepare_select();
 			$this->prepare_where();
@@ -390,26 +390,26 @@ 
 	 */
 	protected function prepare_select() {
 
-		$all_fields = array_keys( $this->columns );
+		$all_fields = array_keys($this->columns);
 		$fields = array();
 
-		if ( ! empty( $this->args['fields'] ) ) {
+		if ( ! empty($this->args['fields'])) {
 
 			$fields = (array) $this->args['fields'];
-			$diff   = array_diff( $fields, $all_fields );
-			$fields = array_intersect( $all_fields, $fields );
+			$diff   = array_diff($fields, $all_fields);
+			$fields = array_intersect($all_fields, $fields);
 
-			if ( ! empty( $diff ) ) {
-				_doing_it_wrong( __METHOD__, esc_html( 'WordPoints Debug Error: invalid field(s) "' . implode( '", "', $diff ) . '" given' ), '1.0.0' );
+			if ( ! empty($diff)) {
+				_doing_it_wrong(__METHOD__, esc_html('WordPoints Debug Error: invalid field(s) "'.implode('", "', $diff).'" given'), '1.0.0');
 			}
 		}
 
 		// Pull all fields by default.
-		if ( empty( $fields ) ) {
+		if (empty($fields)) {
 			$fields = $all_fields;
 		}
 
-		$fields = implode( ', ', array_map( 'wordpoints_escape_mysql_identifier', $fields ) );
+		$fields = implode(', ', array_map('wordpoints_escape_mysql_identifier', $fields));
 
 		$this->select = "SELECT {$fields}";
 	}
@@ -424,13 +424,13 @@ 
 	 *
 	 * @return mixed The validated value, or false if invalid.
 	 */
-	protected function validate_value( $value, $validators ) {
+	protected function validate_value($value, $validators) {
 
-		foreach ( $validators as $validator ) {
+		foreach ($validators as $validator) {
 
-			$value = call_user_func_array( $validator, array( &$value ) );
+			$value = call_user_func_array($validator, array(&$value));
 
-			if ( false === $value ) {
+			if (false === $value) {
 				break;
 			}
 		}
@@ -448,14 +448,14 @@ 
 	 *
 	 * @return array The validated values, with any invalid ones removed.
 	 */
-	protected function validate_values( $values, $validators ) {
+	protected function validate_values($values, $validators) {
 
-		foreach ( $values as $index => $value ) {
+		foreach ($values as $index => $value) {
 
-			$value = $this->validate_value( $value, $validators );
+			$value = $this->validate_value($value, $validators);
 
-			if ( false === $value ) {
-				unset( $values[ $index ] );
+			if (false === $value) {
+				unset($values[$index]);
 			}
 		}
 
@@ -474,9 +474,9 @@ 
 	 *
 	 * @return int|false The validated value or false.
 	 */
-	protected function validate_unsigned_column( $value ) {
+	protected function validate_unsigned_column($value) {
 
-		if ( false !== wordpoints_int( $value ) && $value >= 0 ) {
+		if (false !== wordpoints_int($value) && $value >= 0) {
 			return $value;
 		}
 
@@ -492,14 +492,14 @@ 
 	 *
 	 * @return callable[] The validation functions.
 	 */
-	protected function get_validators_for_column( $data ) {
+	protected function get_validators_for_column($data) {
 
 		$validators = array();
 
 		// Default validators for integer columns.
-		if ( '%d' === $data['format'] ) {
-			if ( ! empty( $data['unsigned'] ) ) {
-				$validators[] = array( $this, 'validate_unsigned_column' );
+		if ('%d' === $data['format']) {
+			if ( ! empty($data['unsigned'])) {
+				$validators[] = array($this, 'validate_unsigned_column');
 			} else {
 				$validators[] = 'wordpoints_int';
 			}
@@ -516,15 +516,15 @@ 
 	 * @param string $column The column name.
 	 * @param array  $data   The column data.
 	 */
-	protected function prepare_column_where( $column, $data ) {
+	protected function prepare_column_where($column, $data) {
 
 		// If a single value has been supplied for the column, it takes precedence.
-		if ( isset( $this->args[ $column ] ) ) {
-			$this->prepare_column( $column, $data );
-		} elseif ( isset( $this->args[ "{$column}__in" ] ) ) {
-			$this->prepare_column__in( $column, $data );
-		} elseif ( isset( $this->args[ "{$column}__not_in" ] ) ) {
-			$this->prepare_column__in( $column, $data, 'NOT IN' );
+		if (isset($this->args[$column])) {
+			$this->prepare_column($column, $data);
+		} elseif (isset($this->args["{$column}__in"])) {
+			$this->prepare_column__in($column, $data);
+		} elseif (isset($this->args["{$column}__not_in"])) {
+			$this->prepare_column__in($column, $data, 'NOT IN');
 		}
 	}
 
@@ -536,29 +536,29 @@ 
 	 * @param string $column The name of the column
 	 * @param array  $data   The column data.
 	 */
-	protected function prepare_column( $column, $data ) {
+	protected function prepare_column($column, $data) {
 
 		global $wpdb;
 
 		if (
-			isset( $data['values'] )
-			&& ! in_array( $this->args[ $column ], $data['values'], true )
+			isset($data['values'])
+			&& ! in_array($this->args[$column], $data['values'], true)
 		) {
 			return;
 		}
 
 		$value = $this->validate_value(
-			$this->args[ $column ]
-			, $this->get_validators_for_column( $data )
+			$this->args[$column]
+			, $this->get_validators_for_column($data)
 		);
 
-		if ( false === $value ) {
+		if (false === $value) {
 			return;
 		}
 
-		$compare = $this->get_comparator_for_column( $column, $data );
+		$compare = $this->get_comparator_for_column($column, $data);
 
-		$column = wordpoints_escape_mysql_identifier( $column );
+		$column = wordpoints_escape_mysql_identifier($column);
 
 		$this->wheres[] = $wpdb->prepare( // WPCS: unprepared SQL OK.
 			"{$column} {$compare} {$data['format']}"
@@ -576,23 +576,23 @@ 
 	 *
 	 * @return string The comparator for the column.
 	 */
-	protected function get_comparator_for_column( $column, $data ) {
+	protected function get_comparator_for_column($column, $data) {
 
-		$comparisons = array( '=', '<', '>', '<>', '!=', '<=', '>=' );
+		$comparisons = array('=', '<', '>', '<>', '!=', '<=', '>=');
 
 		// MySQL doesn't support LIKE and NOT LIKE for int columns.
 		// See http://stackoverflow.com/q/8422455/1924128
-		if ( '%s' === $data['format'] ) {
-			$comparisons = array_merge( $comparisons, array( 'LIKE', 'NOT LIKE' ) );
+		if ('%s' === $data['format']) {
+			$comparisons = array_merge($comparisons, array('LIKE', 'NOT LIKE'));
 		}
 
 		$comparator = '=';
 
 		if (
-			isset( $this->args[ "{$column}__compare" ] )
-			&& in_array( $this->args[ "{$column}__compare" ], $comparisons, true )
+			isset($this->args["{$column}__compare"])
+			&& in_array($this->args["{$column}__compare"], $comparisons, true)
 		) {
-			$comparator = $this->args[ "{$column}__compare" ];
+			$comparator = $this->args["{$column}__compare"];
 		}
 
 		return $comparator;
@@ -607,36 +607,36 @@ 
 	 * @param array  $data   The column data.
 	 * @param string $type   The type of IN clause, IN or NOT IN.
 	 */
-	protected function prepare_column__in( $column, $data, $type = 'IN' ) {
+	protected function prepare_column__in($column, $data, $type = 'IN') {
 
-		$key = "{$column}__" . strtolower( str_replace( ' ', '_', $type ) );
+		$key = "{$column}__".strtolower(str_replace(' ', '_', $type));
 
-		if ( empty( $this->args[ $key ] ) || ! is_array( $this->args[ $key ] ) ) {
+		if (empty($this->args[$key]) || ! is_array($this->args[$key])) {
 			return;
 		}
 
-		$values = $this->args[ $key ];
+		$values = $this->args[$key];
 
-		if ( isset( $data['values'] ) ) {
-			$values = array_intersect( $values, $data['values'] );
+		if (isset($data['values'])) {
+			$values = array_intersect($values, $data['values']);
 		} else {
 			$values = $this->validate_values(
 				$values
-				, $this->get_validators_for_column( $data )
+				, $this->get_validators_for_column($data)
 			);
 		}
 
-		if ( empty( $values ) ) {
+		if (empty($values)) {
 			return;
 		}
 
-		$in = wordpoints_prepare__in( $values, $data['format'] );
+		$in = wordpoints_prepare__in($values, $data['format']);
 
-		if ( false === $in ) {
+		if (false === $in) {
 			return;
 		}
 
-		$column = wordpoints_escape_mysql_identifier( $column );
+		$column = wordpoints_escape_mysql_identifier($column);
 
 		$this->wheres[] = "{$column} {$type} ({$in})";
 	}
@@ -650,19 +650,19 @@ 
 
 		$this->wheres = array();
 
-		foreach ( $this->columns as $column => $data ) {
+		foreach ($this->columns as $column => $data) {
 
-			if ( ! empty( $data['is_date'] ) ) {
-				$this->prepare_date_where( $column );
+			if ( ! empty($data['is_date'])) {
+				$this->prepare_date_where($column);
 			} else {
-				$this->prepare_column_where( $column, $data );
+				$this->prepare_column_where($column, $data);
 			}
 		}
 
 		$this->prepare_meta_where();
 
-		if ( ! empty( $this->wheres ) ) {
-			$this->where = 'WHERE ' . implode( ' AND ', $this->wheres ) . "\n";
+		if ( ! empty($this->wheres)) {
+			$this->where = 'WHERE '.implode(' AND ', $this->wheres)."\n";
 		}
 	}
 
@@ -675,32 +675,32 @@ 
 
 		// MySQL doesn't allow for the offset without a limit, so if no limit is set
 		// we can ignore the start arg. See http://stackoverflow.com/a/271650/1924128
-		if ( ! isset( $this->args['limit'] ) ) {
+		if ( ! isset($this->args['limit'])) {
 			return;
 		}
 
-		foreach ( array( 'limit', 'start' ) as $key ) {
+		foreach (array('limit', 'start') as $key) {
 
 			// Save a backup of the arg value since wordpoints_int() is by reference.
-			$arg = $this->args[ $key ];
+			$arg = $this->args[$key];
 
-			if ( false === wordpoints_int( $this->args[ $key ] ) ) {
+			if (false === wordpoints_int($this->args[$key])) {
 
 				_doing_it_wrong(
 					__METHOD__
 					, sprintf(
 						"WordPoints Debug Error: '%s' must be a positive integer, %s given"
-						, esc_html( $key )
-						, esc_html( strval( $arg ) ? $arg : gettype( $arg ) )
+						, esc_html($key)
+						, esc_html(strval($arg) ? $arg : gettype($arg))
 					)
 					, '1.0.0'
 				);
 
-				$this->args[ $key ] = 0;
+				$this->args[$key] = 0;
 			}
 		}
 
-		if ( $this->args['limit'] > 0 && $this->args['start'] >= 0 ) {
+		if ($this->args['limit'] > 0 && $this->args['start'] >= 0) {
 			$this->limit = "LIMIT {$this->args['start']}, {$this->args['limit']}";
 		}
 	}
@@ -712,20 +712,20 @@ 
 	 */
 	protected function prepare_order_by() {
 
-		if ( empty( $this->args['order_by'] ) ) {
+		if (empty($this->args['order_by'])) {
 			return;
 		}
 
 		$order    = $this->args['order'];
 		$order_by = $this->args['order_by'];
 
-		if ( ! in_array( $order, array( 'DESC', 'ASC' ) ) ) {
+		if ( ! in_array($order, array('DESC', 'ASC'))) {
 
-			_doing_it_wrong( __METHOD__, esc_html( "WordPoints Debug Error: invalid 'order' \"{$order}\", possible values are DESC and ASC" ), '1.0.0' );
+			_doing_it_wrong(__METHOD__, esc_html("WordPoints Debug Error: invalid 'order' \"{$order}\", possible values are DESC and ASC"), '1.0.0');
 			$order = 'DESC';
 		}
 
-		if ( 'meta_value' === $order_by ) {
+		if ('meta_value' === $order_by) {
 
 			global $wpdb;
 
@@ -733,9 +733,9 @@ 
 				$wpdb->{"{$this->meta_type}meta"}
 			);
 
-			if ( isset( $this->args['meta_type'] ) ) {
+			if (isset($this->args['meta_type'])) {
 
-				$meta_type = $this->meta_query->get_cast_for_type( $this->args['meta_type'] );
+				$meta_type = $this->meta_query->get_cast_for_type($this->args['meta_type']);
 				$order_by  = "CAST({$meta_table_name}.meta_value AS {$meta_type})";
 
 			} else {
@@ -743,13 +743,13 @@ 
 				$order_by = "{$meta_table_name}.meta_value";
 			}
 
-		} elseif ( isset( $this->columns[ $order_by ] ) ) {
+		} elseif (isset($this->columns[$order_by])) {
 
-			$order_by = wordpoints_escape_mysql_identifier( $order_by );
+			$order_by = wordpoints_escape_mysql_identifier($order_by);
 
 		} else {
 
-			_doing_it_wrong( __METHOD__, esc_html( "WordPoints Debug Error: invalid 'order_by' \"{$order_by}\", possible values are " . implode( ', ', array_keys( $this->columns ) ) ), '1.0.0' );
+			_doing_it_wrong(__METHOD__, esc_html("WordPoints Debug Error: invalid 'order_by' \"{$order_by}\", possible values are ".implode(', ', array_keys($this->columns))), '1.0.0');
 			return;
 		}
 
@@ -763,25 +763,25 @@ 
 	 *
 	 * @param string $column The name of the column.
 	 */
-	protected function prepare_date_where( $column ) {
+	protected function prepare_date_where($column) {
 
 		if (
-			empty( $this->args[ "{$column}_query" ] )
-			|| ! is_array( $this->args[ "{$column}_query" ] )
+			empty($this->args["{$column}_query"])
+			|| ! is_array($this->args["{$column}_query"])
 		) {
 			return;
 		}
 
-		add_filter( 'date_query_valid_columns', array( $this, 'date_query_valid_columns_filter' ) );
+		add_filter('date_query_valid_columns', array($this, 'date_query_valid_columns_filter'));
 
-		$date_query = new WP_Date_Query( $this->args[ "{$column}_query" ], $column );
+		$date_query = new WP_Date_Query($this->args["{$column}_query"], $column);
 		$date_query = $date_query->get_sql();
 
-		if ( ! empty( $date_query ) ) {
-			$this->wheres[] = ltrim( $date_query, ' AND' );
+		if ( ! empty($date_query)) {
+			$this->wheres[] = ltrim($date_query, ' AND');
 		}
 
-		remove_filter( 'date_query_valid_columns', array( $this, 'date_query_valid_columns_filter' ) );
+		remove_filter('date_query_valid_columns', array($this, 'date_query_valid_columns_filter'));
 	}
 
 	/**
@@ -791,7 +791,7 @@ 
 	 */
 	protected function prepare_meta_where() {
 
-		if ( empty( $this->meta_type ) ) {
+		if (empty($this->meta_type)) {
 			return;
 		}
 
@@ -806,12 +806,12 @@ 
 			)
 		);
 
-		if ( empty( $meta_args ) ) {
+		if (empty($meta_args)) {
 			return;
 		}
 
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $meta_args );
+		$this->meta_query->parse_query_vars($meta_args);
 
 		$meta_query = $this->meta_query->get_sql(
 			$this->meta_type
@@ -820,11 +820,11 @@ 
 			, $this
 		);
 
-		if ( ! empty( $meta_query['where'] ) ) {
-			$this->wheres[] = ltrim( $meta_query['where'], ' AND' );
+		if ( ! empty($meta_query['where'])) {
+			$this->wheres[] = ltrim($meta_query['where'], ' AND');
 		}
 
-		$this->meta_join = $meta_query['join'] . "\n";
+		$this->meta_join = $meta_query['join']."\n";
 	}
 }