eventespresso / event-espresso-core

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

Indentation +12 added lines, -12 removed lines

@@ -3,18 +3,18 @@
 use EventEspresso\core\libraries\rest_api\controllers\Base;
 use EventEspresso\core\libraries\rest_api\Rest_Exception;
 /**
- *
- * Class Calculationshelpers
- *
- * Class for defining which model fields can be calculated, and performing those calculations
- * as requested
- *
- * @package         Event Espresso
- * @subpackage
- * @author				Mike Nelson
- * @since		 	   4.8.35.rc.001
- *
- */
+	 *
+	 * Class Calculationshelpers
+	 *
+	 * Class for defining which model fields can be calculated, and performing those calculations
+	 * as requested
+	 *
+	 * @package         Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 * @since		 	   4.8.35.rc.001
+	 *
+	 */
 if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
 	exit( 'No direct script access allowed' );
 }

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/request_stack/EE_Request.core.php

Spacing +15 added lines, -15 removed lines

@@ -60,15 +60,15 @@ 
 	 * @param array $post
 	 * @param array $cookie
 	 */
-	public function __construct( $get, $post, $cookie ) {
+	public function __construct($get, $post, $cookie) {
 		// grab request vars
 		$this->_get    = $get;
 		$this->_post   = $post;
 		$this->_cookie = $cookie;
-		$this->_params = array_merge( $get, $post );
+		$this->_params = array_merge($get, $post);
 		// AJAX ???
-		$this->ajax       = defined( 'DOING_AJAX' ) ? true : false;
-		$this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false;
+		$this->ajax       = defined('DOING_AJAX') ? true : false;
+		$this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false;
 	}
 
 
@@ -119,10 +119,10 @@ 
 	 * @param bool $override_ee
 	 * @return    void
 	 */
-	public function set( $key, $value, $override_ee = FALSE ) {
+	public function set($key, $value, $override_ee = FALSE) {
 		// don't allow "ee" to be overwritten unless explicitly instructed to do so
-		if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) {
-			$this->_params[ $key ] = $value;
+		if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) {
+			$this->_params[$key] = $value;
 		}
 	}
 
@@ -136,8 +136,8 @@ 
 	 * @param null $default
 	 * @return    mixed
 	 */
-	public function get( $key, $default = NULL ) {
-		return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default;
+	public function get($key, $default = NULL) {
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param $key
 	 * @return    boolean
 	 */
-	public function is_set( $key ) {
-		return isset( $this->_params[ $key ] ) ? TRUE : FALSE;
+	public function is_set($key) {
+		return isset($this->_params[$key]) ? TRUE : FALSE;
 	}
 
 
@@ -162,10 +162,10 @@ 
 	 * @param $key
 	 * @param bool $unset_from_global_too
 	 */
-	public function un_set( $key, $unset_from_global_too = false ) {
-		unset( $this->_params[ $key ] );
-		if ( $unset_from_global_too ) {
-			unset( $_REQUEST[ $key ] );
+	public function un_set($key, $unset_from_global_too = false) {
+		unset($this->_params[$key]);
+		if ($unset_from_global_too) {
+			unset($_REQUEST[$key]);
 		}
 	}
 

core/EE_Request_Handler.core.php

Spacing +78 added lines, -78 removed lines

@@ -65,14 +65,14 @@ 
 	 * @param WP $wp
 	 * @return \EE_Request_Handler
 	 */
-	public function __construct( $wp = null ) {
+	public function __construct($wp = null) {
 		// grab request vars
 		// NOTE: WHEN MERGING TO 4.9 PLZ FAVOUR THE CHANGES IN 4.9 OVER THE FOLLOWING LINE
-		$this->_params = array_merge( $_GET, $_POST );
+		$this->_params = array_merge($_GET, $_POST);
 		// AJAX ???
-		$this->ajax = defined( 'DOING_AJAX' ) ? true : false;
-		$this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false;
-		do_action( 'AHEE__EE_Request_Handler__construct__complete' );
+		$this->ajax = defined('DOING_AJAX') ? true : false;
+		$this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false;
+		do_action('AHEE__EE_Request_Handler__construct__complete');
 	}
 
 
@@ -84,12 +84,12 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function parse_request( $wp = null ) {
+	public function parse_request($wp = null) {
 		//if somebody forgot to provide us with WP, that's ok because its global
-		if ( ! $wp instanceof WP ) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		$this->set_request_vars( $wp );
+		$this->set_request_vars($wp);
 	}
 
 
@@ -101,14 +101,14 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function set_request_vars( $wp = null ) {
-		if ( ! is_admin() ) {
+	public function set_request_vars($wp = null) {
+		if ( ! is_admin()) {
 			// set request post_id
-			$this->set( 'post_id', $this->get_post_id_from_request( $wp ));
+			$this->set('post_id', $this->get_post_id_from_request($wp));
 			// set request post name
-			$this->set( 'post_name', $this->get_post_name_from_request( $wp ));
+			$this->set('post_name', $this->get_post_name_from_request($wp));
 			// set request post_type
-			$this->set( 'post_type', $this->get_post_type_from_request( $wp ));
+			$this->set('post_type', $this->get_post_type_from_request($wp));
 			// true or false ? is this page being used by EE ?
 			$this->set_espresso_page();
 		}
@@ -123,20 +123,20 @@ 
 	 * @param WP $wp
 	 * @return int
 	 */
-	public function get_post_id_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_id_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_id = null;
-		if ( isset( $wp->query_vars['p'] )) {
+		if (isset($wp->query_vars['p'])) {
 			$post_id = $wp->query_vars['p'];
 		}
-		if ( ! $post_id && isset( $wp->query_vars['page_id'] )) {
+		if ( ! $post_id && isset($wp->query_vars['page_id'])) {
 			$post_id = $wp->query_vars['page_id'];
 		}
-		if ( ! $post_id && isset( $wp->request )) {
-			if ( is_numeric( basename( $wp->request ))) {
-				$post_id = basename( $wp->request );
+		if ( ! $post_id && isset($wp->request)) {
+			if (is_numeric(basename($wp->request))) {
+				$post_id = basename($wp->request);
 			}
 		}
 		return $post_id;
@@ -151,35 +151,35 @@ 
 	 * @param WP $wp
 	 * @return string
 	 */
-	public function get_post_name_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_name_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_name = null;
-		if ( isset( $wp->query_vars['name'] ) && ! empty( $wp->query_vars['name'] )) {
+		if (isset($wp->query_vars['name']) && ! empty($wp->query_vars['name'])) {
 			$post_name = $wp->query_vars['name'];
 		}
-		if ( ! $post_name && isset( $wp->query_vars['pagename'] ) && ! empty( $wp->query_vars['pagename'] )) {
+		if ( ! $post_name && isset($wp->query_vars['pagename']) && ! empty($wp->query_vars['pagename'])) {
 			$post_name = $wp->query_vars['pagename'];
 		}
-		if ( ! $post_name && isset( $wp->request ) && ! empty( $wp->request )) {
-			$possible_post_name = basename( $wp->request );
-			if ( ! is_numeric( $possible_post_name )) {
+		if ( ! $post_name && isset($wp->request) && ! empty($wp->request)) {
+			$possible_post_name = basename($wp->request);
+			if ( ! is_numeric($possible_post_name)) {
 				/** @type WPDB $wpdb */
 				global $wpdb;
 				$SQL = "SELECT ID from $wpdb->posts WHERE post_status='publish' AND post_name=%s";
-				$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $possible_post_name ));
-				if ( $possible_post_name ) {
+				$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $possible_post_name));
+				if ($possible_post_name) {
 					$post_name = $possible_post_name;
 				}
 			}
 		}
-		if ( ! $post_name && $this->get( 'post_id' )) {
+		if ( ! $post_name && $this->get('post_id')) {
 			/** @type WPDB $wpdb */
 			global $wpdb;
 			$SQL = "SELECT post_name from $wpdb->posts WHERE post_status='publish' AND ID=%d";
-			$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $this->get( 'post_id' )));
-			if( $possible_post_name ) {
+			$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $this->get('post_id')));
+			if ($possible_post_name) {
 				$post_name = $possible_post_name;
 			}
 		}
@@ -195,11 +195,11 @@ 
 	 * @param WP $wp
 	 * @return mixed
 	 */
-	public function get_post_type_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_type_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		return isset( $wp->query_vars['post_type'] ) ? $wp->query_vars['post_type'] : null;
+		return isset($wp->query_vars['post_type']) ? $wp->query_vars['post_type'] : null;
 	}
 
 
@@ -209,18 +209,18 @@ 
 	 * @param  WP $wp
 	 * @return bool|string|void
 	 */
-	public function get_current_page_permalink( $wp = null ) {
-		$post_id = $this->get_post_id_from_request( $wp );
-		if ( $post_id ) {
-			$current_page_permalink = get_permalink( $post_id );
+	public function get_current_page_permalink($wp = null) {
+		$post_id = $this->get_post_id_from_request($wp);
+		if ($post_id) {
+			$current_page_permalink = get_permalink($post_id);
 		} else {
-			if ( ! $wp instanceof WP ) {
+			if ( ! $wp instanceof WP) {
 				global $wp;
 			}
-			if ( $wp->request ) {
-				$current_page_permalink = site_url( $wp->request );
+			if ($wp->request) {
+				$current_page_permalink = site_url($wp->request);
 			} else {
-				$current_page_permalink = esc_url( site_url( $_SERVER[ 'REQUEST_URI' ] ) );
+				$current_page_permalink = esc_url(site_url($_SERVER['REQUEST_URI']));
 			}
 		}
 		return $current_page_permalink;
@@ -237,41 +237,41 @@ 
 	public function test_for_espresso_page() {
 		global $wp;
 		/** @type EE_CPT_Strategy $EE_CPT_Strategy */
-		$EE_CPT_Strategy = EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		$EE_CPT_Strategy = EE_Registry::instance()->load_core('CPT_Strategy');
 		$espresso_CPT_taxonomies = $EE_CPT_Strategy->get_CPT_taxonomies();
-		if ( is_array( $espresso_CPT_taxonomies ) ) {
-			foreach ( $espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details ) {
-				if ( isset( $wp->query_vars, $wp->query_vars[ $espresso_CPT_taxonomy ] ) ) {
+		if (is_array($espresso_CPT_taxonomies)) {
+			foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details) {
+				if (isset($wp->query_vars, $wp->query_vars[$espresso_CPT_taxonomy])) {
 					return true;
 				}
 			}
 		}
 		// load espresso CPT endpoints
 		$espresso_CPT_endpoints = $EE_CPT_Strategy->get_CPT_endpoints();
-		$post_type_CPT_endpoints = array_flip( $espresso_CPT_endpoints );
-		$post_types = (array)$this->get( 'post_type' );
-		foreach ( $post_types as $post_type ) {
+		$post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints);
+		$post_types = (array) $this->get('post_type');
+		foreach ($post_types as $post_type) {
 			// was a post name passed ?
-			if ( isset( $post_type_CPT_endpoints[ $post_type ] ) ) {
+			if (isset($post_type_CPT_endpoints[$post_type])) {
 				// kk we know this is an espresso page, but is it a specific post ?
-				if ( ! $this->get( 'post_name' ) ) {
+				if ( ! $this->get('post_name')) {
 					// there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events
-					$post_name = isset( $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] ) ? $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] : null;
+					$post_name = isset($post_type_CPT_endpoints[$this->get('post_type')]) ? $post_type_CPT_endpoints[$this->get('post_type')] : null;
 					// if the post type matches on of our then set the endpoint
-					if ( $post_name ) {
-						$this->set( 'post_name', $post_name );
+					if ($post_name) {
+						$this->set('post_name', $post_name);
 					}
 				}
 				return true;
 			}
 		}
-		if ( $this->get( 'post_name' )) {
+		if ($this->get('post_name')) {
 			// load all pages using espresso shortcodes
-			$post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			$post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// make sure core pages are included
-			$espresso_pages = array_merge( $espresso_CPT_endpoints, $post_shortcodes );
+			$espresso_pages = array_merge($espresso_CPT_endpoints, $post_shortcodes);
 			// was a post name passed ?
-			if (  isset( $espresso_pages[ $this->get( 'post_name' ) ] )) {
+			if (isset($espresso_pages[$this->get('post_name')])) {
 				 return true;
 			}
 		}
@@ -287,7 +287,7 @@ 
 	 * @param null $value
 	 * @return    mixed
 	 */
-	public function set_espresso_page( $value = null ) {
+	public function set_espresso_page($value = null) {
 		$value = $value ? $value : $this->test_for_espresso_page();
 		$this->_params['is_espresso_page'] = $value;
 	}
@@ -301,7 +301,7 @@ 
 	 *  @return 	mixed
 	 */
 	public function is_espresso_page() {
-		return isset( $this->_params['is_espresso_page'] ) ? $this->_params['is_espresso_page'] : false;
+		return isset($this->_params['is_espresso_page']) ? $this->_params['is_espresso_page'] : false;
 	}
 
 
@@ -325,10 +325,10 @@ 
 	 * @param bool $override_ee
 	 * @return    void
 	 */
-	public function set( $key, $value, $override_ee = false ) {
+	public function set($key, $value, $override_ee = false) {
 		// don't allow "ee" to be overwritten unless explicitly instructed to do so
-		if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) {
-			$this->_params[ $key ] = $value;
+		if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) {
+			$this->_params[$key] = $value;
 		}
 	}
 
@@ -342,8 +342,8 @@ 
 	 * @param null $default
 	 * @return    mixed
 	 */
-	public function get( $key, $default = null ) {
-		return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default;
+	public function get($key, $default = null) {
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
 	}
 
 
@@ -355,8 +355,8 @@ 
 	 * @param $key
 	 * @return    boolean
 	 */
-	public function is_set( $key ) {
-		return isset( $this->_params[ $key ] ) ? true : false;
+	public function is_set($key) {
+		return isset($this->_params[$key]) ? true : false;
 	}
 
 
@@ -368,8 +368,8 @@ 
 	 * @param $key
 	 * @return    void
 	 */
-	public function un_set( $key ) {
-		unset( $this->_params[ $key ] );
+	public function un_set($key) {
+		unset($this->_params[$key]);
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param $value
 	 * @return    void
 	 */
-	public function set_notice( $key, $value ) {
-		$this->_notice[ $key ] = $value;
+	public function set_notice($key, $value) {
+		$this->_notice[$key] = $value;
 	}
 
 
@@ -395,8 +395,8 @@ 
 	 * @param $key
 	 * @return    mixed
 	 */
-	public function get_notice( $key ) {
-		return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : null;
+	public function get_notice($key) {
+		return isset($this->_notice[$key]) ? $this->_notice[$key] : null;
 	}
 
 
@@ -408,7 +408,7 @@ 
 	 * @param $string
 	 * @return    void
 	 */
-	public function add_output( $string ) {
+	public function add_output($string) {
 		$this->_output .= $string;
 	}
 
@@ -430,8 +430,8 @@ 
 	 * @param $item
 	 * @param $key
 	 */
-	function sanitize_text_field_for_array_walk( &$item, &$key ) {
-		$item = strpos( $item, 'email' ) !== false ? sanitize_email( $item ) : sanitize_text_field( $item );
+	function sanitize_text_field_for_array_walk(&$item, &$key) {
+		$item = strpos($item, 'email') !== false ? sanitize_email($item) : sanitize_text_field($item);
 	}
 
 
@@ -441,7 +441,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return false; }
+	public function __set($a, $b) { return false; }
 
 
 

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
 				)
 			),

modules/core_rest_api/EED_Core_Rest_Api.module.php

Spacing +89 added lines, -89 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 use EventEspresso\core\libraries\rest_api\Calculated_Model_Fields;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -34,7 +34,7 @@ 
 	 */
 	public static function instance() {
 		self::$_field_calculator = new Calculated_Model_Fields();
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -64,10 +64,10 @@ 
 
 
 	public static function set_hooks_both() {
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'register_routes' ), 10 );
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'set_hooks_rest_api' ), 5 );
-		add_filter( 'rest_route_data', array( 'EED_Core_Rest_Api', 'hide_old_endpoints' ), 10, 2 );
-		add_filter( 'rest_index', array( 'EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index' ) );
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'register_routes'), 10);
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'set_hooks_rest_api'), 5);
+		add_filter('rest_route_data', array('EED_Core_Rest_Api', 'hide_old_endpoints'), 10, 2);
+		add_filter('rest_index', array('EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index'));
 		EED_Core_Rest_Api::invalidate_cached_route_data_on_version_change();
 	}
 
@@ -85,7 +85,7 @@ 
 	 * Loads all the hooks which make requests to old versions of the API
 	 * appear the same as they always did
 	 */
-	public static function set_hooks_for_changes(){
+	public static function set_hooks_for_changes() {
 		self::_set_hooks_for_changes();
 	}
 	/**
@@ -93,16 +93,16 @@ 
 	 * appear the same as they always did
 	 */
 	protected static function _set_hooks_for_changes() {
-		$folder_contents = EEH_File::get_contents_of_folders( array( EE_LIBRARIES . 'rest_api' . DS . 'changes' ), false );
-		foreach( $folder_contents as $classname_in_namespace => $filepath ) {
+		$folder_contents = EEH_File::get_contents_of_folders(array(EE_LIBRARIES.'rest_api'.DS.'changes'), false);
+		foreach ($folder_contents as $classname_in_namespace => $filepath) {
 			//ignore the base parent class
-			if( $classname_in_namespace === 'Changes_In_Base' ) {
+			if ($classname_in_namespace === 'Changes_In_Base') {
 				continue;
 			}
-			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\' . $classname_in_namespace;
-			if ( class_exists( $full_classname )) {
+			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\'.$classname_in_namespace;
+			if (class_exists($full_classname)) {
 				$instance_of_class = new $full_classname;
-				if ( $instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base ) {
+				if ($instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base) {
 					$instance_of_class->set_hooks();
 				}
 			}
@@ -115,16 +115,16 @@ 
 	 * so we actually prefer to only do it when an EE plugin is activated or upgraded
 	 */
 	public static function register_routes() {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
 					register_rest_route(
 						$namespace,
 						$endpoint,
 						array(
-							'callback' => $route[ 'callback' ],
-							'methods' => $route[ 'methods' ],
-							'args' => isset( $route[ 'args' ] ) ? $route[ 'args' ] : array(),
+							'callback' => $route['callback'],
+							'methods' => $route['methods'],
+							'args' => isset($route['args']) ? $route['args'] : array(),
 						)
 					);
 				}
@@ -138,11 +138,11 @@ 
 	 * next time the WP API is used
 	 */
 	public static function invalidate_cached_route_data_on_version_change() {
-		if( EE_System::instance()->detect_req_type() != EE_System::req_type_normal ) {
+		if (EE_System::instance()->detect_req_type() != EE_System::req_type_normal) {
 			EED_Core_Rest_Api::invalidate_cached_route_data();
 		}
-		foreach( EE_Registry::instance()->addons as $addon ){
-			if( $addon instanceof EE_Addon && $addon->detect_req_type() != EE_System::req_type_normal ) {
+		foreach (EE_Registry::instance()->addons as $addon) {
+			if ($addon instanceof EE_Addon && $addon->detect_req_type() != EE_System::req_type_normal) {
 				EED_Core_Rest_Api::invalidate_cached_route_data();
 			}
 		}
@@ -153,7 +153,7 @@ 
 	 */
 	public static function invalidate_cached_route_data() {
 		//delete the saved EE REST API routes
-		delete_option( EED_Core_Rest_Api::saved_routes_option_names );
+		delete_option(EED_Core_Rest_Api::saved_routes_option_names);
 	}
 
 	/**
@@ -165,10 +165,10 @@ 
 	 * }
 	 */
 	public static function get_ee_route_data() {
-		$ee_routes = get_option( self::saved_routes_option_names, null );
-		if( ! $ee_routes || ( defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE )){
+		$ee_routes = get_option(self::saved_routes_option_names, null);
+		if ( ! $ee_routes || (defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE)) {
 			self::save_ee_routes();
-			$ee_routes = get_option( self::saved_routes_option_names, array() );
+			$ee_routes = get_option(self::saved_routes_option_names, array());
 		}
 		return $ee_routes;
 	}
@@ -179,7 +179,7 @@ 
 	 * @return void
 	 */
 	public static function save_ee_routes() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$instance = self::instance();
 			$routes = apply_filters(
 				'EED_Core_Rest_Api__save_ee_routes__routes',
@@ -190,7 +190,7 @@ 
 					$instance->_register_rpc_routes()
 				)
 			);
-			update_option( self::saved_routes_option_names, $routes, true );
+			update_option(self::saved_routes_option_names, $routes, true);
 		}
 	}
 
@@ -199,7 +199,7 @@ 
 	 * @return array @see get_ee_route_data
 	 */
 	protected function _register_model_routes() {
-		EE_Registry::instance()->load_helper( 'Inflector' );
+		EE_Registry::instance()->load_helper('Inflector');
 		$models_to_register = apply_filters(
 			'FHEE__EED_Core_REST_API___register_model_routes',
 			EE_Registry::instance()->non_abstract_db_models
@@ -208,24 +208,24 @@ 
 		unset($models_to_register['Extra_Meta']);
 		unset($models_to_register['Extra_Join']);
 		$model_routes = array( );
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
 
-			foreach ( $models_to_register as $model_name => $model_classname ) {
-				$model = \EE_Registry::instance()->load_model( $model_name );
+			foreach ($models_to_register as $model_name => $model_classname) {
+				$model = \EE_Registry::instance()->load_model($model_name);
 				//yes we could just register one route for ALL models, but then they wouldn't show up in the index
-				$ee_namespace = self::ee_api_namespace . $version;
-				$plural_model_route = EEH_Inflector::pluralize_and_lower( $model_name );
-				$singular_model_route = $plural_model_route . '/(?P<id>\d+)' ;
-				$model_routes[ $ee_namespace ][ $plural_model_route ] = array(
+				$ee_namespace = self::ee_api_namespace.$version;
+				$plural_model_route = EEH_Inflector::pluralize_and_lower($model_name);
+				$singular_model_route = $plural_model_route.'/(?P<id>\d+)';
+				$model_routes[$ee_namespace][$plural_model_route] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 								'handle_request_get_all' ),
 							'methods' => WP_REST_Server::READABLE,
 							'hidden_endpoint' => $hidden_endpoint,
-							'args' => $this->_get_read_query_params( $model, $version ),
+							'args' => $this->_get_read_query_params($model, $version),
 							'_links' => array(
-								'self' => rest_url( $ee_namespace . $singular_model_route ),
+								'self' => rest_url($ee_namespace.$singular_model_route),
 							)
 						),
 //						array(
@@ -236,14 +236,14 @@ 
 //							'hidden_endpoint' => $hidden_endpoint
 //						)
 					);
-				$model_routes[ $ee_namespace ][ $singular_model_route ] = array(
+				$model_routes[$ee_namespace][$singular_model_route] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 								'handle_request_get_one' ),
 							'methods' => WP_REST_Server::READABLE,
 							'hidden_endpoint' => $hidden_endpoint,
-							'args' => $this->_get_response_selection_query_params( $model, $version)
+							'args' => $this->_get_response_selection_query_params($model, $version)
 						),
 //						array(
 //							'callback' => array(
@@ -254,19 +254,19 @@ 
 //							),
 				);
 				//@todo: also handle  DELETE for a single item
-				foreach ( $model->relation_settings() as $relation_name => $relation_obj ) {
+				foreach ($model->relation_settings() as $relation_name => $relation_obj) {
 					$related_model_name_endpoint_part = EventEspresso\core\libraries\rest_api\controllers\model\Read::get_related_entity_name(
 						$relation_name,
 						$relation_obj
 					);
-					$model_routes[ $ee_namespace ][ $singular_model_route . '/' . $related_model_name_endpoint_part ] = array(
+					$model_routes[$ee_namespace][$singular_model_route.'/'.$related_model_name_endpoint_part] = array(
 							array(
 								'callback' => array(
 									'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 									'handle_request_get_related' ),
 								'methods' => WP_REST_Server::READABLE,
 								'hidden_endpoint' => $hidden_endpoint,
-								'args' => $this->_get_read_query_params( $relation_obj->get_other_model(), $version ),
+								'args' => $this->_get_read_query_params($relation_obj->get_other_model(), $version),
 							),
 //							array(
 //								'callback' => array(
@@ -290,11 +290,11 @@ 
 	 */
 	protected function _register_rpc_routes() {
 		$routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$ee_namespace = self::ee_api_namespace . $version;
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$ee_namespace = self::ee_api_namespace.$version;
 			$this_versions_routes = array();
 			//checkin endpoint
-			$this_versions_routes[ 'registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)' ] = array(
+			$this_versions_routes['registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)'] = array(
 				array(
 					'callback' => array(
 						'EventEspresso\core\libraries\rest_api\controllers\rpc\Checkin',
@@ -305,12 +305,12 @@ 
 						'force' => array(
 							'required' => false,
 							'default' => false,
-							'description' => __( 'Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso' )
+							'description' => __('Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso')
 						)
 					)
 				)
 			);
-			$routes[ $ee_namespace ] = apply_filters(
+			$routes[$ee_namespace] = apply_filters(
 				'FHEE__EED_Core_Rest_Api___register_rpc_routes__this_versions_routes',
 				$this_versions_routes,
 				$version,
@@ -326,19 +326,19 @@ 
 	 * @param string $version
 	 * @return array
 	 */
-	protected function _get_response_selection_query_params( \EEM_Base $model, $version ) {
+	protected function _get_response_selection_query_params(\EEM_Base $model, $version) {
 		return apply_filters(
 			'FHEE__EED_Core_Rest_Api___get_response_selection_query_params',
 			array(
 				'include' => array(
 					'required' => false,
 					'default' => '*',
-					'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso' ),
+					'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso'),
 				),
 				'calculate' => array(
 					'required' => false,
 					'default' => '',
-					'enum' => self::$_field_calculator->retrieve_calculated_fields_for_model( $model )
+					'enum' => self::$_field_calculator->retrieve_calculated_fields_for_model($model)
 				)
 			),
 			$model,
@@ -356,43 +356,43 @@ 
 	 * @return array    describing the args acceptable when querying this model
 	 * @throws \EE_Error
 	 */
-	protected function _get_read_query_params( \EEM_Base $model, $version ) {
+	protected function _get_read_query_params(\EEM_Base $model, $version) {
 		$default_orderby = array();
-		foreach( $model->get_combined_primary_key_fields() as $key_field ) {
-			$default_orderby[ $key_field->get_name() ] = 'ASC';
+		foreach ($model->get_combined_primary_key_fields() as $key_field) {
+			$default_orderby[$key_field->get_name()] = 'ASC';
 		}
 		return array_merge(
-			$this->_get_response_selection_query_params( $model, $version ),
+			$this->_get_response_selection_query_params($model, $version),
 			array(
 				'where' => array(
 					'required' => false,
 					'default' => array(),
-					'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#where for documentation', 'event_espresso' ),
+					'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#where for documentation', 'event_espresso'),
 					),
 				'limit' => array(
 					'required' => false,
 					'default' => EED_Core_Rest_Api::get_default_query_limit(),
-					'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#limit for documentation', 'event_espresso' )
+					'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#limit for documentation', 'event_espresso')
 				),
 				'order_by' => array(
 					'required' => false,
 					'default' => $default_orderby,
-					'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#order_by for documentation', 'event_espresso' )
+					'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#order_by for documentation', 'event_espresso')
 				),
 				'group_by' => array(
 					'required' => false,
 					'default' => null,
-					'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#group_by for documentation', 'event_espresso' )
+					'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#group_by for documentation', 'event_espresso')
 				),
 				'having' => array(
 					'required' => false,
 					'default' => null,
-					'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#having for documentation', 'event_espresso' )
+					'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#having for documentation', 'event_espresso')
 				),
 				'caps' => array(
 					'required' => false,
 					'default' => EEM_Base::caps_read,
-					'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#caps for documentation', 'event_espresso' )
+					'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#caps for documentation', 'event_espresso')
 				),
 			)
 		);
@@ -404,8 +404,8 @@ 
 	 */
 	protected function _register_config_routes() {
 		$config_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$config_routes[ self::ee_api_namespace . $version ][ 'config' ] = array(
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$config_routes[self::ee_api_namespace.$version]['config'] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\config\Read',
@@ -424,8 +424,8 @@ 
 	 */
 	protected function _register_meta_routes() {
 		$meta_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$meta_routes[ self::ee_api_namespace . $version ][ '/resources' ] = array(
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$meta_routes[self::ee_api_namespace.$version]['/resources'] = array(
 				array(
 					'callback' => array(
 						'EventEspresso\core\libraries\rest_api\controllers\model\Meta',
@@ -446,13 +446,13 @@ 
 	 * @param array $route_data
 	 * @return array
 	 */
-	public static function hide_old_endpoints( $route_data ) {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
-					if( $route[ 'hidden_endpoint' ] ) {
-						$full_route = '/' . ltrim( $namespace, '/' ) . '/' . ltrim( $endpoint, '/' );
-						unset( $route_data[ $full_route ] );
+	public static function hide_old_endpoints($route_data) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
+					if ($route['hidden_endpoint']) {
+						$full_route = '/'.ltrim($namespace, '/').'/'.ltrim($endpoint, '/');
+						unset($route_data[$full_route]);
 					}
 				}
 			}
@@ -491,7 +491,7 @@ 
 	 */
 	public static function latest_rest_api_version() {
 		$versions_served = \EED_Core_Rest_Api::versions_served();
-		return end( array_keys( $versions_served ) );
+		return end(array_keys($versions_served));
 	}
 
 	/**
@@ -505,32 +505,32 @@ 
 	public static function versions_served() {
 		$versions_served = array();
 		$possibly_served_versions = EED_Core_Rest_Api::version_compatibilities();
-		$lowest_compatible_version = end( $possibly_served_versions);
-		reset( $possibly_served_versions );
-		$versions_served_historically = array_keys( $possibly_served_versions );
-		$latest_version = end( $versions_served_historically );
-		reset( $versions_served_historically );
+		$lowest_compatible_version = end($possibly_served_versions);
+		reset($possibly_served_versions);
+		$versions_served_historically = array_keys($possibly_served_versions);
+		$latest_version = end($versions_served_historically);
+		reset($versions_served_historically);
 		//for each version of core we have ever served:
-		foreach ( $versions_served_historically as $key_versioned_endpoint ) {
+		foreach ($versions_served_historically as $key_versioned_endpoint) {
 			//if it's not above the current core version, and it's compatible with the current version of core
-			if( $key_versioned_endpoint == $latest_version ) {
+			if ($key_versioned_endpoint == $latest_version) {
 				//don't hide the latest version in the index
-				$versions_served[ $key_versioned_endpoint ] = false;
-			} else if(
+				$versions_served[$key_versioned_endpoint] = false;
+			} else if (
 				$key_versioned_endpoint < EED_Core_Rest_Api::core_version()
 				&& $key_versioned_endpoint >= $lowest_compatible_version
 			) {
 				//include, but hide, previous versions which are still supported
-				$versions_served[ $key_versioned_endpoint ] = true;
-			} elseif(
+				$versions_served[$key_versioned_endpoint] = true;
+			} elseif (
 				apply_filters(
 					'FHEE__EED_Core_Rest_Api__versions_served__include_incompatible_versions',
 					false,
 					$possibly_served_versions
 				)
-			){
+			) {
 				//if a version is no longer supported, don't include it in index or list of versions served
-				$versions_served[ $key_versioned_endpoint ] = true;
+				$versions_served[$key_versioned_endpoint] = true;
 			}
 		}
 		return $versions_served;
@@ -543,7 +543,7 @@ 
 	 * @return string
 	 */
 	public static function core_version() {
-		return apply_filters( 'FHEE__EED_Core_REST_API__core_version', implode('.', array_slice( explode( '.', espresso_version() ), 0, 3 ) ) );
+		return apply_filters('FHEE__EED_Core_REST_API__core_version', implode('.', array_slice(explode('.', espresso_version()), 0, 3)));
 	}
 
 	/**
@@ -568,7 +568,7 @@ 
 	 * @param  WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 
 	}
 

core/libraries/rest_api/changes/Changes_In_4_8_36.php

Spacing +20 added lines, -20 removed lines

@@ -15,28 +15,28 @@ 
 		//set a hook to remove the "calculate" query param
 		add_filter(
 			'FHEE__EED_Core_Rest_Api___get_response_selection_query_params',
-			array( $this, 'remove_calculate_query_param' ),
+			array($this, 'remove_calculate_query_param'),
 			10,
 			3
 		);
 		//don't add the _calculated_fields either
 		add_filter(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_before_inaccessible_field_removal',
-			array( $this, 'remove_calculated_fields_from_response' ),
+			array($this, 'remove_calculated_fields_from_response'),
 			10,
 			5
 		);
 		//and also don't add the count headers
 		add_filter(
 			'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
-			array( $this, 'remove_headers_new_in_this_version' ),
+			array($this, 'remove_headers_new_in_this_version'),
 			10,
 			3
 		);
 		//remove the old featured_image part of the response...
 		add_filter(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_before_inaccessible_field_removal',
-			array( $this, 'remove_old_featured_image_part_of_cpt_entities' ),
+			array($this, 'remove_old_featured_image_part_of_cpt_entities'),
 			10,
 			5
 		);
@@ -46,7 +46,7 @@ 
 		//before this, infinity was -1, now it's null
 		add_filter(
 			'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api',
-			array( $this, 'use_negative_one_for_infinity_before_this_version' ),
+			array($this, 'use_negative_one_for_infinity_before_this_version'),
 			10,
 			4
 		);
@@ -59,9 +59,9 @@ 
 	 * @param string $version
 	 * @return array
 	 */
-	public function remove_calculate_query_param( $query_params, \EEM_Base $model, $version ) {
-		if( $this->applies_to_version( $version ) ) {
-			unset( $query_params[ 'calculate' ] );
+	public function remove_calculate_query_param($query_params, \EEM_Base $model, $version) {
+		if ($this->applies_to_version($version)) {
+			unset($query_params['calculate']);
 		}
 		return $query_params;
 	}
@@ -82,8 +82,8 @@ 
 		\WP_REST_Request $request,
 		Read $controller
 	) {
-		if( $this->applies_to_version( $controller->get_model_version_info()->requested_version() ) ) {
-			unset( $entity_response_array[ '_calculated_fields' ] );
+		if ($this->applies_to_version($controller->get_model_version_info()->requested_version())) {
+			unset($entity_response_array['_calculated_fields']);
 		}
 		return $entity_response_array;
 	}
@@ -101,14 +101,14 @@ 
 		Base $controller,
 		$version
 	) {
-		if( $this->applies_to_version( $version ) ) {
+		if ($this->applies_to_version($version)) {
 			$headers = array_diff_key(
 				$headers,
 				array_flip(
 					array(
-						Base::header_prefix_for_wp . 'Total',
-						Base::header_prefix_for_wp . 'TotalPages',
-						Base::header_prefix_for_wp . 'PageSize'
+						Base::header_prefix_for_wp.'Total',
+						Base::header_prefix_for_wp.'TotalPages',
+						Base::header_prefix_for_wp.'PageSize'
 					)));
 		}
 		return $headers;
@@ -130,14 +130,14 @@ 
 		\WP_REST_Request $request,
 		Read $controller
 	) {
-		if( $this->applies_to_version( $controller->get_model_version_info()->requested_version() )
+		if ($this->applies_to_version($controller->get_model_version_info()->requested_version())
 			&& $model instanceof \EEM_CPT_Base
 		) {
 			$attachment = wp_get_attachment_image_src(
-				get_post_thumbnail_id( $entity_response_array[ $model->primary_key_name() ] ),
+				get_post_thumbnail_id($entity_response_array[$model->primary_key_name()]),
 				'full'
 			);
-			$entity_response_array[ 'featured_image_url' ] = !empty( $attachment ) ? $attachment[ 0 ] : null;
+			$entity_response_array['featured_image_url'] = ! empty($attachment) ? $attachment[0] : null;
 		}
 		return $entity_response_array;
 	}
@@ -152,9 +152,9 @@ 
 	 * @param string $requested_value
 	 * @return mixed
 	 */
-	public function use_negative_one_for_infinity_before_this_version( $new_value, $field_obj, $original_value, $requested_value ) {
-		if( $this->applies_to_version( $requested_value )
-			&& $original_value === EE_INF ) {
+	public function use_negative_one_for_infinity_before_this_version($new_value, $field_obj, $original_value, $requested_value) {
+		if ($this->applies_to_version($requested_value)
+			&& $original_value === EE_INF) {
 			//return the old representation of infinity in the JSON
 			return -1;
 		}