WordPoints / hooks-api

src/includes/constants.php

Spacing +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@
 
 global $wpdb;
 
-$wpdb->wordpoints_hook_hits = $wpdb->base_prefix . 'wordpoints_hook_hits';
-$wpdb->wordpoints_hook_hitmeta = $wpdb->base_prefix . 'wordpoints_hook_hitmeta';
-$wpdb->wordpoints_hook_periods = $wpdb->base_prefix . 'wordpoints_hook_periods';
+$wpdb->wordpoints_hook_hits = $wpdb->base_prefix.'wordpoints_hook_hits';
+$wpdb->wordpoints_hook_hitmeta = $wpdb->base_prefix.'wordpoints_hook_hitmeta';
+$wpdb->wordpoints_hook_periods = $wpdb->base_prefix.'wordpoints_hook_periods';
 
 // EOF

src/includes/classes/db/query.php

Spacing +111 added lines, -111 removed lines

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

src/admin/includes/classes/ajax/hooks.php

Indentation +4 added lines, -4 removed lines

@@ -96,8 +96,8 @@ 
 	) {
 
 		return 'wordpoints_create_hook_reaction|' . $reactor->get_slug()
-		       . '|' . wordpoints_hooks()->get_current_mode()
-		       . '|' . wp_json_encode( $reactor->reactions->get_context_id() );
+			   . '|' . wordpoints_hooks()->get_current_mode()
+			   . '|' . wp_json_encode( $reactor->reactions->get_context_id() );
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 		WordPoints_Hook_ReactionI $reaction
 	) {
 		return 'wordpoints_update_hook_reaction|'
-		       . wp_json_encode( $reaction->get_guid() );
+			   . wp_json_encode( $reaction->get_guid() );
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 		WordPoints_Hook_ReactionI $reaction
 	) {
 		return 'wordpoints_delete_hook_reaction|'
-		       . wp_json_encode( $reaction->get_guid() );
+			   . wp_json_encode( $reaction->get_guid() );
 	}
 
 	//

Spacing +58 added lines, -58 removed lines

@@ -52,7 +52,7 @@ 
 	 *
 	 * @return array The hook reaction data extracted into an array.
 	 */
-	public static function prepare_hook_reaction( WordPoints_Hook_ReactionI $reaction ) {
+	public static function prepare_hook_reaction(WordPoints_Hook_ReactionI $reaction) {
 
 		return array_merge(
 			$reaction->get_all_meta()
@@ -60,8 +60,8 @@ 
 				'id' => $reaction->ID,
 				'event' => $reaction->get_event_slug(),
 				'reactor' => $reaction->get_reactor_slug(),
-				'nonce' => self::get_update_nonce( $reaction ),
-				'delete_nonce' => self::get_delete_nonce( $reaction ),
+				'nonce' => self::get_update_nonce($reaction),
+				'delete_nonce' => self::get_delete_nonce($reaction),
 			)
 		);
 	}
@@ -76,9 +76,9 @@ 
 	 *
 	 * @return string A nonce for creating a new reaction to this reactor.
 	 */
