eventespresso / event-espresso-core

core/middleware/EE_Recommended_Versions.core.php

Spacing +27 added lines, -27 removed lines

@@ -22,35 +22,35 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
 		//$this->_response->add_output( "\n\t IN >>  " . __CLASS__ );
 		//$this->_response->set_notice( 1, 'hey look at this' );
 		// check required WP version
-		if ( ! $this->_minimum_wp_version_required() ) {
-			$this->_request->un_set( 'activate', true );
-			add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 );
+		if ( ! $this->_minimum_wp_version_required()) {
+			$this->_request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
 			//$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' );
 			$this->_response->terminate_request();
 		}
 		// check required PHP version
-		if ( ! $this->_minimum_php_version_required() ) {
-			$this->_request->un_set( 'activate', true );
-			add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 );
+		if ( ! $this->_minimum_php_version_required()) {
+			$this->_request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_php_version_error'), 1);
 			//$this->_response->add_output( "\n<br />" . 'minimum_php_version_error' );
 			$this->_response->terminate_request();
 		}
 		// check recommended WP version
-		if ( ! $this->_minimum_wp_version_recommended() ) {
+		if ( ! $this->_minimum_wp_version_recommended()) {
 			$this->_display_minimum_recommended_wp_version_notice();
 		}
 		// check recommended PHP version
-		if ( ! $this->_minimum_php_version_recommended() ) {
+		if ( ! $this->_minimum_php_version_recommended()) {
 			$this->_display_minimum_recommended_php_version_notice();
 		}
 		$this->_test_for_php_version_7();
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
 		//$this->_response->add_output( "\n\t OUT << " . __CLASS__ );
 		return $this->_response;
 	}
@@ -64,9 +64,9 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) {
+	private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) {
 		global $wp_version;
-		return version_compare( $wp_version, $min_version, '>=' ) ? true : false;
+		return version_compare($wp_version, $min_version, '>=') ? true : false;
 	}
 
 
@@ -78,7 +78,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_wp_version_required() {
-		return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED );
+		return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED);
 	}
 
 
@@ -90,7 +90,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_wp_version_recommended() {
-		return $this->_check_wp_version( EE_MIN_WP_VER_RECOMMENDED );
+		return $this->_check_wp_version(EE_MIN_WP_VER_RECOMMENDED);
 	}
 
 
@@ -102,8 +102,8 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) {
-		return version_compare( PHP_VERSION, $min_version, '>=' ) ? true : false;
+	private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) {
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_php_version_required() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED);
 	}
 
 
@@ -127,7 +127,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_php_version_recommended() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED);
 	}
 
 
