eventespresso / event-espresso-core

core/db_classes/EE_Extra_Join.class.php

Spacing +5 added lines, -5 removed lines

@@ -22,9 +22,9 @@ 
 	 * @param null  $timezone
 	 * @return EE_Event_Message_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = NULL) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -34,8 +34,8 @@ 
 	 * @param null  $timezone
 	 * @return EE_Event_Message_Template
 	 */
-	public static function new_instance_from_db ( $props_n_values = array(), $timezone = NULL ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = NULL) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/libraries/form_sections/strategies/validation/EE_Max_Length_Validation_Strategy.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -8,36 +8,36 @@
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
  * @author				Mike Nelson
  */
-class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	protected $_max_length;
 
-	public function __construct( $validation_error_message = NULL, $max_length = EE_INF ) {
+	public function __construct($validation_error_message = NULL, $max_length = EE_INF) {
 		$this->_max_length = $max_length;
-		if( $validation_error_message === null ) {
-			$validation_error_message = sprintf( __( 'Input is too long. Maximum number of characters is %1$s', 'event_espresso' ), $max_length );
+		if ($validation_error_message === null) {
+			$validation_error_message = sprintf(__('Input is too long. Maximum number of characters is %1$s', 'event_espresso'), $max_length);
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 	/**
 	 * @param $normalized_value
 	 */
 	public function validate($normalized_value) {
-		if( $this->_max_length !== EE_INF &&
+		if ($this->_max_length !== EE_INF &&
 				$normalized_value &&
-				is_string( $normalized_value ) &&
-				 strlen( $normalized_value ) > $this->_max_length){
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'maxlength' );
+				is_string($normalized_value) &&
+				 strlen($normalized_value) > $this->_max_length) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'maxlength');
 		}
 	}
 
 	/**
 	 * @return array
 	 */
-	function get_jquery_validation_rule_array(){
-		if( $this->_max_length !== EE_INF ) {
-			return array( 'maxlength'=> $this->_max_length, 'messages' => array( 'maxlength' => $this->get_validation_error_message() ) );
+	function get_jquery_validation_rule_array() {
+		if ($this->_max_length !== EE_INF) {
+			return array('maxlength'=> $this->_max_length, 'messages' => array('maxlength' => $this->get_validation_error_message()));
 		} else {
 			return array();
 		}

core/db_models/EEM_Extra_Join.model.php

Spacing +9 added lines, -9 removed lines

@@ -21,26 +21,26 @@
  * @since		 	   $VID:$
  *
  */
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
-class EEM_Extra_Join extends EEM_Base{
+class EEM_Extra_Join extends EEM_Base {
 	// private instance of the Extra Join object
 	protected static $_instance = NULL;
 	
 	public function __construct($timezone = NULL) {
-		$models_this_can_join = array_keys( EE_Registry::instance()->non_abstract_db_models );
+		$models_this_can_join = array_keys(EE_Registry::instance()->non_abstract_db_models);
 		$this->_tables = array(
-			'Extra_Join' => new EE_Primary_Table( 'esp_extra_join', 'EXJ_ID' ),
+			'Extra_Join' => new EE_Primary_Table('esp_extra_join', 'EXJ_ID'),
 		);
 		$this->_fields = array(
 			'Extra_Join' => array(
-				'EXJ_ID' => new EE_Primary_Key_Int_Field( 'EXJ_ID', __( 'Extra Join ID', 'event_espresso' ) ),
-				'EXJ_first_model_ID' => new EE_Foreign_Key_String_Field( 'EXJ_first_model_ID', __( 'First Model ID', 'event_espresso' ), true, 0, $models_this_can_join ),
-				'EXJ_first_model_name' => new EE_Any_Foreign_Model_Name_Field( 'EXJ_first_model_name', __( 'First Model Name', 'event_espresso'), true, '', $models_this_can_join ),
-				'EXJ_second_model_ID' => new EE_Foreign_Key_String_Field( 'EXJ_second_model_ID', __( 'Second Model ID', 'event_espresso' ), true, 0, $models_this_can_join ),
-				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field( 'EXJ_second_model_name', __( 'Second Model Name', 'event_espresso'), true, '', $models_this_can_join ),
+				'EXJ_ID' => new EE_Primary_Key_Int_Field('EXJ_ID', __('Extra Join ID', 'event_espresso')),
+				'EXJ_first_model_ID' => new EE_Foreign_Key_String_Field('EXJ_first_model_ID', __('First Model ID', 'event_espresso'), true, 0, $models_this_can_join),
+				'EXJ_first_model_name' => new EE_Any_Foreign_Model_Name_Field('EXJ_first_model_name', __('First Model Name', 'event_espresso'), true, '', $models_this_can_join),
+				'EXJ_second_model_ID' => new EE_Foreign_Key_String_Field('EXJ_second_model_ID', __('Second Model ID', 'event_espresso'), true, 0, $models_this_can_join),
+				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field('EXJ_second_model_name', __('Second Model Name', 'event_espresso'), true, '', $models_this_can_join),
 				
 			)
 		);

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

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers\config;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -21,11 +21,11 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \EE_Config|\WP_Error
 	 */
-	public static function handle_request( \WP_REST_Request $request) {
+	public static function handle_request(\WP_REST_Request $request) {
 		$cap = \EE_Restriction_Generator_Base::get_default_restrictions_cap();
-		if( \EE_Capabilities::instance()->current_user_can( $cap, 'read_over_api' ) ){
+		if (\EE_Capabilities::instance()->current_user_can($cap, 'read_over_api')) {
 			return \EE_Config::instance();
-		}else{
+		} else {
 			return new \WP_Error(
 				'cannot_read_config',
 				sprintf(
@@ -35,7 +35,7 @@ 
 					),
 					$cap
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
 	}
@@ -45,11 +45,11 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \EE_Config|\WP_Error
 	 */
-	public static function handle_request_site_info( \WP_REST_Request $request) {
+	public static function handle_request_site_info(\WP_REST_Request $request) {
 		return array(
 			'default_timezone' => array(
 				'pretty' => \EEH_DTT_Helper::get_timezone_string_for_display(),
-				'string' => get_option( 'timezone_string' ),
+				'string' => get_option('timezone_string'),
 				'offset' => \EEH_DTT_Helper::get_site_timezone_gmt_offset(),
 			),
 			'default_currency' => \EE_Config::instance()->currency

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

Indentation +3 added lines, -3 removed lines

@@ -26,9 +26,9 @@
 	protected $_model_version_info;
 
 /**
-	 * Sets the version the user requested
-	 * @param string $version eg '4.8'
-	 */
+ * Sets the version the user requested
+ * @param string $version eg '4.8'
+ */
 	public function set_requested_version( $version ) {
 		parent::set_requested_version( $version );
 		$this->_model_version_info = new Model_Version_Info( $version );

Spacing +10 added lines, -10 removed lines

@@ -3,8 +3,8 @@ 
 use EventEspresso\core\libraries\rest_api\controllers\Base as Controller_Base;
 use EventEspresso\core\libraries\rest_api\Model_Version_Info;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -29,9 +29,9 @@ 
 	 * Sets the version the user requested
 	 * @param string $version eg '4.8'
 	 */
-	public function set_requested_version( $version ) {
-		parent::set_requested_version( $version );
-		$this->_model_version_info = new Model_Version_Info( $version );
+	public function set_requested_version($version) {
+		parent::set_requested_version($version);
+		$this->_model_version_info = new Model_Version_Info($version);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @return \EventEspresso\core\libraries\rest_api\Model_Version_Info
 	 * @throws \EE_Error
 	 */
-	public function get_model_version_info(){
-		if( ! $this->_model_version_info ) {
+	public function get_model_version_info() {
+		if ( ! $this->_model_version_info) {
 			throw new \EE_Error(
 				sprintf(
 					__(
@@ -66,9 +66,9 @@ 
 	 * @param array $classnames
 	 * @return boolean
 	 */
-	public function is_subclass_of_one( $object, $classnames ) {
-		foreach( $classnames as $classname ) {
-			if( is_a( $object, $classname ) ) {
+	public function is_subclass_of_one($object, $classnames) {
+		foreach ($classnames as $classname) {
+			if (is_a($object, $classname)) {
 				return true;
 			}
 		}

core/libraries/rest_api/controllers/Base.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 	 *
 	 * @param string $route
 	 * @param string $regex
-	 * @param array  $match_keys EXCLUDING matching the entire regex
+	 * @param string[]  $match_keys EXCLUDING matching the entire regex
 	 * @return array where  $match_keys are the keys (the first value of $match_keys
 	 * becomes the first key of the return value, etc. Eg passing in $match_keys of
 	 * array( 'model', 'id' ), will, if the regex is successful, will return

Spacing +60 added lines, -60 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers;
 use EventEspresso\core\libraries\rest_api\Rest_Exception;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -49,7 +49,7 @@ 
 
 
 	public function __construct() {
-		$this->_debug_mode = defined( 'EE_REST_API_DEBUG_MODE' ) ? EE_REST_API_DEBUG_MODE : false;
+		$this->_debug_mode = defined('EE_REST_API_DEBUG_MODE') ? EE_REST_API_DEBUG_MODE : false;
 	}
 
 
@@ -57,7 +57,7 @@ 
 	 * Sets the version the user requested
 	 * @param string $version eg '4.8'
 	 */
-	public function set_requested_version( $version ) {
+	public function set_requested_version($version) {
 		$this->_requested_version = $version;
 	}
 
@@ -66,8 +66,8 @@ 
 	 * @param string $key
 	 * @param string|array $info
 	 */
-	protected function _set_debug_info( $key, $info ){
-		$this->_debug_info[ $key ] = $info;
+	protected function _set_debug_info($key, $info) {
+		$this->_debug_info[$key] = $info;
 	}
 
 	/**
@@ -79,14 +79,14 @@ 
 	 * @param boolean      $use_ee_prefix whether to use the EE prefix on the header, or fallback to
 	 *                                    the standard WP one
 	 */
-	protected function _set_response_header( $header_key, $value, $use_ee_prefix = true ) {
-		if( is_array( $value ) ) {
-			foreach( $value as $value_key => $value_value ) {
-				$this->_set_response_header(  $header_key . '[' . $value_key . ']', $value_value );
+	protected function _set_response_header($header_key, $value, $use_ee_prefix = true) {
+		if (is_array($value)) {
+			foreach ($value as $value_key => $value_value) {
+				$this->_set_response_header($header_key.'['.$value_key.']', $value_value);
 			}
 		} else {
 			$prefix = $use_ee_prefix ? Base::header_prefix_for_ee : Base::header_prefix_for_wp;
-			$this->_response_headers[ $prefix . $header_key  ] = $value;
+			$this->_response_headers[$prefix.$header_key] = $value;
 		}
 	}
 
@@ -95,7 +95,7 @@ 
 	 * @return array
 	 */
 	protected function _get_response_headers() {
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
 			$this->_response_headers,
 			$this,
 			$this->_requested_version
@@ -107,13 +107,13 @@ 
 	 * @param \WP_Error $wp_error_response
 	 * @return \WP_Error
 	 */
-	protected function _add_ee_errors_to_response( \WP_Error $wp_error_response ) {
+	protected function _add_ee_errors_to_response(\WP_Error $wp_error_response) {
 		$notices_during_checkin = \EE_Error::get_raw_notices();
-		if( ! empty( $notices_during_checkin[ 'errors' ] ) ) {
-			foreach( $notices_during_checkin[ 'errors' ] as $error_code => $error_message ) {
+		if ( ! empty($notices_during_checkin['errors'])) {
+			foreach ($notices_during_checkin['errors'] as $error_code => $error_message) {
 				$wp_error_response->add(
-					sanitize_key( $error_code ),
-					strip_tags( $error_message ) );
+					sanitize_key($error_code),
+					strip_tags($error_message) );
 			}
 		}
 		return $wp_error_response;
@@ -131,27 +131,27 @@ 
 	 * @param array|\WP_Error|\Exception $response
 	 * @return \WP_REST_Response
 	 */
-	public function send_response( $response ) {
-		if( $response instanceof Rest_Exception ) {
-			$response = new \WP_Error( $response->get_string_code(), $response->getMessage(), $response->get_data() );
+	public function send_response($response) {
+		if ($response instanceof Rest_Exception) {
+			$response = new \WP_Error($response->get_string_code(), $response->getMessage(), $response->get_data());
 		}
-		if( $response instanceof \Exception ) {
+		if ($response instanceof \Exception) {
 			$code = $response->getCode() ? $response->getCode() : 'error_occurred';
-			$response = new \WP_Error( $code, $response->getMessage() );
+			$response = new \WP_Error($code, $response->getMessage());
 		}
-		if( $response instanceof \WP_Error ) {
-			$response = $this->_add_ee_errors_to_response( $response );
-			$rest_response = $this->_create_rest_response_from_wp_error( $response );
-		}else{
-			$rest_response = new \WP_REST_Response( $response, 200 );
+		if ($response instanceof \WP_Error) {
+			$response = $this->_add_ee_errors_to_response($response);
+			$rest_response = $this->_create_rest_response_from_wp_error($response);
+		} else {
+			$rest_response = new \WP_REST_Response($response, 200);
 		}
 		$headers = array();
-		if( $this->_debug_mode && is_array( $this->_debug_info ) ) {
-			foreach( $this->_debug_info  as $debug_key => $debug_info ) {
-				if( is_array( $debug_info ) ) {
-					$debug_info = wp_json_encode( $debug_info );
+		if ($this->_debug_mode && is_array($this->_debug_info)) {
+			foreach ($this->_debug_info  as $debug_key => $debug_info) {
+				if (is_array($debug_info)) {
+					$debug_info = wp_json_encode($debug_info);
 				}
-				$headers[ 'X-EE4-Debug-' . ucwords( $debug_key ) ] = $debug_info;
+				$headers['X-EE4-Debug-'.ucwords($debug_key)] = $debug_info;
 			}
 		}
 		$headers = array_merge(
@@ -160,7 +160,7 @@ 
 			$this->_get_headers_from_ee_notices()
 		);
 
-		$rest_response->set_headers( $headers );
+		$rest_response->set_headers($headers);
 		return $rest_response;
 	}
 
@@ -171,31 +171,31 @@ 
 	 * @param \WP_Error $wp_error
 	 * @return \WP_REST_Response
 	 */
-	protected function _create_rest_response_from_wp_error( \WP_Error $wp_error ) {
+	protected function _create_rest_response_from_wp_error(\WP_Error $wp_error) {
 		$error_data = $wp_error->get_error_data();
-		if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
+		if (is_array($error_data) && isset($error_data['status'])) {
 			$status = $error_data['status'];
 		} else {
 			$status = 500;
 		}
 
 		$errors = array();
-		foreach ( (array) $wp_error->errors as $code => $messages ) {
-			foreach ( (array) $messages as $message ) {
+		foreach ((array) $wp_error->errors as $code => $messages) {
+			foreach ((array) $messages as $message) {
 				$errors[] = array(
 					'code'    => $code,
 					'message' => $message,
-					'data'    => $wp_error->get_error_data( $code )
+					'data'    => $wp_error->get_error_data($code)
 				);
 			}
 		}
-		$data = isset( $errors[0] ) ? $errors[0] : array();
-		if ( count( $errors ) > 1 ) {
+		$data = isset($errors[0]) ? $errors[0] : array();
+		if (count($errors) > 1) {
 			// Remove the primary error.
-			array_shift( $errors );
+			array_shift($errors);
 			$data['additional_errors'] = $errors;
 		}
-		return new \WP_REST_Response( $data, $status );
+		return new \WP_REST_Response($data, $status);
 	}
 
 	/**
@@ -205,12 +205,12 @@ 
 	protected function _get_headers_from_ee_notices() {
 		$headers = array();
 		$notices = \EE_Error::get_raw_notices();
-		foreach( $notices as $notice_type => $sub_notices ) {
-			if( ! is_array( $sub_notices ) ) {
+		foreach ($notices as $notice_type => $sub_notices) {
+			if ( ! is_array($sub_notices)) {
 				continue;
 			}
-			foreach( $sub_notices as $notice_code => $sub_notice ) {
-				$headers[ 'X-EE4-Notices-' . \EEH_Inflector::humanize( $notice_type ) . '[' . $notice_code . ']' ] = strip_tags( $sub_notice );
+			foreach ($sub_notices as $notice_code => $sub_notice) {
+				$headers['X-EE4-Notices-'.\EEH_Inflector::humanize($notice_type).'['.$notice_code.']'] = strip_tags($sub_notice);
 			}
 		}
 		return apply_filters(
@@ -228,14 +228,14 @@ 
 	 * @param string $route
 	 * @return string
 	 */
-	public function get_requested_version( $route = null ) {
+	public function get_requested_version($route = null) {
 		$matches = $this->parse_route(
 			$route,
-			'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '~',
-			array( 'version' )
+			'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'~',
+			array('version')
 			);
-		if( isset( $matches[ 'version' ] ) ) {
-			return $matches[ 'version' ];
+		if (isset($matches['version'])) {
+			return $matches['version'];
 		} else {
 			return \EED_Core_Rest_Api::latest_rest_api_version();
 		}
@@ -260,23 +260,23 @@ 
 	 * array( 'model' => 'foo', 'id' => 'bar' )
 	 * @throws \EE_Error if it couldn't be parsed
 	 */
-	public function parse_route( $route, $regex, $match_keys ) {
+	public function parse_route($route, $regex, $match_keys) {
 		$indexed_matches = array();
-		$success = preg_match( $regex, $route, $matches );
-		if(
-			is_array( $matches ) ) {
+		$success = preg_match($regex, $route, $matches);
+		if (
+			is_array($matches) ) {
 			//skip the overall regex match. Who cares
-			for( $i = 1; $i <= count( $match_keys ); $i++ ) {
-				if( ! isset( $matches[ $i ] ) ) {
+			for ($i = 1; $i <= count($match_keys); $i++) {
+				if ( ! isset($matches[$i])) {
 					$success = false;
 				} else {
-					$indexed_matches[ $match_keys[ $i - 1 ] ] = $matches[ $i ];
+					$indexed_matches[$match_keys[$i - 1]] = $matches[$i];
 				}
 			}
 		}
-		if( ! $success ) {
+		if ( ! $success) {
 			throw new \EE_Error(
-				__( 'We could not parse the URL. Please contact Event Espresso Support', 'event_espresso' ),
+				__('We could not parse the URL. Please contact Event Espresso Support', 'event_espresso'),
 				'endpoint_parsing_error'
 			);
 		}

core/libraries/rest_api/Model_Version_Info.php

Braces +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 				$validation_error_message = $default_validation_strategy->get_validation_error_message();
 			}
 			throw new EE_Validation_Error( $validation_error_message, 'float_only' );
-		}else{
+		} else{
 			return floatval($normalized_value);
 		}
 	}
@@ -55,7 +55,7 @@ 
 	public function unnormalize($normalized_value) {
 		if( empty( $normalized_value ) ){
 			return '0.00';
-		}else{
+		} else{
 			return "$normalized_value";
 		}
 	}

Spacing +61 added lines, -61 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -94,7 +94,7 @@ 
      *
      * @param array $requested_version
      */
-    public function __construct( $requested_version ) {
+    public function __construct($requested_version) {
 		$this->_requested_version = $requested_version;
 		$this->_model_changes = array(
 			'4.8.29' => array(
@@ -116,13 +116,13 @@ 
 			'table_column' => 'N/A',
 			'always_available' => true,
 		);
-		foreach( $this->_resource_changes as $version => $model_classnames ) {
-			foreach( $model_classnames as $model_classname => $extra_fields ) {
-				foreach( $extra_fields as $fieldname => $field_data ) {
-					$this->_resource_changes[ $model_classname ][ $fieldname ][ 'name' ] = $fieldname;
-					foreach( $defaults as $attribute => $default_value ) {
-						if( ! isset( $this->_resource_changes[ $model_classname ][ $fieldname ][ $attribute ] ) ) {
-							$this->_resource_changes[ $model_classname ][ $fieldname ][ $attribute ] = $default_value;
+		foreach ($this->_resource_changes as $version => $model_classnames) {
+			foreach ($model_classnames as $model_classname => $extra_fields) {
+				foreach ($extra_fields as $fieldname => $field_data) {
+					$this->_resource_changes[$model_classname][$fieldname]['name'] = $fieldname;
+					foreach ($defaults as $attribute => $default_value) {
+						if ( ! isset($this->_resource_changes[$model_classname][$fieldname][$attribute])) {
+							$this->_resource_changes[$model_classname][$fieldname][$attribute] = $default_value;
 						}
 					}
 				}
@@ -138,11 +138,11 @@ 
 	 * @return array
 	 */
 	public function model_changes_between_requested_version_and_current() {
-		if( $this->_cached_model_changes_between_requested_version_and_current === null ) {
+		if ($this->_cached_model_changes_between_requested_version_and_current === null) {
 			$model_changes = array();
-			foreach( $this->model_changes() as $version => $models_changed_in_version ) {
-				if( $version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version() ) {
-					$model_changes[ $version ] = $models_changed_in_version;
+			foreach ($this->model_changes() as $version => $models_changed_in_version) {
+				if ($version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version()) {
+					$model_changes[$version] = $models_changed_in_version;
 				}
 			}
 			$this->_cached_model_changes_between_requested_version_and_current = $model_changes;
@@ -158,11 +158,11 @@ 
 	 * @return array
 	 */
 	public function resource_changes_between_requested_version_and_current() {
-		if( $this->_cached_resource_changes_between_requested_version_and_current === null ) {
+		if ($this->_cached_resource_changes_between_requested_version_and_current === null) {
 			$resource_changes = array();
-			foreach( $this->resource_changes() as $version => $model_classnames ) {
-				if( $version <= \EED_Core_Rest_Api::core_version()  && $version > $this->requested_version()  ) {
-					$resource_changes[ $version ] = $model_classnames;
+			foreach ($this->resource_changes() as $version => $model_classnames) {
+				if ($version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version()) {
+					$resource_changes[$version] = $model_classnames;
 				}
 			}
 			$this->_cached_resource_changes_between_requested_version_and_current = $resource_changes;
@@ -174,7 +174,7 @@ 
 	 * If a request was sent to 'wp-json/ee/v4.7/events' this would be '4.7'
 	 * @return string like '4.6'
 	 */
-	public function requested_version(){
+	public function requested_version() {
 		return $this->_requested_version;
 	}
 
@@ -188,7 +188,7 @@ 
 	 * If a version is missing then we don't know anything about what changes it introduced from the previous version
 	 * @return array
 	 */
-	public function model_changes(){
+	public function model_changes() {
 		return $this->_model_changes;
 	}
 
@@ -199,12 +199,12 @@ 
 	 * @return array keys are model names, values are their classname
 	 */
 	public function models_for_requested_version() {
-		if( $this->_cached_models_for_requested_version === null ) {
+		if ($this->_cached_models_for_requested_version === null) {
 			$all_models_in_current_version = \EE_Registry::instance()->non_abstract_db_models;
-			foreach( $this->model_changes_between_requested_version_and_current() as $version => $models_changed ) {
-				foreach( $models_changed as $model_name => $new_indicator_or_fields_added ) {
-					if( $new_indicator_or_fields_added === Model_Version_Info::model_added ) {
-						unset( $all_models_in_current_version[ $model_name ] );
+			foreach ($this->model_changes_between_requested_version_and_current() as $version => $models_changed) {
+				foreach ($models_changed as $model_name => $new_indicator_or_fields_added) {
+					if ($new_indicator_or_fields_added === Model_Version_Info::model_added) {
+						unset($all_models_in_current_version[$model_name]);
 					}
 				}
 			}
@@ -227,11 +227,11 @@ 
 	 * @param string $model_name eg 'Event'
 	 * @return boolean
 	 */
-	public function is_model_name_in_this_version( $model_name ) {
+	public function is_model_name_in_this_version($model_name) {
 		$model_names = $this->models_for_requested_version();
-		if( isset( $model_names[ $model_name ] ) ) {
+		if (isset($model_names[$model_name])) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -246,10 +246,10 @@ 
 	 * @return \EEM_Base
 	 * @throws \EE_Error
 	 */
-	public function load_model( $model_name ) {
-		if( $this->is_model_name_in_this_version( $model_name ) ) {
-			return \EE_Registry::instance()->load_model( $model_name );
-		}else{
+	public function load_model($model_name) {
+		if ($this->is_model_name_in_this_version($model_name)) {
+			return \EE_Registry::instance()->load_model($model_name);
+		} else {
 			throw new \EE_Error(
 				sprintf(
 					__(
@@ -271,21 +271,21 @@ 
 	 * @param \EEM_Base $model
 	 * @return array|\EE_Model_Field_Base[]
 	 */
-	public function fields_on_model_in_this_version( $model ) {
-		if( ! isset( $this->_cached_fields_on_models[ $model->get_this_model_name() ] ) ) {
+	public function fields_on_model_in_this_version($model) {
+		if ( ! isset($this->_cached_fields_on_models[$model->get_this_model_name()])) {
 			//get all model changes between the requested version and current core version
 			$changes = $this->model_changes_between_requested_version_and_current();
 			//fetch all fields currently on this model
 			$current_fields = $model->field_settings();
 			//remove all fields that have been added since
-			foreach( $changes as $version => $changes_in_version ) {
-				if(
-					isset( $changes_in_version[ $model->get_this_model_name() ] )
-					&& $changes_in_version[ $model->get_this_model_name() ] !== Model_Version_Info::model_added
+			foreach ($changes as $version => $changes_in_version) {
+				if (
+					isset($changes_in_version[$model->get_this_model_name()])
+					&& $changes_in_version[$model->get_this_model_name()] !== Model_Version_Info::model_added
 				) {
 					$current_fields = array_diff_key(
 						$current_fields,
-						array_flip( $changes_in_version[ $model->get_this_model_name() ] )
+						array_flip($changes_in_version[$model->get_this_model_name()])
 					);
 				}
 			}
@@ -303,9 +303,9 @@ 
 	 * @param array $classnames
 	 * @return boolean
 	 */
-	public function is_subclass_of_one( $object, $classnames ) {
-		foreach( $classnames as $classname ) {
-			if( is_a( $object, $classname ) ) {
+	public function is_subclass_of_one($object, $classnames) {
+		foreach ($classnames as $classname) {
+			if (is_a($object, $classname)) {
 				return true;
 			}
 		}
@@ -316,10 +316,10 @@ 
 	 * Returns the list of model field classes that that the API basically ignores
 	 * @return array
 	 */
-	public function fields_ignored(){
+	public function fields_ignored() {
 		return apply_filters(
 			'FHEE__Controller_Model_Read_fields_ignored',
-			array( 'EE_Foreign_Key_Field_Base', 'EE_Any_Foreign_Model_Name_Field' )
+			array('EE_Foreign_Key_Field_Base', 'EE_Any_Foreign_Model_Name_Field')
 		);
 	}
 
@@ -328,8 +328,8 @@ 
 	 * @param EE_Model_Field_Base
 	 * @return boolean
 	 */
-	public function field_is_ignored( $field_obj ){
-		 return $this->is_subclass_of_one( $field_obj, $this->fields_ignored() );
+	public function field_is_ignored($field_obj) {
+		 return $this->is_subclass_of_one($field_obj, $this->fields_ignored());
 	}
 
 	/**
@@ -340,7 +340,7 @@ 
 	public function fields_that_have_rendered_format() {
 		return apply_filters(
 			'FHEE__Controller_Model_Read__fields_raw',
-			array( 'EE_Post_Content_Field', 'EE_Full_HTML_Field' )
+			array('EE_Post_Content_Field', 'EE_Full_HTML_Field')
 		);
 	}
 
@@ -349,8 +349,8 @@ 
 	 * @param EE_Model_Field_Base
 	 * @return boolean
 	 */
-	public function field_has_rendered_format( $field_obj ){
-		 return $this->is_subclass_of_one( $field_obj, $this->fields_that_have_rendered_format() );
+	public function field_has_rendered_format($field_obj) {
+		 return $this->is_subclass_of_one($field_obj, $this->fields_that_have_rendered_format());
 	}
 
 	/**
@@ -362,7 +362,7 @@ 
 	public function fields_that_have_pretty_format() {
 		return apply_filters(
 			'FHEE__Controller_Model_Read__fields_pretty',
-			array( 'EE_Enum_Integer_Field', 'EE_Enum_Text_Field', 'EE_Money_Field' )
+			array('EE_Enum_Integer_Field', 'EE_Enum_Text_Field', 'EE_Money_Field')
 		);
 	}
 
@@ -371,8 +371,8 @@ 
 	 * @param EE_Model_Field_Base
 	 * @return boolean
 	 */
-	public function field_has_pretty_format( $field_obj ){
-		 return $this->is_subclass_of_one( $field_obj, $this->fields_that_have_pretty_format() );
+	public function field_has_pretty_format($field_obj) {
+		 return $this->is_subclass_of_one($field_obj, $this->fields_that_have_pretty_format());
 	}
 
 	/**
@@ -389,12 +389,12 @@ 
 	 * @param \EEM_Base $model
 	 * @return array
 	 */
-	public function extra_resource_properties_for_model( $model ) {
+	public function extra_resource_properties_for_model($model) {
 		$extra_properties = array();
-		foreach( $this->resource_changes_between_requested_version_and_current() as $version => $model_classnames ) {
-			foreach( $model_classnames as $model_classname => $properties_added_in_this_version ) {
-				if( is_subclass_of( $model, $model_classname ) ) {
-					$extra_properties = array_merge( $extra_properties, $properties_added_in_this_version );
+		foreach ($this->resource_changes_between_requested_version_and_current() as $version => $model_classnames) {
+			foreach ($model_classnames as $model_classname => $properties_added_in_this_version) {
+				if (is_subclass_of($model, $model_classname)) {
+					$extra_properties = array_merge($extra_properties, $properties_added_in_this_version);
 				}
 			}
 		}
@@ -407,11 +407,11 @@ 
 	 * @param \EEM_Base $model
 	 * @return \EE_Model_Relation_Base[]
 	 */
-	public function relation_settings( \EEM_Base $model ) {
+	public function relation_settings(\EEM_Base $model) {
 		$relations = array();
-		foreach( $model->relation_settings() as $relation_name => $relation_obj ) {
-			if( $this->is_model_name_in_this_version(  $relation_name ) ) {
-				$relations[ $relation_name ] = $relation_obj;
+		foreach ($model->relation_settings() as $relation_name => $relation_obj) {
+			if ($this->is_model_name_in_this_version($relation_name)) {
+				$relations[$relation_name] = $relation_obj;
 			}
 		}
 		//filter the results, but use the old filter name

Indentation +10 added lines, -10 removed lines

@@ -89,12 +89,12 @@ 
 
 
 
-    /**
-     * Model_Version_Info constructor.
-     *
-     * @param string $requested_version
-     */
-    public function __construct( $requested_version ) {
+	/**
+	 * Model_Version_Info constructor.
+	 *
+	 * @param string $requested_version
+	 */
+	public function __construct( $requested_version ) {
 		$this->_requested_version = $requested_version;
 		$this->_model_changes = array(
 			'4.8.29' => array(
@@ -209,10 +209,10 @@ 
 				}
 			}
 			$this->_cached_models_for_requested_version = apply_filters(
-			    'FHEE__EventEspresso_core_libraries_rest_api__models_for_requested_version',
-                $all_models_in_current_version,
-                $this
-            );
+				'FHEE__EventEspresso_core_libraries_rest_api__models_for_requested_version',
+				$all_models_in_current_version,
+				$this
+			);
 		}
 		return $this->_cached_models_for_requested_version;
 	}

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

Braces +3 added lines, -3 removed lines

@@ -44,11 +44,11 @@
 
 				if( $field_obj instanceof \EE_Boolean_Field ) {
 					$datatype = 'Boolean';
-				}elseif( $field_obj->get_wpdb_data_type() == '%d' ) {
+				} elseif( $field_obj->get_wpdb_data_type() == '%d' ) {
 					$datatype = 'Number';
-				}elseif( $field_name instanceof \EE_Serialized_Text_Field ) {
+				} elseif( $field_name instanceof \EE_Serialized_Text_Field ) {
 					$datatype = 'Object';
-				}else{
+				} else{
 					$datatype = 'String';
 				}
 				$field_json = array(

Spacing +36 added lines, -36 removed lines

@@ -3,8 +3,8 @@ 
 
 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');
 }
 
 /**
@@ -25,20 +25,20 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array|\WP_REST_Response
 	 */
-	public static function handle_request_models_meta( \WP_REST_Request $request ) {
+	public static function handle_request_models_meta(\WP_REST_Request $request) {
 		$controller = new Meta();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . 'resources~',
-				array( 'version' ) );
-			if( $matches instanceof \WP_REST_Response ) {
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'resources~',
+				array('version') );
+			if ($matches instanceof \WP_REST_Response) {
 				return $matches;
 			}
-			$controller->set_requested_version( $matches[ 'version' ] );
-			return $controller->send_response( $controller->_get_models_metadata_entity() );
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+			$controller->set_requested_version($matches['version']);
+			return $controller->send_response($controller->_get_models_metadata_entity());
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -46,22 +46,22 @@ 
 	 * Gets the model metadata resource entity
 	 * @return array for JSON response, describing all the models available in teh requested version
 	 */
-	protected function _get_models_metadata_entity(){
+	protected function _get_models_metadata_entity() {
 		$response = array();
-		foreach( $this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname ){
-			$model = $this->get_model_version_info()->load_model( $model_name );
+		foreach ($this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname) {
+			$model = $this->get_model_version_info()->load_model($model_name);
 			$fields_json = array();
-			foreach( $this->get_model_version_info()->fields_on_model_in_this_version( $model ) as $field_name => $field_obj ) {
-				if( $this->get_model_version_info()->field_is_ignored( $field_obj ) ) {
+			foreach ($this->get_model_version_info()->fields_on_model_in_this_version($model) as $field_name => $field_obj) {
+				if ($this->get_model_version_info()->field_is_ignored($field_obj)) {
 					continue;
 				}
-				if( $field_obj instanceof \EE_Boolean_Field ) {
+				if ($field_obj instanceof \EE_Boolean_Field) {
 					$datatype = 'Boolean';
-				}elseif( $field_obj->get_wpdb_data_type() == '%d' ) {
+				}elseif ($field_obj->get_wpdb_data_type() == '%d') {
 					$datatype = 'Number';
-				}elseif( $field_name instanceof \EE_Serialized_Text_Field ) {
+				}elseif ($field_name instanceof \EE_Serialized_Text_Field) {
 					$datatype = 'Object';
-				}else{
+				} else {
 					$datatype = 'String';
 				}
 				$default_value = Model_Data_Translator::prepare_field_value_for_json(
@@ -72,30 +72,30 @@ 
 				$field_json = array(
 					'name' => $field_name,
 					'nicename' => $field_obj->get_nicename(),
-					'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format( $field_obj ),
-					'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format( $field_obj ),
-					'type' => str_replace('EE_', '', get_class( $field_obj ) ),
+					'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format($field_obj),
+					'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format($field_obj),
+					'type' => str_replace('EE_', '', get_class($field_obj)),
 					'datatype' => $datatype,
 					'nullable' => $field_obj->is_nullable(),
 					'default' => $default_value,
 					'table_alias' => $field_obj->get_table_alias(),
 					'table_column' => $field_obj->get_table_column(),
 				);
-				$fields_json[ $field_json[ 'name' ] ] = $field_json;
+				$fields_json[$field_json['name']] = $field_json;
 
 			}
-			$fields_json = array_merge( $fields_json, $this->get_model_version_info()->extra_resource_properties_for_model( $model ) );
-			$response[ $model_name ]['fields'] = apply_filters( 'FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model );
+			$fields_json = array_merge($fields_json, $this->get_model_version_info()->extra_resource_properties_for_model($model));
+			$response[$model_name]['fields'] = apply_filters('FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model);
 			$relations_json = array();
-			foreach( $model->relation_settings()  as $relation_name => $relation_obj ) {
+			foreach ($model->relation_settings()  as $relation_name => $relation_obj) {
 				$relation_json = array(
 					'name' => $relation_name,
-					'type' => str_replace( 'EE_', '', get_class( $relation_obj ) ),
+					'type' => str_replace('EE_', '', get_class($relation_obj)),
 					'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false,
 				);
-				$relations_json[ $relation_name ] = $relation_json;
+				$relations_json[$relation_name] = $relation_json;
 			}
-			$response[ $model_name ][ 'relations' ] = apply_filters( 'FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model );
+			$response[$model_name]['relations'] = apply_filters('FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model);
 		}
 		return $response;
 	}
@@ -105,24 +105,24 @@ 
 	 * @param \WP_REST_Response $rest_response_obj
 	 * @return \WP_REST_Response
 	 */
-	public static function filter_ee_metadata_into_index( \WP_REST_Response $rest_response_obj ) {
+	public static function filter_ee_metadata_into_index(\WP_REST_Response $rest_response_obj) {
 		$response_data = $rest_response_obj->get_data();
 		$addons = array();
-		foreach( \EE_Registry::instance()->addons as $addon){
+		foreach (\EE_Registry::instance()->addons as $addon) {
 			$addon_json = array(
 				'name' => $addon->name(),
 				'version' => $addon->version()
 			);
-			$addons[ $addon_json[ 'name' ] ] = $addon_json;
+			$addons[$addon_json['name']] = $addon_json;
 		}
-		$response_data[ 'ee' ] = array(
+		$response_data['ee'] = array(
 			'version' => \EEM_System_Status::instance()->get_ee_version(),
 			'documentation_url' => 'https://github.com/eventespresso/event-espresso-core/tree/master/docs/C--REST-API',
 			'addons' => $addons,
 			'maintenance_mode' => \EE_Maintenance_Mode::instance()->real_level(),
-			'served_core_versions' => array_keys( \EED_Core_Rest_Api::versions_served() ),
+			'served_core_versions' => array_keys(\EED_Core_Rest_Api::versions_served()),
 		);
-		$rest_response_obj->set_data( $response_data );
+		$rest_response_obj->set_data($response_data);
 		return $rest_response_obj;
 	}
 }

core/data_migration_scripts/4_9_0_stages/EE_DMS_4_9_0_Answers_With_No_Registration.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -14,7 +14,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_9_0_Answers_With_No_Registration extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_9_0_Answers_With_No_Registration extends EE_Data_Migration_Script_Stage {
 
 
 
@@ -24,7 +24,7 @@ 
 	 * @return EE_DMS_4_9_0_Answers_With_No_Registration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Answer Cleanup', 'event_espresso' );
+		$this->_pretty_name = __('Answer Cleanup', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -48,9 +48,9 @@ 
 	protected function _migration_step($num_items_to_migrate = 50) {
 		global $wpdb;
 		$wpdb->delete(
-			$wpdb->prefix . 'esp_answer',
-			array( 'REG_ID' => 0 ),
-			array( '%d' )
+			$wpdb->prefix.'esp_answer',
+			array('REG_ID' => 0),
+			array('%d')
 		);
 		$this->set_completed();
 		return 1;