WordPoints / hooks-api

src/includes/classes/hierarchy.php

Doc Comments +44 added lines

@@ -9,17 +9,49 @@ 
 
 interface WordPoints_HierarchyI {
 	public function get();
+
+	/**
+	 * @return void
+	 */
 	public function push( $field, $data );
+
+	/**
+	 * @return void
+	 */
 	public function pop();
 	public function set_field( $field, $value );
+
+	/**
+	 * @param string $field
+	 * @param string $sub
+	 * @param string $sub_2
+	 */
 	public function get_field( $field, $sub = null, $sub_2 = null );
 	public function get_id();
 	public function go_to( $id );
+
+	/**
+	 * @param string $field
+	 *
+	 * @return void
+	 */
 	public function push_to( $field, $value );
+
+	/**
+	 * @return boolean
+	 */
 	public function ascend();
+
+	/**
+	 * @return boolean
+	 */
 	public function descend( $to = null );
 	public function is_main();
 	public function next();
+
+	/**
+	 * @return void
+	 */
 	public function reset();
 }
 
@@ -134,6 +166,9 @@ 
 	protected $current = 0;
 	protected $i = 0;
 
+	/**
+	 * @param string $descendant_index
+	 */
 	public function __construct( $descendant_index ) {
 		$this->descendant_index = $descendant_index;
 	}
@@ -196,10 +231,16 @@ 
 		$this->current = 0;
 	}
 
+	/**
+	 * @param string $field
+	 */
 	public function set_field( $field, $value ) {
 		$this->hierarchy[ $this->current ][ $field ] = $value;
 	}
 