-	public static function get_create_nonce( WordPoints_Hook_Reactor $reactor ) {
+	public static function get_create_nonce(WordPoints_Hook_Reactor $reactor) {
 
-		return wp_create_nonce( self::get_create_nonce_action( $reactor ) );
+		return wp_create_nonce(self::get_create_nonce_action($reactor));
 	}
 
 	/**
@@ -95,9 +95,9 @@ 
 		WordPoints_Hook_Reactor $reactor
 	) {
 
-		return 'wordpoints_create_hook_reaction|' . $reactor->get_slug()
-		       . '|' . wordpoints_hooks()->get_current_mode()
-		       . '|' . wp_json_encode( $reactor->reactions->get_context_id() );
+		return 'wordpoints_create_hook_reaction|'.$reactor->get_slug()
+		       . '|'.wordpoints_hooks()->get_current_mode()
+		       . '|'.wp_json_encode($reactor->reactions->get_context_id());
 	}
 
 	/**
@@ -109,9 +109,9 @@ 
 	 *
 	 * @return string A nonce for updating this reaction.
 	 */
-	public static function get_update_nonce( WordPoints_Hook_ReactionI $reaction ) {
+	public static function get_update_nonce(WordPoints_Hook_ReactionI $reaction) {
 
-		return wp_create_nonce( self::get_update_nonce_action( $reaction ) );
+		return wp_create_nonce(self::get_update_nonce_action($reaction));
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 		WordPoints_Hook_ReactionI $reaction
 	) {
 		return 'wordpoints_update_hook_reaction|'
-		       . wp_json_encode( $reaction->get_guid() );
+		       . wp_json_encode($reaction->get_guid());
 	}
 
 	/**
@@ -139,9 +139,9 @@ 
 	 *
 	 * @return string A nonce for deleting this reaction.
 	 */
-	public static function get_delete_nonce( WordPoints_Hook_ReactionI $reaction ) {
+	public static function get_delete_nonce(WordPoints_Hook_ReactionI $reaction) {
 
-		return wp_create_nonce( self::get_delete_nonce_action( $reaction ) );
+		return wp_create_nonce(self::get_delete_nonce_action($reaction));
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 		WordPoints_Hook_ReactionI $reaction
 	) {
 		return 'wordpoints_delete_hook_reaction|'
-		       . wp_json_encode( $reaction->get_guid() );
+		       . wp_json_encode($reaction->get_guid());
 	}
 
 	//
@@ -183,17 +183,17 @@ 
 
 		add_action(
 			'wp_ajax_wordpoints_admin_create_hook_reaction'
-			, array( $this, 'create_hook_reaction' )
+			, array($this, 'create_hook_reaction')
 		);
 
 		add_action(
 			'wp_ajax_wordpoints_admin_update_hook_reaction'
-			, array( $this, 'update_hook_reaction' )
+			, array($this, 'update_hook_reaction')
 		);
 
 		add_action(
 			'wp_ajax_wordpoints_admin_delete_hook_reaction'
-			, array( $this, 'delete_hook_reaction' )
+			, array($this, 'delete_hook_reaction')
 		);
 	}
 
@@ -208,11 +208,11 @@ 
 
 		$reactor = $this->get_reactor();
 
-		$this->verify_request( $this->get_create_nonce_action( $reactor ) );
+		$this->verify_request($this->get_create_nonce_action($reactor));
 
-		$reaction = $reactor->reactions->create_reaction( $this->get_data() );
+		$reaction = $reactor->reactions->create_reaction($this->get_data());
 
-		$this->send_json_result( $reaction, 'create' );
+		$this->send_json_result($reaction, 'create');
 	}
 
 	/**
@@ -227,14 +227,14 @@ 
 		$reactor  = $this->get_reactor();
 		$reaction = $this->get_reaction();
 
-		$this->verify_request( $this->get_update_nonce_action( $reaction ) );
+		$this->verify_request($this->get_update_nonce_action($reaction));
 
 		$reaction = $reactor->reactions->update_reaction(
 			$reaction->ID
 			, $this->get_data()
 		);
 
-		$this->send_json_result( $reaction, 'update' );
+		$this->send_json_result($reaction, 'update');
 	}
 
 	/**
@@ -249,12 +249,12 @@ 
 		$reactor  = $this->get_reactor();
 		$reaction = $this->get_reaction();
 
-		$this->verify_request( $this->get_delete_nonce_action( $reaction ) );
+		$this->verify_request($this->get_delete_nonce_action($reaction));
 
-		$result = $reactor->reactions->delete_reaction( $reaction->ID );
+		$result = $reactor->reactions->delete_reaction($reaction->ID);
 
-		if ( ! $result ) {
-			wp_send_json_error( array( 'message' => __( 'There was an error deleting the reaction. Please try again.', 'wordpoints' ) ) );
+		if ( ! $result) {
+			wp_send_json_error(array('message' => __('There was an error deleting the reaction. Please try again.', 'wordpoints')));
 		}
 
 		wp_send_json_success();
@@ -275,11 +275,11 @@ 
 	 *
 	 * @param string $debug_context Context sent with the message (for debugging).
 	 */
-	private function unexpected_error( $debug_context ) {
+	private function unexpected_error($debug_context) {
 
 		wp_send_json_error(
 			array(
-				'message' => __( 'There was an unexpected error. Try reloading the page.', 'wordpoints' ),
+				'message' => __('There was an unexpected error. Try reloading the page.', 'wordpoints'),
 				'debug'   => $debug_context,
 			)
 		);
@@ -295,8 +295,8 @@ 
 	 */
 	private function verify_user_can() {
 
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( array( 'message' => __( 'You do not have permission to perform this action. Maybe you have been logged out?', 'wordpoints' ) ) );
+		if ( ! current_user_can('manage_options')) {
+			wp_send_json_error(array('message' => __('You do not have permission to perform this action. Maybe you have been logged out?', 'wordpoints')));
 		}
 	}
 
@@ -309,14 +309,14 @@ 
 	 *
 	 * @param string $action The action the nonce should be for.
 	 */
-	private function verify_request( $action ) {
+	private function verify_request($action) {
 
 		if (
-			empty( $_POST['nonce'] )
-			|| ! wordpoints_verify_nonce( 'nonce', $action, null, 'post' )
+			empty($_POST['nonce'])
+			|| ! wordpoints_verify_nonce('nonce', $action, null, 'post')
 		) {
 			wp_send_json_error(
-				array( 'message' => __( 'Your security token for this action has expired. Refresh the page and try again.', 'wordpoints' ) )
+				array('message' => __('Your security token for this action has expired. Refresh the page and try again.', 'wordpoints'))
 			);
 		}
 	}
@@ -330,16 +330,16 @@ 
 	 */
 	protected function get_reactor() {
 
-		if ( ! isset( $_POST['reactor'] ) ) { // WPCS: CSRF OK.
-			$this->unexpected_error( 'reactor' );
+		if ( ! isset($_POST['reactor'])) { // WPCS: CSRF OK.
+			$this->unexpected_error('reactor');
 		}
 
-		$reactor_slug = sanitize_key( $_POST['reactor'] ); // WPCS: CSRF OK.
+		$reactor_slug = sanitize_key($_POST['reactor']); // WPCS: CSRF OK.
 
-		$reactor = wordpoints_hooks()->reactors->get( $reactor_slug );
+		$reactor = wordpoints_hooks()->reactors->get($reactor_slug);
 
-		if ( ! $reactor instanceof WordPoints_Hook_Reactor ) {
-			$this->unexpected_error( 'reactor_invalid' );
+		if ( ! $reactor instanceof WordPoints_Hook_Reactor) {
+			$this->unexpected_error('reactor_invalid');
 		}
 
 		$this->reactor_slug = $reactor_slug;
@@ -357,16 +357,16 @@ 
 	 */
 	protected function get_reaction() {
 
-		if ( ! isset( $_POST['id'] ) ) { // WPCS: CSRF OK.
-			$this->unexpected_error( 'id' );
+		if ( ! isset($_POST['id'])) { // WPCS: CSRF OK.
+			$this->unexpected_error('id');
 		}
 
 		$reaction = $this->reactor->reactions->get_reaction(
-			wordpoints_int( $_POST['id'] ) // WPCS: CSRF OK.
+			wordpoints_int($_POST['id']) // WPCS: CSRF OK.
 		);
 
-		if ( ! $reaction ) {
-			wp_send_json_error( array( 'message' => __( 'The reaction ID passed to the server is invalid. Perhaps it has been deleted. Try reloading the page.', 'wordpoints' ) ) );
+		if ( ! $reaction) {
+			wp_send_json_error(array('message' => __('The reaction ID passed to the server is invalid. Perhaps it has been deleted. Try reloading the page.', 'wordpoints')));
 		}
 
 		return $reaction;
@@ -381,9 +381,9 @@ 
 	 */
 	protected function get_data() {
 
-		$data = wp_unslash( $_POST ); // WPCS: CSRF OK.
+		$data = wp_unslash($_POST); // WPCS: CSRF OK.
 
-		unset( $data['id'], $data['action'], $data['nonce'], $data['reactor'] );
+		unset($data['id'], $data['action'], $data['nonce'], $data['reactor']);
 
 		return $data;
 	}
@@ -396,30 +396,30 @@ 
 	 * @param mixed  $result The result of the action.
 	 * @param string $action The action being performed: 'create' or 'update'.
 	 */
-	private function send_json_result( $result, $action ) {
+	private function send_json_result($result, $action) {
 
-		if ( ! $result ) {
+		if ( ! $result) {
 
-			if ( 'create' === $action ) {
-				$message = __( 'There was an error adding the reaction. Please try again.', 'wordpoints' );
+			if ('create' === $action) {
+				$message = __('There was an error adding the reaction. Please try again.', 'wordpoints');
 			} else {
-				$message = __( 'There was an error updating the reaction. Please try again.', 'wordpoints' );
+				$message = __('There was an error updating the reaction. Please try again.', 'wordpoints');
 			}
 
-			wp_send_json_error( array( 'message' => $message ) );
+			wp_send_json_error(array('message' => $message));
 
-		} elseif ( $result instanceof WordPoints_Hook_Reaction_Validator ) {
+		} elseif ($result instanceof WordPoints_Hook_Reaction_Validator) {
 
-			wp_send_json_error( array( 'errors' => $result->get_errors() ) );
+			wp_send_json_error(array('errors' => $result->get_errors()));
 		}
 
 		$data = null;
 
-		if ( 'create' === $action ) {
-			$data = self::prepare_hook_reaction( $result );
+		if ('create' === $action) {
+			$data = self::prepare_hook_reaction($result);
 		}
 
-		wp_send_json_success( $data );
+		wp_send_json_success($data);
 	}
 }
 

src/includes/functions.php

Spacing +126 added lines, -126 removed lines

@@ -33,9 +33,9 @@ 
  *
  * @param WordPoints_Class_Registry_Persistent $reactors The reactors registry.
  */
-function wordpoints_hook_reactors_init( $reactors ) {
+function wordpoints_hook_reactors_init($reactors) {
 
-	$reactors->register( 'points', 'WordPoints_Hook_Reactor_Points' );
+	$reactors->register('points', 'WordPoints_Hook_Reactor_Points');
 }
 
 /**
@@ -47,7 +47,7 @@ 
  *
  * @param WordPoints_Class_Registry_Children $reaction_stores The store registry.
  */
-function wordpoints_hook_reaction_stores_init( $reaction_stores ) {
+function wordpoints_hook_reaction_stores_init($reaction_stores) {
 
 	$reaction_stores->register(
 		'points'
@@ -55,7 +55,7 @@ 
 		, 'WordPoints_Hook_Reaction_Store_Options'
 	);
 
-	if ( is_wordpoints_network_active() ) {
+	if (is_wordpoints_network_active()) {
 		$reaction_stores->register(
 			'points'
 			, 'network'
@@ -73,11 +73,11 @@ 
  *
  * @param WordPoints_Class_Registry_Persistent $extensions The extension registry.
  */
-function wordpoints_hook_extension_init( $extensions ) {
+function wordpoints_hook_extension_init($extensions) {
 
-	$extensions->register( 'blocker', 'WordPoints_Hook_Extension_Blocker' );
-	$extensions->register( 'conditions', 'WordPoints_Hook_Extension_Conditions' );
-	$extensions->register( 'periods', 'WordPoints_Hook_Extension_Periods' );
+	$extensions->register('blocker', 'WordPoints_Hook_Extension_Blocker');
+	$extensions->register('conditions', 'WordPoints_Hook_Extension_Conditions');
+	$extensions->register('periods', 'WordPoints_Hook_Extension_Periods');
 }
 
 /**
@@ -89,7 +89,7 @@ 
  *
  * @param WordPoints_Class_Registry_Children $conditions The conditions registry.
  */
-function wordpoints_hook_conditions_init( $conditions ) {
+function wordpoints_hook_conditions_init($conditions) {
 
 	$conditions->register(
 		'text'
@@ -125,7 +125,7 @@ 
  *
  * @param WordPoints_Hook_Actions $actions The action registry.
  */
-function wordpoints_hook_actions_init( $actions ) {
+function wordpoints_hook_actions_init($actions) {
 
 	$actions->register(
 		'comment_approve'
@@ -133,8 +133,8 @@ 
 		, array(
 			'action' => 'transition_comment_status',
 			'data'   => array(
-				'arg_index'    => array( 'comment' => 2 ),
-				'requirements' => array( 0 => 'approved' ),
+				'arg_index'    => array('comment' => 2),
+				'requirements' => array(0 => 'approved'),
 			),
 		)
 	);
@@ -145,7 +145,7 @@ 
 		, array(
 			'action' => 'wp_insert_comment',
 			'data'   => array(
-				'arg_index' => array( 'comment' => 1 ),
+				'arg_index' => array('comment' => 1),
 			),
 		)
 	);
@@ -156,8 +156,8 @@ 
 		, array(
 			'action' => 'transition_comment_status',
 			'data'   => array(
-				'arg_index' => array( 'comment' => 2 ),
-				'requirements' => array( 1 => 'approved' ),
+				'arg_index' => array('comment' => 2),
+				'requirements' => array(1 => 'approved'),
 			),
 		)
 	);
@@ -169,8 +169,8 @@ 
 		, array(
 			'action' => 'transition_post_status',
 			'data'   => array(
-				'arg_index' => array( 'post' => 2 ),
-				'requirements' => array( 0 => 'publish' ),
+				'arg_index' => array('post' => 2),
+				'requirements' => array(0 => 'publish'),
 			),
 		)
 	);
@@ -181,8 +181,8 @@ 
 		, array(
 			'action' => 'transition_post_status',
 			'data'   => array(
-				'arg_index' => array( 'post' => 2 ),
-				'requirements' => array( 1 => 'publish' ),
+				'arg_index' => array('post' => 2),
+				'requirements' => array(1 => 'publish'),
 			),
 		)
 	);
@@ -193,7 +193,7 @@ 
 		, array(
 			'action' => 'add_attachment',
 			'data'   => array(
-				'arg_index' => array( 'post\attachment' => 0 ),
+				'arg_index' => array('post\attachment' => 0),
 			),
 		)
 	);
@@ -204,7 +204,7 @@ 
 		, array(
 			'action' => 'delete_post',
 			'data'   => array(
-				'arg_index' => array( 'post' => 0 ),
+				'arg_index' => array('post' => 0),
 			),
 		)
 	);
@@ -215,7 +215,7 @@ 
 		, array(
 			'action' => 'user_register',
 			'data'   => array(
-				'arg_index' => array( 'user' => 0 ),
+				'arg_index' => array('user' => 0),
 			),
 		)
 	);
@@ -226,7 +226,7 @@ 
 		, array(
 			'action' => is_multisite() ? 'wpmu_delete_user' : 'delete_user',
 			'data'   => array(
-				'arg_index' => array( 'user' => 0 ),
+				'arg_index' => array('user' => 0),
 			),
 		)
 	);
@@ -249,7 +249,7 @@ 
  *
  * @param WordPoints_Hook_Events $events The event registry.
  */
-function wordpoints_hook_events_init( $events ) {
+function wordpoints_hook_events_init($events) {
 
 	$events->register(
 		'user_register'
@@ -279,7 +279,7 @@ 
 	);
 
 	// Register events for all of the public post types.
-	$post_types = get_post_types( array( 'public' => true ) );
+	$post_types = get_post_types(array('public' => true));
 
 	/**
 	 * Filter which post types to register hook events for.
@@ -288,20 +288,20 @@ 
 	 *
 	 * @param string[] The post type slugs ("names").
 	 */
-	$post_types = apply_filters( 'wordpoints_register_hook_events_for_post_types', $post_types );
+	$post_types = apply_filters('wordpoints_register_hook_events_for_post_types', $post_types);
 
-	foreach ( $post_types as $slug ) {
-		wordpoints_register_post_type_hook_events( $slug );
+	foreach ($post_types as $slug) {
+		wordpoints_register_post_type_hook_events($slug);
 	}
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 
 		$event_slugs = array(
 			'user_visit',
 			'user_register',
 		);
 
-		foreach ( $event_slugs as $event_slug ) {
+		foreach ($event_slugs as $event_slug) {
 			// TODO network hooks
 			$events->args->register(
 				$event_slug
@@ -321,10 +321,10 @@ 
  *
  * @param WordPoints_App_Registry $entities The entities app.
  */
-function wordpoints_entities_app_init( $entities ) {
+function wordpoints_entities_app_init($entities) {
 
-	$entities->sub_apps->register( 'children', 'WordPoints_Class_Registry_Children' );
-	$entities->sub_apps->register( 'contexts', 'WordPoints_Class_Registry' );
+	$entities->sub_apps->register('children', 'WordPoints_Class_Registry_Children');
+	$entities->sub_apps->register('contexts', 'WordPoints_Class_Registry');
 }
 
 /**
@@ -336,10 +336,10 @@ 
  *
  * @param WordPoints_Class_Registry $contexts The entity context registry.
  */
-function wordpoints_entity_contexts_init( $contexts ) {
+function wordpoints_entity_contexts_init($contexts) {
 
-	$contexts->register( 'network', 'WordPoints_Entity_Context_Network' );
-	$contexts->register( 'site', 'WordPoints_Entity_Context_Site' );
+	$contexts->register('network', 'WordPoints_Entity_Context_Network');
+	$contexts->register('site', 'WordPoints_Entity_Context_Site');
 }
 
 /**
@@ -351,18 +351,18 @@ 
  *
  * @param WordPoints_App_Registry $entities The entities app.
  */
-function wordpoints_entities_init( $entities ) {
+function wordpoints_entities_init($entities) {
 
 	$children = $entities->children;
 
-	$entities->register( 'user', 'WordPoints_Entity_User' );
-	$children->register( 'user', 'roles', 'WordPoints_Entity_User_Roles' );
+	$entities->register('user', 'WordPoints_Entity_User');
+	$children->register('user', 'roles', 'WordPoints_Entity_User_Roles');
 
-	$entities->register( 'user_role', 'WordPoints_Entity_User_Role' );
-	$children->register( 'user_role', 'name', 'WordPoints_Entity_User_Role_Name' );
+	$entities->register('user_role', 'WordPoints_Entity_User_Role');
+	$children->register('user_role', 'name', 'WordPoints_Entity_User_Role_Name');
 
 	// Register entities for all of the public post types.
-	$post_types = get_post_types( array( 'public' => true ) );
+	$post_types = get_post_types(array('public' => true));
 
 	/**
 	 * Filter which post types to register entities for.
@@ -371,14 +371,14 @@ 
 	 *
 	 * @param string[] The post type slugs ("names").
 	 */
-	$post_types = apply_filters( 'wordpoints_register_entities_for_post_types', $post_types );
+	$post_types = apply_filters('wordpoints_register_entities_for_post_types', $post_types);
 
-	foreach ( $post_types as $slug ) {
-		wordpoints_register_post_type_entities( $slug );
+	foreach ($post_types as $slug) {
+		wordpoints_register_post_type_entities($slug);
 	}
 
 	// Register entities for all of the public taxonomies.
-	$taxonomies = get_taxonomies( array( 'public' => true ) );
+	$taxonomies = get_taxonomies(array('public' => true));
 
 	/**
 	 * Filter which taxonomies to register entities for.
@@ -387,10 +387,10 @@ 
 	 *
 	 * @param string[] The taxonomy slugs.
 	 */
-	$taxonomies = apply_filters( 'wordpoints_register_entities_for_taxonomies', $taxonomies );
+	$taxonomies = apply_filters('wordpoints_register_entities_for_taxonomies', $taxonomies);
 
-	foreach ( $taxonomies as $slug ) {
-		wordpoints_register_taxonomy_entities( $slug );
+	foreach ($taxonomies as $slug) {
+		wordpoints_register_taxonomy_entities($slug);
 	}
 }
 
@@ -401,28 +401,28 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_register_post_type_entities( $slug ) {
+function wordpoints_register_post_type_entities($slug) {
 
 	$entities = wordpoints_entities();
 	$children = $entities->children;
 
-	$entities->register( "post\\{$slug}", 'WordPoints_Entity_Post' );
-	$children->register( "post\\{$slug}", 'author', 'WordPoints_Entity_Post_Author' );
+	$entities->register("post\\{$slug}", 'WordPoints_Entity_Post');
+	$children->register("post\\{$slug}", 'author', 'WordPoints_Entity_Post_Author');
 
-	$supports = get_all_post_type_supports( $slug );
+	$supports = get_all_post_type_supports($slug);
 
-	if ( isset( $supports['editor'] ) ) {
-		$children->register( "post\\{$slug}", 'content', 'WordPoints_Entity_Post_Content' );
+	if (isset($supports['editor'])) {
+		$children->register("post\\{$slug}", 'content', 'WordPoints_Entity_Post_Content');
 	}
 
-	if ( isset( $supports['comments'] ) ) {
-		$entities->register( "comment\\{$slug}", 'WordPoints_Entity_Comment' );
-		$children->register( "comment\\{$slug}", "post\\{$slug}", 'WordPoints_Entity_Comment_Post' );
-		$children->register( "comment\\{$slug}", 'author', 'WordPoints_Entity_Comment_Author' );
+	if (isset($supports['comments'])) {
+		$entities->register("comment\\{$slug}", 'WordPoints_Entity_Comment');
+		$children->register("comment\\{$slug}", "post\\{$slug}", 'WordPoints_Entity_Comment_Post');
+		$children->register("comment\\{$slug}", 'author', 'WordPoints_Entity_Comment_Author');
 	}
 
-	foreach ( get_object_taxonomies( $slug ) as $taxonomy_slug ) {
-		$children->register( "post\\{$slug}", "terms\\{$taxonomy_slug}", 'WordPoints_Entity_Post_Terms' );
+	foreach (get_object_taxonomies($slug) as $taxonomy_slug) {
+		$children->register("post\\{$slug}", "terms\\{$taxonomy_slug}", 'WordPoints_Entity_Post_Terms');
 	}
 
 	/**
@@ -432,7 +432,7 @@ 
 	 *
 	 * @param string $slug The slug ("name") of the post type.
 	 */
-	do_action( 'wordpoints_register_post_type_entities', $slug );
+	do_action('wordpoints_register_post_type_entities', $slug);
 }
 
 /**
@@ -442,13 +442,13 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_register_post_type_hook_events( $slug ) {
+function wordpoints_register_post_type_hook_events($slug) {
 
 	$event_slugs = array();
 
 	$events = wordpoints_hooks()->events;
 
-	if ( 'attachment' === $slug ) {
+	if ('attachment' === $slug) {
 
 		$event_slugs[] = 'media_upload';
 
@@ -476,7 +476,7 @@ 
 			, array(
 				'actions' => array(
 					'fire'    => 'post_publish',
-					'reverse' => array( 'post_depublish', 'post_delete' ),
+					'reverse' => array('post_depublish', 'post_delete'),
 				),
 				'args'    => array(
 					"post\\{$slug}" => 'WordPoints_Hook_Arg_Dynamic',
@@ -485,7 +485,7 @@ 
 		);
 	}
 
-	if ( post_type_supports( $slug, 'comments' ) ) {
+	if (post_type_supports($slug, 'comments')) {
 
 		$event_slugs[] = "comment_leave\\{$slug}";
 
@@ -494,7 +494,7 @@ 
 			, 'WordPoints_Hook_Event_Comment_Leave'
 			, array(
 				'actions' => array(
-					'fire' => array( 'comment_approve', 'comment_new' ),
+					'fire' => array('comment_approve', 'comment_new'),
 					'reverse' => 'comment_deapprove',
 				),
 				'args' => array(
@@ -504,8 +504,8 @@ 
 		);
 	}
 
-	if ( is_multisite() ) {
-		foreach ( $event_slugs as $event_slug ) {
+	if (is_multisite()) {
+		foreach ($event_slugs as $event_slug) {
 			$events->args->register(
 				$event_slug
 				, 'current:site'
@@ -521,7 +521,7 @@ 
 	 *
 	 * @param string $slug The slug ("name") of the post type.
 	 */
-	do_action( 'wordpoints_register_post_type_hook_events', $slug );
+	do_action('wordpoints_register_post_type_hook_events', $slug);
 }
 
 /**
@@ -531,13 +531,13 @@ 
  *
  * @param string $slug The slug of the taxonomy.
  */
-function wordpoints_register_taxonomy_entities( $slug ) {
+function wordpoints_register_taxonomy_entities($slug) {
 
 	$entities = wordpoints_entities();
 	$children = $entities->children;
 
-	$entities->register( "term\\{$slug}", 'WordPoints_Entity_Term' );
-	$children->register( "term\\{$slug}", 'id', 'WordPoints_Entity_Term_Id' );
+	$entities->register("term\\{$slug}", 'WordPoints_Entity_Term');
+	$children->register("term\\{$slug}", 'id', 'WordPoints_Entity_Term_Id');
 
 	/**
 	 * Fired when registering the entities for a taxonomy.
@@ -546,7 +546,7 @@ 
 	 *
 	 * @param string $slug The taxonomy's slug.
 	 */
-	do_action( 'wordpoints_register_taxonomy_entities', $slug );
+	do_action('wordpoints_register_taxonomy_entities', $slug);
 }
 
 /**
@@ -558,10 +558,10 @@ 
  *
  * @param WordPoints_Class_RegistryI $data_types The data types registry.
  */
-function wordpoints_data_types_init( $data_types ) {
+function wordpoints_data_types_init($data_types) {
 
-	$data_types->register( 'integer', 'WordPoints_Data_Type_Integer' );
-	$data_types->register( 'text', 'WordPoints_Data_Type_Text' );
+	$data_types->register('integer', 'WordPoints_Data_Type_Integer');
+	$data_types->register('text', 'WordPoints_Data_Type_Text');
 }
 
 /**
@@ -576,9 +576,9 @@ 
  *
  * @return bool Whether the user can view the points log.
  */
-function wordpoints_hooks_user_can_view_points_log( $can_view, $log ) {
+function wordpoints_hooks_user_can_view_points_log($can_view, $log) {
 
-	if ( ! $can_view ) {
+	if ( ! $can_view) {
 		return $can_view;
 	}
 
@@ -587,11 +587,11 @@ 
 	$event_slug = $log->log_type;
 
 	/** @var WordPoints_Hook_Arg $arg */
-	foreach ( wordpoints_hooks()->events->args->get_children( $event_slug ) as $slug => $arg ) {
+	foreach (wordpoints_hooks()->events->args->get_children($event_slug) as $slug => $arg) {
 
-		$value = wordpoints_get_points_log_meta( $log->id, $slug, true );
+		$value = wordpoints_get_points_log_meta($log->id, $slug, true);
 
-		if ( ! $value ) {
+		if ( ! $value) {
 			continue;
 		}
 
@@ -601,7 +601,7 @@ 
 			, $value
 		);
 
-		if ( ! $can_view ) {
+		if ( ! $can_view) {
 			break;
 		}
 	}
@@ -620,20 +620,20 @@ 
  *
  * @return bool Whether the user can view this entity.
  */
-function wordpoints_entity_user_can_view( $user_id, $entity_slug, $entity_id ) {
+function wordpoints_entity_user_can_view($user_id, $entity_slug, $entity_id) {
 
-	$entity = wordpoints_entities()->get( $entity_slug );
+	$entity = wordpoints_entities()->get($entity_slug);
 
 	// If this entity type is not found, we have no way of determining whether it is
 	// safe for the user to view it.
-	if ( ! ( $entity instanceof WordPoints_Entity ) ) {
+	if ( ! ($entity instanceof WordPoints_Entity)) {
 		return false;
 	}
 
 	$can_view = true;
 
-	if ( $entity instanceof WordPoints_Entity_Restricted_VisibilityI ) {
-		$can_view = $entity->user_can_view( $user_id, $entity_id );
+	if ($entity instanceof WordPoints_Entity_Restricted_VisibilityI) {
+		$can_view = $entity->user_can_view($user_id, $entity_id);
 	}
 
 	/**
@@ -664,8 +664,8 @@ 
  */
 function wordpoints_apps() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
-		WordPoints_App::$main = new WordPoints_App( 'apps' );
+	if ( ! isset(WordPoints_App::$main)) {
+		WordPoints_App::$main = new WordPoints_App('apps');
 	}
 
 	return WordPoints_App::$main;
@@ -680,7 +680,7 @@ 
  */
 function wordpoints_hooks() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
@@ -696,7 +696,7 @@ 
  */
 function wordpoints_entities() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
@@ -712,13 +712,13 @@ 
  *
  * @param WordPoints_App $app The main apps app.
  */
-function wordpoints_apps_init( $app ) {
+function wordpoints_apps_init($app) {
 
 	$apps = $app->sub_apps;
 
-	$apps->register( 'hooks', 'WordPoints_Hooks' );
-	$apps->register( 'entities', 'WordPoints_App_Registry' );
-	$apps->register( 'data_types', 'WordPoints_Class_Registry' );
+	$apps->register('hooks', 'WordPoints_Hooks');
+	$apps->register('entities', 'WordPoints_App_Registry');
+	$apps->register('data_types', 'WordPoints_Class_Registry');
 }
 
 /**
@@ -731,19 +731,19 @@ 
  *
  * @return object|false The constructed object, or false if to many args were passed.
  */
-function wordpoints_construct_class_with_args( $class_name, array $args ) {
+function wordpoints_construct_class_with_args($class_name, array $args) {
 
-	switch ( count( $args ) ) {
+	switch (count($args)) {
 		case 0:
 			return new $class_name();
 		case 1:
-			return new $class_name( $args[0] );
+			return new $class_name($args[0]);
 		case 2:
-			return new $class_name( $args[0], $args[1] );
+			return new $class_name($args[0], $args[1]);
 		case 3:
-			return new $class_name( $args[0], $args[1], $args[2] );
+			return new $class_name($args[0], $args[1], $args[2]);
 		case 4:
-			return new $class_name( $args[0], $args[1], $args[2], $args[3] );
+			return new $class_name($args[0], $args[1], $args[2], $args[3]);
 		default:
 			return false;
 	}
@@ -765,13 +765,13 @@ 
  * @return array The slug parsed into the 'generic' and 'dynamic' portions. If the
  *               slug is not dynamic, the value of each of those keys will be false.
  */
-function wordpoints_parse_dynamic_slug( $slug ) {
+function wordpoints_parse_dynamic_slug($slug) {
 
-	$parsed = array( 'dynamic' => false, 'generic' => false );
+	$parsed = array('dynamic' => false, 'generic' => false);
 
-	$parts = explode( '\\', $slug, 2 );
+	$parts = explode('\\', $slug, 2);
 
-	if ( isset( $parts[1] ) ) {
+	if (isset($parts[1])) {
 		$parsed['dynamic'] = $parts[1];
 		$parsed['generic'] = $parts[0];
 	}
@@ -810,28 +810,28 @@ 
  *                     contexts, indexed by context slug, or false if any of the
  *                     contexts isn't current.
  */
-function wordpoints_entities_get_current_context_id( $slug ) {
+function wordpoints_entities_get_current_context_id($slug) {
 
 	$current_context = array();
 
 	/** @var WordPoints_Class_Registry $contexts */
 	$contexts = wordpoints_entities()->contexts;
 
-	while ( $slug ) {
+	while ($slug) {
 
-		$context = $contexts->get( $slug );
+		$context = $contexts->get($slug);
 
-		if ( ! $context instanceof WordPoints_Entity_Context ) {
+		if ( ! $context instanceof WordPoints_Entity_Context) {
 			return false;
 		}
 
 		$id = $context->get_current_id();
 
-		if ( false === $id ) {
+		if (false === $id) {
 			return false;
 		}
 
-		$current_context[ $slug ] = $id;
+		$current_context[$slug] = $id;
 
 		$slug = $context->get_parent_slug();
 	}
@@ -852,22 +852,22 @@ 
  */
 function wordpoints_is_network_context() {
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return false;
 	}
 
-	if ( is_network_admin() ) {
+	if (is_network_admin()) {
 		return true;
 	}
 
 	// See https://core.trac.wordpress.org/ticket/22589
 	if (
-		defined( 'DOING_AJAX' )
+		defined('DOING_AJAX')
 		&& DOING_AJAX
-		&& isset( $_SERVER['HTTP_REFERER'] )
+		&& isset($_SERVER['HTTP_REFERER'])
 		&& preg_match(
-			'#^' . preg_quote( network_admin_url(), '#' ) . '#i'
-			, esc_url_raw( wp_unslash( $_SERVER['HTTP_REFERER'] ) )
+			'#^'.preg_quote(network_admin_url(), '#').'#i'
+			, esc_url_raw(wp_unslash($_SERVER['HTTP_REFERER']))
 		)
 	) {
 		return true;
@@ -880,7 +880,7 @@ 
 	 *
 	 * @param bool $in_network_context Whether we are in network context.
 	 */
-	return apply_filters( 'wordpoints_is_network_context', false );
+	return apply_filters('wordpoints_is_network_context', false);
 }
 
 /**
@@ -894,21 +894,21 @@ 
  *
  * @return string The primary arg's GUID, JSON encoded.
  */
-function wordpoints_hooks_get_event_primary_arg_guid_json( WordPoints_Hook_Event_Args $event_args ) {
+function wordpoints_hooks_get_event_primary_arg_guid_json(WordPoints_Hook_Event_Args $event_args) {
 
 	$entity = $event_args->get_primary_arg();
 
-	if ( ! $entity ) {
+	if ( ! $entity) {
 		return '';
 	}
 
 	$the_guid = $entity->get_the_guid();
 
-	if ( ! $the_guid ) {
+	if ( ! $the_guid) {
 		return '';
 	}
 
-	return wp_json_encode( $the_guid );
+	return wp_json_encode($the_guid);
 }
 
 /**
@@ -921,7 +921,7 @@ 
  */
 function wordpoints_hooks_api_add_global_cache_groups() {
 
-	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
+	if (function_exists('wp_cache_add_global_groups')) {
 
 		wp_cache_add_global_groups(
 			array(
@@ -947,8 +947,8 @@ 
  * @return string The escaped identifier. Already quoted, do not place within
  *                backticks.
  */
-function wordpoints_escape_mysql_identifier( $identifier ) {
-	return '`' . str_replace( '`', '``', $identifier ) . '`';
+function wordpoints_escape_mysql_identifier($identifier) {
+	return '`'.str_replace('`', '``', $identifier).'`';
 }
 
 // EOF

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

Spacing +3 added lines, -3 removed lines

@@ -24,15 +24,15 @@
 	/**
 	 * @since 1.0.0
 	 */
-	public function validate_action_type_settings( $settings ) {
+	public function validate_action_type_settings($settings) {
 		return (bool) $settings;
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	public function should_hit( WordPoints_Hook_Fire $fire ) {
-		return ! $this->get_settings_from_fire( $fire );
+	public function should_hit(WordPoints_Hook_Fire $fire) {
+		return ! $this->get_settings_from_fire($fire);
 	}
 }
 

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

Spacing +77 added lines, -77 removed lines

@@ -25,11 +25,11 @@ 
 	public function get_ui_script_data() {
 
 		$periods = array(
-			MINUTE_IN_SECONDS   => __( 'Minute', 'wordpoints' ),
-			HOUR_IN_SECONDS     => __( 'Hour',   'wordpoints' ),
-			DAY_IN_SECONDS      => __( 'Day',    'wordpoints' ),
-			WEEK_IN_SECONDS     => __( 'Week',   'wordpoints' ),
-			30 * DAY_IN_SECONDS => __( 'Month',  'wordpoints' ),
+			MINUTE_IN_SECONDS   => __('Minute', 'wordpoints'),
+			HOUR_IN_SECONDS     => __('Hour', 'wordpoints'),
+			DAY_IN_SECONDS      => __('Day', 'wordpoints'),
+			WEEK_IN_SECONDS     => __('Week', 'wordpoints'),
+			30 * DAY_IN_SECONDS => __('Month', 'wordpoints'),
 		);
 
 		/**
@@ -39,12 +39,12 @@ 
 		 *
 		 * @param string[] $periods The period titles, indexed by length in seconds.
 		 */
-		$periods = apply_filters( 'wordpoints_hooks_ui_data_periods', $periods );
+		$periods = apply_filters('wordpoints_hooks_ui_data_periods', $periods);
 
 		return array(
 			'periods' => $periods,
 			'l10n' => array(
-				'label' => __( 'Trigger reaction no more than once per:', 'wordpoints' ),
+				'label' => __('Trigger reaction no more than once per:', 'wordpoints'),
 			),
 		);
 	}
@@ -58,25 +58,25 @@ 
 	 *
 	 * @return array The validated periods.
 	 */
-	protected function validate_action_type_settings( $periods ) {
+	protected function validate_action_type_settings($periods) {
 
-		if ( ! is_array( $periods ) ) {
+		if ( ! is_array($periods)) {
 
 			$this->validator->add_error(
-				__( 'Periods do not match expected format.', 'wordpoints' )
+				__('Periods do not match expected format.', 'wordpoints')
 			);
 
 			return array();
 		}
 
-		foreach ( $periods as $index => $period ) {
+		foreach ($periods as $index => $period) {
 
-			$this->validator->push_field( $index );
+			$this->validator->push_field($index);
 
-			$period = $this->validate_period( $period );
+			$period = $this->validate_period($period);
 
-			if ( $period ) {
-				$periods[ $index ] = $period;
+			if ($period) {
+				$periods[$index] = $period;
 			}
 
 			$this->validator->pop_field();
@@ -94,30 +94,30 @@ 
 	 *
 	 * @return array|false The validated period, or false if invalid.
 	 */
-	protected function validate_period( $period ) {
+	protected function validate_period($period) {
 
-		if ( ! is_array( $period ) ) {
+		if ( ! is_array($period)) {
 			$this->validator->add_error(
-				__( 'Period does not match expected format.', 'wordpoints' )
+				__('Period does not match expected format.', 'wordpoints')
 			);
 
 			return false;
 		}
 
-		if ( isset( $period['args'] ) ) {
-			$this->validate_period_args( $period['args'] );
+		if (isset($period['args'])) {
+			$this->validate_period_args($period['args']);
 		}
 
-		if ( ! isset( $period['length'] ) ) {
+		if ( ! isset($period['length'])) {
 
 			$this->validator->add_error(
-				__( 'Period length setting is missing.', 'wordpoints' )
+				__('Period length setting is missing.', 'wordpoints')
 			);
 
-		} elseif ( false === wordpoints_posint( $period['length'] ) ) {
+		} elseif (false === wordpoints_posint($period['length'])) {
 
 			$this->validator->add_error(
-				__( 'Period length must be a positive integer.', 'wordpoints' )
+				__('Period length must be a positive integer.', 'wordpoints')
 				, 'length'
 			);
 
@@ -134,34 +134,34 @@ 
 	 *
 	 * @param mixed $args The args the period is related to.
 	 */
-	protected function validate_period_args( $args ) {
+	protected function validate_period_args($args) {
 
-		if ( ! is_array( $args ) ) {
+		if ( ! is_array($args)) {
 
 			$this->validator->add_error(
-				__( 'Period does not match expected format.', 'wordpoints' )
+				__('Period does not match expected format.', 'wordpoints')
 				, 'args'
 			);
 
 			return;
 		}
 
-		$this->validator->push_field( 'args' );
+		$this->validator->push_field('args');
 
-		foreach ( $args as $index => $hierarchy ) {
+		foreach ($args as $index => $hierarchy) {
 
-			$this->validator->push_field( $index );
+			$this->validator->push_field($index);
 
-			if ( ! is_array( $hierarchy ) ) {
+			if ( ! is_array($hierarchy)) {
 
 				$this->validator->add_error(
-					__( 'Period does not match expected format.', 'wordpoints' )
+					__('Period does not match expected format.', 'wordpoints')
 				);
 
-			} elseif ( ! $this->event_args->get_from_hierarchy( $hierarchy ) ) {
+			} elseif ( ! $this->event_args->get_from_hierarchy($hierarchy)) {
 
 				$this->validator->add_error(
-					__( 'Invalid period.', 'wordpoints' ) // TODO better error message
+					__('Invalid period.', 'wordpoints') // TODO better error message
 				);
 			}
 
@@ -174,18 +174,18 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function should_hit( WordPoints_Hook_Fire $fire ) {
+	public function should_hit(WordPoints_Hook_Fire $fire) {
 
-		$periods = $this->get_settings_from_fire( $fire );
+		$periods = $this->get_settings_from_fire($fire);
 
-		if ( empty( $periods ) ) {
+		if (empty($periods)) {
 			return true;
 		}
 
 		$this->event_args = $fire->event_args;
 
-		foreach ( $periods as $period ) {
-			if ( ! $this->has_period_ended( $period, $fire->reaction ) ) {
+		foreach ($periods as $period) {
+			if ( ! $this->has_period_ended($period, $fire->reaction)) {
 				return false;
 			}
 		}
@@ -209,24 +209,24 @@ 
 	) {
 
 		$period = $this->get_period_by_reaction(
-			$this->get_period_signature( $settings, $reaction )
+			$this->get_period_signature($settings, $reaction)
 			, $reaction
 		);
 
 		// If the period isn't found, we know that we can still fire.
-		if ( ! $period ) {
+		if ( ! $period) {
 			return true;
 		}
 
-		$now = current_time( 'timestamp' );
-		$hit_time = strtotime( $period->date, $now );
+		$now = current_time('timestamp');
+		$hit_time = strtotime($period->date, $now);
 
-		if ( ! empty( $settings['relative'] ) ) {
-			return ( $hit_time < $now - $settings['length'] );
+		if ( ! empty($settings['relative'])) {
+			return ($hit_time < $now - $settings['length']);
 		} else {
 			return (
-				(int) ( $hit_time / $settings['length'] )
-				< (int) ( $now / $settings['length'] )
+				(int) ($hit_time / $settings['length'])
+				< (int) ($now / $settings['length'])
 			);
 		}
 	}
@@ -240,24 +240,24 @@ 
 	 *
 	 * @return array The arg values.
 	 */
-	protected function get_arg_values( array $period_args ) {
+	protected function get_arg_values(array $period_args) {
 
 		$values = array();
 
-		foreach ( $period_args as $arg_hierarchy ) {
+		foreach ($period_args as $arg_hierarchy) {
 
 			$arg = $this->event_args->get_from_hierarchy(
 				$arg_hierarchy
 			);
 
-			if ( ! $arg instanceof WordPoints_EntityishI ) {
+			if ( ! $arg instanceof WordPoints_EntityishI) {
 				continue;
 			}
 
-			$values[ implode( '.', $arg_hierarchy ) ] = $arg->get_the_value();
+			$values[implode('.', $arg_hierarchy)] = $arg->get_the_value();
 		}
 
-		ksort( $values );
+		ksort($values);
 
 		return $values;
 	}
@@ -271,11 +271,11 @@ 
 	 *
 	 * @return object|false The period data, or false if not found.
 	 */
-	protected function get_period( $period_id ) {
+	protected function get_period($period_id) {
 
-		$period = wp_cache_get( $period_id, 'wordpoints_hook_periods' );
+		$period = wp_cache_get($period_id, 'wordpoints_hook_periods');
 
-		if ( ! $period ) {
+		if ( ! $period) {
 
 			global $wpdb;
 
@@ -292,11 +292,11 @@ 
 				)
 			);
 
-			if ( ! $period ) {
+			if ( ! $period) {
 				return false;
 			}
 
-			wp_cache_set( $period->id, $period, 'wordpoints_hook_periods' );
+			wp_cache_set($period->id, $period, 'wordpoints_hook_periods');
 		}
 
 		return $period;
@@ -320,14 +320,14 @@ 
 
 		$reaction_guid = $reaction->get_guid();
 
-		$cache_key = wp_json_encode( $reaction_guid ) . "-{$signature}";
+		$cache_key = wp_json_encode($reaction_guid)."-{$signature}";
 
 		// Before we run the query, we try to lookup the ID in the cache.
-		$period_id = wp_cache_get( $cache_key, 'wordpoints_hook_period_ids_by_reaction' );
+		$period_id = wp_cache_get($cache_key, 'wordpoints_hook_period_ids_by_reaction');
 
 		// If we found it, we can retrieve the period by ID instead.
-		if ( $period_id ) {
-			return $this->get_period( $period_id );
+		if ($period_id) {
+			return $this->get_period($period_id);
 		}
 
 		global $wpdb;
@@ -351,17 +351,17 @@ 
 				, $signature
 				, $reaction_guid['reactor']
 				, $reaction_guid['store']
-				, wp_json_encode( $reaction_guid['context_id'] )
+				, wp_json_encode($reaction_guid['context_id'])
 				, $reaction_guid['id']
 			)
 		);
 
-		if ( ! $period ) {
+		if ( ! $period) {
 			return false;
 		}
 
-		wp_cache_set( $cache_key, $period->id, 'wordpoints_hook_period_ids_by_reaction' );
-		wp_cache_set( $period->id, $period, 'wordpoints_hook_periods' );
+		wp_cache_set($cache_key, $period->id, 'wordpoints_hook_period_ids_by_reaction');
+		wp_cache_set($period->id, $period, 'wordpoints_hook_periods');
 
 		return $period;
 	}
@@ -369,20 +369,20 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function after_hit( WordPoints_Hook_Fire $fire ) {
+	public function after_hit(WordPoints_Hook_Fire $fire) {
 
-		$periods = $this->get_settings_from_fire( $fire );
+		$periods = $this->get_settings_from_fire($fire);
 
-		if ( empty( $periods ) ) {
+		if (empty($periods)) {
 			return;
 		}
 
 		$this->event_args = $fire->event_args;
 
-		foreach ( $periods as $settings ) {
+		foreach ($periods as $settings) {
 
 			$this->add_period(
-				$this->get_period_signature( $settings, $fire->reaction )
+				$this->get_period_signature($settings, $fire->reaction)
 				, $fire
 			);
 		}
@@ -407,14 +407,14 @@ 
 		WordPoints_Hook_ReactionI $reaction
 	) {
 
-		if ( isset( $settings['args'] ) ) {
+		if (isset($settings['args'])) {
 			$period_args = $settings['args'];
 		} else {
-			$period_args = array( $reaction->get_meta( 'target' ) );
+			$period_args = array($reaction->get_meta('target'));
 		}
 
 		return wordpoints_hash(
-			wp_json_encode( $this->get_arg_values( $period_args ) )
+			wp_json_encode($this->get_arg_values($period_args))
 		);
 	}
 
@@ -428,7 +428,7 @@ 
 	 *
 	 * @return false|object The period data, or false if not found.
 	 */
-	protected function add_period( $signature, WordPoints_Hook_Fire $fire ) {
+	protected function add_period($signature, WordPoints_Hook_Fire $fire) {
 
 		global $wpdb;
 
@@ -438,17 +438,17 @@ 
 				'hit_id' => $fire->hit_id,
 				'signature' => $signature,
 			)
-			, array( '%d', '%s' )
+			, array('%d', '%s')
 		);
 
-		if ( ! $inserted ) {
+		if ( ! $inserted) {
 			return false;
 		}
 
 		$period_id = $wpdb->insert_id;
 
 		wp_cache_set(
-			wp_json_encode( $fire->reaction->get_guid() ) . "-{$signature}"
+			wp_json_encode($fire->reaction->get_guid())."-{$signature}"
 			, $period_id
 			, 'wordpoints_hook_period_ids_by_reaction'
 		);

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

Spacing +54 added lines, -54 removed lines

@@ -42,14 +42,14 @@ 
 
 		$conditions_data = array();
 
-		foreach ( $this->conditions->get_all() as $data_type => $conditions ) {
-			foreach ( $conditions as $slug => $condition ) {
+		foreach ($this->conditions->get_all() as $data_type => $conditions) {
+			foreach ($conditions as $slug => $condition) {
 
-				if ( ! ( $condition instanceof WordPoints_Hook_Condition ) ) {
+				if ( ! ($condition instanceof WordPoints_Hook_Condition)) {
 					continue;
 				}
 
-				$conditions_data[ $data_type ][ $slug ] = array(
+				$conditions_data[$data_type][$slug] = array(
 					'slug'      => $slug,
 					'data_type' => $data_type,
 					'title'     => $condition->get_title(),
@@ -58,14 +58,14 @@ 
 			}
 		}
 
-		return array( 'conditions' => $conditions_data );
+		return array('conditions' => $conditions_data);
 	}
 
 	/**
 	 * @since 1.0.0
 	 */
-	protected function validate_action_type_settings( $settings ) {
-		return $this->validate_conditions( $settings );
+	protected function validate_action_type_settings($settings) {
+		return $this->validate_conditions($settings);
 	}
 
 	/**
@@ -78,36 +78,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();
@@ -117,18 +117,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;
@@ -144,32 +144,32 @@ 
 	 * @return array|false The validated conditions settings, or false if unable to
 	 *                     validate.
 	 */
-	protected function validate_condition( $settings ) {
+	protected function validate_condition($settings) {
 
-		if ( ! isset( $settings['type'] ) ) {
-			$this->validator->add_error( __( 'Condition type is missing.', 'wordpoints' ) );
+		if ( ! isset($settings['type'])) {
+			$this->validator->add_error(__('Condition type is missing.', 'wordpoints'));
 			return false;
 		}
 
 		$arg = $this->event_args->get_current();
 
-		$data_type = $this->get_data_type( $arg );
+		$data_type = $this->get_data_type($arg);
 
-		if ( ! $data_type ) {
+		if ( ! $data_type) {
 			$this->validator->add_error(
-				__( 'This type of condition does not work for the selected attribute.', 'wordpoints' )
+				__('This type of condition does not work for the selected attribute.', 'wordpoints')
 			);
 
 			return false;
 		}
 
-		$condition = wordpoints_hooks()->conditions->get( $data_type, $settings['type'] );
+		$condition = wordpoints_hooks()->conditions->get($data_type, $settings['type']);
 
-		if ( ! $condition ) {
+		if ( ! $condition) {
 
 			$this->validator->add_error(
 				sprintf(
-					__( 'Unknown condition type “%s”.', 'wordpoints' )
+					__('Unknown condition type “%s”.', 'wordpoints')
 					, $settings['type']
 				)
 				, 'type'
@@ -178,17 +178,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
@@ -196,7 +196,7 @@ 
 			, $this->validator
 		);
 
-		list( $this->validator, $this->event_args ) = $backup;
+		list($this->validator, $this->event_args) = $backup;
 
 		$this->validator->pop_field();
 
@@ -206,11 +206,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;
 		}
 
@@ -232,35 +232,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;
 			}
 		}
@@ -277,13 +277,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/condition/entity/array/contains.php

Spacing +34 added lines, -34 removed lines

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

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

Spacing +39 added lines, -39 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	protected $action_types = array( 'fire', 'reverse' );
+	protected $action_types = array('fire', 'reverse');
 
 	/**
 	 * @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,54 +114,54 @@ 
 		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 ( 'reverse' === $fire->action_type ) {
-			$this->reverse_hit( $fire );
+		if ('reverse' === $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();
 
-		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) {
 
 		$meta_queries = array(
 			array(
@@ -172,7 +172,7 @@ 
 			),
 		);
 
-		foreach ( $fire->event_args->get_entities() as $slug => $entity ) {
+		foreach ($fire->event_args->get_entities() as $slug => $entity) {
 
 			$meta_queries[] = array(
 				'key'   => $slug,
@@ -189,35 +189,35 @@ 
 
 		$logs = $query->get();
 
-		if ( ! $logs ) {
+		if ( ! $logs) {
 			return;
 		}
 
 		global $wpdb;
 
-		add_filter( 'wordpoints_points_log', '__return_false' );
+		add_filter('wordpoints_points_log', '__return_false');
 
-		foreach ( $logs as $log ) {
+		foreach ($logs as $log) {
 
 			wordpoints_alter_points(
 				$log->user_id
 				, -$log->points
 				, $log->points_type
 				, "reverse-{$log->log_type}"
-				, array( 'original_log_id' => $log->id )
+				, array('original_log_id' => $log->id)
 			);
 
-			wordpoints_points_log_delete_all_metadata( $log->id );
+			wordpoints_points_log_delete_all_metadata($log->id);
 
 			// Now delete the log.
 			$wpdb->delete(
 				$wpdb->wordpoints_points_logs
-				, array( 'id' => $log->id )
+				, array('id' => $log->id)
 				, '%d'
 			); // WPCS: cache OK, cleaned by wordpoints_alter_points().
 		}
 
-		remove_filter( 'wordpoints_points_log', '__return_false' );
+		remove_filter('wordpoints_points_log', '__return_false');
 	}
 }