WordPoints / hooks-api

src/includes/classes/wpdb/wrapper.php

Spacing +51 added lines, -51 removed lines

@@ -11,60 +11,60 @@ 
 
 	protected $wpdb;
 
-	public function __construct( $wpdb ) {
+	public function __construct($wpdb) {
 		$this->wpdb = $wpdb;
 	}
 
-	public function __get( $name ) {
+	public function __get($name) {
 		return $this->wpdb->$name;
 	}
 
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		$this->wpdb->$name = $value;
 	}
 
-	public function __isset( $name ) {
-		return isset( $this->wpdb->$name );
+	public function __isset($name) {
+		return isset($this->wpdb->$name);
 	}
 
-	public function __unset( $name ) {
-		unset( $this->wpdb->$name );
+	public function __unset($name) {
+		unset($this->wpdb->$name);
 	}
 
-	public function __call( $name, $arguments ) {
+	public function __call($name, $arguments) {
 
-		$wrappers = wordpoints_apps()->get_sub_app( 'wpdb_wrappers' );
-		$slugs = $wrappers->get_child_slugs( $name );
+		$wrappers = wordpoints_apps()->get_sub_app('wpdb_wrappers');
+		$slugs = $wrappers->get_child_slugs($name);
 		$should_listen = $query = false;
 
 
-		switch ( $name ) {
+		switch ($name) {
 
 			case 'insert':
 //			case 'replace':
-				$query = new WordPoints_WPDB_Query_Data_Array( $this->args[0] );
+				$query = new WordPoints_WPDB_Query_Data_Array($this->args[0]);
 			break;
 
 			case 'update':
-				$query =  new WordPoints_WPDB_Query_Data_Array( $this->args[0], $this->args[2] );
+				$query = new WordPoints_WPDB_Query_Data_Array($this->args[0], $this->args[2]);
 			break;
 
 			case 'delete':
-				$query =  new WordPoints_WPDB_Query_Data_Array( $this->args[0], $this->args[1] );
+				$query = new WordPoints_WPDB_Query_Data_Array($this->args[0], $this->args[1]);
 			break;
 
 			case 'query':
-				$query =  new WordPoints_WPDB_Query_Data_SQL( $this->args[0] );
+				$query = new WordPoints_WPDB_Query_Data_SQL($this->args[0]);
 			break;
 		}
 
-		if ( $query ) {
+		if ($query) {
 			/** @var WordPoints_WPDB_Query_WrapperI $wrapper */
-			$wrapper = $wrappers->get( $name, $query );
+			$wrapper = $wrappers->get($name, $query);
 
 			$result = $wrapper->execute();
 		} else {
-			$result = call_user_func_array( array( $this->wpdb, $name ), $arguments );
+			$result = call_user_func_array(array($this->wpdb, $name), $arguments);
 		}
 
 		return $result;
@@ -84,7 +84,7 @@ 
 
 class WordPoints_MySQL_Query_Parser_Simple_Insert implements WordPoints_MySQL_Query_Parser_SimpleI {
 
-	public function __construct( $sql ) {
+	public function __construct($sql) {
 		$this->sql = $sql;
 	}
 
@@ -99,7 +99,7 @@ 
 		// columns will not be needed. then the other code can decide what to do.
 		// although I guess sense we have the tablel name we could reun the query
 		// ourselves if we need/want to.
-		if ( stripos( $this->sql, 'ON DUPLICATE KEY UPDATE' ) ) {
+		if (stripos($this->sql, 'ON DUPLICATE KEY UPDATE')) {
 
 		}
 
@@ -119,7 +119,7 @@ 
 	 */
 	protected $parser;
 
-	public function __construct( $sql ) {
+	public function __construct($sql) {
 		$this->sql = $sql;
 		$this->parser = $this->get_parser();
 	}
@@ -130,7 +130,7 @@ 
 		// of query it is.
 		// maybe the parser will actually be passed in, and the query type deterimed
 		// by teh method wrapper.
-		$parser = new WordPoints_MySQL_Query_Parser_Simple_Insert( $this->sql );
+		$parser = new WordPoints_MySQL_Query_Parser_Simple_Insert($this->sql);
 		// maybe we don't even need to parse.
 		return $parser;
 	}
@@ -149,7 +149,7 @@ 
 	protected $table_name;
 	protected $where_data;
 
-	public function __construct( $table_name, $where_data = array() ) {
+	public function __construct($table_name, $where_data = array()) {
 		$this->table_name = $table_name;
 		$this->where_data = $where_data;
 	}
@@ -164,7 +164,7 @@ 
 }
 
 interface WordPoints_WPDB_Query_WrapperI {
-	public function __construct( $slug, $args, $wpdb );
+	public function __construct($slug, $args, $wpdb);
 	public function execute();
 
 }
@@ -185,7 +185,7 @@ 
 	protected $result;
 	protected $backed_up_wpdb_vars;
 
-	public function __construct( $slug, $args, $wpdb ) {
+	public function __construct($slug, $args, $wpdb) {
 		$this->slug = $slug;
 		$this->args = $args;
 		$this->wpdb = $wpdb;
@@ -194,20 +194,20 @@ 
 
 	protected function get_query_data() {
 
-		switch ( $this->slug ) {
+		switch ($this->slug) {
 
 			case 'insert':
 				//			case 'replace':
-				return new WordPoints_WPDB_Query_Data_Array( $this->args[0] );
+				return new WordPoints_WPDB_Query_Data_Array($this->args[0]);
 
 			case 'update':
-				return new WordPoints_WPDB_Query_Data_Array( $this->args[0], $this->args[2] );
+				return new WordPoints_WPDB_Query_Data_Array($this->args[0], $this->args[2]);
 
 			case 'delete':
-				return new WordPoints_WPDB_Query_Data_Array( $this->args[0], $this->args[1] );
+				return new WordPoints_WPDB_Query_Data_Array($this->args[0], $this->args[1]);
 
 			case 'query':
-				return new WordPoints_WPDB_Query_Data_SQL( $this->args[0] );
+				return new WordPoints_WPDB_Query_Data_SQL($this->args[0]);
 		}
 
 		return false;
@@ -217,13 +217,13 @@ 
 
 		$should_listen = $this->should_listen();
 
-		if ( $should_listen ) {
+		if ($should_listen) {
 			$this->before_query();
 		}
 
-		$this->result = call_user_func_array( array( $this->wpdb, $this->slug ), $this->args );
+		$this->result = call_user_func_array(array($this->wpdb, $this->slug), $this->args);
 
-		if ( $should_listen && $this->was_successful_query() ) {
+		if ($should_listen && $this->was_successful_query()) {
 			$this->backup_wpdb_vars();
 			$this->after_query();
 			$this->restore_wpdb_vars();
@@ -252,8 +252,8 @@ 
 
 		// we could check for the availableility of eahc valu here in case of dropins
 		// or they become not available in the future.
-		foreach ( $to_backup as $property ) {
-			$this->backed_up_wpdb_vars[ $property ] = $this->wpdb->$property;
+		foreach ($to_backup as $property) {
+			$this->backed_up_wpdb_vars[$property] = $this->wpdb->$property;
 		}
 	}
 
@@ -263,7 +263,7 @@ 
 		// with the backed up result.
 		$this->wpdb->flush();
 
-		foreach ( $this->backed_up_wpdb_vars as $property => $value ) {
+		foreach ($this->backed_up_wpdb_vars as $property => $value) {
 			$this->wpdb->$property = $value;
 		}
 	}
@@ -301,18 +301,18 @@ 
 	 */
 	protected function is_entity_table() {
 
-		$this->entity = 'new entity object' . $this->data->get_table_name();
+		$this->entity = 'new entity object'.$this->data->get_table_name();
 
 		return true;
 	}
 
 	public function should_listen() {
 
-		if ( ! $this->data ) {
+		if ( ! $this->data) {
 			return false;
 		}
 
-		if ( $this->is_entity_table() ) {
+		if ($this->is_entity_table()) {
 			return false;
 		}
 
@@ -320,7 +320,7 @@ 
 	}
 
 	protected function was_successful_query() {
-		return (bool) wordpoints_posint( $not_by_ref = $this->wpdb->num_rows );
+		return (bool) wordpoints_posint($not_by_ref = $this->wpdb->num_rows);
 	}
 }
 
@@ -330,7 +330,7 @@ 
 	protected $args;
 	protected $wpdb;
 
-	public function __construct( $slug, $args, $wpdb ) {
+	public function __construct($slug, $args, $wpdb) {
 		$this->slug = $slug;
 		$this->args = $args;
 		$this->wpdb = $wpdb;
@@ -341,10 +341,10 @@ 
 		// check if this is a query that we want to listen to.
 		// if so, call execute on a particular child.
 		// otherwise, just call execute.
-		if ( $this->get_query_type() ) {
+		if ($this->get_query_type()) {
 
 		} else {
-			$result = call_user_func_array( array( $this->wpdb, $this->slug ), $this->args );
+			$result = call_user_func_array(array($this->wpdb, $this->slug), $this->args);
 		}
 
 		return $result;
@@ -369,15 +369,15 @@ 
 
 		$ids = $this->get_entity_ids();
 
-		$this->entities = new WordPoints_Entity_Array( $this->entity->get_slug() );
-		$this->entities->set_the_value( $ids );
+		$this->entities = new WordPoints_Entity_Array($this->entity->get_slug());
+		$this->entities->set_the_value($ids);
 	}
 
 	protected function get_entity_ids() {
 		$where = $this->data->get_where_clause();
-		$id_field = wordpoints_escape_mysql_identifier( $this->entity->get_id_field() );
-		$table_name = wordpoints_escape_mysql_identifier( $this->data->get_table_name() );
-		return $this->wpdb->get_col( "SELECT {$id_field} FROM {$table_name} {$where}" );
+		$id_field = wordpoints_escape_mysql_identifier($this->entity->get_id_field());
+		$table_name = wordpoints_escape_mysql_identifier($this->data->get_table_name());
+		return $this->wpdb->get_col("SELECT {$id_field} FROM {$table_name} {$where}");
 	}
 
 	protected function after_query() {
@@ -396,13 +396,13 @@ 
 		$where_clause = $this->data->get_where_clause();
 
 		// get a before snapshot, if any matching are found.
-		if ( $where_clause ) {
+		if ($where_clause) {
 
 		}
 	}
 
 	protected function after_query() {
-		$this->entity->set_the_value( $this->wpdb->insert_id );
+		$this->entity->set_the_value($this->wpdb->insert_id);
 		// I guess we invoke the api to run the action now?
 		$this->trigger_entity_create_actions();
 	}
@@ -413,7 +413,7 @@ 
 
 	protected function after_query() {
 		// I guess we invoke the api to run the action now?
-		$this->trigger_entity_delete_actions( $this->entities );
+		$this->trigger_entity_delete_actions($this->entities);
 	}
 }
 

src/includes/classes/spec.php

Spacing +50 added lines, -50 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()->get_sub_app( 'data_types' );
+		$data_types = wordpoints_apps()->get_sub_app('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',
 			),
 		);
@@ -192,18 +192,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();
 		}
 
@@ -213,21 +213,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'
 			);
 		}
@@ -237,12 +237,12 @@ 
 
 	protected function validate_conditions() {
 
-		$conditions_extension = wordpoints_hooks()->get_sub_app( 'extensions' )->get(
+		$conditions_extension = wordpoints_hooks()->get_sub_app('extensions')->get(
 			'conditions'
 		);
 
 		$conditions = $conditions_extension->validate_settings(
-			array( 'conditions' => $this->settings['conditions'] )
+			array('conditions' => $this->settings['conditions'])
 			, $this->validator
 			, $this->validator->get_event_args()
 		);
@@ -252,9 +252,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));
 	}
 
 	/**
@@ -266,41 +266,41 @@ 
 	 *
 	 * @return WordPoints_Entity[]
 	 */
-	protected function filter_entities( $entities ) {
+	protected function filter_entities($entities) {
 
-		$conditions_extension = wordpoints_hooks()->get_sub_app( 'extensions' )->get(
+		$conditions_extension = wordpoints_hooks()->get_sub_app('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/includes/classes/hooks.php

Spacing +36 added lines, -36 removed lines

@@ -40,13 +40,13 @@ 
 	protected function init() {
 
 		$sub_apps = $this->sub_apps;
-		$sub_apps->register( 'router', 'WordPoints_Hook_Router' );
-		$sub_apps->register( 'actions', 'WordPoints_Hook_Actions' );
-		$sub_apps->register( 'events', 'WordPoints_Hook_Events' );
-		$sub_apps->register( 'reactors', 'WordPoints_Class_Registry_Persistent' );
-		$sub_apps->register( 'reaction_stores', 'WordPoints_Class_Registry_Children' );
-		$sub_apps->register( 'extensions', 'WordPoints_Class_Registry_Persistent' );
-		$sub_apps->register( 'conditions', 'WordPoints_Class_Registry_Children' );
+		$sub_apps->register('router', 'WordPoints_Hook_Router');
+		$sub_apps->register('actions', 'WordPoints_Hook_Actions');
+		$sub_apps->register('events', 'WordPoints_Hook_Events');
+		$sub_apps->register('reactors', 'WordPoints_Class_Registry_Persistent');
+		$sub_apps->register('reaction_stores', 'WordPoints_Class_Registry_Children');
+		$sub_apps->register('extensions', 'WordPoints_Class_Registry_Persistent');
+		$sub_apps->register('conditions', 'WordPoints_Class_Registry_Children');
 
 		parent::init();
 	}
@@ -69,8 +69,8 @@ 
 	 */
 	public function get_current_mode() {
 
-		if ( ! isset( $this->current_mode ) ) {
-			$this->current_mode = ( wordpoints_is_network_context() ? 'network' : 'standard' );
+		if ( ! isset($this->current_mode)) {
+			$this->current_mode = (wordpoints_is_network_context() ? 'network' : 'standard');
 		}
 
 		return $this->current_mode;
@@ -88,7 +88,7 @@ 
 	 *
 	 * @param string $mode The slug of the mode to set as the current mode.
 	 */
-	public function set_current_mode( $mode ) {
+	public function set_current_mode($mode) {
 		$this->current_mode = $mode;
 	}
 
@@ -101,19 +101,19 @@ 
 	 *
 	 * @return WordPoints_Hook_Reaction_StoreI|false The reaction storage object.
 	 */
-	public function get_reaction_store( $slug ) {
+	public function get_reaction_store($slug) {
 
-		$reaction_store = $this->get_sub_app( 'reaction_stores' )->get(
+		$reaction_store = $this->get_sub_app('reaction_stores')->get(
 			$this->get_current_mode()
 			, $slug
 		);
 
-		if ( ! $reaction_store instanceof WordPoints_Hook_Reaction_StoreI ) {
+		if ( ! $reaction_store instanceof WordPoints_Hook_Reaction_StoreI) {
 			return false;
 		}
 
 		// Allowing access to stores out-of-context would lead to strange behavior.
-		if ( false === $reaction_store->get_context_id() ) {
+		if (false === $reaction_store->get_context_id()) {
 			return false;
 		}
 
@@ -136,19 +136,19 @@ 
 		$action_type
 	) {
 
-		foreach ( $this->get_sub_app( 'reaction_stores' )->get_all() as $reaction_stores ) {
-			foreach ( $reaction_stores as $reaction_store ) {
+		foreach ($this->get_sub_app('reaction_stores')->get_all() as $reaction_stores) {
+			foreach ($reaction_stores as $reaction_store) {
 
-				if ( ! $reaction_store instanceof WordPoints_Hook_Reaction_StoreI ) {
+				if ( ! $reaction_store instanceof WordPoints_Hook_Reaction_StoreI) {
 					continue;
 				}
 
 				// Allowing access to stores out-of-context would lead to strange behavior.
-				if ( false === $reaction_store->get_context_id() ) {
+				if (false === $reaction_store->get_context_id()) {
 					continue;
 				}
 
-				foreach ( $reaction_store->get_reactions_to_event( $event_slug ) as $reaction ) {
+				foreach ($reaction_store->get_reactions_to_event($event_slug) as $reaction) {
 
 					$fire = new WordPoints_Hook_Fire(
 						$event_args
@@ -156,7 +156,7 @@ 
 						, $action_type
 					);
 
-					$this->fire_reaction( $fire );
+					$this->fire_reaction($fire);
 				}
 			}
 		}
@@ -169,32 +169,32 @@ 
 	 *
 	 * @param WordPoints_Hook_Fire $fire The hook fire object.
 	 */
-	protected function fire_reaction( $fire ) {
+	protected function fire_reaction($fire) {
 
 		/** @var WordPoints_Hook_ReactorI $reactor */
-		$reactor = $this->get_sub_app( 'reactors' )->get( $fire->reaction->get_reactor_slug() );
+		$reactor = $this->get_sub_app('reactors')->get($fire->reaction->get_reactor_slug());
 
-		if ( ! in_array( $fire->action_type, $reactor->get_action_types(), true ) ) {
+		if ( ! in_array($fire->action_type, $reactor->get_action_types(), true)) {
 			return;
 		}
 
-		$validator = new WordPoints_Hook_Reaction_Validator( $fire->reaction, true );
+		$validator = new WordPoints_Hook_Reaction_Validator($fire->reaction, true);
 		$validator->validate();
 
-		if ( $validator->had_errors() ) {
+		if ($validator->had_errors()) {
 			return;
 		}
 
-		unset( $validator );
+		unset($validator);
 
 		/** @var WordPoints_Hook_ExtensionI[] $extensions */
-		$extensions = $this->get_sub_app( 'extensions' )->get_all();
+		$extensions = $this->get_sub_app('extensions')->get_all();
 
-		foreach ( $extensions as $extension ) {
-			if ( ! $extension->should_hit( $fire ) ) {
-				foreach ( $extensions as $ext ) {
-					if ( $ext instanceof WordPoints_Hook_Extension_Miss_ListenerI ) {
-						$ext->after_miss( $fire );
+		foreach ($extensions as $extension) {
+			if ( ! $extension->should_hit($fire)) {
+				foreach ($extensions as $ext) {
+					if ($ext instanceof WordPoints_Hook_Extension_Miss_ListenerI) {
+						$ext->after_miss($fire);
 					}
 				}
 
@@ -204,11 +204,11 @@ 
 
 		$fire->hit();
 
-		$reactor->hit( $fire );
+		$reactor->hit($fire);
 
-		foreach ( $extensions as $extension ) {
-			if ( $extension instanceof WordPoints_Hook_Extension_Hit_ListenerI ) {
-				$extension->after_hit( $fire );
+		foreach ($extensions as $extension) {
+			if ($extension instanceof WordPoints_Hook_Extension_Hit_ListenerI) {
+				$extension->after_hit($fire);
 			}
 		}
 	}

src/includes/classes/entity/change.php

Spacing +63 added lines, -63 removed lines

@@ -10,19 +10,19 @@ 
 // this is basicaly a router.
 class WordPoints_Entity_chang_trigger implements WordPoints_Entity_Change_ListenerI {
 
-	public function created( WordPoints_Entity $entity ) {
+	public function created(WordPoints_Entity $entity) {
 		// can multiple entities be created at once? not using insert() but via query()
 		// maybe? and how shoudl we handle that, all at once or one by one?
 
 		/** @var WordPoints_Entity_Change_ListenerI[] $listeners */
-		$listeners = wordpoints_apps()->get_sub_app( 'entity_change_listeners' );
-		foreach ( $listeners as $listener ) {
-			$listener->created( $entity );
+		$listeners = wordpoints_apps()->get_sub_app('entity_change_listeners');
+		foreach ($listeners as $listener) {
+			$listener->created($entity);
 		}
 	}
 
 
-	public function updated( WordPoints_Entity $before, WordPoints_Entity $after ) {
+	public function updated(WordPoints_Entity $before, WordPoints_Entity $after) {
 
 		// what if multiple entities are updated at once? do we run each one separatately?
 		// mayb ethat should be left up to the listenter.
@@ -30,7 +30,7 @@ 
 	}
 
 
-	public function deleted( WordPoints_Entity $entity ) {
+	public function deleted(WordPoints_Entity $entity) {
 
 		// what if we need information about this entitie's relationships, etc., that
 		// isn't included inthe entity object?
@@ -58,41 +58,41 @@ 
 
 // this is basically a reactor
 interface WordPoints_Entity_Change_ListenerI {
-	public function created( WordPoints_Entity $entity );
-	public function updated( WordPoints_Entity $before, WordPoints_Entity $after );
-	public function deleted( WordPoints_Entity $entity );
+	public function created(WordPoints_Entity $entity);
+	public function updated(WordPoints_Entity $before, WordPoints_Entity $after);
+	public function deleted(WordPoints_Entity $entity);
 }
 
 class WordPoints_Entity_Change_Listener_Hooks implements WordPoints_Entity_Change_ListenerI {
 
-	public function created( WordPoints_Entity $entity ) {
+	public function created(WordPoints_Entity $entity) {
 
 		// maybe we would have multuiple events with requirements for a single entity?
 		// like comment author and post commentn author targets for the same hook.
 		// but I guess taht is just one event.
 		// what about user register vs user create on MS?
-		if ( $this->matches_requirements( $entity ) ) {
-			$this->fire_event( 'add', $entity );
+		if ($this->matches_requirements($entity)) {
+			$this->fire_event('add', $entity);
 		}
 	}
 
-	public function updated( WordPoints_Entity $before, WordPoints_Entity $after ) {
+	public function updated(WordPoints_Entity $before, WordPoints_Entity $after) {
 
-		if ( $this->matches_requirements( $after ) ) {
-			if ( ! $this->matches_requirements( $before ) ) {
-				$this->fire_event( 'add', $after );
+		if ($this->matches_requirements($after)) {
+			if ( ! $this->matches_requirements($before)) {
+				$this->fire_event('add', $after);
 			}
 		} else {
-			if ( $this->matches_requirements( $before ) ) {
-				$this->fire_event( 'remove', $after );
+			if ($this->matches_requirements($before)) {
+				$this->fire_event('remove', $after);
 			}
 		}
 	}
 
-	public function deleted( WordPoints_Entity $entity ) {
+	public function deleted(WordPoints_Entity $entity) {
 
-		if ( $this->matches_requirements( $entity ) ) {
-			$this->fire_event( 'remove', $entity );
+		if ($this->matches_requirements($entity)) {
+			$this->fire_event('remove', $entity);
 		}
 	}
 
@@ -108,20 +108,20 @@ 
 	// called into play when the entity itself is deleted is moot, because the
 	// reltionships, etc., aren't even taken into account when toggle-off is called,
 	// in the points reactor. other reators might, i guess.
-	protected function matches_requirements( WordPoints_Entity $entity ) {
+	protected function matches_requirements(WordPoints_Entity $entity) {
 
 		/** @var WordPoints_Class_Registry $defaults */
-		$defaults = wordpoints_apps()->get_sub_app( 'entity_possession_defaults' );
+		$defaults = wordpoints_apps()->get_sub_app('entity_possession_defaults');
 
-		$defaults = $defaults->get( $entity->get_slug() );
+		$defaults = $defaults->get($entity->get_slug());
 
-		if ( ! $defaults ) {
+		if ( ! $defaults) {
 			return false;
 		}
 
 		// use conditions here?
-		foreach ( $defaults as $child => $value ) {
-			if ( $entity->get_child( $child ) !== $value ) {
+		foreach ($defaults as $child => $value) {
+			if ($entity->get_child($child) !== $value) {
 				return false;
 			}
 		}
@@ -129,13 +129,13 @@ 
 		return true;
 	}
 
-	protected function fire_event( $type, WordPoints_Entity $entity ) {
+	protected function fire_event($type, WordPoints_Entity $entity) {
 
-		$args = new WordPoints_Hook_Event_Args( array() );
-		$args->add_entity( $entity );
+		$args = new WordPoints_Hook_Event_Args(array());
+		$args->add_entity($entity);
 
 		wordpoints_hooks()->fire(
-			$type . '_entity_' . $entity->get_slug(),
+			$type.'_entity_'.$entity->get_slug(),
 			$args,
 			'toggle_on'
 		);
@@ -144,31 +144,31 @@ 
 
 class WordPoints_Entity_Change_Listener_Points implements WordPoints_Entity_Change_ListenerI {
 
-	public function created( WordPoints_Entity $entity ) {
+	public function created(WordPoints_Entity $entity) {
 
 		$this->process_entityish(
 			$entity
-			, $this->get_settings_for_entity( $entity )
+			, $this->get_settings_for_entity($entity)
 		);
 	}
 
-	protected function process_entityish( WordPoints_EntityishI $entity, $settings ) {
+	protected function process_entityish(WordPoints_EntityishI $entity, $settings) {
 
 		// possibly make this more like extension handling
-		if ( ! $this->meets_conditions( $entity, $settings['conditions'] ) ) {
+		if ( ! $this->meets_conditions($entity, $settings['conditions'])) {
 			return;
 		}
 
 		// possibly make this more like reactor handling.
-		$this->award_points( $settings );
+		$this->award_points($settings);
 
 		// only proces the attributes taht have changed.
 		// acutally, in this case, the entity was just created.
-		if ( $entity instanceof WordPoints_Entity_ParentI ) {
+		if ($entity instanceof WordPoints_Entity_ParentI) {
 
 			// this check runs on attributes only.
-			foreach ( $settings['children'] as $child_slug => $child_settings ) {
-				$this->process_entityish( $entity->get_child( $child_slug ), $child_settings );
+			foreach ($settings['children'] as $child_slug => $child_settings) {
+				$this->process_entityish($entity->get_child($child_slug), $child_settings);
 			}
 
 			// we also need to check for any children, like relationships, that have
@@ -176,7 +176,7 @@ 
 			// for this we need a list of relationships.
 			// if we do two-way relationships, we may need to have infinite-loop
 			// halding here, depending.
-			foreach ( $this->get_related_entities( $entity ) as $child_entity ) {
+			foreach ($this->get_related_entities($entity) as $child_entity) {
 				// If a comment was just created, for example, and we have conditions
 				// on the post entity, that affect the comment author, this allows
 				// us to handle those by pulling up the settings for the post entity
@@ -195,7 +195,7 @@ 
 				// as we've proposed...
 				$this->process_entityish(
 					$child_entity
-					, $this->get_entity_settings( $child_entity )
+					, $this->get_entity_settings($child_entity)
 				);
 			}
 		}
@@ -209,15 +209,15 @@ 
 	// doesn't really make sense.
 	// I think relationships can be created and deleted, but not really updated.
 	// so maybe what we need is a separate api?
-	public function updated( WordPoints_Entity $before, WordPoints_Entity $after ) {
+	public function updated(WordPoints_Entity $before, WordPoints_Entity $after) {
 
-		$settings = $this->get_settings_for_entity( $before );
+		$settings = $this->get_settings_for_entity($before);
 
 		/** @var WordPoints_Class_Registry_ChildrenI $children */
-		$children = wordpoints_entities()->get_sub_app( 'children' );
-		foreach ( $children->get_children_slugs( $before->get_slug() ) as $child_slug ) {
+		$children = wordpoints_entities()->get_sub_app('children');
+		foreach ($children->get_children_slugs($before->get_slug()) as $child_slug) {
 			
-			if ( ! isset( $settings['children'][ $child_slug ] ) ) {
+			if ( ! isset($settings['children'][$child_slug])) {
 				continue;
 			}
 			
@@ -232,23 +232,23 @@ 
 			// but then we'll not be checking even the relationships taht are defined
 			// on the atts. so we have to decide whether those should be handled by
 			// a separate api or not.
-			if ( $before->get_the_attr_value( $child_slug ) === $after->get_the_attr_value( $child_slug ) ) {
+			if ($before->get_the_attr_value($child_slug) === $after->get_the_attr_value($child_slug)) {
 				continue;
 			}
 
 			$this->process_modified_entityish(
-				$before->get_child( $child_slug )
-				, $after->get_child( $child_slug )
-				, $settings['children'][ $child_slug ]
+				$before->get_child($child_slug)
+				, $after->get_child($child_slug)
+				, $settings['children'][$child_slug]
 			);
 		}
 	}
 
-	protected function process_modified_entityish( WordPoints_EntityishI $before, WordPoints_EntityishI $after, $settings ) {
+	protected function process_modified_entityish(WordPoints_EntityishI $before, WordPoints_EntityishI $after, $settings) {
 
-		if ( ! $this->meets_conditions( $before, $settings['conditions'] ) ) {
-			if ( $this->meets_conditions( $after, $settings['conditions'] ) ) {
-				$this->award_points( $settings );
+		if ( ! $this->meets_conditions($before, $settings['conditions'])) {
+			if ($this->meets_conditions($after, $settings['conditions'])) {
+				$this->award_points($settings);
 
 				// also need to process other eneities that are affected by this
 				// change, which may have conditions on this, i.e., that could be
@@ -265,38 +265,38 @@ 
 				// then we do indeed need to run through the children/parents.
 			}
 		} else {
-			if ( ! $this->meets_conditions( $after, $settings['conditions'] ) ) {
-				$this->remove_points( $settings );
+			if ( ! $this->meets_conditions($after, $settings['conditions'])) {
+				$this->remove_points($settings);
 			}
 		}
 	}
 
-	public function deleted( WordPoints_Entity $entity ) {
+	public function deleted(WordPoints_Entity $entity) {
 		// basically the opposite of created().
-		$this->process_entityish_reverse( $entity );
+		$this->process_entityish_reverse($entity);
 	}
 
-	protected function meets_conditions( WordPoints_EntityishI $entityish, $conditions ) {
+	protected function meets_conditions(WordPoints_EntityishI $entityish, $conditions) {
 		// use conditions api
 
 		return false;
 	}
 
-	private function award_points( $settings ) {
+	private function award_points($settings) {
 
-		$hierarchy = new WordPoints_Entity_Hierarchy( $this->eitnty );
+		$hierarchy = new WordPoints_Entity_Hierarchy($this->eitnty);
 		// todo we'll need to introudce entity array targets, possibly.
 		// how will we know how to reverse the target reltinoship chains in the UI
 		// before saving? i guess we'll need to either have a dedicated index fo taht
 		// or else juust look it up by looping through the relationships (though we'd
 		// have to remove the entity array {} part from any one-to-many relationships
 		// and maybe we'd have to add it to others?)
-		$targets = $hierarchy->get_from_hierarchy( $settings['target'] );
+		$targets = $hierarchy->get_from_hierarchy($settings['target']);
 
 		// maybe just one target, maybe several, depending.
 	}
 
-	private function get_related_entities( WordPoints_Entity $entity ) {
+	private function get_related_entities(WordPoints_Entity $entity) {
 
 		// what we need is parental conditions. Conditions that go up the chain,
 		// and look back at parent entities. This way we can handle the info about

src/includes/classes/app.php

Spacing +13 added lines, -13 removed lines

@@ -94,16 +94,16 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function __construct( $slug, $parent = null ) {
+	public function __construct($slug, $parent = null) {
 
 		$this->slug = $slug;
 		$this->full_slug = $slug;
 
-		if ( $parent instanceof WordPoints_App ) {
+		if ($parent instanceof WordPoints_App) {
 			$this->parent = $parent;
 
-			if ( 'apps' !== $this->parent->full_slug ) {
-				$this->full_slug = $this->parent->full_slug . '-' . $this->full_slug;
+			if ('apps' !== $this->parent->full_slug) {
+				$this->full_slug = $this->parent->full_slug.'-'.$this->full_slug;
 			}
 		}
 
@@ -121,21 +121,21 @@ 
 	 *
 	 * @return null|object|WordPoints_App|WordPoints_Class_RegistryI|WordPoints_Class_Registry_ChildrenI The sub app, or null if not found.
 	 */
-	public function get_sub_app( $slug ) {
+	public function get_sub_app($slug) {
 
-		$sub_app = $this->sub_apps->get( $slug, array( $this ) );
+		$sub_app = $this->sub_apps->get($slug, array($this));
 
-		if ( ! $sub_app ) {
+		if ( ! $sub_app) {
 			return null;
 		}
 
 		if (
-			empty( $this->did_init[ $slug ] )
+			empty($this->did_init[$slug])
 			&& ! self::$main->silent
-			&& $this->should_do_registry_init( $sub_app )
+			&& $this->should_do_registry_init($sub_app)
 		) {
 
-			$this->did_init[ $slug ] = true;
+			$this->did_init[$slug] = true;
 
 			/**
 			 * Initialization of an app registry.
@@ -147,7 +147,7 @@ 
 			 * @param WordPoints_Class_RegistryI|WordPoints_Class_Registry_ChildrenI
 			 *        $registry The registry object.
 			 */
-			do_action( "wordpoints_init_app_registry-{$this->full_slug}-{$slug}", $sub_app );
+			do_action("wordpoints_init_app_registry-{$this->full_slug}-{$slug}", $sub_app);
 		}
 
 		return $sub_app;
@@ -173,7 +173,7 @@ 
 	 *
 	 * @return bool Whether to call the init action or not.
 	 */
-	protected function should_do_registry_init( $registry ) {
+	protected function should_do_registry_init($registry) {
 		return (
 		   $registry instanceof WordPoints_Class_RegistryI
 		   || $registry instanceof WordPoints_Class_Registry_ChildrenI
@@ -197,7 +197,7 @@ 
 		 *
 		 * @param WordPoints_App $app The app object.
 		 */
-		do_action( "wordpoints_init_app-{$this->full_slug}", $this );
+		do_action("wordpoints_init_app-{$this->full_slug}", $this);
 	}
 }
 

src/includes/classes/hook/reaction.php

Spacing +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@ 
 	 * @param int                             $id    The ID of a hook reaction.
 	 * @param WordPoints_Hook_Reaction_StoreI $store The storage object.
 	 */
-	public function __construct( $id, WordPoints_Hook_Reaction_StoreI $store ) {
+	public function __construct($id, WordPoints_Hook_Reaction_StoreI $store) {
 
-		$this->ID    = wordpoints_int( $id );
+		$this->ID    = wordpoints_int($id);
 		$this->store = $store;
 	}
 
@@ -69,7 +69,7 @@ 
 	 * @since 1.0.0
 	 */
 	public function get_reactor_slug() {
-		return $this->get_meta( 'reactor' );
+		return $this->get_meta('reactor');
 	}
 
 	/**

src/includes/classes/hook/router.php

Spacing +51 added lines, -51 removed lines

@@ -89,13 +89,13 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function __call( $name, $args ) {
+	public function __call($name, $args) {
 
-		$this->route_action( $name, $args );
+		$this->route_action($name, $args);
 
 		// Return the first value, in case it is hooked to a filter.
 		$return = null;
-		if ( isset( $args[0] ) ) {
+		if (isset($args[0])) {
 			$return = $args[0];
 		}
 
@@ -112,9 +112,9 @@ 
 	 *                     action name and the priority.
 	 * @param array  $args The args the action was fired with.
 	 */
-	protected function route_action( $name, $args ) {
+	protected function route_action($name, $args) {
 
-		if ( ! isset( $this->action_index[ $name ] ) ) {
+		if ( ! isset($this->action_index[$name])) {
 			return;
 		}
 
@@ -122,48 +122,48 @@ 
 		// registry attempts to access the router in its own constructor. The result
 		// of attempting to do this before the router itself has been fully
 		// constructed is that the events registry gets null instead of the router.
-		if ( ! isset( $this->hooks ) ) {
+		if ( ! isset($this->hooks)) {
 
 			$hooks = wordpoints_hooks();
 
 			$this->hooks   = $hooks;
-			$this->events  = $hooks->get_sub_app( 'events' );
-			$this->actions = $hooks->get_sub_app( 'actions' );
-			$this->event_args = $this->events->get_sub_app( 'args' );
+			$this->events  = $hooks->get_sub_app('events');
+			$this->actions = $hooks->get_sub_app('actions');
+			$this->event_args = $this->events->get_sub_app('args');
 		}
 
-		foreach ( $this->action_index[ $name ]['actions'] as $slug => $data ) {
+		foreach ($this->action_index[$name]['actions'] as $slug => $data) {
 
-			if ( ! isset( $this->event_index[ $slug ] ) ) {
+			if ( ! isset($this->event_index[$slug])) {
 				continue;
 			}
 
-			$action_object = $this->actions->get( $slug, $args, $data );
+			$action_object = $this->actions->get($slug, $args, $data);
 
-			if ( ! ( $action_object instanceof WordPoints_Hook_ActionI ) ) {
+			if ( ! ($action_object instanceof WordPoints_Hook_ActionI)) {
 				continue;
 			}
 
-			if ( ! $action_object->should_fire() ) {
+			if ( ! $action_object->should_fire()) {
 				continue;
 			}
 
-			foreach ( $this->event_index[ $slug ] as $type => $events ) {
-				foreach ( $events as $event_slug => $unused ) {
+			foreach ($this->event_index[$slug] as $type => $events) {
+				foreach ($events as $event_slug => $unused) {
 
-					if ( ! $this->events->is_registered( $event_slug ) ) {
+					if ( ! $this->events->is_registered($event_slug)) {
 						continue;
 					}
 
-					$event_args = $this->event_args->get_children( $event_slug, array( $action_object ) );
+					$event_args = $this->event_args->get_children($event_slug, array($action_object));
 
-					if ( empty( $event_args ) ) {
+					if (empty($event_args)) {
 						continue;
 					}
 
-					$event_args = new WordPoints_Hook_Event_Args( $event_args );
+					$event_args = new WordPoints_Hook_Event_Args($event_args);
 
-					$this->hooks->fire( $event_slug, $event_args, $type );
+					$this->hooks->fire($event_slug, $event_args, $type);
 				}
 			}
 		}
@@ -192,56 +192,56 @@ 
 	 *        }
 	 * }
 	 */
-	public function add_action( $slug, array $args ) {
+	public function add_action($slug, array $args) {
 
 		$priority = 10;
-		if ( isset( $args['priority'] ) ) {
+		if (isset($args['priority'])) {
 			$priority = $args['priority'];
 		}
 
-		if ( ! isset( $args['action'] ) ) {
+		if ( ! isset($args['action'])) {
 			return;
 		}
 
 		$method = "{$args['action']},{$priority}";
 
-		$this->action_index[ $method ]['actions'][ $slug ] = array();
+		$this->action_index[$method]['actions'][$slug] = array();
 
 		$arg_number = 1;
 
-		if ( isset( $args['data'] ) ) {
+		if (isset($args['data'])) {
 
-			if ( isset( $args['data']['arg_index'] ) ) {
-				$arg_number = 1 + max( $args['data']['arg_index'] );
+			if (isset($args['data']['arg_index'])) {
+				$arg_number = 1 + max($args['data']['arg_index']);
 			}
 
-			if ( isset( $args['data']['requirements'] ) ) {
-				$requirements = 1 + max( array_keys( $args['data']['requirements'] ) );
+			if (isset($args['data']['requirements'])) {
+				$requirements = 1 + max(array_keys($args['data']['requirements']));
 
-				if ( $requirements > $arg_number ) {
+				if ($requirements > $arg_number) {
 					$arg_number = $requirements;
 				}
 			}
 
-			$this->action_index[ $method ]['actions'][ $slug ] = $args['data'];
+			$this->action_index[$method]['actions'][$slug] = $args['data'];
 		}
 
-		if ( isset( $args['arg_number'] ) ) {
+		if (isset($args['arg_number'])) {
 			$arg_number = $args['arg_number'];
 		}
 
 		// If this action is already being routed, and will have enough args, we
 		// don't need to hook to it again.
 		if (
-			isset( $this->action_index[ $method ]['arg_number'] )
-			&& $this->action_index[ $method ]['arg_number'] >= $arg_number
+			isset($this->action_index[$method]['arg_number'])
+			&& $this->action_index[$method]['arg_number'] >= $arg_number
 		) {
 			return;
 		}
 
-		$this->action_index[ $method ]['arg_number'] = $arg_number;
+		$this->action_index[$method]['arg_number'] = $arg_number;
 
-		add_action( $args['action'], array( $this, $method ), $priority, $arg_number );
+		add_action($args['action'], array($this, $method), $priority, $arg_number);
 	}
 
 	/**
@@ -251,20 +251,20 @@ 
 	 *
 	 * @param string $slug The action slug.
 	 */
-	public function remove_action( $slug ) {
+	public function remove_action($slug) {
 
-		foreach ( $this->action_index as $method => $data ) {
-			if ( isset( $data['actions'][ $slug ] ) ) {
+		foreach ($this->action_index as $method => $data) {
+			if (isset($data['actions'][$slug])) {
 
-				unset( $this->action_index[ $method ]['actions'][ $slug ] );
+				unset($this->action_index[$method]['actions'][$slug]);
 
-				if ( empty( $this->action_index[ $method ]['actions'] ) ) {
+				if (empty($this->action_index[$method]['actions'])) {
 
-					unset( $this->action_index[ $method ] );
+					unset($this->action_index[$method]);
 
-					list( $action, $priority ) = explode( ',', $method );
+					list($action, $priority) = explode(',', $method);
 
-					remove_action( $action, array( $this, $method ), $priority );
+					remove_action($action, array($this, $method), $priority);
 				}
 			}
 		}
@@ -279,8 +279,8 @@ 
 	 * @param string $action_slug The slug of the action.
 	 * @param string $action_type The type of action. Default is 'fire'.
 	 */
-	public function add_event_to_action( $event_slug, $action_slug, $action_type = 'fire' ) {
-		$this->event_index[ $action_slug ][ $action_type ][ $event_slug ] = true;
+	public function add_event_to_action($event_slug, $action_slug, $action_type = 'fire') {
+		$this->event_index[$action_slug][$action_type][$event_slug] = true;
 	}
 
 	/**
@@ -292,8 +292,8 @@ 
 	 * @param string $action_slug The slug of the action.
 	 * @param string $action_type The type of action. Default is 'fire'.
 	 */
-	public function remove_event_from_action( $event_slug, $action_slug, $action_type = 'fire' ) {
-		unset( $this->event_index[ $action_slug ][ $action_type ][ $event_slug ] );
+	public function remove_event_from_action($event_slug, $action_slug, $action_type = 'fire') {
+		unset($this->event_index[$action_slug][$action_type][$event_slug]);
 	}
 
 	/**
@@ -305,8 +305,8 @@ 
 	 */
 	public function get_event_index() {
 
-		if ( empty( $this->event_index ) ) {
-			wordpoints_hooks()->get_sub_app( 'events' );
+		if (empty($this->event_index)) {
+			wordpoints_hooks()->get_sub_app('events');
 		}
 
 		return $this->event_index;

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

Spacing +55 added lines, -55 removed lines

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

src/includes/classes/hook/reactor/points.php

Spacing +46 added lines, -46 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	protected $action_types = array( 'fire', 'toggle_on', 'toggle_off' );
+	protected $action_types = array('fire', 'toggle_on', 'toggle_off');
 
 	/**
 	 * @since 1.0.0
@@ -58,9 +58,9 @@ 
 	 */
 	public function get_settings_fields() {
 
-		$this->settings_fields['points']['label'] = _x( 'Points', 'form label', 'wordpoints' );
-		$this->settings_fields['log_text']['label'] = _x( 'Log Text', 'form label', 'wordpoints' );
-		$this->settings_fields['description']['label'] = _x( 'Description', 'form label', 'wordpoints' );
+		$this->settings_fields['points']['label'] = _x('Points', 'form label', 'wordpoints');
+		$this->settings_fields['log_text']['label'] = _x('Log Text', 'form label', 'wordpoints');
+		$this->settings_fields['description']['label'] = _x('Description', 'form label', 'wordpoints');
 
 		return parent::get_settings_fields();
 	}
@@ -72,8 +72,8 @@ 
 
 		$data = parent::get_ui_script_data();
 
-		$data['target_label'] = __( 'Award To', 'wordpoints' );
-		$data['periods_label'] = __( 'Award each user no more than once per:', 'wordpoints' );
+		$data['target_label'] = __('Award To', 'wordpoints');
+		$data['periods_label'] = __('Award each user no more than once per:', 'wordpoints');
 
 		return $data;
 	}
@@ -87,23 +87,23 @@ 
 		WordPoints_Hook_Event_Args $event_args
 	) {
 
-		if ( ! isset( $settings['points'] ) || false === wordpoints_int( $settings['points'] ) ) {
-			$validator->add_error( __( 'Points must be an integer.', 'wordpoints' ), 'points' );
+		if ( ! isset($settings['points']) || false === wordpoints_int($settings['points'])) {
+			$validator->add_error(__('Points must be an integer.', 'wordpoints'), 'points');
 		}
 
-		if ( ! isset( $settings['points_type'] ) || ! wordpoints_is_points_type( $settings['points_type'] ) ) {
-			$validator->add_error( __( 'Invalid points type.', 'wordpoints' ), 'points_type' );
+		if ( ! isset($settings['points_type']) || ! wordpoints_is_points_type($settings['points_type'])) {
+			$validator->add_error(__('Invalid points type.', 'wordpoints'), 'points_type');
 		}
 
-		if ( ! isset( $settings['description'] ) ) {
-			$validator->add_error( __( 'Description is required.', 'wordpoints' ), 'description' );
+		if ( ! isset($settings['description'])) {
+			$validator->add_error(__('Description is required.', 'wordpoints'), 'description');
 		}
 
-		if ( ! isset( $settings['log_text'] ) ) {
-			$validator->add_error( __( 'Log Text is required.', 'wordpoints' ), 'log_text' );
+		if ( ! isset($settings['log_text'])) {
+			$validator->add_error(__('Log Text is required.', 'wordpoints'), 'log_text');
 		}
 
-		return parent::validate_settings( $settings, $validator, $event_args );
+		return parent::validate_settings($settings, $validator, $event_args);
 	}
 
 	/**
@@ -114,58 +114,58 @@ 
 		array $settings
 	) {
 
-		parent::update_settings( $reaction, $settings );
+		parent::update_settings($reaction, $settings);
 
-		$reaction->update_meta( 'points', $settings['points'] );
-		$reaction->update_meta( 'points_type', $settings['points_type'] );
-		$reaction->update_meta( 'description', $settings['description'] );
-		$reaction->update_meta( 'log_text', $settings['log_text'] );
+		$reaction->update_meta('points', $settings['points']);
+		$reaction->update_meta('points_type', $settings['points_type']);
+		$reaction->update_meta('description', $settings['description']);
+		$reaction->update_meta('log_text', $settings['log_text']);
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	public function hit( WordPoints_Hook_Fire $fire ) {
+	public function hit(WordPoints_Hook_Fire $fire) {
 
-		if ( 'toggle_off' === $fire->action_type ) {
-			$this->reverse_hit( $fire );
+		if ('toggle_off' === $fire->action_type) {
+			$this->reverse_hit($fire);
 			return;
 		}
 
 		$reaction = $fire->reaction;
 
 		$target = $fire->event_args->get_from_hierarchy(
-			$reaction->get_meta( 'target' )
+			$reaction->get_meta('target')
 		);
 
-		if ( ! $target instanceof WordPoints_Entity ) {
+		if ( ! $target instanceof WordPoints_Entity) {
 			return;
 		}
 
-		$meta = array( 'hook_hit_id' => $fire->hit_id );
+		$meta = array('hook_hit_id' => $fire->hit_id);
 
-		foreach ( $fire->event_args->get_entities() as $entity ) {
-			$meta[ $entity->get_slug() ] = $entity->get_the_id();
+		foreach ($fire->event_args->get_entities() as $entity) {
+			$meta[$entity->get_slug()] = $entity->get_the_id();
 		}
 
 		wordpoints_alter_points(
 			$target->get_the_id()
-			, $reaction->get_meta( 'points' )
-			, $reaction->get_meta( 'points_type' )
+			, $reaction->get_meta('points')
+			, $reaction->get_meta('points_type')
 			, $reaction->get_event_slug()
 			, $meta
-			, $reaction->get_meta( 'log_text' )
+			, $reaction->get_meta('log_text')
 		);
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	public function reverse_hit( WordPoints_Hook_Fire $fire ) {
+	public function reverse_hit(WordPoints_Hook_Fire $fire) {
 
-		$hit_ids = $this->get_hit_ids_to_be_reversed( $fire );
+		$hit_ids = $this->get_hit_ids_to_be_reversed($fire);
 
-		if ( empty( $hit_ids ) ) {
+		if (empty($hit_ids)) {
 			return;
 		}
 
@@ -183,11 +183,11 @@ 
 
 		$logs = $query->get();
 
-		if ( ! $logs ) {
+		if ( ! $logs) {
 			return;
 		}
 
-		$this->reverse_logs( $logs, $fire );
+		$this->reverse_logs($logs, $fire);
 	}
 
 	/**
@@ -199,10 +199,10 @@ 
 	 *
 	 * @return array The IDs of the hits to be reversed.
 	 */
-	protected function get_hit_ids_to_be_reversed( WordPoints_Hook_Fire $fire ) {
+	protected function get_hit_ids_to_be_reversed(WordPoints_Hook_Fire $fire) {
 
 		// We closely integrate with the reversals extension to get the hit IDs.
-		if ( ! isset( $fire->data['reversals']['hit_ids'] ) ) {
+		if ( ! isset($fire->data['reversals']['hit_ids'])) {
 			return array();
 		}
 
@@ -217,28 +217,28 @@ 
 	 * @param object[]             $logs The logs to reverse.
 	 * @param WordPoints_Hook_Fire $fire The fire object.
 	 */
-	protected function reverse_logs( $logs, WordPoints_Hook_Fire $fire ) {
+	protected function reverse_logs($logs, WordPoints_Hook_Fire $fire) {
 
-		$event = wordpoints_hooks()->get_sub_app( 'events' )->get(
+		$event = wordpoints_hooks()->get_sub_app('events')->get(
 			$fire->reaction->get_event_slug()
 		);
 
-		if ( $event instanceof WordPoints_Hook_Event_ReversingI ) {
+		if ($event instanceof WordPoints_Hook_Event_ReversingI) {
 
 			/* translators: 1: log text for transaction that is being reversed, 2: the reason that this is being reversed. */
-			$template = __( 'Reversed “%1$s” (%2$s)', 'wordpoints' );
+			$template = __('Reversed “%1$s” (%2$s)', 'wordpoints');
 
 			$event_description = $event->get_reversal_text();
 
 		} else {
 
 			/* translators: 1: log text for transaction that is being reversed. */
-			$template = __( 'Reversed “%1$s”', 'wordpoints' );
+			$template = __('Reversed “%1$s”', 'wordpoints');
 
 			$event_description = '';
 		}
 
-		foreach ( $logs as $log ) {
+		foreach ($logs as $log) {
 
 			$log_id = wordpoints_alter_points(
 				$log->user_id
@@ -249,11 +249,11 @@ 
 					'original_log_id' => $log->id,
 					'hook_hit_id'     => $fire->hit_id,
 				)
-				, sprintf( $template, $log->text, $event_description )
+				, sprintf($template, $log->text, $event_description)
 			);
 
 			// Mark the old log as reversed by this one.
-			wordpoints_update_points_log_meta( $log->id, 'auto_reversed', $log_id );
+			wordpoints_update_points_log_meta($log->id, 'auto_reversed', $log_id);
 		}
 	}
 }