+	/**
+	 * @param string $field
+	 */
 	public function get_field( $field, $sub = null, $sub_2 = null ) {
 
 		if ( ! isset( $this->hierarchy[ $this->current ][ $field ] ) ) {
@@ -225,6 +266,9 @@ 
 		return $this->hierarchy[ $this->current ][ $field ];
 	}
 
+	/**
+	 * @param string $field
+	 */
 	public function push_to( $field, $value ) {
 
 		if ( ! isset( $this->hierarchy[ $this->current ][ $field ] ) ) {

Spacing +91 added lines, -91 removed lines

@@ -9,15 +9,15 @@ 
 
 interface WordPoints_HierarchyI {
 	public function get();
-	public function push( $field, $data );
+	public function push($field, $data);
 	public function pop();
-	public function set_field( $field, $value );
-	public function get_field( $field, $sub = null, $sub_2 = null );
+	public function set_field($field, $value);
+	public function get_field($field, $sub = null, $sub_2 = null);
 	public function get_id();
-	public function go_to( $id );
-	public function push_to( $field, $value );
+	public function go_to($id);
+	public function push_to($field, $value);
 	public function ascend();
-	public function descend( $to = null );
+	public function descend($to = null);
 	public function is_main();
 	public function next();
 	public function reset();
@@ -31,20 +31,20 @@ 
 	protected $descendant_index;
 
 	public function __construct() {
-		$this->current =& $this->hierarchy;
+		$this->current = & $this->hierarchy;
 	}
 
 	public function get() {
 		return $this->hierarchy;
 	}
 
-	public function push( $field, $data ) {
+	public function push($field, $data) {
 
-		if ( ! isset( $this->current['slug'] ) || $this->current['slug'] !== $field ) {
+		if ( ! isset($this->current['slug']) || $this->current['slug'] !== $field) {
 
-			if ( ! empty( $this->hierarchy ) ) {
-				$this->current[ $this->descendant_index ][ $field ] = $data;
-				$this->current =& $this->current[ $this->descendant_index ][ $field ];
+			if ( ! empty($this->hierarchy)) {
+				$this->current[$this->descendant_index][$field] = $data;
+				$this->current = & $this->current[$this->descendant_index][$field];
 			} else {
 				$this->current = $this->stack[0] = $data;
 			}
@@ -57,14 +57,14 @@ 
 
 	public function pop() {
 
-		unset( $this->current );
+		unset($this->current);
 
-		$this->current = array_pop( $this->stack );
+		$this->current = array_pop($this->stack);
 	}
 
 	public function reset() {
 		//	unset( $this->current_arg );
-		$this->current =& $this->hierarchy;
+		$this->current = & $this->hierarchy;
 		$this->stack = array();
 	}
 
@@ -80,30 +80,30 @@ 
 //		return $this->current[ $field ];
 //	}
 
-	public function push_to( $field, $value ) {
+	public function push_to($field, $value) {
 
-		if ( ! isset( $this->current[ $field ] ) ) {
+		if ( ! isset($this->current[$field])) {
 
 		}
 		//var_dump( $field, $value,$this->current[ $field ] );
-		$this->current[ $field ][] = $value;
+		$this->current[$field][] = $value;
 	}
 
-	public function set_sub_field( $slug, $field, $value ) {
-		$this->current[ $this->descendant_index ][ $slug ][ $field ] = $value;
+	public function set_sub_field($slug, $field, $value) {
+		$this->current[$this->descendant_index][$slug][$field] = $value;
 	}
 
-	public function get_sub_field( $slug, $field ) {
-		return $this->current[ $this->descendant_index ][ $slug ][ $field ];
+	public function get_sub_field($slug, $field) {
+		return $this->current[$this->descendant_index][$slug][$field];
 	}
 
-	public function get_sub_data( $slug ) {
-		return $this->current[ $this->descendant_index ][ $slug ];
+	public function get_sub_data($slug) {
+		return $this->current[$this->descendant_index][$slug];
 	}
 
 	public function ascend() {
 
-		if ( ! $this->stack ) {
+		if ( ! $this->stack) {
 			return false;
 		}
 
@@ -112,15 +112,15 @@ 
 		return true;
 	}
 
-	public function descend( $to = null ) {
+	public function descend($to = null) {
 
-		if ( ! isset( $this->hierarchy[ $this->descendant_index ] ) ) {
+		if ( ! isset($this->hierarchy[$this->descendant_index])) {
 			return false;
 		}
 
-		reset( $this->current[ $this->descendant_index ] );
-		$field = key( $this->current[ $this->descendant_index ] );
-		$this->current =& $this->current[ $this->descendant_index ][ $field ];
+		reset($this->current[$this->descendant_index]);
+		$field = key($this->current[$this->descendant_index]);
+		$this->current = & $this->current[$this->descendant_index][$field];
 
 		$this->stack[] = $this->current;
 
@@ -134,52 +134,52 @@ 
 	protected $current = 0;
 	protected $i = 0;
 
-	public function __construct( $descendant_index ) {
+	public function __construct($descendant_index) {
 		$this->descendant_index = $descendant_index;
 	}
 
 	public function get() {
 	//	var_dump( $this->hierarchy );
 
-		if ( empty( $this->hierarchy ) ) {
+		if (empty($this->hierarchy)) {
 			return array();
 		}
 
-		return $this->build_hierarchy( $this->hierarchy[0] );
+		return $this->build_hierarchy($this->hierarchy[0]);
 	}
 
-	protected function build_hierarchy( $arg ) {
+	protected function build_hierarchy($arg) {
 
-		if ( isset( $arg[ $this->descendant_index ] ) ) {
+		if (isset($arg[$this->descendant_index])) {
 
-			foreach ( $arg[ $this->descendant_index ] as $sub_arg => $i ) {
-				$arg[ $this->descendant_index ][ $sub_arg ] = $this->build_hierarchy( $this->hierarchy[ $i ] );
+			foreach ($arg[$this->descendant_index] as $sub_arg => $i) {
+				$arg[$this->descendant_index][$sub_arg] = $this->build_hierarchy($this->hierarchy[$i]);
 			}
 		}
 
-		if ( isset( $arg['_parent'] ) ) {
-			unset( $arg['_parent'] );
+		if (isset($arg['_parent'])) {
+			unset($arg['_parent']);
 		}
 
-		unset( $arg['_i'] );
+		unset($arg['_i']);
 
 		return $arg;
 	}
 
-	public function push( $field, $data ) {
+	public function push($field, $data) {
 
-		if ( ! isset( $this->hierarchy[ $this->current ]['slug'] ) || $this->hierarchy[ $this->current ]['slug'] !== $field ) {
+		if ( ! isset($this->hierarchy[$this->current]['slug']) || $this->hierarchy[$this->current]['slug'] !== $field) {
 
 			$i = $this->i++;
 
-			if ( ! empty( $this->hierarchy ) ) {
-				$this->hierarchy[ $this->current ][ $this->descendant_index ][ $field ] = $i;
+			if ( ! empty($this->hierarchy)) {
+				$this->hierarchy[$this->current][$this->descendant_index][$field] = $i;
 				$data['_parent'] = $this->current;
 			}
 
-			$this->hierarchy[ $i ] = $data;
-			$this->hierarchy[ $i ]['slug'] = $field;
-			$this->hierarchy[ $i ]['_i'] = $i;
+			$this->hierarchy[$i] = $data;
+			$this->hierarchy[$i]['slug'] = $field;
+			$this->hierarchy[$i]['_i'] = $i;
 
 			$this->current = $i;
 		}
@@ -187,8 +187,8 @@ 
 
 	public function pop() {
 
-		$this->current = isset( $this->hierarchy[ $this->current ]['_parent'] )
-			?  $this->hierarchy[ $this->current ]['_parent']
+		$this->current = isset($this->hierarchy[$this->current]['_parent'])
+			? $this->hierarchy[$this->current]['_parent']
 			: 0;
 	}
 
@@ -196,95 +196,95 @@ 
 		$this->current = 0;
 	}
 
-	public function set_field( $field, $value ) {
-		$this->hierarchy[ $this->current ][ $field ] = $value;
+	public function set_field($field, $value) {
+		$this->hierarchy[$this->current][$field] = $value;
 	}
 
-	public function get_field( $field, $sub = null, $sub_2 = null ) {
+	public function get_field($field, $sub = null, $sub_2 = null) {
 
-		if ( ! isset( $this->hierarchy[ $this->current ][ $field ] ) ) {
+		if ( ! isset($this->hierarchy[$this->current][$field])) {
 			return null;
 		}
 
-		if ( isset( $sub ) ) {
-			if ( ! isset( $this->hierarchy[ $this->current ][ $field ][ $sub ] ) ) {
+		if (isset($sub)) {
+			if ( ! isset($this->hierarchy[$this->current][$field][$sub])) {
 				return null;
 			}
 
-			if ( isset( $sub_2 ) ) {
-				if ( ! isset( $this->hierarchy[ $this->current ][ $field ][ $sub ][ $sub_2 ] ) ) {
+			if (isset($sub_2)) {
+				if ( ! isset($this->hierarchy[$this->current][$field][$sub][$sub_2])) {
 					return null;
 				} else {
-					return $this->hierarchy[ $this->current ][ $field ][ $sub ][ $sub_2 ];
+					return $this->hierarchy[$this->current][$field][$sub][$sub_2];
 				}
 			}
 
-			return $this->hierarchy[ $this->current ][ $field ][ $sub ];
+			return $this->hierarchy[$this->current][$field][$sub];
 		}
 
-		return $this->hierarchy[ $this->current ][ $field ];
+		return $this->hierarchy[$this->current][$field];
 	}
 
-	public function push_to( $field, $value ) {
+	public function push_to($field, $value) {
 
-		if ( ! isset( $this->hierarchy[ $this->current ][ $field ] ) ) {
+		if ( ! isset($this->hierarchy[$this->current][$field])) {
 
 		}
 		//var_dump( $field, $value,$this->current[ $field ] );
-		$this->hierarchy[ $this->current ][ $field ][] = $value;
+		$this->hierarchy[$this->current][$field][] = $value;
 	}
 
-	public function set_sub_field( $slug, $field, $value ) {
-		$this->hierarchy[ $this->current ][ $this->descendant_index ][ $slug ][ $field ] = $value;
+	public function set_sub_field($slug, $field, $value) {
+		$this->hierarchy[$this->current][$this->descendant_index][$slug][$field] = $value;
 	}
 
-	public function get_sub_field( $slug, $field ) {
+	public function get_sub_field($slug, $field) {
 
-		return $this->hierarchy[ $this->current ][ $this->descendant_index ][ $slug ][ $field ];
+		return $this->hierarchy[$this->current][$this->descendant_index][$slug][$field];
 	}
 
-	public function get_sub_data( $slug ) {
-		return $this->hierarchy[ $this->current ][ $this->descendant_index ][ $slug ];
+	public function get_sub_data($slug) {
+		return $this->hierarchy[$this->current][$this->descendant_index][$slug];
 	}
 
-	public function has_child( $slug ) {
-		return isset( $this->hierarchy[ $this->current ][ $this->descendant_index ][ $slug ] );
+	public function has_child($slug) {
+		return isset($this->hierarchy[$this->current][$this->descendant_index][$slug]);
 	}
 
 	public function get_children() {
-		return isset( $this->hierarchy[ $this->current ][ $this->descendant_index ][ $slug ] );
+		return isset($this->hierarchy[$this->current][$this->descendant_index][$slug]);
 
 	}
 
 	public function ascend() {
 
-		if ( ! isset( $this->hierarchy[ $this->current ]['_parent'] ) ) {
+		if ( ! isset($this->hierarchy[$this->current]['_parent'])) {
 			return false;
 		}
 
-		$this->current = $this->hierarchy[ $this->current ]['_parent'];
+		$this->current = $this->hierarchy[$this->current]['_parent'];
 
 		return true;
 	}
 
-	public function descend( $to = null ) {
+	public function descend($to = null) {
 
-		if ( ! isset( $this->hierarchy[ $this->current ][ $this->descendant_index ] ) ) {
+		if ( ! isset($this->hierarchy[$this->current][$this->descendant_index])) {
 			return false;
 		}
 
-		if ( isset( $to ) ) {
+		if (isset($to)) {
 
-			if ( ! isset( $this->hierarchy[ $this->current ][ $this->descendant_index ][ $to ] ) ) {
+			if ( ! isset($this->hierarchy[$this->current][$this->descendant_index][$to])) {
 				return false;
 			}
 
-			$this->current = $this->hierarchy[ $this->current ][ $this->descendant_index ][ $to ];
+			$this->current = $this->hierarchy[$this->current][$this->descendant_index][$to];
 
 		} else {
 
 			$this->current = reset(
-				$this->hierarchy[ $this->current ][ $this->descendant_index ]
+				$this->hierarchy[$this->current][$this->descendant_index]
 			);
 		}
 
@@ -293,29 +293,29 @@ 
 
 	public function next() {
 
-		if ( ! isset( $this->hierarchy[ $this->current ]['_parent'] ) ) {
+		if ( ! isset($this->hierarchy[$this->current]['_parent'])) {
 			return false;
 		}
 
-		$parent = $this->hierarchy[ $this->current ]['_parent'];
+		$parent = $this->hierarchy[$this->current]['_parent'];
 
-		if ( ! isset( $this->hierarchy[ $parent ][ $this->descendant_index ] ) ) {
+		if ( ! isset($this->hierarchy[$parent][$this->descendant_index])) {
 			return false;
 		}
 
-		$sub_args = $this->hierarchy[ $parent ][ $this->descendant_index ];
+		$sub_args = $this->hierarchy[$parent][$this->descendant_index];
 
-		reset( $sub_args );
+		reset($sub_args);
 
-		while ( current( $sub_args ) !== $this->current ) {
-			next( $sub_args );
+		while (current($sub_args) !== $this->current) {
+			next($sub_args);
 		}
 
-		if ( ! next( $sub_args ) ) {
+		if ( ! next($sub_args)) {
 			return false;
 		}
 
-		$this->current = current( $sub_args );
+		$this->current = current($sub_args);
 
 		return true;
 	}
@@ -324,9 +324,9 @@ 
 		return $this->current;
 	}
 
-	public function go_to( $id ) {
+	public function go_to($id) {
 
-		if ( false === wordpoints_posint( $id ) || $id < 0 ) {
+		if (false === wordpoints_posint($id) || $id < 0) {
 			return;
 		}
 

src/includes/classes/hook/reaction/storage.php

Doc Comments +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
 	 *
 	 * @param string $event_slug The slug of the event this reaction is for.
 	 *
-	 * @return int|false The reaction ID, or false if not created.
+	 * @return integer The reaction ID, or false if not created.
 	 */
 	abstract protected function _create_reaction( $event_slug );
 }

Spacing +25 added lines, -25 removed lines

@@ -58,7 +58,7 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function __construct( $reactor_slug, $network_wide ) {
+	public function __construct($reactor_slug, $network_wide) {
 
 		$this->reactor_slug = $reactor_slug;
 		$this->network_wide = $network_wide;
@@ -82,27 +82,27 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function get_reaction( $id ) {
+	public function get_reaction($id) {
 
-		if ( ! $this->reaction_exists( $id ) ) {
+		if ( ! $this->reaction_exists($id)) {
 			return false;
 		}
 
-		return new $this->reaction_class( $id, $this );
+		return new $this->reaction_class($id, $this);
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	public function create_reaction( array $settings ) {
-		return $this->create_or_update_reaction( $settings );
+	public function create_reaction(array $settings) {
+		return $this->create_or_update_reaction($settings);
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	public function update_reaction( $id, array $settings ) {
-		return $this->create_or_update_reaction( $settings, $id );
+	public function update_reaction($id, array $settings) {
+		return $this->create_or_update_reaction($settings, $id);
 	}
 
 	/**
@@ -117,44 +117,44 @@ 
 	 *         The reaction object if created/updated successfully. False or a
 	 *         validator instance if not.
 	 */
-	protected function create_or_update_reaction( array $settings, $id = null ) {
+	protected function create_or_update_reaction(array $settings, $id = null) {
 
-		$is_new = ! isset( $id );
+		$is_new = ! isset($id);
 
-		if ( ! $is_new && ! $this->reaction_exists( $id ) ) {
+		if ( ! $is_new && ! $this->reaction_exists($id)) {
 			return false;
 		}
 
 		/** @var WordPoints_Hook_Reactor $reactor */
-		$reactor = $this->hooks->reactors->get( $this->reactor_slug );
+		$reactor = $this->hooks->reactors->get($this->reactor_slug);
 
-		$validator = new WordPoints_Hook_Reaction_Validator( $settings, $reactor );
+		$validator = new WordPoints_Hook_Reaction_Validator($settings, $reactor);
 		$settings = $validator->validate();
 
-		if ( $validator->had_errors() ) {
+		if ($validator->had_errors()) {
 			return $validator;
 		}
 
-		if ( $is_new ) {
+		if ($is_new) {
 
-			$id = $this->_create_reaction( $settings['event'] );
+			$id = $this->_create_reaction($settings['event']);
 
-			if ( ! $id ) {
+			if ( ! $id) {
 				return false;
 			}
 		}
 
-		$reaction = $this->get_reaction( $id );
+		$reaction = $this->get_reaction($id);
 
-		$reaction->update_event_slug( $settings['event'] );
+		$reaction->update_event_slug($settings['event']);
 
-		unset( $settings['event'] );
+		unset($settings['event']);
 
-		$reactor->update_settings( $reaction, $settings );
+		$reactor->update_settings($reaction, $settings);
 
 		/** @var WordPoints_Hook_Extension $extension */
-		foreach ( $this->hooks->extensions->get_all() as $extension ) {
-			$extension->update_settings( $reaction, $settings );
+		foreach ($this->hooks->extensions->get_all() as $extension) {
+			$extension->update_settings($reaction, $settings);
 		}
 
 		/**
@@ -164,7 +164,7 @@ 
 		 * @param array                     $settings The new settings for the reaction.
 		 * @param bool                      $is_new   Whether the reaction was just now created.
 		 */
-		do_action( 'wordpoints_hook_reaction_save', $reaction, $settings, $is_new );
+		do_action('wordpoints_hook_reaction_save', $reaction, $settings, $is_new);
 
 		return $reaction;
 	}
@@ -181,7 +181,7 @@ 
 	 *
 	 * @return int|false The reaction ID, or false if not created.
 	 */
-	abstract protected function _create_reaction( $event_slug );
+	abstract protected function _create_reaction($event_slug);
 }
 
 // EOF

src/includes/classes/hook/retroactive/query.php

Doc Comments +4 added lines

@@ -73,6 +73,10 @@
 
 
 interface WordPoints_Hook_Reactor_RetroactiveI extends WordPoints_Hook_Retroactive_Query_ModifierI {
+
+	/**
+	 * @return void
+	 */
 	public function retroactive_hit( $target, array $records, WordPoints_Hook_Event_RetroactiveI $event, WordPoints_Hook_ReactionI $reaction );
 }
 

Spacing +185 added lines, -185 removed lines

@@ -73,14 +73,14 @@ 
 
 
 interface WordPoints_Hook_Reactor_RetroactiveI extends WordPoints_Hook_Retroactive_Query_ModifierI {
-	public function retroactive_hit( $target, array $records, WordPoints_Hook_Event_RetroactiveI $event, WordPoints_Hook_ReactionI $reaction );
+	public function retroactive_hit($target, array $records, WordPoints_Hook_Event_RetroactiveI $event, WordPoints_Hook_ReactionI $reaction);
 }
 
 abstract class WordPoints_Hook_Reactor_Retroactive implements WordPoints_Hook_Reactor_RetroactiveI {
 
-	public function modify_retroactive_query( WordPoints_Hook_Retroactive_QueryI $query ) {
+	public function modify_retroactive_query(WordPoints_Hook_Retroactive_QueryI $query) {
 
-		$query->set_target( $query->get_reaction()->get_meta( 'target' ) );
+		$query->set_target($query->get_reaction()->get_meta('target'));
 	}
 
 	public function spam_hits() {
@@ -97,17 +97,17 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function retroactive_hit( $target, array $records, WordPoints_Hook_Event_RetroactiveI $event, WordPoints_Hook_ReactionI $reaction ) {
+	public function retroactive_hit($target, array $records, WordPoints_Hook_Event_RetroactiveI $event, WordPoints_Hook_ReactionI $reaction) {
 
-		$count = count( $records );
+		$count = count($records);
 
 		wordpoints_alter_points(
 			$target
-			, $reaction->get_meta( 'points' ) * $count
-			, $reaction->get_meta( 'points_type' )
-			, 'retroactive_' . $reaction->get_event_slug()
-			, array( 'count' => $count )
-			, $event->get_retroactive_description( $reaction )
+			, $reaction->get_meta('points') * $count
+			, $reaction->get_meta('points_type')
+			, 'retroactive_'.$reaction->get_event_slug()
+			, array('count' => $count)
+			, $event->get_retroactive_description($reaction)
 		);
 	}
 
@@ -139,22 +139,22 @@ 
 
 		$logs = $query->get();
 
-		if ( ! $logs ) {
+		if ( ! $logs) {
 			return;
 		}
 
-		foreach ( $logs as $log ) {
+		foreach ($logs as $log) {
 
 			wordpoints_alter_points(
 				$log->user_id
-				, - ( $log->points / wordpoints_get_points_log_meta( $log->id, 'count', true ) )
+				, -($log->points / wordpoints_get_points_log_meta($log->id, 'count', true))
 				, $log->points_type
 				, "reverse_{$event}"
-				, array( 'original_log_id' => $log->id )
+				, array('original_log_id' => $log->id)
 				, $args->get_description()
 			);
 
-			wordpoints_add_points_log_meta( $log->id, 'auto_reversed', $args->get_entity_id() );
+			wordpoints_add_points_log_meta($log->id, 'auto_reversed', $args->get_entity_id());
 		}
 	}
 }
@@ -196,16 +196,16 @@ 
 
 	protected $results;
 
-	public function __construct( WordPoints_Hook_ReactionI $reaction ) {
-		var_dump( __METHOD__ );
+	public function __construct(WordPoints_Hook_ReactionI $reaction) {
+		var_dump(__METHOD__);
 		$this->reaction = $reaction;
-		$this->arg_hierarchy = new WordPoints_Hierarchy( 'sub_args' );
+		$this->arg_hierarchy = new WordPoints_Hierarchy('sub_args');
 		$this->hooks = wordpoints_hooks();
 		$this->entities = wordpoints_entities();
 
 		$this->validator = new WordPoints_Hook_Reaction_Validator(
 			$reaction
-			, $this->hooks->reactors->get( $reaction->get_reactor_slug() )
+			, $this->hooks->reactors->get($reaction->get_reactor_slug())
 			, true
 		);
 	}
@@ -219,12 +219,12 @@ 
 	}
 
 	public function get_results() {
-		var_dump( __METHOD__ );
-		if ( ! isset( $this->results ) ) {
+		var_dump(__METHOD__);
+		if ( ! isset($this->results)) {
 
 			$this->execute();
 
-			if ( $this->validator->had_errors() ) {
+			if ($this->validator->had_errors()) {
 				$this->results = $this->validator;
 			}
 		}
@@ -233,7 +233,7 @@ 
 	}
 
 	protected function execute() {
-		var_dump( __METHOD__ );
+		var_dump(__METHOD__);
 		try {
 
 			$this->prepare_query();
@@ -241,41 +241,41 @@ 
 			$this->filter_results();
 			$this->group_results();
 
-		} catch ( WordPoints_Hook_Validator_Exception $e ) {
-			unset( $e );
+		} catch (WordPoints_Hook_Validator_Exception $e) {
+			unset($e);
 		}
 	}
 
 	protected function prepare_query() {
-		var_dump( __METHOD__ );
+		var_dump(__METHOD__);
 		$event_slug = $this->reaction->get_event_slug();
 
-		$event = $this->hooks->events->get( $event_slug );
+		$event = $this->hooks->events->get($event_slug);
 
-		if ( ! ( $event instanceof WordPoints_Hook_Event_RetroactiveI ) ) {
-			$this->validator->add_error( 'invalid hook' );
+		if ( ! ($event instanceof WordPoints_Hook_Event_RetroactiveI)) {
+			$this->validator->add_error('invalid hook');
 		}
 
-		foreach ( $this->hooks->events->args->get_children( $event_slug ) as $arg ) {
+		foreach ($this->hooks->events->args->get_children($event_slug) as $arg) {
 			$this->arg_hierarchy_push( // TODO
 				$arg
 			);
 		}
 
-		if ( $event instanceof WordPoints_Hook_Retroactive_Query_ModifierI ) {
-			$event->modify_retroactive_query( $this );
+		if ($event instanceof WordPoints_Hook_Retroactive_Query_ModifierI) {
+			$event->modify_retroactive_query($this);
 			$this->reset();
 		}
 
-		$reactor = $this->hooks->reactors->get( $this->reaction->get_reactor_slug() );
+		$reactor = $this->hooks->reactors->get($this->reaction->get_reactor_slug());
 
-		$reactor->modify_retroactive_query( $this );
+		$reactor->modify_retroactive_query($this);
 		$this->reset();
 
-		foreach ( $this->hooks->extensions->get_all() as $extension ) {
+		foreach ($this->hooks->extensions->get_all() as $extension) {
 
-			if ( $extension instanceof WordPoints_Hook_Retroactive_Query_ModifierI ) {
-				$extension->modify_retroactive_query( $this );
+			if ($extension instanceof WordPoints_Hook_Retroactive_Query_ModifierI) {
+				$extension->modify_retroactive_query($this);
 				$this->reset();
 			}
 		}
@@ -284,161 +284,161 @@ 
 	protected function perform_query() {
 //		var_dump( __METHOD__,$this->arg_hierarchy->get() );exit;
 
-		$this->queries = new WordPoints_Hierarchy( 'sub_queries' );
-		$this->consolidate_queries( array( $this->arg_hierarchy->get() ) );
-		unset( $this->query );
+		$this->queries = new WordPoints_Hierarchy('sub_queries');
+		$this->consolidate_queries(array($this->arg_hierarchy->get()));
+		unset($this->query);
 
 		$this->queries->reset();
 //var_dump( $this->queries );exit;
 		// Find the tip of a query.
-		$this->results = $this->execute_queries( $this->queries->get() );
+		$this->results = $this->execute_queries($this->queries->get());
 
-		if ( is_wp_error( $this->results ) ) {
-			$this->validator->add_error( $this->results );
+		if (is_wp_error($this->results)) {
+			$this->validator->add_error($this->results);
 		}
 	}
 
-	protected function consolidate_queries( $arg_hierarchy, $storage_type = null ) {
-		var_dump( __METHOD__, wp_list_pluck( $arg_hierarchy, 'slug' ) );
-		foreach ( $arg_hierarchy as $data ) {
-			$this->consolidate_query( $data );
+	protected function consolidate_queries($arg_hierarchy, $storage_type = null) {
+		var_dump(__METHOD__, wp_list_pluck($arg_hierarchy, 'slug'));
+		foreach ($arg_hierarchy as $data) {
+			$this->consolidate_query($data);
 		}
 	}
 
-	protected function consolidate_query( $data ) {
-var_dump($data['slug']);var_dump($data['storage_info']['type'], $this->queries->get_field( 'slug' ) );
-		if ( $data['storage_info']['type'] !== $this->queries->get_field( 'slug' ) ) {
+	protected function consolidate_query($data) {
+var_dump($data['slug']); var_dump($data['storage_info']['type'], $this->queries->get_field('slug'));
+		if ($data['storage_info']['type'] !== $this->queries->get_field('slug')) {
 
 			$parent_id = null;
-			if ( isset( $this->query ) ) {
+			if (isset($this->query)) {
 				$parent_id = $this->query->get_id();
 			}
-			var_dump( $parent_id );
+			var_dump($parent_id);
 
-			$this->query = new WordPoints_Hierarchy( 'sub_args' );
+			$this->query = new WordPoints_Hierarchy('sub_args');
 
 			$this->queries->push(
 				$data['storage_info']['type']
-				, array( 'query' => $this->query, 'parent_id' => $parent_id )
+				, array('query' => $this->query, 'parent_id' => $parent_id)
 			);
 
 			$pushed_query = true;
 		}
 
-		if ( isset( $data['sub_args'] ) ) {
+		if (isset($data['sub_args'])) {
 			$sub_args = $data['sub_args'];
-			unset( $data['sub_args'] );
+			unset($data['sub_args']);
 		}
 
-		$this->query->push( $data['slug'], $data );
+		$this->query->push($data['slug'], $data);
 
-		if ( isset( $sub_args ) ) {
-			var_dump( '$sub_args',$data['slug'], wp_list_pluck($sub_args, 'slug') );
-			$this->consolidate_queries( $sub_args, $data['storage_info']['type'] );
+		if (isset($sub_args)) {
+			var_dump('$sub_args', $data['slug'], wp_list_pluck($sub_args, 'slug'));
+			$this->consolidate_queries($sub_args, $data['storage_info']['type']);
 		}
 
 		$this->query->pop();
 
-		if ( ! empty( $pushed_query ) ) {
+		if ( ! empty($pushed_query)) {
 			$this->queries->pop();
-			$this->query = $this->queries->get_field( 'query' );
+			$this->query = $this->queries->get_field('query');
 		}
 	}
 
-	protected function execute_queries( $queries ) {
-		var_dump( __METHOD__ );
+	protected function execute_queries($queries) {
+		var_dump(__METHOD__);
 //var_dump($queries);exit;
 		/** @var WordPoints_HierarchyI $query */
 		$query = $queries['query'];
 
-		if ( isset( $queries['sub_queries'] ) ) {
-			foreach ( $queries['sub_queries'] as $query_data ) {
+		if (isset($queries['sub_queries'])) {
+			foreach ($queries['sub_queries'] as $query_data) {
 
-				$results = $this->execute_queries( $query_data );
+				$results = $this->execute_queries($query_data);
 
-				if ( is_wp_error( $results ) ) {
+				if (is_wp_error($results)) {
 					return $results;
 				}
 
-				if ( empty( $results ) ) {
+				if (empty($results)) {
 					return array();
 				}
 
 				/** @var WordPoints_HierarchyI $child_query */
 				$child_query = $query_data['query'];
-				$query->go_to( $query_data['parent_id'] );
+				$query->go_to($query_data['parent_id']);
 //				var_dump( $query, $child_query );exit;
 				$condition = array(
 //					'field' => $child_query->get_field( 'slug' ),
 					'compare' => 'in',
 					'value' => wp_list_pluck(
 						$results
-						, $child_query->get_field( 'storage_info', 'meta', 'id_field' )
+						, $child_query->get_field('storage_info', 'meta', 'id_field')
 					),
 				);
 
-				$query->push_to( 'conditions', $condition );
+				$query->push_to('conditions', $condition);
 			}
 		}
 
 		$query->reset();
-		$storage_type = $query->get_field( 'storage_info', 'type' );
+		$storage_type = $query->get_field('storage_info', 'type');
 //var_dump( $query );exit;
-		$executor = $this->hooks->retroactive_query_executors->get( $storage_type );
+		$executor = $this->hooks->retroactive_query_executors->get($storage_type);
 
-		if ( ! $executor ) {
-			var_dump( $query );
+		if ( ! $executor) {
+			var_dump($query);
 			$this->validator->add_error(
-				sprintf( 'unknown storage type "%s".', $storage_type )
+				sprintf('unknown storage type "%s".', $storage_type)
 			);
 		}
 
-		return $executor->execute( array( $query->get() ) );
+		return $executor->execute(array($query->get()));
 	}
 
 	protected function filter_results() {
-		var_dump( __METHOD__ );
-		$reactor = $this->hooks->reactors->get( $this->reaction->get_reactor_slug() );
+		var_dump(__METHOD__);
+		$reactor = $this->hooks->reactors->get($this->reaction->get_reactor_slug());
 
-		if ( $reactor instanceof WordPoints_Hook_Retroactive_Query_FilterI ) {
-			$reactor->filter_retroactive_query( $this );
+		if ($reactor instanceof WordPoints_Hook_Retroactive_Query_FilterI) {
+			$reactor->filter_retroactive_query($this);
 		}
 
-		foreach ( $this->hooks->extensions->get_all() as $extension ) {
-			if ( $extension instanceof WordPoints_Hook_Retroactive_Query_FilterI ) {
-				$extension->filter_retroactive_query( $this );
+		foreach ($this->hooks->extensions->get_all() as $extension) {
+			if ($extension instanceof WordPoints_Hook_Retroactive_Query_FilterI) {
+				$extension->filter_retroactive_query($this);
 			}
 		}
 	}
 
 	protected function group_results() {
-		var_dump( __METHOD__ );
+		var_dump(__METHOD__);
 		$grouped_results = array();
 
-		foreach ( $this->results as $result ) {
-			$grouped_results[ $result->target ][] = $result;
+		foreach ($this->results as $result) {
+			$grouped_results[$result->target][] = $result;
 		}
 
 		$this->results = $grouped_results;
 	}
 
-	public function add_condition( array $condition ) {
-		var_dump( __METHOD__ );
+	public function add_condition(array $condition) {
+		var_dump(__METHOD__);
 
-		$this->arg_hierarchy->push_to( 'conditions', $condition );
+		$this->arg_hierarchy->push_to('conditions', $condition);
 	}
 
-	public function select_value( $data = array() ) {
-		var_dump( __METHOD__ );
+	public function select_value($data = array()) {
+		var_dump(__METHOD__);
 
-		$this->arg_hierarchy->set_field( 'select', $data );
+		$this->arg_hierarchy->set_field('select', $data);
 //	var_dump( $this->arg_hierarchy);exit;
 	}
 
-	public function set_target( $target_arg ) {
+	public function set_target($target_arg) {
 
-		foreach ( $target_arg as $arg_slug ) {
-			$this->arg_hierarchy_push( $arg_slug );
+		foreach ($target_arg as $arg_slug) {
+			$this->arg_hierarchy_push($arg_slug);
 		}
 
 //		$id = $this->arg_hierarchy->get_id();
@@ -448,10 +448,10 @@ 
 //			$field = $this->arg_hierarchy->get_field( 'storage_info', 'meta', 'field' );
 //			$this->arg_hierarchy->ascend();
 //		} else {
-			$field = $this->arg_hierarchy->get_field( 'storage_info', 'meta', 'id_field' );
+			$field = $this->arg_hierarchy->get_field('storage_info', 'meta', 'id_field');
 //		}
 
-		$this->select_value( array( 'field' => $field, 'as' => 'target' ) );
+		$this->select_value(array('field' => $field, 'as' => 'target'));
 
 //		$this->arg_hierarchy->go_to( $id );
 	}
@@ -463,41 +463,41 @@ 
 	 * @return WordPoints_EntityishI
 	 */
 	public function get_arg() {
-		return $this->arg_hierarchy->get_field( 'arg' );
+		return $this->arg_hierarchy->get_field('arg');
 	}
 
-	public function arg_hierarchy_push( $slug ) {
-		var_dump( __METHOD__, $slug );
+	public function arg_hierarchy_push($slug) {
+		var_dump(__METHOD__, $slug);
 
-		$current_slug = $this->arg_hierarchy->get_field( 'slug' );
+		$current_slug = $this->arg_hierarchy->get_field('slug');
 
-		if ( $current_slug === $slug && $this->arg_hierarchy->is_main() ) {
+		if ($current_slug === $slug && $this->arg_hierarchy->is_main()) {
 			return;
 		}
 
 //		if ( $current_slug !== $slug ) {
 
-			if ( empty( $current_slug ) ) {
-				$arg = $this->entities->get( $slug );
+			if (empty($current_slug)) {
+				$arg = $this->entities->get($slug);
 			} else {
 
 				// If this child exists, don't overwrite it, just descend into it.
-				if ( $this->arg_hierarchy->has_child( $slug ) ) {
-					$this->arg_hierarchy->descend( $slug );
+				if ($this->arg_hierarchy->has_child($slug)) {
+					$this->arg_hierarchy->descend($slug);
 					return;
 				}
 
-				$parent_arg = $this->arg_hierarchy->get_field( 'arg' );
+				$parent_arg = $this->arg_hierarchy->get_field('arg');
 
-				if ( $parent_arg instanceof WordPoints_Entity_ParentI ) {
-					$arg = $parent_arg->get_child( $slug );
+				if ($parent_arg instanceof WordPoints_Entity_ParentI) {
+					$arg = $parent_arg->get_child($slug);
 				} else {
 					return; // TODO
 				}
 			}
 
-			if ( $arg instanceof WordPoints_Entity_Array ) {
-				$arg = $this->entities->get( $arg->get_entity_slug() );
+			if ($arg instanceof WordPoints_Entity_Array) {
+				$arg = $this->entities->get($arg->get_entity_slug());
 			}
 
 			$data['arg'] = $arg;
@@ -505,7 +505,7 @@ 
 			// TODO check if storage type is recognized?
 			$data['storage_info'] = $arg->get_storage_info();
 
-			$this->arg_hierarchy->push( $slug, $data );
+			$this->arg_hierarchy->push($slug, $data);
 
 //		} else {
 //			$data = array();
@@ -513,22 +513,22 @@ 
 	}
 
 	public function arg_hierarchy_pop() {
-		var_dump( __METHOD__ );
+		var_dump(__METHOD__);
 		$this->arg_hierarchy->pop();
 	}
 
 	public function reset() {
-		var_dump( __METHOD__ );
+		var_dump(__METHOD__);
 		$this->arg_hierarchy->reset();
 	}
 }
 
 interface WordPoints_Hook_Retroactive_Query_FilterI {
-	public function filter_retroactive_query( WordPoints_Hook_Retroactive_QueryI $query );
+	public function filter_retroactive_query(WordPoints_Hook_Retroactive_QueryI $query);
 }
 
 interface WordPoints_Hook_Retroactive_Query_ExecutorI {
-	public function execute( $query );
+	public function execute($query);
 }
 
 /*
@@ -557,49 +557,49 @@ 
 	protected $array;
 	protected $results;
 
-	public function execute( $query ) {
+	public function execute($query) {
 //var_dump( __METHOD__, $query );//exit;
-		foreach ( $query as $arg_data ) {
+		foreach ($query as $arg_data) {
 
 			$meta = $arg_data['storage_info']['meta'];
 
-			if ( isset( $meta['getter'] ) ) {
+			if (isset($meta['getter'])) {
 				$this->array = $meta['getter']();
 			}
 //var_dump($this->array);
 //var_dump( $arg_data );exit;
-			if ( isset( $arg_data['conditions'] ) ) {
+			if (isset($arg_data['conditions'])) {
 //var_dump( $arg_data );
-				foreach ( $arg_data['conditions'] as $condition ) {
+				foreach ($arg_data['conditions'] as $condition) {
 
-					if ( ! isset( $condition['field'] ) ) {
-						if ( $arg_data['arg'] instanceof WordPoints_Entity_Attr ) {
+					if ( ! isset($condition['field'])) {
+						if ($arg_data['arg'] instanceof WordPoints_Entity_Attr) {
 							$condition['field'] = $meta['field'];
 						} else {
 							$condition['field'] = $meta['id_field'];
 						}
 					}
 
-					if ( ! isset( $condition['condition'] ) ) {
+					if ( ! isset($condition['condition'])) {
 						$condition['condition'] = '=';
 					}
 
 					$filter_args = array();
 
-					switch ( $condition['condition'] ) {
+					switch ($condition['condition']) {
 
 						case '=':
-							$filter_args[ $condition['field'] ] = $condition['value'];
+							$filter_args[$condition['field']] = $condition['value'];
 							break;
 
 						case 'in':
 							// TODO
 
 						default:
-							return new WP_Error( 'invalid condition type' );
+							return new WP_Error('invalid condition type');
 					}
 //var_dump( $filter_args );exit;
-					$this->array = wp_list_filter( $this->array, $filter_args );
+					$this->array = wp_list_filter($this->array, $filter_args);
 				}
 			}
 
@@ -607,9 +607,9 @@ 
 //				$builder->add_field( $arg_data['select'] );
 //			}
 
-			if ( isset( $arg_data['sub_args'] ) ) {
+			if (isset($arg_data['sub_args'])) {
 				$this->parent_data = $arg_data;
-				$this->array = $this->execute( $arg_data['sub_args'] );
+				$this->array = $this->execute($arg_data['sub_args']);
 			}
 
 			$this->results = $this->array;
@@ -619,7 +619,7 @@ 
 	}
 }
 
-wordpoints_hooks()->retroactive_query_executors->register( 'array', 'WordPoints_Hook_Retroactive_Query_Executor_Array' );
+wordpoints_hooks()->retroactive_query_executors->register('array', 'WordPoints_Hook_Retroactive_Query_Executor_Array');
 
 class WordPoints_Hook_Retroactive_Query_Executor_MySQL
 	implements WordPoints_Hook_Retroactive_Query_ExecutorI {
@@ -638,86 +638,86 @@ 
 
 	protected $entered_join;
 
-	public function execute( $query ) {
+	public function execute($query) {
 		// WE should be getting a hierarchy object here.
 		// This will let us loop over things easier.
 		// We'll also need to be marking the non-usable parts of the query.
 		// We'll need to test that as well.
-		var_dump( __METHOD__, $query );//exit;
+		var_dump(__METHOD__, $query); //exit;
 
 		global $wpdb;
 
 		$this->builder = new WordPoints_Query_Builder_DB_MySQL();
 
-		$this->build_query( $query );
+		$this->build_query($query);
 
 		$sql = $this->builder->get_query();
 
-		if ( is_wp_error( $sql ) ) {
+		if (is_wp_error($sql)) {
 			return $sql;
 		}
-var_dump( $sql );
-		return $wpdb->get_results( $sql );
+var_dump($sql);
+		return $wpdb->get_results($sql);
 	}
 
-	protected function build_query( $args ) {
-var_dump( __METHOD__, isset($this->grandparent_data['slug'])?$this->grandparent_data['slug']:null,  isset($this->parent_data['slug'])?$this->parent_data['slug']:null);
-		foreach ( $args as $arg_data ) {
-var_dump( $arg_data['slug'] );
+	protected function build_query($args) {
+var_dump(__METHOD__, isset($this->grandparent_data['slug']) ? $this->grandparent_data['slug'] : null, isset($this->parent_data['slug']) ? $this->parent_data['slug'] : null);
+		foreach ($args as $arg_data) {
+var_dump($arg_data['slug']);
 			$this->arg_data = $arg_data;
 
-			if ( isset( $arg_data['storage_info']['meta']['table_name'] ) ) {
-				$this->build_table_schema( $arg_data['storage_info']['meta'] );
+			if (isset($arg_data['storage_info']['meta']['table_name'])) {
+				$this->build_table_schema($arg_data['storage_info']['meta']);
 			}
 //var_dump(  $arg_data['conditions']  );
-			if ( isset( $arg_data['conditions'] ) ) {
-				$this->build_conditions( $arg_data['conditions'] );
+			if (isset($arg_data['conditions'])) {
+				$this->build_conditions($arg_data['conditions']);
 			}
 
-			if ( isset( $arg_data['select'] ) ) {
-				$this->builder->add_field( $arg_data['select'] );
+			if (isset($arg_data['select'])) {
+				$this->builder->add_field($arg_data['select']);
 			}
 
-			if ( isset( $arg_data['sub_args'] ) ) {
-var_dump( array_keys( $arg_data['sub_args']));
+			if (isset($arg_data['sub_args'])) {
+var_dump(array_keys($arg_data['sub_args']));
 				$this->grandparent_data = $this->parent_data;
 				$this->parent_data = $arg_data;
 
-				$this->build_query( $arg_data['sub_args'] );
+				$this->build_query($arg_data['sub_args']);
 
 				$this->parent_data = $this->grandparent_data;
 			}
 
-			if ( isset( $this->entered_join ) ) {
+			if (isset($this->entered_join)) {
 				$this->builder->exit_join();
 				$this->entered_join = null;
-				var_dump( '******** exit join *****' );
+				var_dump('******** exit join *****');
 			}
 		}
 	}
 
-	protected function build_table_schema( $db ) {
+	protected function build_table_schema($db) {
 
-		if ( $this->builder->get_table() ) {
+		if ($this->builder->get_table()) {
 
-			if ( $this->parent_data['arg'] instanceof WordPoints_Entity_Relationship ) {
+			if ($this->parent_data['arg'] instanceof WordPoints_Entity_Relationship) {
 				$primary_field = $this->parent_data['storage_info']['meta']['field'];
 				$join_field = $db['id_field'];
 				//$primary_field = $this->arg_data['arg']->get_secondary_field();
-			} elseif ( $this->arg_data['arg'] instanceof WordPoints_Entity_Relationship ) {
+			} elseif ($this->arg_data['arg'] instanceof WordPoints_Entity_Relationship) {
 				$join_field = $db['join_field'];
 				$primary_field = $this->parent_data['storage_info']['meta']['id_field'];
 			} else {
-				var_dump( $this->parent_data['arg'],$this->arg_data['arg'], $this->builder);
-				throw new WordPoints_Query_Builder_Exception( 'Houston, we have a problem.' );
+				var_dump($this->parent_data['arg'], $this->arg_data['arg'], $this->builder);
+				throw new WordPoints_Query_Builder_Exception('Houston, we have a problem.');
 			}
 
-			if ( is_array( $primary_field ) && isset( $primary_field['table_name'] ) ) {
-				$this->builder->enter_join( $primary_field );
+			if (is_array($primary_field) && isset($primary_field['table_name'])) {
+				$this->builder->enter_join($primary_field);
 				$primary_field = $primary_field['on']['join_field'];
 			}
 
-var_dump( __METHOD__, $db, $primary_field, $this->parent_data['arg'],$this->arg_data['arg'] );
+var_dump(__METHOD__, $db, $primary_field, $this->parent_data['arg'], $this->arg_data['arg']);
 
 			$join = array(
 				'table_name' => $db['table_name'],
@@ -727,28 +727,28 @@ 
 				),
 			);
 
-			if ( isset( $db['join_where'] ) ) {
+			if (isset($db['join_where'])) {
 				$join['where'] = $db['join_where'];
 			}
 
-			$this->builder->enter_join( $join );
+			$this->builder->enter_join($join);
 
 			$this->entered_join = true;
-			var_dump( '******** enter join *****' );
+			var_dump('******** enter join *****');
 
 		} else {
-			$this->builder->set_table( $db['table_name'] );
-			$this->builder->add_field( $db['id_field'] );
+			$this->builder->set_table($db['table_name']);
+			$this->builder->add_field($db['id_field']);
 		}
 	}
 
-	protected function build_conditions( $conditions ) {
+	protected function build_conditions($conditions) {
 
 		// Join conditions should be pushed to the end.
 		$join_conditions = array();
 
-		foreach ( $conditions as $condition ) {
-			var_dump( __METHOD__, $condition);
+		foreach ($conditions as $condition) {
+			var_dump(__METHOD__, $condition);
 
 			// THis needs to be the identifier field for the type of arg that this
 			// field represents.
@@ -756,43 +756,43 @@ 
 			// However, for a relationship it could be something else.
 			// Ultimately, this will have to be left up to the arg object to
 			// decide.
-			if ( ! isset( $condition['field'] ) ) {
-				if ( $this->arg_data['arg'] instanceof WordPoints_Entity_Relationship ) {
+			if ( ! isset($condition['field'])) {
+				if ($this->arg_data['arg'] instanceof WordPoints_Entity_Relationship) {
 //					$condition['field'] = $this->arg_data['arg']->get_secondary_field();
 					$condition['field'] = $this->arg_data['storage_info']['meta']['field'];
 
-					if ( is_array( $condition['field'] && isset( $condition['field']['table_name'] ) ) ) {
+					if (is_array($condition['field'] && isset($condition['field']['table_name']))) {
 						$join_conditions[] = $condition;
 						continue;
 					}
-				} elseif ( $this->arg_data['arg'] instanceof WordPoints_Entity_Attr ) {
+				} elseif ($this->arg_data['arg'] instanceof WordPoints_Entity_Attr) {
 					$condition['field'] = $this->arg_data['arg']->get_field();
 				} else {
-					var_dump($this->arg_data['arg']);exit;
+					var_dump($this->arg_data['arg']); exit;
 				}
 			}
-var_dump(  $condition);
-			$this->builder->where( $condition );
+var_dump($condition);
+			$this->builder->where($condition);
 		}
 
-		$join_count = count( $join_conditions );
+		$join_count = count($join_conditions);
 		$i = 0;
 
-		foreach ( $join_conditions as $condition ) {
+		foreach ($join_conditions as $condition) {
 
 			$i++;
-var_dump( $condition );
-			$this->builder->enter_join( $condition['field'] );
+var_dump($condition);
+			$this->builder->enter_join($condition['field']);
 
 			$condition['field'] = $condition['field']['on']['primary_field'];
 
-			$this->builder->where( $condition );
+			$this->builder->where($condition);
 
 			$this->builder->exit_join();
 
 			// If there are more join conditions, we need to leave a fresh, trailing
 			// join for the next one to join to.
-			if ( $i < $join_count ) {
+			if ($i < $join_count) {
 
 				// There is a current join, but it is already being used, so we
 				// need to exit it.
@@ -808,7 +808,7 @@ 
 }
 
 
-wordpoints_hooks()->retroactive_query_executors->register( 'db', 'WordPoints_Hook_Retroactive_Query_Executor_MySQL' );
+wordpoints_hooks()->retroactive_query_executors->register('db', 'WordPoints_Hook_Retroactive_Query_Executor_MySQL');
 
 
 // EOF

src/includes/classes/hook/settings.php

Doc Comments +20 added lines

@@ -8,12 +8,32 @@
  */
 
 interface WordPoints_Hook_Reaction_SettingI {
+
+	/**
+	 * @return void
+	 */
 	public function __construct( $slug );
+
+	/**
+	 * @return string
+	 */
 	public function get_type();
+
+	/**
+	 * @return string
+	 */
 	public function get_label();
+
+	/**
+	 * @return boolean
+	 */
 	public function is_required();
 	public function get( WordPoints_Hook_ReactionI $reaction );
 	public function validate( $value, WordPoints_Hook_Reaction_Validator $validator );
+
+	/**
+	 * @return void
+	 */
 	public function save( $value, WordPoints_Hook_ReactionI $reaction, $is_new );
 }
 

Spacing +33 added lines, -33 removed lines

@@ -8,13 +8,13 @@ 
  */
 
 interface WordPoints_Hook_Reaction_SettingI {
-	public function __construct( $slug );
+	public function __construct($slug);
 	public function get_type();
 	public function get_label();
 	public function is_required();
-	public function get( WordPoints_Hook_ReactionI $reaction );
-	public function validate( $value, WordPoints_Hook_Reaction_Validator $validator );
-	public function save( $value, WordPoints_Hook_ReactionI $reaction, $is_new );
+	public function get(WordPoints_Hook_ReactionI $reaction);
+	public function validate($value, WordPoints_Hook_Reaction_Validator $validator);
+	public function save($value, WordPoints_Hook_ReactionI $reaction, $is_new);
 }
 
 class WordPoints_Hook_Reaction_Setting implements WordPoints_Hook_Reaction_SettingI {
@@ -23,7 +23,7 @@ 
 	protected $type = 'hidden';
 	protected $required = true;
 
-	public function __construct( $slug ) {
+	public function __construct($slug) {
 		$this->slug = $slug;
 	}
 
@@ -39,17 +39,17 @@ 
 		return $this->required;
 	}
 
-	public function get( WordPoints_Hook_ReactionI $reaction ) {
-		return $reaction->get_meta( $this->slug );
+	public function get(WordPoints_Hook_ReactionI $reaction) {
+		return $reaction->get_meta($this->slug);
 	}
 
-	public function validate( $value, WordPoints_Hook_Reaction_Validator $validator ) {
+	public function validate($value, WordPoints_Hook_Reaction_Validator $validator) {
 
-		if ( $this->is_required() && '' === trim( $value ) ) {
+		if ($this->is_required() && '' === trim($value)) {
 
 			$validator->add_error(
 				sprintf(
-					__( '%s cannot be empty.', 'wordpoints' )
+					__('%s cannot be empty.', 'wordpoints')
 					, $this->get_label()
 				)
 				, $this->slug
@@ -59,8 +59,8 @@ 
 		return $value;
 	}
 
-	public function save( $value, WordPoints_Hook_ReactionI $reaction, $is_new ) {
-		$reaction->update_meta( $this->slug, $value );
+	public function save($value, WordPoints_Hook_ReactionI $reaction, $is_new) {
+		$reaction->update_meta($this->slug, $value);
 	}
 }
 //
@@ -82,12 +82,12 @@ 
 
 		$fields = array();
 
-		foreach ( $this->settings as $slug => $class ) {
+		foreach ($this->settings as $slug => $class) {
 
 			/** @var WordPoints_Hook_Reaction_SettingI $setting */
-			$setting = new $class( $slug );
+			$setting = new $class($slug);
 
-			$fields[ $slug ] = array(
+			$fields[$slug] = array(
 				'type' => $setting->get_type(),
 				'label' => $setting->get_label(),
 				'required' => $setting->is_required(),
@@ -97,29 +97,29 @@ 
 		return $fields;
 	}
 
-	public function save_settings( $reaction, $settings, $is_new ) {
+	public function save_settings($reaction, $settings, $is_new) {
 
-		foreach ( $this->settings as $slug => $class ) {
+		foreach ($this->settings as $slug => $class) {
 
 			/** @var WordPoints_Hook_Reaction_SettingI $setting */
-			$setting = new $class( $slug );
+			$setting = new $class($slug);
 
-			$value = isset( $settings[ $slug ] ) ? $settings[ $slug ] : null;
+			$value = isset($settings[$slug]) ? $settings[$slug] : null;
 
-			$setting->save( $value, $reaction, $is_new );
+			$setting->save($value, $reaction, $is_new);
 		}
 	}
 
-	public function validate_settings( $settings, $validator ) {
+	public function validate_settings($settings, $validator) {
 
-		foreach ( $this->settings as $slug => $class ) {
+		foreach ($this->settings as $slug => $class) {
 
 			/** @var WordPoints_Hook_Reaction_SettingI $setting */
-			$setting = new $class( $slug );
+			$setting = new $class($slug);
 
-			$value = isset( $settings[ $slug ] ) ? $settings[ $slug ] : null;
+			$value = isset($settings[$slug]) ? $settings[$slug] : null;
 
-			$settings[ $slug ] = $setting->validate( $value, $validator );
+			$settings[$slug] = $setting->validate($value, $validator);
 		}
 
 		return $settings;
@@ -133,10 +133,10 @@ 
  *
  * @param WordPoints_Hooks $hooks
  */
-function wordpoints_hook_settings_app( $hooks ) {
-	$hooks->sub_apps->register( 'settings', 'WordPoints_Hook_Settings' );
+function wordpoints_hook_settings_app($hooks) {
+	$hooks->sub_apps->register('settings', 'WordPoints_Hook_Settings');
 }
-add_action( 'wordpoints_hooks_init', 'wordpoints_hook_settings_app' );
+add_action('wordpoints_hooks_init', 'wordpoints_hook_settings_app');
 
 /**
  *
@@ -145,13 +145,13 @@ 
  *
  * @param WordPoints_Hook_Settings $settings
  */
-function wordpoints_register_hook_settings( $settings ) {
+function wordpoints_register_hook_settings($settings) {
 
-	add_action( 'wordpoints_hook_reaction_save', array( $settings, 'save_settings' ), 10, 3 );
-	add_filter( 'wordpoints_hook_reaction_validate', array( $settings, 'validate_settings' ), 10, 2 );
+	add_action('wordpoints_hook_reaction_save', array($settings, 'save_settings'), 10, 3);
+	add_filter('wordpoints_hook_reaction_validate', array($settings, 'validate_settings'), 10, 2);
 
-	$settings->register( 'description', 'WordPoints_Hook_Reaction_Setting_Description' );
+	$settings->register('description', 'WordPoints_Hook_Reaction_Setting_Description');
 }
-add_action( 'wordpoints_hook_settings_init', 'wordpoints_register_hook_settings' );
+add_action('wordpoints_hook_settings_init', 'wordpoints_register_hook_settings');
 
 // EOF

src/includes/classes/query/builder/db/mysql.php

Doc Comments +24 added lines

@@ -9,12 +9,36 @@
 
 
 interface WordPoints_Query_BuilderI {
+
+	/**
+	 * @return void
+	 */
 	public function set_fields( $fields );
+
+	/**
+	 * @return void
+	 */
 	public function add_field( $field );
+
+	/**
+	 * @return void
+	 */
 	public function set_table( $table_name );
 	public function get_table();
+
+	/**
+	 * @return void
+	 */
 	public function enter_join( $join );
+
+	/**
+	 * @return void
+	 */
 	public function exit_join();
+
+	/**
+	 * @return void
+	 */
 	public function where( $condition );
 	public function get_query();
 }

Spacing +119 added lines, -119 removed lines

@@ -9,13 +9,13 @@ 
 
 
 interface WordPoints_Query_BuilderI {
-	public function set_fields( $fields );
-	public function add_field( $field );
-	public function set_table( $table_name );
+	public function set_fields($fields);
+	public function add_field($field);
+	public function set_table($table_name);
 	public function get_table();
-	public function enter_join( $join );
+	public function enter_join($join);
 	public function exit_join();
-	public function where( $condition );
+	public function where($condition);
 	public function get_query();
 }
 
@@ -33,55 +33,55 @@ 
 	protected $aliases = array();
 
 	public function __construct() {
-		$this->query = new WordPoints_Hierarchy( 'joins' );
-		$this->query->push( '', array() );
+		$this->query = new WordPoints_Hierarchy('joins');
+		$this->query->push('', array());
 	}
 
-	public function set_fields( $fields ) {
-		$this->query->set_field( 'fields', $fields );
+	public function set_fields($fields) {
+		$this->query->set_field('fields', $fields);
 	}
 
-	public function add_field( $field ) {
-		$this->query->push_to( 'fields', $field );
+	public function add_field($field) {
+		$this->query->push_to('fields', $field);
 	}
 
-	public function set_table( $table_name ) {
-		$this->query->set_field( 'table_name',  $table_name );
+	public function set_table($table_name) {
+		$this->query->set_field('table_name', $table_name);
 	}
 
 	public function get_table() {
-		return $this->query->get_field( 'table_name' );
+		return $this->query->get_field('table_name');
 	}
 
-	protected function get_alias( $data ) {
+	protected function get_alias($data) {
 
-		if ( ! isset( $this->aliases[ $data['table_name'] ] ) ) {
-			$this->aliases[ $data['table_name'] ] = 0;
+		if ( ! isset($this->aliases[$data['table_name']])) {
+			$this->aliases[$data['table_name']] = 0;
 		}
 
-		return $data['table_name'] . '_' . ++$this->aliases[ $data['table_name'] ];
+		return $data['table_name'].'_'.++$this->aliases[$data['table_name']];
 	}
 
-	public function enter_join( $join ) {
-		$alias = $this->get_alias( $join );
-		$this->query->push( $alias, $join );
+	public function enter_join($join) {
+		$alias = $this->get_alias($join);
+		$this->query->push($alias, $join);
 	}
 
 	public function exit_join() {
 		$this->query->pop();
 	}
 
-	public function where( $condition ) {
+	public function where($condition) {
 
-		$where = $this->query->get_field( 'where' );
+		$where = $this->query->get_field('where');
 
-		if ( ! is_array( $where ) ) {
+		if ( ! is_array($where)) {
 			$where = array();
 		}
 
 		$where[] = $condition;
 
-		$this->query->set_field( 'where', $where );
+		$this->query->set_field('where', $where);
 	}
 }
 
@@ -101,64 +101,64 @@ 
 
 		var_dump($this->query);
 		try {
-			$this->build_query( $this->query->get() );
-		} catch ( WordPoints_Query_Builder_Exception $e ) {
-			return new WP_Error( $e->getMessage(), $e->getTraceAsString() );
+			$this->build_query($this->query->get());
+		} catch (WordPoints_Query_Builder_Exception $e) {
+			return new WP_Error($e->getMessage(), $e->getTraceAsString());
 		}
 
 		return $this->sql;
 	}
 
-	protected function build_query( $query ) {
+	protected function build_query($query) {
 
-		var_dump( __METHOD__, $query );
+		var_dump(__METHOD__, $query);
 
-		$this->alias = $this->get_alias( $query );
+		$this->alias = $this->get_alias($query);
 
-		$this->build_fields( $query );
-		$this->build_from( $query );
-		$this->build_joins( $query );
-		$this->build_where( $query );
+		$this->build_fields($query);
+		$this->build_from($query);
+		$this->build_joins($query);
+		$this->build_where($query);
 		$this->build_select();
 	}
 
 	protected function build_select() {
 
-		if ( empty( $this->fields ) ) {
-			throw new WordPoints_Query_Builder_Exception( 'no fields' );
+		if (empty($this->fields)) {
+			throw new WordPoints_Query_Builder_Exception('no fields');
 		}
 
-		$this->sql = 'SELECT' . $this->fields . $this->sql;
+		$this->sql = 'SELECT'.$this->fields.$this->sql;
 	}
 
-	protected function build_fields( $query ) {
+	protected function build_fields($query) {
 
-		if ( empty( $query['fields'] ) ) {
+		if (empty($query['fields'])) {
 			return;
 		}
 
-		foreach ( $query['fields'] as $field ) {
+		foreach ($query['fields'] as $field) {
 
-			if ( ! is_array( $field ) ) {
-				$field = array( 'field' => $field );
+			if ( ! is_array($field)) {
+				$field = array('field' => $field);
 			}
 
-			if ( ! isset( $field['field'] ) ) {
-				throw new WordPoints_Query_Builder_Exception( 'invalid field' );
+			if ( ! isset($field['field'])) {
+				throw new WordPoints_Query_Builder_Exception('invalid field');
 			}
 
-			if ( ! empty( $this->fields ) ) {
+			if ( ! empty($this->fields)) {
 				$this->fields .= ',';
 			}
 
-			$this->fields .= ' ' . $this->build_field( $field['field'] );
+			$this->fields .= ' '.$this->build_field($field['field']);
 
 			$as = $field['field'];
-			if ( isset( $field['as'] ) ) {
+			if (isset($field['as'])) {
 				$as = $field['as'];
 			}
 
-			$this->fields .= ' AS `' . $this->escape_identifier( $as ) . '`';
+			$this->fields .= ' AS `'.$this->escape_identifier($as).'`';
 		}
 	}
 
@@ -171,118 +171,118 @@ 
 	 *
 	 * @throws WordPoints_Query_Builder_Exception
 	 */
-	protected function build_field( $field ) {
+	protected function build_field($field) {
 
-		$field_name = $this->get_field_name( $field );
+		$field_name = $this->get_field_name($field);
 
-		$sql = '`' . $this->escape_identifier( $this->alias ) . '`';
-		$sql .= '.`' . $this->escape_identifier( $field_name ) . '`';
+		$sql = '`'.$this->escape_identifier($this->alias).'`';
+		$sql .= '.`'.$this->escape_identifier($field_name).'`';
 
 		return $sql;
 	}
 
-	protected function build_from( $query ) {
+	protected function build_from($query) {
 
-		if ( ! isset( $query['table_name'] ) ) {
-			throw new WordPoints_Query_Builder_Exception( 'table_name' );
+		if ( ! isset($query['table_name'])) {
+			throw new WordPoints_Query_Builder_Exception('table_name');
 		}
 
 		$this->sql .= "\n";
-		$this->sql .= 'FROM `' . $this->escape_identifier( $query['table_name'] ) . '`';
-		$this->sql .= ' AS `' . $this->escape_identifier( $this->alias ) . '`';
+		$this->sql .= 'FROM `'.$this->escape_identifier($query['table_name']).'`';
+		$this->sql .= ' AS `'.$this->escape_identifier($this->alias).'`';
 	}
 
-	protected function build_joins( $query ) {
+	protected function build_joins($query) {
 
-		if ( ! isset( $query['joins'] ) ) {
+		if ( ! isset($query['joins'])) {
 			return;
 		}
 
-		foreach ( $query['joins'] as $join ) {
-			$this->build_join( $join );
+		foreach ($query['joins'] as $join) {
+			$this->build_join($join);
 		}
 	}
 
-	protected function build_join( $join ) {
+	protected function build_join($join) {
 
-		if ( ! isset( $join['table_name'] ) ) {
-			throw new WordPoints_Query_Builder_Exception( 'join table_name' );
+		if ( ! isset($join['table_name'])) {
+			throw new WordPoints_Query_Builder_Exception('join table_name');
 		}
 
-		if ( ! isset( $join['on'] ) ) {
-			throw new WordPoints_Query_Builder_Exception( 'join on' );
+		if ( ! isset($join['on'])) {
+			throw new WordPoints_Query_Builder_Exception('join on');
 		}
 
-		if ( ! isset( $join['on']['join_field'] ) ) {
-			throw new WordPoints_Query_Builder_Exception( 'join on join_field' );
+		if ( ! isset($join['on']['join_field'])) {
+			throw new WordPoints_Query_Builder_Exception('join on join_field');
 		}
 
-		if ( ! isset( $join['on']['primary_field'] ) ) {
-			throw new WordPoints_Query_Builder_Exception( 'join on primary_field' );
+		if ( ! isset($join['on']['primary_field'])) {
+			throw new WordPoints_Query_Builder_Exception('join on primary_field');
 		}
 
-		$alias = $this->get_alias( $join );
+		$alias = $this->get_alias($join);
 
 		$this->sql .= "\n";
-		$this->sql .= 'INNER JOIN `' . $this->escape_identifier( $join['table_name'] ) . '`';
-		$this->sql .= ' AS `' . $this->escape_identifier( $alias ) . '`';
-		$this->sql .= "\n\t" . 'ON ' . $this->build_field( $join['on']['primary_field'] );
+		$this->sql .= 'INNER JOIN `'.$this->escape_identifier($join['table_name']).'`';
+		$this->sql .= ' AS `'.$this->escape_identifier($alias).'`';
+		$this->sql .= "\n\t".'ON '.$this->build_field($join['on']['primary_field']);
 
 		$old_alias = $this->alias;
 		$this->alias = $alias;
 
-		$this->sql .= ' = ' . $this->build_field( $join['on']['join_field'] );
+		$this->sql .= ' = '.$this->build_field($join['on']['join_field']);
 
-		$this->build_fields( $join );
+		$this->build_fields($join);
 
-		if ( isset( $join['where'] ) ) {
-			foreach ( $join['where'] as $condition ) {
-				$this->build_condition( $condition );
+		if (isset($join['where'])) {
+			foreach ($join['where'] as $condition) {
+				$this->build_condition($condition);
 			}
 		}
 
-		$this->build_joins( $join );
+		$this->build_joins($join);
 
 		$this->alias = $old_alias;
 	}
 
-	protected function build_where( $query ) {
+	protected function build_where($query) {
 
-		if ( empty( $query['where'] ) ) {
+		if (empty($query['where'])) {
 			return;
 		}
 
 		$this->sql .= "\n";
 		$this->sql .= 'WHERE 1=1';
 
-		foreach ( $query['where'] as $condition ) {
-			$this->build_condition( $condition );
+		foreach ($query['where'] as $condition) {
+			$this->build_condition($condition);
 		}
 	}
 
-	protected function build_condition( $condition ) {
+	protected function build_condition($condition) {
 
 		global $wpdb;
 
-		if ( ! isset( $condition['field'], $condition['value'] ) ) {
+		if ( ! isset($condition['field'], $condition['value'])) {
 			var_dump($condition);
-			throw new WordPoints_Query_Builder_Exception( 'bad condition' );
+			throw new WordPoints_Query_Builder_Exception('bad condition');
 		}
 
-		if ( ! isset( $condition['compare'] ) ) {
+		if ( ! isset($condition['compare'])) {
 			$condition['compare'] = '=';
 		}
 
 		$this->sql .= "\n\t";
 
-		$this->build_condition_type( $condition );
+		$this->build_condition_type($condition);
 
-		$field_type = $this->get_field_type( $condition['field'] );
-		if ( 'serialized_array' === $field_type ) {
-			if ( is_array( $condition['value'] ) ) {
-				if ( isset( $condition['compare'] ) && 'in' === $condition['compare'] ) {
+		$field_type = $this->get_field_type($condition['field']);
+		if ('serialized_array' === $field_type) {
+			if (is_array($condition['value'])) {
+				if (isset($condition['compare']) && 'in' === $condition['compare']) {
 					$this->sql .= '( 1=0 ';
-					foreach ( $condition['value'] as $index => $value ) {
+					foreach ($condition['value'] as $index => $value) {
 						$this->build_condition(
 							array(
 								'type' => 'or',
@@ -296,13 +296,13 @@ 
 					return;
 				}
 			} else {
-				$condition['value'] = $this->serialize_value( $condition['value'] );
+				$condition['value'] = $this->serialize_value($condition['value']);
 			}
 		}
 
-		$this->sql .= $this->build_field( $condition['field'] );
+		$this->sql .= $this->build_field($condition['field']);
 
-		switch ( $condition['compare'] ) {
+		switch ($condition['compare']) {
 
 			case '=':
 				$this->sql .= ' = ';
@@ -313,18 +313,18 @@ 
 				break;
 
 			case 'in':
-				$this->sql .= ' IN (' . wordpoints_prepare__in( $condition['value'] ) . ')';
+				$this->sql .= ' IN ('.wordpoints_prepare__in($condition['value']).')';
 				return;
 
 			default:
-				throw new WordPoints_Query_Builder_Exception( 'bad condition comparison' );
+				throw new WordPoints_Query_Builder_Exception('bad condition comparison');
 		}
 
-		if ( ! is_scalar( $condition['value'] ) ) {
-			throw new WordPoints_Query_Builder_Exception( 'bad condition value' );
+		if ( ! is_scalar($condition['value'])) {
+			throw new WordPoints_Query_Builder_Exception('bad condition value');
 		}
 
-		$this->sql .= $wpdb->prepare( '%s', $condition['value'] );
+		$this->sql .= $wpdb->prepare('%s', $condition['value']);
 	}
 
 	/**
@@ -336,13 +336,13 @@ 
 	 *
 	 * @throws WordPoints_Query_Builder_Exception
 	 */
-	protected function build_condition_type( $condition ) {
+	protected function build_condition_type($condition) {
 
-		if ( ! isset( $condition['type'] ) ) {
+		if ( ! isset($condition['type'])) {
 			$condition['type'] = 'and';
 		}
 
-		switch ( $condition['type'] ) {
+		switch ($condition['type']) {
 
 			case 'and':
 				$this->sql .= 'AND ';
@@ -353,21 +353,21 @@ 
 				break;
 
 			default:
-				throw new WordPoints_Query_Builder_Exception( 'bad condition type' );
+				throw new WordPoints_Query_Builder_Exception('bad condition type');
 		}
 	}
 
-	protected function escape_identifier( $identifier ) {
+	protected function escape_identifier($identifier) {
 
-		return str_replace( '`', '``', $identifier );
+		return str_replace('`', '``', $identifier);
 	}
 
-	protected function get_field_name( $field ) {
+	protected function get_field_name($field) {
 
-		if ( is_array( $field ) ) {
+		if (is_array($field)) {
 
-			if ( ! isset( $field['name'] ) ) {
-				throw new WordPoints_Query_Builder_Exception( 'field name' );
+			if ( ! isset($field['name'])) {
+				throw new WordPoints_Query_Builder_Exception('field name');
 			}
 
 			$field = $field['name'];
@@ -376,22 +376,22 @@ 
 		return $field;
 	}
 
-	protected function get_field_type( $field ) {
+	protected function get_field_type($field) {
 
-		if ( is_array( $field ) && isset( $field['type'] ) ) {
+		if (is_array($field) && isset($field['type'])) {
 			return $field['type'];
 		}
 
 		return 'string';
 	}
 
-	protected function serialize_value( $value ) {
+	protected function serialize_value($value) {
 
-		if ( is_string( $value ) ) {
-			$value = '"' . $value . '"';
+		if (is_string($value)) {
+			$value = '"'.$value.'"';
 		}
 
-		return '%:' . $value . ';%';
+		return '%:'.$value.';%';
 	}
 }
 

src/includes/classes/spec.php

Doc Comments +3 added lines

@@ -284,6 +284,9 @@
 		return $entities;
 	}
 
+	/**
+	 * @param integer $count
+	 */
 	protected function check_count( $count ) {
 
 		if ( isset( $this->settings['max'] ) && $count > $this->settings['max'] ) {

Spacing +47 added lines, -47 removed lines

@@ -11,9 +11,9 @@ 
 interface WordPoints_SpecI {
 	public function get_title();
 	public function get_settings_fields();
-	public function validate_settings( $settings );
+	public function validate_settings($settings);
 	public function is_met();
-	public function get_error( $name );
+	public function get_error($name);
 }
 
 abstract class WordPoints_Spec implements  WordPoints_SpecI {
@@ -25,38 +25,38 @@ 
 	 * @param $value
 	 * @param $expected
 	 */
-	public function __construct( $value, $expected ) {
+	public function __construct($value, $expected) {
 		$this->value = $value;
 		$this->expected = $expected;
 	}
 
-	public function validate_settings( $settings ) {
+	public function validate_settings($settings) {
 
 		$data_types = wordpoints_apps()->data_types;
 
-		foreach ( $this->get_settings_fields() as $setting => $data ) {
+		foreach ($this->get_settings_fields() as $setting => $data) {
 
-			if ( ! isset( $settings[ $setting ] ) ) {
+			if ( ! isset($settings[$setting])) {
 
-				if ( ! empty( $data['required'] ) ) {
+				if ( ! empty($data['required'])) {
 					return 'error'; // TODO
 				}
 
 			} else {
 
-				$data_type = $data_types->get( $data['type'] );
+				$data_type = $data_types->get($data['type']);
 
-				if ( ! $data_type instanceof WordPoints_Data_TypeI ) {
+				if ( ! $data_type instanceof WordPoints_Data_TypeI) {
 					continue;
 				}
 
-				$value = $data_type->validate_value( $settings[ $setting ] );
+				$value = $data_type->validate_value($settings[$setting]);
 
-				if ( is_wp_error( $value ) ) {
+				if (is_wp_error($value)) {
 					return $value;
 				}
 
-				$settings[ $setting ] = $value;
+				$settings[$setting] = $value;
 			}
 		}
 
@@ -67,7 +67,7 @@ 
 class WordPoints_Spec_Number_Max extends WordPoints_Spec {
 
 	public function get_title() {
-		return __( 'Maximum', 'wordpoints' );
+		return __('Maximum', 'wordpoints');
 	}
 
 	public function get_settings_fields() {
@@ -85,10 +85,10 @@ 
 		return $this->value <= $this->expected;
 	}
 
-	public function get_error( $name ) {
+	public function get_error($name) {
 
 		return sprintf(
-			__( '%1$s must not be more than %2$s.', 'wordpoints' )
+			__('%1$s must not be more than %2$s.', 'wordpoints')
 			, $name
 			, $this->expected
 		);
@@ -98,7 +98,7 @@ 
 class WordPoints_Spec_String_Length_Max extends WordPoints_Spec {
 
 	public function get_title() {
-		return __( 'Maximum Length', 'wordpoints' );
+		return __('Maximum Length', 'wordpoints');
 	}
 
 	public function get_settings_fields() {
@@ -112,13 +112,13 @@ 
 	}
 
 	public function is_met() {
-		return strlen( $this->value ) <= $this->expected;
+		return strlen($this->value) <= $this->expected;
 	}
 
-	public function get_error( $name ) {
+	public function get_error($name) {
 
 		return sprintf(
-			__( '%1$s must not be longer than %2$s characters.', 'wordpoints' )
+			__('%1$s must not be longer than %2$s characters.', 'wordpoints')
 			, $name
 			, $this->expected
 		);
@@ -129,20 +129,20 @@ 
 class WordPoints_Spec_String_Contains extends WordPoints_Spec {
 
 	public function get_title() {
-		return __( 'Contains', 'wordpoints' );
+		return __('Contains', 'wordpoints');
 	}
 
 	public function get_settings_fields() {
 	}
 
 	public function is_met() {
-		return false !== strpos( $this->value, $this->expected );
+		return false !== strpos($this->value, $this->expected);
 	}
 
-	public function get_error( $name ) {
+	public function get_error($name) {
 
 		return sprintf(
-			__( '%1$s must contain "%2$s".', 'wordpoints' ) // TODO quotes
+			__('%1$s must contain "%2$s".', 'wordpoints') // TODO quotes
 			, $name
 			, $this->expected
 		);
@@ -165,19 +165,19 @@ 
 	protected $validator;
 
 	public function get_title() {
-		return __( 'Contains', 'wordpoints' );
+		return __('Contains', 'wordpoints');
 	}
 
 	public function get_settings_fields() {
 		return array(
 			'min' => array(
 				'slug'  => 'min',
-				'label' => __( 'Minimum number of items', 'wordpoints' ),
+				'label' => __('Minimum number of items', 'wordpoints'),
 				'type'  => 'number',
 			),
 			'max' => array(
 				'slug'  => 'max',
-				'label' => __( 'Maximum number of items', 'wordpoints' ),
+				'label' => __('Maximum number of items', 'wordpoints'),
 				'type'  => 'number',
 			),
 		);
@@ -189,18 +189,18 @@ 
 		WordPoints_Hook_Reaction_Validator $validator
 	) {
 
-		if ( ! $this->arg_type_supported( $arg, $validator ) ) {
+		if ( ! $this->arg_type_supported($arg, $validator)) {
 			return false;
 		}
 
 		$this->settings = $settings;
 		$this->validator = $validator;
 
-		if ( ! $this->validate_count() ) {
+		if ( ! $this->validate_count()) {
 			return false;
 		}
 
-		if ( isset( $settings['conditions'] ) ) {
+		if (isset($settings['conditions'])) {
 			$this->validate_conditions();
 		}
 
@@ -210,21 +210,21 @@ 
 	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'] )
-			&& ! wordpoints_posint( $this->settings['min'] )
+			! empty($this->settings['min'])
+			&& ! 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'
 			);
 		}
@@ -239,7 +239,7 @@ 
 		);
 
 		$conditions = $conditions_extension->validate_settings(
-			array( 'conditions' => $this->settings['conditions'] )
+			array('conditions' => $this->settings['conditions'])
 			, $this->validator
 			, $this->validator->get_event_args()
 		);
@@ -249,9 +249,9 @@ 
 
 	public function is_met() {
 
-		$entities = $this->filter_entities( $this->value );
+		$entities = $this->filter_entities($this->value);
 
-		return $this->check_count( count( $entities ) );
+		return $this->check_count(count($entities));
 	}
 
 	/**
@@ -263,41 +263,41 @@ 
 	 *
 	 * @return WordPoints_Entity[]
 	 */
-	protected function filter_entities( $entities ) {
+	protected function filter_entities($entities) {
 
 		$conditions_extension = wordpoints_hooks()->extensions->get(
 			'conditions'
 		);
 
-		foreach ( $entities as $index => $entity ) {
+		foreach ($entities as $index => $entity) {
 
 			$matches = $conditions_extension->conditions_are_met(
 				$this->expected['conditions']
-				, new WordPoints_Hook_Event_Args( array( $entity ) )
+				, new WordPoints_Hook_Event_Args(array($entity))
 			);
 
-			if ( ! $matches ) {
-				unset( $entities[ $index ] );
+			if ( ! $matches) {
+				unset($entities[$index]);
 			}
 		}
 
 		return $entities;
 	}
 
-	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;
 		}
 
 		return true;
 	}
 
-	public function get_error( $name ) {
+	public function get_error($name) {
 		// TODO: Implement get_error() method.
 	}
 }

src/admin/includes/classes/screen.php

Spacing +4 added lines, -4 removed lines

@@ -62,8 +62,8 @@ 
 	public function hooks() {
 
 		/* Load the JavaScript needed for the settings screen. */
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-		add_action( "admin_footer-{$this->id}", array( $this, 'footer_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
+		add_action("admin_footer-{$this->id}", array($this, 'footer_scripts'));
 	}
 
 	/**
@@ -98,11 +98,11 @@ 
 
 		<div class="wrap">
 
-			<h1><?php echo esc_html( $this->get_title() ); ?></h1>
+			<h1><?php echo esc_html($this->get_title()); ?></h1>
 
 			<?php settings_errors(); ?>
 
-			<?php wordpoints_admin_show_tabs( $this->tabs, false ); ?>
+			<?php wordpoints_admin_show_tabs($this->tabs, false); ?>
 
 			<?php $this->display_content(); ?>
 

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

Spacing +104 added lines, -104 removed lines

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

src/admin/includes/classes/screens.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 	 * @since 1.0.0
 	 */
 	public function __construct() {
-		add_action( 'current_screen', array( $this, 'set_current_screen' ) );
+		add_action('current_screen', array($this, 'set_current_screen'));
 	}
 
 	/**
@@ -37,11 +37,11 @@ 
 	 *
 	 * @param WP_Screen $current_screen The WP_Screen object for the current screen.
 	 */
-	public function set_current_screen( $current_screen ) {
+	public function set_current_screen($current_screen) {
 
-		$screen = $this->get( $current_screen->id );
+		$screen = $this->get($current_screen->id);
 
-		if ( ! ( $screen instanceof WordPoints_Admin_Screen ) ) {
+		if ( ! ($screen instanceof WordPoints_Admin_Screen)) {
 			return;
 		}
 
@@ -49,7 +49,7 @@ 
 
 		add_action(
 			"load-{$current_screen->id}"
-			, array( $this->current_screen, 'load' )
+			, array($this->current_screen, 'load')
 		);
 	}