@@ -144,7 +144,7 @@ 
 			<p>
 				<?php
 				printf(
-					__( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
+					__('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
 					EE_MIN_WP_VER_REQUIRED,
 					$wp_version,
 					'<br/>',
@@ -169,7 +169,7 @@ 
 			<p>
 				<?php
 				printf(
-					__( 'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
+					__('We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
 					EE_MIN_PHP_VER_REQUIRED,
 					PHP_VERSION,
 					'<br/>',
@@ -192,9 +192,9 @@ 
 	private function _display_minimum_recommended_wp_version_notice() {
 		global $wp_version;
 		EE_Error::add_persistent_admin_notice(
-			'wp_version_' . str_replace( '.', '-', EE_MIN_WP_VER_RECOMMENDED ) . '_recommended',
+			'wp_version_'.str_replace('.', '-', EE_MIN_WP_VER_RECOMMENDED).'_recommended',
 			sprintf(
-				__( 'Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
+				__('Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
 				EE_MIN_WP_VER_RECOMMENDED,
 				$wp_version,
 				'<br/>',
@@ -213,9 +213,9 @@ 
 	 */
 	private function _display_minimum_recommended_php_version_notice() {
 		EE_Error::add_persistent_admin_notice(
-			'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended',
+			'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
 			sprintf(
-				__( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
+				__('Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
 				EE_MIN_PHP_VER_RECOMMENDED,
 				PHP_VERSION,
 				'<br/>',
@@ -232,10 +232,10 @@ 
 	 * @access private
 	 */
 	private function _test_for_php_version_7() {
-		if ( $this->_check_php_version( '7' ) ) {
-			define( 'EE_PHP_7', true );
+		if ($this->_check_php_version('7')) {
+			define('EE_PHP_7', true);
 		} else {
-			define( 'EE_PHP_7', false );
+			define('EE_PHP_7', false);
 		}
 	}
 

core/libraries/rest_api/changes/Changes_In_4_8_34.php

Doc Comments -1 removed lines

@@ -22,7 +22,6 @@
 	/**
 	 * Removes the checkin and checkout endpoints from the index for requests
 	 * to api versions lowers than 4.8.33
-	 * @param array $routes_on_this_version
 	 * @param EventEspresso\core\libraries\rest_api\controllers\Base $controller
 	 * @return array like $routes_on_this_version
 	 */

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 		//is for lower than 4.8.33
 		add_filter( 
 			'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
-			array( $this, 'remove_response_headers' ),
+			array($this, 'remove_response_headers'),
 			10,
 			3
 		);
@@ -26,9 +26,9 @@ 
 	 * @param EventEspresso\core\libraries\rest_api\controllers\Base $controller
 	 * @return array like $routes_on_this_version
 	 */
-	public function remove_response_headers( $response_headers, $controller, $requested_version ) {
-		if( $controller instanceof Base 
-			&& $this->applies_to_version(  $requested_version ) ) {
+	public function remove_response_headers($response_headers, $controller, $requested_version) {
+		if ($controller instanceof Base 
+			&& $this->applies_to_version($requested_version)) {
 			return array();
 		}
 		return $response_headers;

core/libraries/rest_api/controllers/model/Read.php

Braces +14 added lines, -14 removed lines

@@ -239,7 +239,7 @@ 
 		){
 			if( $relation instanceof \EE_Belongs_To_Relation ) {
 				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
+			} else{
 				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
 			}
 			return new \WP_Error(
@@ -291,7 +291,7 @@ 
 		}
 		if( $relation instanceof \EE_Belongs_To_Relation ){
 			return array_shift( $nice_results );
-		}else{
+		} else{
 			return $nice_results;
 		}
 	}
@@ -405,14 +405,14 @@ 
 			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
 			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
 				unset( $result[ $field_name ] );
-			}elseif(
+			} elseif(
 				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
 			){
 				$result[ $field_name ] = array(
 					'raw' => $field_obj->prepare_for_get( $field_value ),
 					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
 				);
-			}elseif(
+			} elseif(
 				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
 			){
 				$result[ $field_name ] = array(
@@ -595,7 +595,7 @@ 
 	public static function get_related_entity_name( $relation_name, $relation_obj ){
 		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
 			return strtolower( $relation_name );
-		}else{
+		} else{
 			return \EEH_Inflector::pluralize_and_lower( $relation_name );
 		}
 	}
@@ -665,7 +665,7 @@ 
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
 		if( in_array( $context, $valid_contexts )  ){
 			return $context;
-		}else{
+		} else{
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -690,7 +690,7 @@ 
 			$order_by = $query_parameters[ 'order_by' ];
 		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
 			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		} else{
 			$order_by = null;
 		}
 		if( $order_by !== null ){
@@ -700,7 +700,7 @@ 
 			$group_by = $query_parameters[ 'group_by' ];
 		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
 			$group_by = $query_parameters[ 'groupby' ];
-		}else{
+		} else{
 			$group_by = null;
 		}
 		if( $group_by !== null ){
@@ -723,7 +723,7 @@ 
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
 			if( ! is_array( $query_parameters[ 'limit' ] ) ) {
 				$limit_array = explode(',', (string)$query_parameters['limit']);
-			}else {
+			} else {
 				$limit_array = $query_parameters[ 'limit' ];
 			}
 			$sanitized_limit = array();
@@ -739,12 +739,12 @@ 
 				$sanitized_limit[] = intval( $limit_part );
 			}
 			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
+		} else{
 			$model_query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
 		if( isset( $query_parameters[ 'caps' ] ) ) {
 			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
+		} else{
 			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
 		}
 		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
@@ -764,7 +764,7 @@ 
 		foreach( $query_params as $key => $value ) {
 			if( is_array( $value ) ) {
 				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
+			} else{
 				$model_ready_query_params[ $key ] = $value;
 			}
 		}
@@ -816,11 +816,11 @@ 
 					//found the model name at the exact start
 					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				} elseif( $field_to_include == $model_name ){
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else{
 			//look for ones with no period
 			foreach( $includes as $field_to_include ) {
 				$field_to_include = trim( $field_to_include );

Spacing +293 added lines, -293 removed lines

@@ -6,8 +6,8 @@ 
 use EventEspresso\core\libraries\rest_api\Rest_Exception;
 use EventEspresso\core\libraries\rest_api\Model_Data_Translator;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -33,7 +33,7 @@ 
 
 	public function __construct() {
 		parent::__construct();
-		\EE_Registry::instance()->load_helper( 'Inflector' );
+		\EE_Registry::instance()->load_helper('Inflector');
 		$this->_fields_calculator = new Calculated_Model_Fields();
 	}
 
@@ -42,22 +42,22 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_all( \WP_REST_Request $request) {
+	public static function handle_request_get_all(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)~',
-				array( 'version', 'model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)~',
+				array('version', 'model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -65,12 +65,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entities_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 					)
 			);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -80,21 +80,21 @@ 
 	 * @param \WP_Rest_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_one( \WP_Rest_Request $request ) {
+	public static function handle_request_get_one(\WP_Rest_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)~',
-				array( 'version', 'model', 'id' ) );
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)~',
+				array('version', 'model', 'id') );
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -102,12 +102,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entity_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 						)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -119,40 +119,40 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_related( \WP_REST_Request $request ) {
+	public static function handle_request_get_related(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)/(.*)~',
-				array( 'version', 'model', 'id', 'related_model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)/(.*)~',
+				array('version', 'model', 'id', 'related_model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$main_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $main_model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$main_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($main_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$main_model_name_singular
 						)
 					)
 				);
 			}
-			$main_model = $controller->get_model_version_info()->load_model( $main_model_name_singular );
+			$main_model = $controller->get_model_version_info()->load_model($main_model_name_singular);
 			//assume the related model name is plural and try to find the model's name
-			$related_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'related_model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			$related_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['related_model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				//so the word didn't singularize well. Maybe that's just because it's a singular word?
-				$related_model_name_singular = \EEH_Inflector::humanize( $matches[ 'related_model' ] );
+				$related_model_name_singular = \EEH_Inflector::humanize($matches['related_model']);
 			}
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$related_model_name_singular
 						)
 					)
@@ -161,13 +161,13 @@ 
 
 			return $controller->send_response(
 					$controller->get_entities_from_relation(
-						$request->get_param( 'id' ),
-						$main_model->related_settings_for( $related_model_name_singular ) ,
+						$request->get_param('id'),
+						$main_model->related_settings_for($related_model_name_singular),
 						$request
 					)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -180,27 +180,27 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entities_from_model( $model, $request) {
-		$query_params = $this->create_model_query_params( $model, $request->get_params() );
-		if( ! Capabilities::current_user_has_partial_access_to( $model, $query_params[ 'caps' ] ) ) {
-			$model_name_plural = \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() );
+	public function get_entities_from_model($model, $request) {
+		$query_params = $this->create_model_query_params($model, $request->get_params());
+		if ( ! Capabilities::current_user_has_partial_access_to($model, $query_params['caps'])) {
+			$model_name_plural = \EEH_Inflector::pluralize_and_lower($model->get_this_model_name());
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $model_name_plural ),
+				sprintf('rest_%s_cannot_list', $model_name_plural),
 				sprintf(
-					__( 'Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso'),
 					$model_name_plural,
-					Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] )
+					Capabilities::get_missing_permissions_string($model, $query_params['caps'])
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
 
-		$this->_set_headers_from_query_params( $model, $query_params );
+		$this->_set_headers_from_query_params($model, $query_params);
 		/** @type array $results */
-		$results = $model->get_all_wpdb_results( $query_params );
+		$results = $model->get_all_wpdb_results($query_params);
 		$nice_results = array( );
-		foreach ( $results as $result ) {
-			$nice_results[ ] = $this->create_entity_from_wpdb_result(
+		foreach ($results as $result) {
+			$nice_results[] = $this->create_entity_from_wpdb_result(
 					$model,
 					$result,
 					$request
@@ -221,62 +221,62 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entities_from_relation( $id,  $relation, $request ) {
-		$context = $this->validate_context( $request->get_param( 'caps' ));
+	public function get_entities_from_relation($id, $relation, $request) {
+		$context = $this->validate_context($request->get_param('caps'));
 		$model = $relation->get_this_model();
 		$related_model = $relation->get_other_model();
 		//check if they can access the 1st model object
-		$query_params = array( array( $model->primary_key_name() => $id ),'limit' => 1 );
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+		$query_params = array(array($model->primary_key_name() => $id), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] = $context;
-		$this->_set_debug_info( 'main model query params', $restricted_query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $related_model, $context ) );
+		$restricted_query_params['caps'] = $context;
+		$this->_set_debug_info('main model query params', $restricted_query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($related_model, $context));
 
-		if(
+		if (
 			! (
-				Capabilities::current_user_has_partial_access_to( $related_model, $context )
-				&& $model->exists( $restricted_query_params )
+				Capabilities::current_user_has_partial_access_to($related_model, $context)
+				&& $model->exists($restricted_query_params)
 			)
-		){
-			if( $relation instanceof \EE_Belongs_To_Relation ) {
-				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
-				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
+		) {
+			if ($relation instanceof \EE_Belongs_To_Relation) {
+				$related_model_name_maybe_plural = strtolower($related_model->get_this_model_name());
+			} else {
+				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower($related_model->get_this_model_name());
 			}
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $related_model_name_maybe_plural ),
+				sprintf('rest_%s_cannot_list', $related_model_name_maybe_plural),
 				sprintf(
-					__(	'Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso'),
 					$related_model_name_maybe_plural,
 					$relation->get_this_model()->get_this_model_name(),
 					implode(
 						',',
 						array_keys(
-							Capabilities::get_missing_permissions( $related_model, $context )
+							Capabilities::get_missing_permissions($related_model, $context)
 						)
 					)
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		$query_params = $this->create_model_query_params( $relation->get_other_model(), $request->get_params() );
-		$query_params[0][ $relation->get_this_model()->get_this_model_name() . '.' . $relation->get_this_model()->primary_key_name() ] = $id;
-		$query_params[ 'default_where_conditions' ] = 'none';
-		$query_params[ 'caps' ] = $context;
-		$this->_set_headers_from_query_params( $relation->get_other_model(), $query_params );
+		$query_params = $this->create_model_query_params($relation->get_other_model(), $request->get_params());
+		$query_params[0][$relation->get_this_model()->get_this_model_name().'.'.$relation->get_this_model()->primary_key_name()] = $id;
+		$query_params['default_where_conditions'] = 'none';
+		$query_params['caps'] = $context;
+		$this->_set_headers_from_query_params($relation->get_other_model(), $query_params);
 		/** @type array $results */
-		$results = $relation->get_other_model()->get_all_wpdb_results( $query_params );
+		$results = $relation->get_other_model()->get_all_wpdb_results($query_params);
 		$nice_results = array();
-		foreach( $results as $result ) {
+		foreach ($results as $result) {
 			$nice_result = $this->create_entity_from_wpdb_result(
 				$relation->get_other_model(),
 				$result,
 				$request
 			);
-			if( $relation instanceof \EE_HABTM_Relation ) {
+			if ($relation instanceof \EE_HABTM_Relation) {
 				//put the unusual stuff (properties from the HABTM relation) first, and make sure
 				//if there are conflicts we prefer the properties from the main model
 				$join_model_result = $this->create_entity_from_wpdb_result(
@@ -284,18 +284,18 @@ 
 					$result,
 					$request
 				);
-				$joined_result = array_merge( $nice_result, $join_model_result );
+				$joined_result = array_merge($nice_result, $join_model_result);
 				//but keep the meta stuff from the main model
-				if( isset( $nice_result['meta'] ) ){
+				if (isset($nice_result['meta'])) {
 					$joined_result['meta'] = $nice_result['meta'];
 				}
 				$nice_result = $joined_result;
 			}
 			$nice_results[] = $nice_result;
 		}
-		if( $relation instanceof \EE_Belongs_To_Relation ){
-			return array_shift( $nice_results );
-		}else{
+		if ($relation instanceof \EE_Belongs_To_Relation) {
+			return array_shift($nice_results);
+		} else {
 			return $nice_results;
 		}
 	}
@@ -307,32 +307,32 @@ 
 	 * @param array $query_params
 	 * @return void
 	 */
-	protected function _set_headers_from_query_params( $model, $query_params ) {
-		$this->_set_debug_info( 'model query params', $query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] ) );
+	protected function _set_headers_from_query_params($model, $query_params) {
+		$this->_set_debug_info('model query params', $query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($model, $query_params['caps']));
 		//normally the limit to a 2-part array, where the 2nd item is the limit
-		if( ! isset( $query_params[ 'limit' ] ) ) {
-			$query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
+		if ( ! isset($query_params['limit'])) {
+			$query_params['limit'] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
-		if( is_array( $query_params[ 'limit' ] )  ) {
-			$limit_parts = $query_params[ 'limit' ];
+		if (is_array($query_params['limit'])) {
+			$limit_parts = $query_params['limit'];
 		} else {
-			$limit_parts = explode(',', $query_params[ 'limit' ] );
-			if( count( $limit_parts ) == 1 ){
-				$limit_parts = array(0, $limit_parts[ 0 ] );
+			$limit_parts = explode(',', $query_params['limit']);
+			if (count($limit_parts) == 1) {
+				$limit_parts = array(0, $limit_parts[0]);
 			}
 		}
 		//remove the group by and having parts of the query, as those will
 		//make the sql query return an array of values, instead of just a single value
-		unset( $query_params[ 'group_by' ] );
-		unset( $query_params[ 'having' ] );
-		unset( $query_params[ 'limit' ] );
-		$count = $model->count( $query_params, null, true );
-
-		$pages = $count / $limit_parts[ 1 ];
-		$this->_set_response_header( 'Total', $count, false );
-		$this->_set_response_header( 'PageSize', $limit_parts[ 1 ], false );
-		$this->_set_response_header( 'TotalPages', ceil( $pages ), false );
+		unset($query_params['group_by']);
+		unset($query_params['having']);
+		unset($query_params['limit']);
+		$count = $model->count($query_params, null, true);
+
+		$pages = $count / $limit_parts[1];
+		$this->_set_response_header('Total', $count, false);
+		$this->_set_response_header('PageSize', $limit_parts[1], false);
+		$this->_set_response_header('TotalPages', ceil($pages), false);
 	}
 
 
@@ -345,47 +345,47 @@ 
 	 * @param string $deprecated no longer used
 	 * @return array ready for being converted into json for sending to client
 	 */
-	public function create_entity_from_wpdb_result( $model, $db_row, $rest_request, $deprecated = null ) {
-		if( ! $rest_request instanceof \WP_REST_Request ) {
+	public function create_entity_from_wpdb_result($model, $db_row, $rest_request, $deprecated = null) {
+		if ( ! $rest_request instanceof \WP_REST_Request) {
 			//ok so this was called in the old style, where the 3rd arg was
 			//$include, and the 4th arg was $context
 			//now setup the request just to avoid fatal errors, although we won't be able
 			//to truly make use of it because it's kinda devoid of info
 			$rest_request = new \WP_REST_Request();
-			$rest_request->set_param( 'include', $rest_request );
-			$rest_request->set_param( 'caps', $deprecated );
+			$rest_request->set_param('include', $rest_request);
+			$rest_request->set_param('caps', $deprecated);
 		}
-		if( $rest_request->get_param( 'caps' ) == null ) {
-			$rest_request->set_param( 'caps', \EEM_Base::caps_read );
+		if ($rest_request->get_param('caps') == null) {
+			$rest_request->set_param('caps', \EEM_Base::caps_read);
 		}
-		$entity_array = $this->_create_bare_entity_from_wpdb_results( $model, $db_row );
-		$entity_array = $this->_add_extra_fields( $model, $db_row, $entity_array );
-		$entity_array[ '_links' ] = $this->_get_entity_links( $model, $db_row, $entity_array );
-		$entity_array[ '_calculated_fields'] = $this->_get_entity_calculations( $model, $db_row, $rest_request );
-		$entity_array = $this->_include_requested_models( $model, $rest_request, $entity_array );
+		$entity_array = $this->_create_bare_entity_from_wpdb_results($model, $db_row);
+		$entity_array = $this->_add_extra_fields($model, $db_row, $entity_array);
+		$entity_array['_links'] = $this->_get_entity_links($model, $db_row, $entity_array);
+		$entity_array['_calculated_fields'] = $this->_get_entity_calculations($model, $db_row, $rest_request);
+		$entity_array = $this->_include_requested_models($model, $rest_request, $entity_array);
 		$entity_array = apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_before_inaccessible_field_removal',
 			$entity_array,
 			$model,
-			$rest_request->get_param( 'caps' ),
+			$rest_request->get_param('caps'),
 			$rest_request,
 			$this
 		);
 		$result_without_inaccessible_fields = Capabilities::filter_out_inaccessible_entity_fields(
 			$entity_array,
 			$model,
-			$rest_request->get_param( 'caps' ),
+			$rest_request->get_param('caps'),
 			$this->get_model_version_info()
 		);
 		$this->_set_debug_info(
 			'inaccessible fields',
-			array_keys( array_diff_key( $entity_array, $result_without_inaccessible_fields ) )
+			array_keys(array_diff_key($entity_array, $result_without_inaccessible_fields))
 		);
 		return apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_return',
 			$result_without_inaccessible_fields,
 			$model,
-			$rest_request->get_param( 'caps' )
+			$rest_request->get_param('caps')
 		);
 	}
 
@@ -397,38 +397,38 @@ 
 	 * @param array $db_row
 	 * @return array entity mostly ready for converting to JSON and sending in the response
 	 */
-	protected function _create_bare_entity_from_wpdb_results( \EEM_Base $model, $db_row ) {
-		$result = $model->deduce_fields_n_values_from_cols_n_values( $db_row );
-		$result = array_intersect_key( $result, $this->get_model_version_info()->fields_on_model_in_this_version( $model ) );
-		foreach( $result as $field_name => $raw_field_value ) {
+	protected function _create_bare_entity_from_wpdb_results(\EEM_Base $model, $db_row) {
+		$result = $model->deduce_fields_n_values_from_cols_n_values($db_row);
+		$result = array_intersect_key($result, $this->get_model_version_info()->fields_on_model_in_this_version($model));
+		foreach ($result as $field_name => $raw_field_value) {
 			$field_obj = $model->field_settings_for($field_name);
-			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
-			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
-				unset( $result[ $field_name ] );
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			$field_value = $field_obj->prepare_for_set_from_db($raw_field_value);
+			if ($this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_ignored())) {
+				unset($result[$field_name]);
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_rendered_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'rendered' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'pretty' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_pretty_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'pretty' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			} elseif ( $field_obj instanceof \EE_Datetime_Field ) {
-				$result[ $field_name ] = Model_Data_Translator::prepare_field_value_for_json(
+			} elseif ($field_obj instanceof \EE_Datetime_Field) {
+				$result[$field_name] = Model_Data_Translator::prepare_field_value_for_json(
 					$field_obj,
 					$field_value,
 					$this->get_model_version_info()->requested_version()
 				);
 			} else {
-				$result[ $field_name ] = Model_Data_Translator::prepare_field_value_for_json(
+				$result[$field_name] = Model_Data_Translator::prepare_field_value_for_json(
 					$field_obj,
-					$field_obj->prepare_for_get( $field_value ),
+					$field_obj->prepare_for_get($field_value),
 					$this->get_model_version_info()->requested_version()
 				);
 			}
@@ -443,9 +443,9 @@ 
 	 * @param array $entity_array
 	 * @return array modified entity
 	 */
-	protected function _add_extra_fields( \EEM_Base $model, $db_row, $entity_array ) {
-		if( $model instanceof \EEM_CPT_Base ) {
-			$entity_array[ 'link' ] = get_permalink( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] );
+	protected function _add_extra_fields(\EEM_Base $model, $db_row, $entity_array) {
+		if ($model instanceof \EEM_CPT_Base) {
+			$entity_array['link'] = get_permalink($db_row[$model->get_primary_key_field()->get_qualified_column()]);
 		}
 		return $entity_array;
 	}
@@ -459,20 +459,20 @@ 
 	 * @param array $entity_array
 	 * @return array the _links item in the entity
 	 */
-	protected function _get_entity_links( $model, $db_row, $entity_array ) {
+	protected function _get_entity_links($model, $db_row, $entity_array) {
 		//add basic links
 		$links = array(
 			'self' => array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $entity_array[ $model->primary_key_name() ]
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$entity_array[$model->primary_key_name()]
 					)
 				)
 			),
 			'collection' => array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() )
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name())
 					)
 				)
 			),
@@ -480,24 +480,24 @@ 
 
 		//add link to the wp core endpoint, if wp api is active
 		global $wp_rest_server;
-		if( $model instanceof \EEM_CPT_Base &&
+		if ($model instanceof \EEM_CPT_Base &&
 			$wp_rest_server instanceof \WP_REST_Server &&
-			$wp_rest_server->get_route_options( '/wp/v2/posts' ) ) {
-			$links[ \EED_Core_Rest_Api::ee_api_link_namespace . 'self_wp_post' ] = array(
+			$wp_rest_server->get_route_options('/wp/v2/posts')) {
+			$links[\EED_Core_Rest_Api::ee_api_link_namespace.'self_wp_post'] = array(
 				array(
-					'href' => rest_url( '/wp/v2/posts/' . $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ),
+					'href' => rest_url('/wp/v2/posts/'.$db_row[$model->get_primary_key_field()->get_qualified_column()]),
 					'single' => true
 				)
 			);
 		}
 
 		//add links to related models
-		foreach( $this->get_model_version_info()->relation_settings( $model ) as $relation_name => $relation_obj ) {
-			$related_model_part = $this->get_related_entity_name( $relation_name, $relation_obj );
-			$links[ \EED_Core_Rest_Api::ee_api_link_namespace . $related_model_part ] = array(
+		foreach ($this->get_model_version_info()->relation_settings($model) as $relation_name => $relation_obj) {
+			$related_model_part = $this->get_related_entity_name($relation_name, $relation_obj);
+			$links[\EED_Core_Rest_Api::ee_api_link_namespace.$related_model_part] = array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $entity_array[ $model->primary_key_name() ] . '/' . $related_model_part
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$entity_array[$model->primary_key_name()].'/'.$related_model_part
 					),
 					'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false
 				)
@@ -513,50 +513,50 @@ 
 	 * @param array $entity_array
 	 * @return array the modified entity
 	 */
-	protected function _include_requested_models( \EEM_Base $model, \WP_REST_Request $rest_request, $entity_array ) {
-		$includes_for_this_model = $this->explode_and_get_items_prefixed_with( $rest_request->get_param( 'include' ), '' );
-		$includes_for_this_model = $this->_remove_model_names_from_array( $includes_for_this_model );
+	protected function _include_requested_models(\EEM_Base $model, \WP_REST_Request $rest_request, $entity_array) {
+		$includes_for_this_model = $this->explode_and_get_items_prefixed_with($rest_request->get_param('include'), '');
+		$includes_for_this_model = $this->_remove_model_names_from_array($includes_for_this_model);
 		//if they passed in * or didn't specify any includes, return everything
-		if( ! in_array( '*', $includes_for_this_model )
-			&& ! empty( $includes_for_this_model ) ) {
-			if( $model->has_primary_key_field() ) {
+		if ( ! in_array('*', $includes_for_this_model)
+			&& ! empty($includes_for_this_model)) {
+			if ($model->has_primary_key_field()) {
 				//always include the primary key. ya just gotta know that at least
 				$includes_for_this_model[] = $model->primary_key_name();
 			}
-			if( $this->explode_and_get_items_prefixed_with( $rest_request->get_param( 'calculate' ), '' ) ) {
+			if ($this->explode_and_get_items_prefixed_with($rest_request->get_param('calculate'), '')) {
 				$includes_for_this_model[] = '_calculated_fields';
 			}
-			$entity_array = array_intersect_key( $entity_array, array_flip( $includes_for_this_model ) );
+			$entity_array = array_intersect_key($entity_array, array_flip($includes_for_this_model));
 		}
-		$relation_settings = $this->get_model_version_info()->relation_settings( $model );
-		foreach( $relation_settings as $relation_name => $relation_obj ) {
+		$relation_settings = $this->get_model_version_info()->relation_settings($model);
+		foreach ($relation_settings as $relation_name => $relation_obj) {
 			$related_fields_to_include = $this->explode_and_get_items_prefixed_with(
-				$rest_request->get_param( 'include' ),
+				$rest_request->get_param('include'),
 				$relation_name
 			);
 			$related_fields_to_calculate = $this->explode_and_get_items_prefixed_with(
-				$rest_request->get_param( 'calculate' ),
+				$rest_request->get_param('calculate'),
 				$relation_name
 			);
 			//did they specify they wanted to include a related model, or
 			//specific fields from a related model?
 			//or did they specify to calculate a field from a related model?
-			if( $related_fields_to_include || $related_fields_to_calculate ) {
+			if ($related_fields_to_include || $related_fields_to_calculate) {
 				//if so, we should include at least some part of the related model
 				$pretend_related_request = new \WP_REST_Request();
 				$pretend_related_request->set_query_params(
 					array(
-						'caps' => $rest_request->get_param( 'caps' ),
+						'caps' => $rest_request->get_param('caps'),
 						'include' => $related_fields_to_include,
 						'calculate' => $related_fields_to_calculate,
 					)
 				);
 				$related_results = $this->get_entities_from_relation(
-					$entity_array[ $model->primary_key_name() ],
+					$entity_array[$model->primary_key_name()],
 					$relation_obj,
 					$pretend_related_request
 				);
-				$entity_array[ $this->get_related_entity_name( $relation_name, $relation_obj ) ] = $related_results instanceof \WP_Error ? null : $related_results;
+				$entity_array[$this->get_related_entity_name($relation_name, $relation_obj)] = $related_results instanceof \WP_Error ? null : $related_results;
 			}
 		}
 		return $entity_array;
@@ -568,8 +568,8 @@ 
 	 * @param array $arr
 	 * @return array
 	 */
-	private function _remove_model_names_from_array( $arr ) {
-		return array_diff( $arr, array_keys( \EE_Registry::instance()->non_abstract_db_models ) );
+	private function _remove_model_names_from_array($arr) {
+		return array_diff($arr, array_keys(\EE_Registry::instance()->non_abstract_db_models));
 	}
 	/**
 	 * Gets the calculated fields for the response
@@ -579,16 +579,16 @@ 
 	 * @param \WP_REST_Request $rest_request
 	 * @return array the _calculations item in the entity
 	 */
-	protected function _get_entity_calculations( $model, $wpdb_row, $rest_request ) {
+	protected function _get_entity_calculations($model, $wpdb_row, $rest_request) {
 		$calculated_fields = $this->explode_and_get_items_prefixed_with(
-			$rest_request->get_param( 'calculate' ),
+			$rest_request->get_param('calculate'),
 			''
 		);
 		//note: setting calculate=* doesn't do anything
 		$calculated_fields_to_return = array();
-		foreach( $calculated_fields as $field_to_calculate ) {
-			try{
-				$calculated_fields_to_return[ $field_to_calculate ] = Model_Data_Translator::prepare_field_value_for_json(
+		foreach ($calculated_fields as $field_to_calculate) {
+			try {
+				$calculated_fields_to_return[$field_to_calculate] = Model_Data_Translator::prepare_field_value_for_json(
 					null,
 					$this->_fields_calculator->retrieve_calculated_field_value(
 						$model,
@@ -599,10 +599,10 @@ 
 					),
 					$this->get_model_version_info()->requested_version()
 				);
-			} catch( Rest_Exception $e ) {
+			} catch (Rest_Exception $e) {
 				//if we don't have permission to read it, just leave it out. but let devs know about the problem
 				$this->_set_response_header(
-					'Notices-Field-Calculation-Errors[' . $e->get_string_code() . '][' . $model->get_this_model_name() . '][' . $field_to_calculate . ']',
+					'Notices-Field-Calculation-Errors['.$e->get_string_code().']['.$model->get_this_model_name().']['.$field_to_calculate.']',
 					$e->getMessage(),
 					true
 				);
@@ -616,7 +616,7 @@ 
 	 * @param string $link_part_after_version_and_slash eg "events/10/datetimes"
 	 * @return string url eg "http://mysite.com/wp-json/ee/v4.6/events/10/datetimes"
 	 */
-	public function get_versioned_link_to( $link_part_after_version_and_slash ) {
+	public function get_versioned_link_to($link_part_after_version_and_slash) {
 		return rest_url(
 			\EED_Core_Rest_Api::ee_api_namespace
 			. $this->get_model_version_info()->requested_version()
@@ -632,11 +632,11 @@ 
 	 * @param \EE_Model_Relation_Base $relation_obj
 	 * @return string
 	 */
-	public static function get_related_entity_name( $relation_name, $relation_obj ){
-		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
-			return strtolower( $relation_name );
-		}else{
-			return \EEH_Inflector::pluralize_and_lower( $relation_name );
+	public static function get_related_entity_name($relation_name, $relation_obj) {
+		if ($relation_obj instanceof \EE_Belongs_To_Relation) {
+			return strtolower($relation_name);
+		} else {
+			return \EEH_Inflector::pluralize_and_lower($relation_name);
 		}
 	}
 
@@ -649,43 +649,43 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entity_from_model( $model, $request ) {
-		$query_params = array( array( $model->primary_key_name() => $request->get_param( 'id' ) ),'limit' => 1);
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+	public function get_entity_from_model($model, $request) {
+		$query_params = array(array($model->primary_key_name() => $request->get_param('id')), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] =  $this->validate_context(  $request->get_param( 'caps' ) );
-		$this->_set_debug_info( 'model query params', $restricted_query_params );
-		$model_rows = $model->get_all_wpdb_results( $restricted_query_params );
-		if ( ! empty ( $model_rows ) ) {
+		$restricted_query_params['caps'] = $this->validate_context($request->get_param('caps'));
+		$this->_set_debug_info('model query params', $restricted_query_params);
+		$model_rows = $model->get_all_wpdb_results($restricted_query_params);
+		if ( ! empty ($model_rows)) {
 			return $this->create_entity_from_wpdb_result(
 				$model,
-				array_shift( $model_rows ),
+				array_shift($model_rows),
 				$request );
 		} else {
 			//ok let's test to see if we WOULD have found it, had we not had restrictions from missing capabilities
-			$lowercase_model_name = strtolower( $model->get_this_model_name() );
-			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results( $query_params );
-			if( ! empty( $model_rows_found_sans_restrictions ) ) {
+			$lowercase_model_name = strtolower($model->get_this_model_name());
+			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results($query_params);
+			if ( ! empty($model_rows_found_sans_restrictions)) {
 				//you got shafted- it existed but we didn't want to tell you!
 				return new \WP_Error(
 					'rest_user_cannot_read',
 					sprintf(
-						__( 'Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso' ),
-						strtolower( $model->get_this_model_name() ),
+						__('Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso'),
+						strtolower($model->get_this_model_name()),
 						Capabilities::get_missing_permissions_string(
 							$model,
-							$this->validate_context( $request->get_param( 'caps' ) ) )
+							$this->validate_context($request->get_param('caps')) )
 					),
-					array( 'status' => 403 )
+					array('status' => 403)
 				);
 			} else {
 				//it's not you. It just doesn't exist
 				return new \WP_Error(
-					sprintf( 'rest_%s_invalid_id', $lowercase_model_name ),
-					sprintf( __( 'Invalid %s ID.', 'event_espresso' ), $lowercase_model_name ),
-					array( 'status' => 404 )
+					sprintf('rest_%s_invalid_id', $lowercase_model_name),
+					sprintf(__('Invalid %s ID.', 'event_espresso'), $lowercase_model_name),
+					array('status' => 404)
 				);
 			}
 		}
@@ -698,14 +698,14 @@ 
 	 * @param string $context
 	 * @return string array key of EEM_Base::cap_contexts_to_cap_action_map()
 	 */
-	public function validate_context( $context ) {
-		if( ! $context ) {
+	public function validate_context($context) {
+		if ( ! $context) {
 			$context = \EEM_Base::caps_read;
 		}
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_contexts )  ){
+		if (in_array($context, $valid_contexts)) {
 			return $context;
-		}else{
+		} else {
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -724,77 +724,77 @@ 
 	 *                          that absolutely no results should be returned
 	 * @throws \EE_Error
 	 */
-	public function create_model_query_params( $model, $query_parameters ) {
+	public function create_model_query_params($model, $query_parameters) {
 		$model_query_params = array( );
-		if ( isset( $query_parameters[ 'where' ] ) ) {
-			$model_query_params[ 0 ] = Model_Data_Translator::prepare_conditions_query_params_for_models(
-				$query_parameters[ 'where' ],
+		if (isset($query_parameters['where'])) {
+			$model_query_params[0] = Model_Data_Translator::prepare_conditions_query_params_for_models(
+				$query_parameters['where'],
 				$model,
 				$this->get_model_version_info()->requested_version()
 			);
 		}
-		if ( isset( $query_parameters[ 'order_by' ] ) ) {
-			$order_by = $query_parameters[ 'order_by' ];
-		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
-			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		if (isset($query_parameters['order_by'])) {
+			$order_by = $query_parameters['order_by'];
+		} elseif (isset($query_parameters['orderby'])) {
+			$order_by = $query_parameters['orderby'];
+		} else {
 			$order_by = null;
 		}
-		if( $order_by !== null ){
-			$model_query_params[ 'order_by' ] =  $order_by;
+		if ($order_by !== null) {
+			$model_query_params['order_by'] = $order_by;
 		}
-		if ( isset( $query_parameters[ 'group_by' ] ) ) {
-			$group_by = $query_parameters[ 'group_by' ];
-		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
-			$group_by = $query_parameters[ 'groupby' ];
-		}else{
+		if (isset($query_parameters['group_by'])) {
+			$group_by = $query_parameters['group_by'];
+		} elseif (isset($query_parameters['groupby'])) {
+			$group_by = $query_parameters['groupby'];
+		} else {
 			$group_by = null;
 		}
-		if( $group_by !== null ){
-			$model_query_params[ 'group_by' ] = $group_by;
+		if ($group_by !== null) {
+			$model_query_params['group_by'] = $group_by;
 		}
-		if ( isset( $query_parameters[ 'having' ] ) ) {
-			$model_query_params[ 'having' ] = Model_Data_Translator::prepare_conditions_query_params_for_models(
-				$query_parameters[ 'having' ],
+		if (isset($query_parameters['having'])) {
+			$model_query_params['having'] = Model_Data_Translator::prepare_conditions_query_params_for_models(
+				$query_parameters['having'],
 				$model,
 				$this->get_model_version_info()->requested_version()
 			);
 		}
-		if ( isset( $query_parameters[ 'order' ] ) ) {
-			$model_query_params[ 'order' ] = $query_parameters[ 'order' ];
+		if (isset($query_parameters['order'])) {
+			$model_query_params['order'] = $query_parameters['order'];
 		}
-		if ( isset( $query_parameters[ 'mine' ] ) ){
-			$model_query_params = $model->alter_query_params_to_only_include_mine( $model_query_params );
+		if (isset($query_parameters['mine'])) {
+			$model_query_params = $model->alter_query_params_to_only_include_mine($model_query_params);
 		}
-		if( isset( $query_parameters[ 'limit' ] ) ) {
+		if (isset($query_parameters['limit'])) {
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
-			if( ! is_array( $query_parameters[ 'limit' ] ) ) {
-				$limit_array = explode(',', (string)$query_parameters['limit']);
-			}else {
-				$limit_array = $query_parameters[ 'limit' ];
+			if ( ! is_array($query_parameters['limit'])) {
+				$limit_array = explode(',', (string) $query_parameters['limit']);
+			} else {
+				$limit_array = $query_parameters['limit'];
 			}
 			$sanitized_limit = array();
-			foreach( $limit_array as $key => $limit_part ) {
-				if( $this->_debug_mode && ( ! is_numeric( $limit_part ) || count( $sanitized_limit ) > 2 ) ) {
+			foreach ($limit_array as $key => $limit_part) {
+				if ($this->_debug_mode && ( ! is_numeric($limit_part) || count($sanitized_limit) > 2)) {
 					throw new \EE_Error(
 						sprintf(
-							__( 'An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso' ),
-							json_encode( $query_parameters[ 'limit' ] )
+							__('An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso'),
+							json_encode($query_parameters['limit'])
 						)
 					);
 				}
-				$sanitized_limit[] = intval( $limit_part );
+				$sanitized_limit[] = intval($limit_part);
 			}
-			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
-			$model_query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
+			$model_query_params['limit'] = implode(',', $sanitized_limit);
+		} else {
+			$model_query_params['limit'] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
-		if( isset( $query_parameters[ 'caps' ] ) ) {
-			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
-			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
+		if (isset($query_parameters['caps'])) {
+			$model_query_params['caps'] = $this->validate_context($query_parameters['caps']);
+		} else {
+			$model_query_params['caps'] = \EEM_Base::caps_read;
 		}
-		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
+		return apply_filters('FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model);
 	}
 
 
@@ -806,13 +806,13 @@ 
 	 * @param array     $query_params sub-array from @see EEM_Base::get_all()
 	 * @return array
 	 */
-	public function prepare_rest_query_params_key_for_models( $model,  $query_params ) {
+	public function prepare_rest_query_params_key_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
-				$model_ready_query_params[ $key ] = $value;
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_key_for_models($model, $value);
+			} else {
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -826,13 +826,13 @@ 
 	 * @param $query_params
 	 * @return array
 	 */
-	public function prepare_rest_query_params_values_for_models( $model, $query_params ) {
+	public function prepare_rest_query_params_values_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_values_for_models( $model, $value );
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_values_for_models($model, $value);
 			} else {
-				$model_ready_query_params[ $key ] = $value;
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -847,33 +847,33 @@ 
 	 * we only return strings starting with that and a period; if no prefix was specified
 	 * we return all items containing NO periods
 	 */
-	public function explode_and_get_items_prefixed_with( $string_to_explode, $prefix ) {
-		if( is_string( $string_to_explode ) ) {
-			$exploded_contents = explode( ',', $string_to_explode );
-		} else if( is_array( $string_to_explode ) ) {
+	public function explode_and_get_items_prefixed_with($string_to_explode, $prefix) {
+		if (is_string($string_to_explode)) {
+			$exploded_contents = explode(',', $string_to_explode);
+		} else if (is_array($string_to_explode)) {
 			$exploded_contents = $string_to_explode;
 		} else {
 			$exploded_contents = array();
 		}
 		//if the string was empty, we want an empty array
-		$exploded_contents = array_filter( $exploded_contents );
+		$exploded_contents = array_filter($exploded_contents);
 		$contents_with_prefix = array();
-		foreach( $exploded_contents as $item ) {
-			$item = trim( $item );
+		foreach ($exploded_contents as $item) {
+			$item = trim($item);
 			//if no prefix was provided, so we look for items with no "." in them
-			if( ! $prefix ) {
+			if ( ! $prefix) {
 				//does this item have a period?
-				if( strpos( $item, '.' ) === false ) {
+				if (strpos($item, '.') === false) {
 					//if not, then its what we're looking for
 					$contents_with_prefix[] = $item;
 				}
-			} else if( strpos( $item, $prefix . '.' ) === 0 ) {
+			} else if (strpos($item, $prefix.'.') === 0) {
 				//this item has the prefix and a period, grab it
 				$contents_with_prefix[] = substr(
 					$item,
-					strpos( $item, $prefix . '.' ) + strlen( $prefix . '.' )
+					strpos($item, $prefix.'.') + strlen($prefix.'.')
 					);
-			} else if( $item === $prefix ) {
+			} else if ($item === $prefix) {
 				//this item is JUST the prefix
 				//so let's grab everything after, which is a blank string
 				$contents_with_prefix[] = '';
@@ -896,33 +896,33 @@ 
 	 * the fields for that model, with the model's name removed from each.
 	 * If $include_string was blank or '*' returns an empty array
 	 */
-	public function extract_includes_for_this_model( $include_string, $model_name = null ) {
-		if( is_array( $include_string ) ) {
-			$include_string = implode( ',', $include_string );
+	public function extract_includes_for_this_model($include_string, $model_name = null) {
+		if (is_array($include_string)) {
+			$include_string = implode(',', $include_string);
 		}
-		if( $include_string === '*' || $include_string === '' ) {
+		if ($include_string === '*' || $include_string === '') {
 			return array();
 		}
-		$includes = explode( ',', $include_string );
+		$includes = explode(',', $include_string);
 		$extracted_fields_to_include = array();
-		if( $model_name ){
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
-				if( strpos( $field_to_include, $model_name . '.' ) === 0 ) {
+		if ($model_name) {
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
+				if (strpos($field_to_include, $model_name.'.') === 0) {
 					//found the model name at the exact start
-					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
+					$field_sans_model_name = str_replace($model_name.'.', '', $field_to_include);
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				}elseif ($field_to_include == $model_name) {
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else {
 			//look for ones with no period
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
 				if (
-					strpos( $field_to_include, '.' ) === false
-					&& ! $this->get_model_version_info()->is_model_name_in_this_version( $field_to_include )
+					strpos($field_to_include, '.') === false
+					&& ! $this->get_model_version_info()->is_model_name_in_this_version($field_to_include)
 				) {
 					$extracted_fields_to_include[] = $field_to_include;
 				}

core/libraries/rest_api/calculations/Event.php

Doc Comments +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
 	 * @param array $wpdb_row
 	 * @param \WP_REST_Request $request
 	 * @param Base $controller
-	 * @return int|null if permission denied
+	 * @return integer if permission denied
 	 */
 	public static function registrations_checked_in_count( $wpdb_row, $request, $controller ){
 		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {

Spacing +69 added lines, -69 removed lines

@@ -15,8 +15,8 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Event extends Calculations_Base {
@@ -32,20 +32,20 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function optimum_sales_at_start( $wpdb_row, $request, $controller ){
-		if( is_array( $wpdb_row ) && isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
-			$event_obj = \EEM_Event::instance()->get_one_by_ID( $wpdb_row[ 'Event_CPT.ID' ] );
+	public static function optimum_sales_at_start($wpdb_row, $request, $controller) {
+		if (is_array($wpdb_row) && isset($wpdb_row['Event_CPT.ID'])) {
+			$event_obj = \EEM_Event::instance()->get_one_by_ID($wpdb_row['Event_CPT.ID']);
 		} else {
 			$event_obj = null;
 		}
-		if( $event_obj instanceof \EE_Event ) {
-			return $event_obj->total_available_spaces( true );
+		if ($event_obj instanceof \EE_Event) {
+			return $event_obj->total_available_spaces(true);
 		} else {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate optimum_sales_at_start because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso' ),
-					$wpdb_row[ 'Event_CPT.ID' ],
-					print_r( $wpdb_row, true )
+					__('Cannot calculate optimum_sales_at_start because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso'),
+					$wpdb_row['Event_CPT.ID'],
+					print_r($wpdb_row, true)
 				)
 			);
 		}
@@ -64,20 +64,20 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function optimum_sales_now( $wpdb_row, $request, $controller ){
-		if( is_array( $wpdb_row ) && isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
-			$event_obj = \EEM_Event::instance()->get_one_by_ID( $wpdb_row[ 'Event_CPT.ID' ] );
+	public static function optimum_sales_now($wpdb_row, $request, $controller) {
+		if (is_array($wpdb_row) && isset($wpdb_row['Event_CPT.ID'])) {
+			$event_obj = \EEM_Event::instance()->get_one_by_ID($wpdb_row['Event_CPT.ID']);
 		} else {
 			$event_obj = null;
 		}
-		if( $event_obj instanceof \EE_Event ) {
-			return $event_obj->total_available_spaces( false );
+		if ($event_obj instanceof \EE_Event) {
+			return $event_obj->total_available_spaces(false);
 		} else {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate optimum_sales_now because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso' ),
-					$wpdb_row[ 'Event_CPT.ID' ],
-					print_r( $wpdb_row, true )
+					__('Cannot calculate optimum_sales_now because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso'),
+					$wpdb_row['Event_CPT.ID'],
+					print_r($wpdb_row, true)
 				)
 			);
 		}
@@ -95,20 +95,20 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function spaces_remaining( $wpdb_row, $request, $controller ){
-		if( is_array( $wpdb_row ) && isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
-			$event_obj = \EEM_Event::instance()->get_one_by_ID( $wpdb_row[ 'Event_CPT.ID' ] );
+	public static function spaces_remaining($wpdb_row, $request, $controller) {
+		if (is_array($wpdb_row) && isset($wpdb_row['Event_CPT.ID'])) {
+			$event_obj = \EEM_Event::instance()->get_one_by_ID($wpdb_row['Event_CPT.ID']);
 		} else {
 			$event_obj = null;
 		}
-		if( $event_obj instanceof \EE_Event ) {
+		if ($event_obj instanceof \EE_Event) {
 			return $event_obj->spaces_remaining_for_sale();
 		} else {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate spaces_remaining because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso' ),
-					$wpdb_row[ 'Event_CPT.ID' ],
-					print_r( $wpdb_row, true )
+					__('Cannot calculate spaces_remaining because the event with ID %1$s (from database row %2$s) was not found', 'event_espresso'),
+					$wpdb_row['Event_CPT.ID'],
+					print_r($wpdb_row, true)
 				)
 			);
 		}
@@ -126,19 +126,19 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function spots_taken( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
+	public static function spots_taken($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Event_CPT.ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate spots_taken because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate spots_taken because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
 		return \EEM_Registration::instance()->count(
 			array(
 				array(
-					'EVT_ID' => $wpdb_row[ 'Event_CPT.ID' ],
+					'EVT_ID' => $wpdb_row['Event_CPT.ID'],
 					'STS_ID' => \EEM_Registration::status_id_approved
 				)
 			),
@@ -160,20 +160,20 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function spots_taken_pending_payment( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
+	public static function spots_taken_pending_payment($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Event_CPT.ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate spots_taken_pending_payment because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate spots_taken_pending_payment because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_registrations', 'spots_taken_pending_payment' );
+		self::_verify_current_user_can('ee_read_registrations', 'spots_taken_pending_payment');
 		return \EEM_Registration::instance()->count(
 			array(
 				array(
-					'EVT_ID' => $wpdb_row[ 'Event_CPT.ID' ],
+					'EVT_ID' => $wpdb_row['Event_CPT.ID'],
 					'STS_ID' => \EEM_Registration::status_id_pending_payment
 				)
 			),
@@ -195,17 +195,17 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function registrations_checked_in_count( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
+	public static function registrations_checked_in_count($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Event_CPT.ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate registrations_checked_in_count because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate registrations_checked_in_count because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_checkins', 'registrations_checked_in_count' );
-		return \EEM_Registration::instance()->count_registrations_checked_into_event( $wpdb_row[ 'Event_CPT.ID' ], true );
+		self::_verify_current_user_can('ee_read_checkins', 'registrations_checked_in_count');
+		return \EEM_Registration::instance()->count_registrations_checked_into_event($wpdb_row['Event_CPT.ID'], true);
 	}
 
 
@@ -221,17 +221,17 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function registrations_checked_out_count( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Event_CPT.ID' ] ) ) {
+	public static function registrations_checked_out_count($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Event_CPT.ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate registrations_checked_out_count because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate registrations_checked_out_count because the database row %1$s does not have an entry for "Event_CPT.ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_checkins', 'registrations_checked_out_count' );
-		return \EEM_Registration::instance()->count_registrations_checked_into_event( $wpdb_row[ 'Event_CPT.ID' ], false );
+		self::_verify_current_user_can('ee_read_checkins', 'registrations_checked_out_count');
+		return \EEM_Registration::instance()->count_registrations_checked_into_event($wpdb_row['Event_CPT.ID'], false);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_thumbnail( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'thumbnail' );
+	public static function image_thumbnail($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'thumbnail');
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_medium( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'medium' );
+	public static function image_medium($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'medium');
 	}
 
 	/**
@@ -263,8 +263,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_medium_large( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'medium_large' );
+	public static function image_medium_large($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'medium_large');
 	}
 
 	/**
@@ -274,8 +274,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_large( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'large' );
+	public static function image_large($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'large');
 	}
 
 	/**
@@ -285,8 +285,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_post_thumbnail( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'post-thumbnail' );
+	public static function image_post_thumbnail($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'post-thumbnail');
 	}
 
 	/**
@@ -296,8 +296,8 @@ 
 	 * @param Base $controller
 	 * @return array
 	 */
-	public static function image_full( $wpdb_row, $request, $controller ) {
-		return self::_calculate_image_data($wpdb_row[ 'Event_CPT.ID' ], 'full' );
+	public static function image_full($wpdb_row, $request, $controller) {
+		return self::_calculate_image_data($wpdb_row['Event_CPT.ID'], 'full');
 	}
 
 	/**
@@ -307,21 +307,21 @@ 
 	 * @param string $image_size one of these: thumbnail, medium, medium_large, large, post-thumbnail, full
 	 * @return array|false if no such image exists. If array it will have keys 'url', 'width', 'height' and 'original'
 	 */
-	protected static function _calculate_image_data( $EVT_ID, $image_size ) {
-		$attachment_id = get_post_thumbnail_id( $EVT_ID );
-		$data = wp_get_attachment_image_src( $attachment_id, $image_size );
-		if( ! $data ) {
+	protected static function _calculate_image_data($EVT_ID, $image_size) {
+		$attachment_id = get_post_thumbnail_id($EVT_ID);
+		$data = wp_get_attachment_image_src($attachment_id, $image_size);
+		if ( ! $data) {
 			return false;
 		}
-		if( isset( $data[ 3] ) ) {
-			$generated = $data[ 3 ];
+		if (isset($data[3])) {
+			$generated = $data[3];
 		} else {
 			$generated = true;
 		}
 		return array(
-			'url' => $data[ 0 ],
-			'width' => $data[ 1 ],
-			'height' => $data[ 2 ],
+			'url' => $data[0],
+			'width' => $data[1],
+			'height' => $data[2],
 			'generated' => $generated
 		);
 	}

core/libraries/rest_api/Model_Data_Translator.php

Doc Comments +5 added lines, -1 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Prepares incoming data from the json or $_REQUEST parameters for the models'
 	 * "$query_params". 
-	 * @param EE_Model_Field_Base $field_obj
+	 * @param \EE_Model_Field_Base $field_obj
 	 * @param mixed $original_value
 	 * @param string $requested_version
 	 * @return mixed
@@ -77,6 +77,7 @@ 
 	* Prepares a field's value for display in the API
 	* @param \EE_Model_Field_Base $field_obj
 	* @param mixed $original_value
+	* @param string $requested_version
 	* @return mixed
 	*/
    public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
@@ -131,6 +132,9 @@ 
 		return $query_param_for_models;
 	}
 	
+	/**
+	 * @return string
+	 */
 	public static function remove_stars_and_anything_after_from_condition_query_param_key( $condition_query_param_key ) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){

Indentation +6 added lines, -6 removed lines

@@ -74,11 +74,11 @@ 
 	}
 	
 	/**
-	* Prepares a field's value for display in the API
-	* @param \EE_Model_Field_Base $field_obj
-	* @param mixed $original_value
-	* @return mixed
-	*/
+	 * Prepares a field's value for display in the API
+	 * @param \EE_Model_Field_Base $field_obj
+	 * @param mixed $original_value
+	 * @return mixed
+	 */
    public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
 		if( $original_value === EE_INF ) {
 			$new_value = self::ee_inf_in_rest;
@@ -95,7 +95,7 @@ 
 			$original_value,
 			$requested_version
 		);
-    }
+	}
 	
 	/**
 	 * Prepares condition-query-parameters (like what's in where and having) from

Spacing +44 added lines, -44 removed lines

@@ -21,8 +21,8 @@ 
  */
 	
 	
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Model_Data_Translator {
@@ -40,14 +40,14 @@ 
 	 * @param string  $requested_version
 	 * @return mixed
 	 */
-	public static function prepare_field_values_from_json( $field_obj, $original_value_maybe_array, $requested_version ) {
-		if( is_array( $original_value_maybe_array ) ) {
+	public static function prepare_field_values_from_json($field_obj, $original_value_maybe_array, $requested_version) {
+		if (is_array($original_value_maybe_array)) {
 			$new_value_maybe_array = array();
-			foreach( $original_value_maybe_array as $array_key => $array_item ) {
-				$new_value_maybe_array[ $array_key ] = self::prepare_field_value_from_json( $field_obj, $array_item, $requested_version );
+			foreach ($original_value_maybe_array as $array_key => $array_item) {
+				$new_value_maybe_array[$array_key] = self::prepare_field_value_from_json($field_obj, $array_item, $requested_version);
 			}
 		} else {
-			$new_value_maybe_array = self::prepare_field_value_from_json( $field_obj, $original_value_maybe_array, $requested_version );
+			$new_value_maybe_array = self::prepare_field_value_from_json($field_obj, $original_value_maybe_array, $requested_version);
 		}
 		return $new_value_maybe_array;
 	}
@@ -60,13 +60,13 @@ 
 	 * @param string $requested_version
 	 * @return mixed
 	 */
-	public static function prepare_field_value_from_json( $field_obj, $original_value, $requested_version ) {
+	public static function prepare_field_value_from_json($field_obj, $original_value, $requested_version) {
 		$new_value = null;
-		if( $field_obj instanceof \EE_Infinite_Integer_Field 
-			&& in_array( $original_value, array( null, '' ), true ) ) {
+		if ($field_obj instanceof \EE_Infinite_Integer_Field 
+			&& in_array($original_value, array(null, ''), true)) {
 			$new_value = EE_INF;
-		} elseif( $field_obj instanceof \EE_Datetime_Field ) {
-			$new_value = rest_parse_date( $original_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field) {
+			$new_value = rest_parse_date($original_value);
 		} else {
 			$new_value = $original_value;
 		}
@@ -79,17 +79,17 @@ 
 	* @param mixed $original_value
 	* @return mixed
 	*/
-   public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
-		if( $original_value === EE_INF ) {
+   public static function prepare_field_value_for_json($field_obj, $original_value, $requested_version) {
+		if ($original_value === EE_INF) {
 			$new_value = self::ee_inf_in_rest;
-		} elseif( $field_obj instanceof \EE_Datetime_Field &&
-			$original_value instanceof \DateTime ) {
-			$new_value = $original_value->format( 'c' );
-			$new_value = mysql_to_rfc3339( $new_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field &&
+			$original_value instanceof \DateTime) {
+			$new_value = $original_value->format('c');
+			$new_value = mysql_to_rfc3339($new_value);
 		} else {
 			$new_value = $original_value;
 		}
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api', 
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api', 
 			$new_value,
 			$field_obj,
 			$original_value,
@@ -105,37 +105,37 @@ 
 	 * @param string $requested_version
 	 * @return array
 	 */
-	public static function prepare_conditions_query_params_for_models( $inputted_query_params_of_this_type, \EEM_Base $model, $requested_version ) {
+	public static function prepare_conditions_query_params_for_models($inputted_query_params_of_this_type, \EEM_Base $model, $requested_version) {
 		$query_param_for_models = array();
-		foreach( $inputted_query_params_of_this_type as $query_param_key => $query_param_value ) {
+		foreach ($inputted_query_params_of_this_type as $query_param_key => $query_param_value) {
 			$field = self::deduce_field_from_query_param( 
-				self::remove_stars_and_anything_after_from_condition_query_param_key( $query_param_key ), 
+				self::remove_stars_and_anything_after_from_condition_query_param_key($query_param_key), 
 				$model
 			);
-			if( $field instanceof \EE_Model_Field_Base ) {
+			if ($field instanceof \EE_Model_Field_Base) {
 				//did they specify an operator?
-				if( is_array( $query_param_value ) ) {
-					$op = $query_param_value[ 0 ];
-					$value = $query_param_value[ 1 ];
-					$new_value = self::prepare_field_values_from_json( $field, $value, $requested_version );
-					$translated_value = array( $op, $new_value );
+				if (is_array($query_param_value)) {
+					$op = $query_param_value[0];
+					$value = $query_param_value[1];
+					$new_value = self::prepare_field_values_from_json($field, $value, $requested_version);
+					$translated_value = array($op, $new_value);
 				} else {
-					$translated_value  = self::prepare_field_value_from_json( $field, $query_param_value, $requested_version );
+					$translated_value = self::prepare_field_value_from_json($field, $query_param_value, $requested_version);
 				}
-				$query_param_for_models[ $query_param_key ] = $translated_value;
+				$query_param_for_models[$query_param_key] = $translated_value;
 			} else {
 				//so it's not for a field, assume it's a logic query param key
-				$query_param_for_models[ $query_param_key ] = self::prepare_conditions_query_params_for_models( $query_param_value, $model, $requested_version );
+				$query_param_for_models[$query_param_key] = self::prepare_conditions_query_params_for_models($query_param_value, $model, $requested_version);
 			}
 		}
 		return $query_param_for_models;
 	}
 	
-	public static function remove_stars_and_anything_after_from_condition_query_param_key( $condition_query_param_key ) {
+	public static function remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
-		if($pos_of_star === FALSE){
+		if ($pos_of_star === FALSE) {
 			return $condition_query_param_key;
-		}else{
+		} else {
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -147,26 +147,26 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model){
+	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model) {
 		//ok, now proceed with deducing which part is the model's name, and which is the field's name
 		//which will help us find the database table and column
 
-		$query_param_parts = explode(".",$query_param_name);
-		if(empty($query_param_parts)){
-			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s",'event_espresso'),$query_param_name));
+		$query_param_parts = explode(".", $query_param_name);
+		if (empty($query_param_parts)) {
+			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s", 'event_espresso'), $query_param_name));
 		}
 		$number_of_parts = count($query_param_parts);
-		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
-		if($number_of_parts == 1){
+		$last_query_param_part = $query_param_parts[count($query_param_parts) - 1];
+		if ($number_of_parts == 1) {
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else {// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
-			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
+			$model = \EE_Registry::instance()->load_model($query_param_parts[$number_of_parts - 2]);
 		}
-		try{
+		try {
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch (\EE_Error $e) {
 			return null;
 		}
 	}

Braces +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){
 			return $condition_query_param_key;
-		}else{
+		} else{
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -159,14 +159,14 @@ 
 		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
 		if($number_of_parts == 1){
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else{// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
 			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
 		}
 		try{
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch(\EE_Error $e){
 			return null;
 		}
 	}

core/libraries/rest_api/calculations/Base.php

Spacing +7 added lines, -7 removed lines

@@ -13,19 +13,19 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Base {
-	protected static function _verify_current_user_can( $required_permission, $attempted_calculation ) {
-		if( ! current_user_can( $required_permission ) ) {
+	protected static function _verify_current_user_can($required_permission, $attempted_calculation) {
+		if ( ! current_user_can($required_permission)) {
 			throw new Rest_Exception(
 				'permission_denied',
 				sprintf( 
-					__( 'Permission denied, you cannot calculate %1$s on %2$s because you do not have the capability "%3$s"', 'event_espresso' ),
+					__('Permission denied, you cannot calculate %1$s on %2$s because you do not have the capability "%3$s"', 'event_espresso'),
 					$attempted_calculation,
-					\EEH_Inflector::pluralize_and_lower( self::get_resource_name() ),
+					\EEH_Inflector::pluralize_and_lower(self::get_resource_name()),
 					$required_permission
 				)
 			);
@@ -38,6 +38,6 @@ 
 	 */
 	public static function get_resource_name() {
 		$classname = get_called_class();
-		return substr( $classname, strrpos( $classname, '\\' ) + 1 );
+		return substr($classname, strrpos($classname, '\\') + 1);
 	}
 }

core/libraries/rest_api/Calculated_Model_Fields.php

Spacing +15 added lines, -15 removed lines

@@ -15,8 +15,8 @@ 
  * @since		 	   4.8.35.rc.001
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Calculated_Model_Fields {
@@ -38,8 +38,8 @@ 
 	 * the WP_Request object,
 	 * the controller object
 	 */
-	public function mapping( $refresh = false ) {
-		if( ! $this->_mapping || $refresh ) {
+	public function mapping($refresh = false) {
+		if ( ! $this->_mapping || $refresh) {
 			$this->_mapping = $this->_generate_new_mapping();
 		}
 		return $this->_mapping;
@@ -52,8 +52,8 @@ 
 	 */
 	protected function _generate_new_mapping() {
 		$rest_api_calculations_namespace = 'EventEspresso\core\libraries\rest_api\calculations\\';
-		$event_calculations_class = $rest_api_calculations_namespace . 'Event';
-		$datetime_calculations_class = $rest_api_calculations_namespace . 'Datetime';
+		$event_calculations_class = $rest_api_calculations_namespace.'Event';
+		$datetime_calculations_class = $rest_api_calculations_namespace.'Datetime';
 		return apply_filters(
 			'FHEE__EventEspresso\core\libraries\rest_api\Calculated_Model_Fields__mapping',
 			array(
@@ -81,10 +81,10 @@ 
 	 * @param \EEM_Base $model
 	 * @return array allowable values for this field
 	 */
-	public function retrieve_calculated_fields_for_model( \EEM_Base $model ) {
+	public function retrieve_calculated_fields_for_model(\EEM_Base $model) {
 		$mapping = $this->mapping();
-		if( isset( $mapping[ $model->get_this_model_name() ] ) ) {
-			return array_keys( $mapping[ $model->get_this_model_name() ] );
+		if (isset($mapping[$model->get_this_model_name()])) {
+			return array_keys($mapping[$model->get_this_model_name()]);
 		} else {
 			return array();
 		}
@@ -103,17 +103,17 @@ 
 	 * @return mixed|null
 	 * @throws \EE_Error
 	 */
-	public function retrieve_calculated_field_value( \EEM_Base $model, $field_name, $wpdb_row, $rest_request, Base $controller ) {
+	public function retrieve_calculated_field_value(\EEM_Base $model, $field_name, $wpdb_row, $rest_request, Base $controller) {
 		$mapping = $this->mapping();
-		if( isset( $mapping[ $model->get_this_model_name() ] )
-			&& isset( $mapping[ $model->get_this_model_name() ][ $field_name ] ) ) {
-			$classname = $mapping[ $model->get_this_model_name() ][ $field_name ];
-			return call_user_func( array( $classname, $field_name ), $wpdb_row, $rest_request, $controller );
+		if (isset($mapping[$model->get_this_model_name()])
+			&& isset($mapping[$model->get_this_model_name()][$field_name])) {
+			$classname = $mapping[$model->get_this_model_name()][$field_name];
+			return call_user_func(array($classname, $field_name), $wpdb_row, $rest_request, $controller);
 		}
 		throw new Rest_Exception( 
 			'calculated_field_does_not_exist',
 			sprintf( 
-				__( 'There is no calculated field %1$s on resource %2$s', 'event_espresso' ), 
+				__('There is no calculated field %1$s on resource %2$s', 'event_espresso'), 
 				$field_name, 
 				$model->get_this_model_name() 
 			) 

core/libraries/rest_api/Rest_Exception.php

Spacing +3 added lines, -3 removed lines

@@ -13,8 +13,8 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Rest_Exception extends \EE_Error {
@@ -24,7 +24,7 @@ 
 	 */
 	protected $_wp_error_data = array();
 	protected $_wp_error_code = '';
-	public function __construct( $string_code, $message, $wp_error_data = array(), $previous = null ) {
+	public function __construct($string_code, $message, $wp_error_data = array(), $previous = null) {
 		parent::__construct( 
 			$message,
 			500,

core/libraries/rest_api/calculations/Datetime.php

Spacing +28 added lines, -28 removed lines

@@ -15,8 +15,8 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Datetime extends Calculations_Base {
@@ -32,20 +32,20 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public static function spaces_remaining_considering_tickets( $wpdb_row, $request, $controller ){
-		if( is_array( $wpdb_row ) && isset( $wpdb_row[ 'Datetime.DTT_ID' ] ) ) {
-			$dtt_obj = \EEM_Datetime::instance()->get_one_by_ID( $wpdb_row[ 'Datetime.DTT_ID' ] );
+	public static function spaces_remaining_considering_tickets($wpdb_row, $request, $controller) {
+		if (is_array($wpdb_row) && isset($wpdb_row['Datetime.DTT_ID'])) {
+			$dtt_obj = \EEM_Datetime::instance()->get_one_by_ID($wpdb_row['Datetime.DTT_ID']);
 		} else {
 			$dtt_obj = null;
 		}
-		if( $dtt_obj instanceof \EE_Datetime ) {
-			return $dtt_obj->spaces_remaining( true );
+		if ($dtt_obj instanceof \EE_Datetime) {
+			return $dtt_obj->spaces_remaining(true);
 		} else {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate spaces_remaining_considering_tickets because the datetime with ID %1$s (from database row %2$s) was not found', 'event_espresso' ),
-					$wpdb_row[ 'Datetime.DTT_ID' ],
-					print_r( $wpdb_row, true )
+					__('Cannot calculate spaces_remaining_considering_tickets because the datetime with ID %1$s (from database row %2$s) was not found', 'event_espresso'),
+					$wpdb_row['Datetime.DTT_ID'],
+					print_r($wpdb_row, true)
 				)
 			);
 		}
@@ -63,17 +63,17 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function registrations_checked_in_count( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Datetime.DTT_ID' ] ) ) {
+	public static function registrations_checked_in_count($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Datetime.DTT_ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate registrations_checked_in_count because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate registrations_checked_in_count because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_checkins', 'registrations_checked_in_count' );
-		return \EEM_Registration::instance()->count_registrations_checked_into_datetime( $wpdb_row[ 'Datetime.DTT_ID' ], true );
+		self::_verify_current_user_can('ee_read_checkins', 'registrations_checked_in_count');
+		return \EEM_Registration::instance()->count_registrations_checked_into_datetime($wpdb_row['Datetime.DTT_ID'], true);
 	}
 
 
@@ -88,17 +88,17 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function registrations_checked_out_count( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Datetime.DTT_ID' ] ) ) {
+	public static function registrations_checked_out_count($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Datetime.DTT_ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate registrations_checked_out_count because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate registrations_checked_out_count because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_checkins', 'registrations_checked_out_count' );
-		return \EEM_Registration::instance()->count_registrations_checked_into_datetime( $wpdb_row[ 'Datetime.DTT_ID' ], false );
+		self::_verify_current_user_can('ee_read_checkins', 'registrations_checked_out_count');
+		return \EEM_Registration::instance()->count_registrations_checked_into_datetime($wpdb_row['Datetime.DTT_ID'], false);
 	}
 
 
@@ -114,20 +114,20 @@ 
 	 * @throws \EE_Error
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
 	 */
-	public static function spots_taken_pending_payment( $wpdb_row, $request, $controller ){
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Datetime.DTT_ID' ] ) ) {
+	public static function spots_taken_pending_payment($wpdb_row, $request, $controller) {
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Datetime.DTT_ID'])) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Cannot calculate spots_taken_pending_payment because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso' ),
-					print_r( $wpdb_row, true )
+					__('Cannot calculate spots_taken_pending_payment because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso'),
+					print_r($wpdb_row, true)
 				)
 			);
 		}
-		self::_verify_current_user_can( 'ee_read_registrations', 'spots_taken_pending_payment' );
+		self::_verify_current_user_can('ee_read_registrations', 'spots_taken_pending_payment');
 		return \EEM_Registration::instance()->count(
 			array(
 				array(
-					'Ticket.Datetime.DTT_ID' => $wpdb_row[ 'Datetime.DTT_ID' ],
+					'Ticket.Datetime.DTT_ID' => $wpdb_row['Datetime.DTT_ID'],
 					'STS_ID' => \EEM_Registration::status_id_pending_payment
 				)
 			),