eventespresso / event-espresso-core

core/libraries/rest_api/Model_Data_Translator.php

Doc Comments +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 	 *
 	 * @param \EE_Model_Field_Base $field_obj
 	 * @param mixed                $original_value
-	 * @param                      $requested_version
+	 * @param                      string $requested_version
 	 * @return mixed
 	 */
    public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {

Indentation +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 			$original_value,
 			$requested_version
 		);
-    }
+	}
 
 
 

Spacing +76 added lines, -76 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');
 }
 
 
@@ -41,14 +41,14 @@ 
 	 * @param string  $requested_version
 	 * @return mixed
 	 */
-	public static function prepare_field_values_from_json( $field_obj, $original_value_maybe_array, $requested_version ) {
-		if( is_array( $original_value_maybe_array ) ) {
+	public static function prepare_field_values_from_json($field_obj, $original_value_maybe_array, $requested_version) {
+		if (is_array($original_value_maybe_array)) {
 			$new_value_maybe_array = array();
-			foreach( $original_value_maybe_array as $array_key => $array_item ) {
-				$new_value_maybe_array[ $array_key ] = Model_Data_Translator::prepare_field_value_from_json( $field_obj, $array_item, $requested_version );
+			foreach ($original_value_maybe_array as $array_key => $array_item) {
+				$new_value_maybe_array[$array_key] = Model_Data_Translator::prepare_field_value_from_json($field_obj, $array_item, $requested_version);
 			}
 		} else {
-			$new_value_maybe_array = Model_Data_Translator::prepare_field_value_from_json( $field_obj, $original_value_maybe_array, $requested_version );
+			$new_value_maybe_array = Model_Data_Translator::prepare_field_value_from_json($field_obj, $original_value_maybe_array, $requested_version);
 		}
 		return $new_value_maybe_array;
 	}
@@ -61,14 +61,14 @@ 
 	 * @param string $request_version (eg 4.8.36)
 	 * @return array
 	 */
-	public static function prepare_field_values_for_json( $field_obj, $original_value_maybe_array, $request_version ){
-		if( is_array( $original_value_maybe_array ) ) {
+	public static function prepare_field_values_for_json($field_obj, $original_value_maybe_array, $request_version) {
+		if (is_array($original_value_maybe_array)) {
 			$new_value_maybe_array = array();
-			foreach( $original_value_maybe_array as $array_key => $array_item ) {
-				$new_value_maybe_array[ $array_key ] = Model_Data_Translator::prepare_field_value_for_json( $field_obj, $array_item, $request_version );
+			foreach ($original_value_maybe_array as $array_key => $array_item) {
+				$new_value_maybe_array[$array_key] = Model_Data_Translator::prepare_field_value_for_json($field_obj, $array_item, $request_version);
 			}
 		} else {
-			$new_value_maybe_array = Model_Data_Translator::prepare_field_value_for_json( $field_obj, $original_value_maybe_array, $request_version );
+			$new_value_maybe_array = Model_Data_Translator::prepare_field_value_for_json($field_obj, $original_value_maybe_array, $request_version);
 		}
 		return $new_value_maybe_array;
 	}
@@ -81,13 +81,13 @@ 
 	 * @param string $requested_version
 	 * @return mixed
 	 */
-	public static function prepare_field_value_from_json( $field_obj, $original_value, $requested_version ) {
+	public static function prepare_field_value_from_json($field_obj, $original_value, $requested_version) {
 		$new_value = null;
-		if( $field_obj instanceof \EE_Infinite_Integer_Field
-			&& in_array( $original_value, array( null, '' ), true ) ) {
+		if ($field_obj instanceof \EE_Infinite_Integer_Field
+			&& in_array($original_value, array(null, ''), true)) {
 			$new_value = EE_INF;
-		} elseif( $field_obj instanceof \EE_Datetime_Field ) {
-			$new_value = rest_parse_date( $original_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field) {
+			$new_value = rest_parse_date($original_value);
 		} else {
 			$new_value = $original_value;
 		}
@@ -104,22 +104,22 @@ 
 	 * @param                      $requested_version
 	 * @return mixed
 	 */
-   public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
-		if( $original_value === EE_INF ) {
+   public static function prepare_field_value_for_json($field_obj, $original_value, $requested_version) {
+		if ($original_value === EE_INF) {
 			$new_value = Model_Data_Translator::ee_inf_in_rest;
-		} elseif( $field_obj instanceof \EE_Datetime_Field ) {
-			if( $original_value instanceof \DateTime ) {
-				$new_value = $original_value->format( 'Y-m-d H:i:s' );
-			} elseif( is_int( $original_value ) ) {
-				$new_value = date( 'Y-m-d H:i:s', $original_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field) {
+			if ($original_value instanceof \DateTime) {
+				$new_value = $original_value->format('Y-m-d H:i:s');
+			} elseif (is_int($original_value)) {
+				$new_value = date('Y-m-d H:i:s', $original_value);
 			} else {
 				$new_value = $original_value;
 			}
-			$new_value = mysql_to_rfc3339( $new_value );
+			$new_value = mysql_to_rfc3339($new_value);
 		} else {
 			$new_value = $original_value;
 		}
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api',
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api',
 			$new_value,
 			$field_obj,
 			$original_value,
@@ -139,29 +139,29 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function prepare_conditions_query_params_for_models( $inputted_query_params_of_this_type, \EEM_Base $model, $requested_version ) {
+	public static function prepare_conditions_query_params_for_models($inputted_query_params_of_this_type, \EEM_Base $model, $requested_version) {
 		$query_param_for_models = array();
-		foreach( $inputted_query_params_of_this_type as $query_param_key => $query_param_value ) {
+		foreach ($inputted_query_params_of_this_type as $query_param_key => $query_param_value) {
 			$field = Model_Data_Translator::deduce_field_from_query_param(
-				Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key( $query_param_key ),
+				Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key($query_param_key),
 				$model
 			);
-			if( $field instanceof \EE_Model_Field_Base ) {
+			if ($field instanceof \EE_Model_Field_Base) {
 				//did they specify an operator?
-				if( is_array( $query_param_value ) ) {
-					$op = $query_param_value[ 0 ];
-					$translated_value = array( $op );
-					if( isset( $query_param_value[ 1 ] ) ) {
-						$value = $query_param_value[ 1 ];
-						$translated_value[1] = Model_Data_Translator::prepare_field_values_from_json( $field, $value, $requested_version );
+				if (is_array($query_param_value)) {
+					$op = $query_param_value[0];
+					$translated_value = array($op);
+					if (isset($query_param_value[1])) {
+						$value = $query_param_value[1];
+						$translated_value[1] = Model_Data_Translator::prepare_field_values_from_json($field, $value, $requested_version);
 					}
 				} else {
-					$translated_value  = Model_Data_Translator::prepare_field_value_from_json( $field, $query_param_value, $requested_version );
+					$translated_value = Model_Data_Translator::prepare_field_value_from_json($field, $query_param_value, $requested_version);
 				}
-				$query_param_for_models[ $query_param_key ] = $translated_value;
+				$query_param_for_models[$query_param_key] = $translated_value;
 			} else {
 				//so it's not for a field, assume it's a logic query param key
-				$query_param_for_models[ $query_param_key ] = Model_Data_Translator::prepare_conditions_query_params_for_models( $query_param_value, $model, $requested_version );
+				$query_param_for_models[$query_param_key] = Model_Data_Translator::prepare_conditions_query_params_for_models($query_param_value, $model, $requested_version);
 			}
 		}
 		return $query_param_for_models;
@@ -176,27 +176,27 @@ 
 	 * @param string $requested_version eg "4.8.36". If null is provided, defaults to the latest release of the EE4 REST API
 	 * @return array which can be passed into the EE4 REST API when querying a model resource
 	 */
-	public static function prepare_query_params_for_rest_api( array $model_query_params, \EEM_Base $model,  $requested_version = null ) {
-		if( $requested_version === null ) {
-			$requested_version = \EED_Core_Rest_Api::latest_rest_api_version() ;
+	public static function prepare_query_params_for_rest_api(array $model_query_params, \EEM_Base $model, $requested_version = null) {
+		if ($requested_version === null) {
+			$requested_version = \EED_Core_Rest_Api::latest_rest_api_version();
 		}
 		$rest_query_params = $model_query_params;
-		if ( isset( $model_query_params[0] ) ) {
-			$rest_query_params[ 'where' ] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api(
-				$model_query_params[ 0 ],
+		if (isset($model_query_params[0])) {
+			$rest_query_params['where'] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api(
+				$model_query_params[0],
 				$model,
 				$requested_version
 			);
-			unset( $rest_query_params[0] );
+			unset($rest_query_params[0]);
 		}
-		if ( isset( $model_query_params[ 'having' ] ) ) {
-			$rest_query_params[ 'having' ] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api(
-				$model_query_params[ 'having' ],
+		if (isset($model_query_params['having'])) {
+			$rest_query_params['having'] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api(
+				$model_query_params['having'],
 				$model,
 				$requested_version
 			);
 		}
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_query_params_for_rest_api', $rest_query_params, $model_query_params, $model, $requested_version );
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_query_params_for_rest_api', $rest_query_params, $model_query_params, $model, $requested_version);
 	}
 
 	/**
@@ -206,29 +206,29 @@ 
 	 * @param string $requested_version eg "4.8.36"
 	 * @return array ready for use in the rest api query params
 	 */
-	public static function prepare_conditions_query_params_for_rest_api( $inputted_query_params_of_this_type, \EEM_Base $model, $requested_version ) {
+	public static function prepare_conditions_query_params_for_rest_api($inputted_query_params_of_this_type, \EEM_Base $model, $requested_version) {
 		$query_param_for_models = array();
-		foreach( $inputted_query_params_of_this_type as $query_param_key => $query_param_value ) {
+		foreach ($inputted_query_params_of_this_type as $query_param_key => $query_param_value) {
 			$field = Model_Data_Translator::deduce_field_from_query_param(
-				Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key( $query_param_key ),
+				Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key($query_param_key),
 				$model
 			);
-			if( $field instanceof \EE_Model_Field_Base ) {
+			if ($field instanceof \EE_Model_Field_Base) {
 				//did they specify an operator?
-				if( is_array( $query_param_value ) ) {
-					$op = $query_param_value[ 0 ];
-					$translated_value = array( $op );
-					if( isset( $query_param_value[ 1 ] ) ) {
-						$value = $query_param_value[ 1 ];
-						$translated_value[1] = Model_Data_Translator::prepare_field_values_for_json( $field, $value, $requested_version );
+				if (is_array($query_param_value)) {
+					$op = $query_param_value[0];
+					$translated_value = array($op);
+					if (isset($query_param_value[1])) {
+						$value = $query_param_value[1];
+						$translated_value[1] = Model_Data_Translator::prepare_field_values_for_json($field, $value, $requested_version);
 					}
 				} else {
-					$translated_value  = Model_Data_Translator::prepare_field_value_for_json( $field, $query_param_value, $requested_version );
+					$translated_value = Model_Data_Translator::prepare_field_value_for_json($field, $query_param_value, $requested_version);
 				}
-				$query_param_for_models[ $query_param_key ] = $translated_value;
+				$query_param_for_models[$query_param_key] = $translated_value;
 			} else {
 				//so it's not for a field, assume it's a logic query param key
-				$query_param_for_models[ $query_param_key ] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api( $query_param_value, $model, $requested_version );
+				$query_param_for_models[$query_param_key] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api($query_param_value, $model, $requested_version);
 			}
 		}
 		return $query_param_for_models;
@@ -240,11 +240,11 @@ 
 	 * @param $condition_query_param_key
 	 * @return string
 	 */
-	public static function remove_stars_and_anything_after_from_condition_query_param_key( $condition_query_param_key ) {
+	public static function remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
-		if($pos_of_star === FALSE){
+		if ($pos_of_star === FALSE) {
 			return $condition_query_param_key;
-		}else{
+		} else {
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -260,26 +260,26 @@ 
 	 * @return \EE_Model_Field_Base
 	 * @throws \EE_Error
 	 */
-	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model){
+	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model) {
 		//ok, now proceed with deducing which part is the model's name, and which is the field's name
 		//which will help us find the database table and column
 
-		$query_param_parts = explode(".",$query_param_name);
-		if(empty($query_param_parts)){
-			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s",'event_espresso'),$query_param_name));
+		$query_param_parts = explode(".", $query_param_name);
+		if (empty($query_param_parts)) {
+			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s", 'event_espresso'), $query_param_name));
 		}
 		$number_of_parts = count($query_param_parts);
-		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
-		if($number_of_parts == 1){
+		$last_query_param_part = $query_param_parts[count($query_param_parts) - 1];
+		if ($number_of_parts == 1) {
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else {// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
-			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
+			$model = \EE_Registry::instance()->load_model($query_param_parts[$number_of_parts - 2]);
 		}
-		try{
+		try {
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch (\EE_Error $e) {
 			return null;
 		}
 	}

core/libraries/form_sections/form_handlers/SequentialStepFormManager.php

Spacing +76 added lines, -76 removed lines

@@ -16,8 +16,8 @@ 
 use Exception;
 use InvalidArgumentException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -115,11 +115,11 @@ 
 		$progress_step_style = 'number_bubbles',
 		EE_Request $request
 	) {
-		$this->setBaseUrl( $base_url );
-		$this->setDefaultFormStep( $default_form_step );
-		$this->setFormAction( $form_action );
-		$this->setFormConfig( $form_config );
-		$this->setProgressStepStyle( $progress_step_style );
+		$this->setBaseUrl($base_url);
+		$this->setDefaultFormStep($default_form_step);
+		$this->setFormAction($form_action);
+		$this->setFormConfig($form_config);
+		$this->setProgressStepStyle($progress_step_style);
 		$this->request = $request;
 	}
 
@@ -130,9 +130,9 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
 	public function baseUrl() {
-		if ( strpos( $this->base_url, $this->getCurrentStep()->slug() ) === false ) {
+		if (strpos($this->base_url, $this->getCurrentStep()->slug()) === false) {
 			add_query_arg(
-				array( $this->form_step_url_key => $this->getCurrentStep()->slug() ),
+				array($this->form_step_url_key => $this->getCurrentStep()->slug()),
 				$this->base_url
 			);
 		}
@@ -146,13 +146,13 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	protected function setBaseUrl( $base_url ) {
-		if ( ! is_string( $base_url ) ) {
-			throw new InvalidDataTypeException( '$base_url', $base_url, 'string' );
+	protected function setBaseUrl($base_url) {
+		if ( ! is_string($base_url)) {
+			throw new InvalidDataTypeException('$base_url', $base_url, 'string');
 		}
-		if ( empty( $base_url ) ) {
+		if (empty($base_url)) {
 			throw new InvalidArgumentException(
-				__( 'The base URL can not be an empty string.', 'event_espresso' )
+				__('The base URL can not be an empty string.', 'event_espresso')
 			);
 		}
 		$this->base_url = $base_url;
@@ -165,7 +165,7 @@ 
 	 * @throws InvalidDataTypeException
 	 */
 	public function formStepUrlKey() {
-		if ( empty( $this->form_step_url_key ) ) {
+		if (empty($this->form_step_url_key)) {
 			$this->setFormStepUrlKey();
 		}
 		return $this->form_step_url_key;
@@ -177,11 +177,11 @@ 
 	 * @param string $form_step_url_key
 	 * @throws InvalidDataTypeException
 	 */
-	public function setFormStepUrlKey( $form_step_url_key = 'ee-form-step' ) {
-		if ( ! is_string( $form_step_url_key ) ) {
-			throw new InvalidDataTypeException( '$form_step_key', $form_step_url_key, 'string' );
+	public function setFormStepUrlKey($form_step_url_key = 'ee-form-step') {
+		if ( ! is_string($form_step_url_key)) {
+			throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
 		}
-		$this->form_step_url_key = ! empty( $form_step_url_key ) ? $form_step_url_key : 'ee-form-step';
+		$this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
 	}
 
 
@@ -199,9 +199,9 @@ 
 	 * @param $default_form_step
 	 * @throws InvalidDataTypeException
 	 */
-	protected function setDefaultFormStep( $default_form_step ) {
-		if ( ! is_string( $default_form_step ) ) {
-			throw new InvalidDataTypeException( '$default_form_step', $default_form_step, 'string' );
+	protected function setDefaultFormStep($default_form_step) {
+		if ( ! is_string($default_form_step)) {
+			throw new InvalidDataTypeException('$default_form_step', $default_form_step, 'string');
 		}
 		$this->default_form_step = $default_form_step;
 	}
@@ -214,8 +214,8 @@ 
 	 * @throws InvalidDataTypeException
 	 */
 	protected function setCurrentStepFromRequest() {
-		$current_step_slug = $this->request()->get( $this->formStepUrlKey(), $this->defaultFormStep() );
-		if ( ! $this->form_steps->setCurrent( $current_step_slug ) ) {
+		$current_step_slug = $this->request()->get($this->formStepUrlKey(), $this->defaultFormStep());
+		if ( ! $this->form_steps->setCurrent($current_step_slug)) {
 			throw new InvalidIdentifierException(
 				$current_step_slug,
 				$this->defaultFormStep(),
@@ -237,8 +237,8 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
 	public function getCurrentStep() {
-		if ( ! $this->form_steps->current() instanceof SequentialStepForm ) {
-			throw new InvalidFormHandlerException( $this->form_steps->current() );
+		if ( ! $this->form_steps->current() instanceof SequentialStepForm) {
+			throw new InvalidFormHandlerException($this->form_steps->current());
 		}
 		return $this->form_steps->current();
 	}
@@ -250,7 +250,7 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
 	public function formAction() {
-		if ( ! is_string( $this->form_action ) || empty( $this->form_action ) ) {
+		if ( ! is_string($this->form_action) || empty($this->form_action)) {
 			$this->form_action = $this->baseUrl();
 		}
 		return $this->form_action;
@@ -262,9 +262,9 @@ 
 	 * @param string $form_action
 	 * @throws InvalidDataTypeException
 	 */
-	public function setFormAction( $form_action ) {
-		if ( ! is_string( $form_action ) ) {
-			throw new InvalidDataTypeException( '$form_action', $form_action, 'string' );
+	public function setFormAction($form_action) {
+		if ( ! is_string($form_action)) {
+			throw new InvalidDataTypeException('$form_action', $form_action, 'string');
 		}
 		$this->form_action = $form_action;
 	}
@@ -275,15 +275,15 @@ 
 	 * @param array $form_action_args
 	 * @throws InvalidDataTypeException
 	 */
-	public function addFormActionArgs( $form_action_args = array() ) {
-		if ( ! is_array( $form_action_args ) ) {
-			throw new InvalidDataTypeException( '$form_action_args', $form_action_args, 'array' );
+	public function addFormActionArgs($form_action_args = array()) {
+		if ( ! is_array($form_action_args)) {
+			throw new InvalidDataTypeException('$form_action_args', $form_action_args, 'array');
 		}
-		$form_action_args = ! empty( $form_action_args )
+		$form_action_args = ! empty($form_action_args)
 			? $form_action_args
-			: array( $this->formStepUrlKey() => $this->form_steps->current()->slug() );
+			: array($this->formStepUrlKey() => $this->form_steps->current()->slug());
 		$this->getCurrentStep()->setFormAction(
-			add_query_arg( $form_action_args, $this->formAction() )
+			add_query_arg($form_action_args, $this->formAction())
 		);
 		$this->form_action = $this->getCurrentStep()->formAction();
 	}
@@ -302,7 +302,7 @@ 
 	/**
 	 * @param string $form_config
 	 */
-	public function setFormConfig( $form_config ) {
+	public function setFormConfig($form_config) {
 		$this->form_config = $form_config;
 	}
 
@@ -320,7 +320,7 @@ 
 	/**
 	 * @param string $progress_step_style
 	 */
-	public function setProgressStepStyle( $progress_step_style ) {
+	public function setProgressStepStyle($progress_step_style) {
 		$this->progress_step_style = $progress_step_style;
 	}
 
@@ -340,7 +340,7 @@ 
 	 */
 	protected function getProgressStepsCollection() {
 		static $collection = null;
-		if ( ! $collection instanceof ProgressStepCollection ) {
+		if ( ! $collection instanceof ProgressStepCollection) {
 			$collection = new ProgressStepCollection();
 		}
 		return $collection;
@@ -356,12 +356,12 @@ 
 	 * @throws InvalidClassException
 	 * @throws InvalidInterfaceException
 	 */
-	protected function generateProgressSteps( Collection $progress_steps_collection ) {
+	protected function generateProgressSteps(Collection $progress_steps_collection) {
 		$current_step = $this->getCurrentStep();
 		/** @var SequentialStepForm $form_step */
-		foreach ( $this->form_steps as $form_step ) {
+		foreach ($this->form_steps as $form_step) {
 			// is this step active ?
-			if ( ! $form_step->initialize() ) {
+			if ( ! $form_step->initialize()) {
 				continue;
 			}
 			$progress_steps_collection->add(
@@ -375,7 +375,7 @@ 
 			);
 		}
 		// set collection pointer back to current step
-		$this->form_steps->setCurrentUsingObject( $current_step );
+		$this->form_steps->setCurrentUsingObject($current_step);
 		return new ProgressStepManager(
 			$this->progressStepStyle(),
 			$this->defaultFormStep(),
@@ -409,9 +409,9 @@ 
 	 * @throws InvalidInterfaceException
 	 * @throws InvalidArgumentException
 	 */
-	public function processForm( $form_data = array() ) {
+	public function processForm($form_data = array()) {
 		$this->buildCurrentStepFormForProcessing();
-		$this->processCurrentStepForm( $form_data );
+		$this->processCurrentStepForm($form_data);
 	}
 
 
@@ -427,10 +427,10 @@ 
 	public function buildCurrentStepFormForDisplay() {
 		$form_step = $this->buildCurrentStepForm();
 		// no displayable content ? then skip straight to processing
-		if ( ! $form_step->displayable() ) {
+		if ( ! $form_step->displayable()) {
 			$this->addFormActionArgs();
-			$form_step->setFormAction( $this->formAction() );
-			wp_safe_redirect( $form_step->formAction() );
+			$form_step->setFormAction($this->formAction());
+			wp_safe_redirect($form_step->formAction());
 		}
 	}
 
@@ -445,7 +445,7 @@ 
 	 * @throws InvalidArgumentException
 	 */
 	public function buildCurrentStepFormForProcessing() {
-		$this->buildCurrentStepForm( false );
+		$this->buildCurrentStepForm(false);
 	}
 
 
@@ -460,14 +460,14 @@ 
 	 * @throws InvalidInterfaceException
 	 * @throws InvalidArgumentException
 	 */
-	private function buildCurrentStepForm( $for_display = true ) {
+	private function buildCurrentStepForm($for_display = true) {
 		$this->form_steps = $this->getFormStepsCollection();
 		$this->setCurrentStepFromRequest();
 		$form_step = $this->getCurrentStep();
-		if ( $form_step->submitBtnText() === __( 'Submit', 'event_espresso' ) ) {
-			$form_step->setSubmitBtnText( __( 'Next Step', 'event_espresso' ) );
+		if ($form_step->submitBtnText() === __('Submit', 'event_espresso')) {
+			$form_step->setSubmitBtnText(__('Next Step', 'event_espresso'));
 		}
-		if ( $for_display && $form_step->displayable() ) {
+		if ($for_display && $form_step->displayable()) {
 			$this->progress_step_manager = $this->generateProgressSteps(
 				$this->getProgressStepsCollection()
 			);
@@ -478,16 +478,16 @@ 
 			$this->progress_step_manager->setPreviousStepsCompleted();
 			$this->progress_step_manager->enqueueStylesAndScripts();
 			$this->addFormActionArgs();
-			$form_step->setFormAction( $this->formAction() );
+			$form_step->setFormAction($this->formAction());
 
 		} else {
-			$form_step->setRedirectUrl( $this->baseUrl() );
+			$form_step->setRedirectUrl($this->baseUrl());
 			$form_step->addRedirectArgs(
-				array( $this->formStepUrlKey() => $this->form_steps->current()->slug() )
+				array($this->formStepUrlKey() => $this->form_steps->current()->slug())
 			);
 		}
 		$form_step->generate();
-		if ( $for_display ) {
+		if ($for_display) {
 			$form_step->enqueueStylesAndScripts();
 		}
 		return $form_step;
@@ -499,7 +499,7 @@ 
 	 * @param bool $return_as_string
 	 * @return string
 	 */
-	public function displayProgressSteps( $return_as_string = true ) {
+	public function displayProgressSteps($return_as_string = true) {
 		$progress_steps = apply_filters(
 			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__before_steps',
 			''
@@ -509,7 +509,7 @@ 
 			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__after_steps',
 			''
 		);
-		if ( $return_as_string ) {
+		if ($return_as_string) {
 			return $progress_steps;
 		}
 		echo $progress_steps;
@@ -523,8 +523,8 @@ 
 	 * @return string
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 */
-	public function displayCurrentStepForm( $return_as_string = true ) {
-		if ( $return_as_string ) {
+	public function displayCurrentStepForm($return_as_string = true) {
+		if ($return_as_string) {
 			return $this->getCurrentStep()->display();
 		}
 		echo $this->getCurrentStep()->display();
@@ -539,32 +539,32 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws InvalidDataTypeException
 	 */
-	public function processCurrentStepForm( $form_data = array() ) {
+	public function processCurrentStepForm($form_data = array()) {
 		// grab instance of current step because after calling next() below,
 		// any calls to getCurrentStep() will return the "next" step because we advanced
 		$current_step = $this->getCurrentStep();
 		try {
 			// form processing should either throw exceptions or return true
-			$current_step->process( $form_data );
-		} catch ( Exception $e ) {
+			$current_step->process($form_data);
+		} catch (Exception $e) {
 			// something went wrong, so...
 			// if WP_DEBUG === true, display the Exception and stack trace right now
-			new ExceptionStackTraceDisplay( $e );
+			new ExceptionStackTraceDisplay($e);
 			// else convert the Exception to an EE_Error
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			// prevent redirect to next step or other if exception was thrown
 			if (
 				$current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_NEXT_STEP
 				|| $current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_OTHER
 			) {
-				$current_step->setRedirectTo( SequentialStepForm::REDIRECT_TO_CURRENT_STEP );
+				$current_step->setRedirectTo(SequentialStepForm::REDIRECT_TO_CURRENT_STEP);
 			}
 		}
 		// save notices to a transient so that when we redirect back
 		// to the display portion for this step
 		// those notices can be displayed
-		EE_Error::get_notices( false, true );
-		$this->redirectForm( $current_step );
+		EE_Error::get_notices(false, true);
+		$this->redirectForm($current_step);
 	}
 
 
@@ -574,13 +574,13 @@ 
 	 *
 	 * @param \EventEspresso\core\libraries\form_sections\form_handlers\SequentialStepFormInterface $current_step
 	 */
-	public function redirectForm( SequentialStepFormInterface $current_step ) {
+	public function redirectForm(SequentialStepFormInterface $current_step) {
 		$redirect_step = $current_step;
-		switch( $current_step->redirectTo() ) {
+		switch ($current_step->redirectTo()) {
 
 			case SequentialStepForm::REDIRECT_TO_OTHER :
 				// going somewhere else, so just check out now
-				wp_safe_redirect( $redirect_step->redirectUrl() );
+				wp_safe_redirect($redirect_step->redirectUrl());
 				exit();
 				break;
 
@@ -590,7 +590,7 @@ 
 
 			case SequentialStepForm::REDIRECT_TO_NEXT_STEP :
 				$this->form_steps->next();
-				if ( $this->form_steps->valid() ) {
+				if ($this->form_steps->valid()) {
 					$redirect_step = $this->form_steps->current();
 				}
 				break;
@@ -600,12 +600,12 @@ 
 				// $redirect_step is already set
 
 		}
-		$current_step->setRedirectUrl( $this->baseUrl() );
+		$current_step->setRedirectUrl($this->baseUrl());
 		$current_step->addRedirectArgs(
 			// use the slug for whatever step we are redirecting too
-			array( $this->formStepUrlKey() => $redirect_step->slug() )
+			array($this->formStepUrlKey() => $redirect_step->slug())
 		);
-		wp_safe_redirect( $current_step->redirectUrl() );
+		wp_safe_redirect($current_step->redirectUrl());
 		exit();
 	}
 

core/libraries/form_sections/inputs/EE_Select_Ajax_Model_Rest_Input.input.php

Spacing +28 added lines, -28 removed lines

@@ -11,7 +11,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base{
+class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base {
 
 	/**
 	 * @var string $_model_name
@@ -50,7 +50,7 @@ 
 	 *                                  And the arguments accepted by EE_Form_Input_With_Options_Base
 	 * @throws \EE_Error
 	 */
-	public function __construct( $input_settings = array() ) {
+	public function __construct($input_settings = array()) {
 		//needed input settings:
 		//select2_args
 		$this->_model_name = EEH_Array::is_set(
@@ -62,7 +62,7 @@ 
 		$query_params = EEH_Array::is_set(
 			$input_settings,
 			'query_params',
-			array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin )
+			array('limit' => 10, 'caps' => EEM_Base::caps_read_admin)
 		);
 		$this->_value_field_name = EEH_Array::is_set(
 			$input_settings,
@@ -72,7 +72,7 @@ 
 		$this->_display_field_name = EEH_Array::is_set(
 			$input_settings,
 			'display_field_name',
-			$model->get_a_field_of_type( 'EE_Text_Field_Base' )->get_name()
+			$model->get_a_field_of_type('EE_Text_Field_Base')->get_name()
 		);
 		$this->_select_columns = EEH_Array::is_set(
 			$input_settings,
@@ -89,27 +89,27 @@ 
 		);
 		//get resource endpoint
 		$rest_controller = new EventEspresso\core\libraries\rest_api\controllers\model\Read();
-		$rest_controller->set_requested_version( EED_Core_Rest_Api::latest_rest_api_version() );
+		$rest_controller->set_requested_version(EED_Core_Rest_Api::latest_rest_api_version());
 		$default_select2_args = array(
 			'ajax' => array(
 				'url' => $rest_controller->get_versioned_link_to(
 					EEH_Array::is_set(
 						$input_settings,
 						'endpoint',
-						EEH_Inflector::pluralize_and_lower( $this->_model_name )
+						EEH_Inflector::pluralize_and_lower($this->_model_name)
 					)
 				),
 				'dataType' => 'json',
 				'delay' => '250',
 				'data_interface' => 'EE_Select2_REST_API_Interface',
 				'data_interface_args' => array(
-					'default_query_params' => (object)Model_Data_Translator::prepare_query_params_for_rest_api(
+					'default_query_params' => (object) Model_Data_Translator::prepare_query_params_for_rest_api(
 						$query_params,
 						$model
 					),
 					'display_field' => $this->_display_field_name,
 					'value_field' => $this->_value_field_name,
-					'nonce' => wp_create_nonce( 'wp_rest' )
+					'nonce' => wp_create_nonce('wp_rest')
 				),
 			),
 			'cache' => true,
@@ -117,10 +117,10 @@ 
 		);
 		$select2_args = array_replace_recursive(
 			$default_select2_args,
-			(array)EEH_Array::is_set( $input_settings, 'select2_args', array() )
+			(array) EEH_Array::is_set($input_settings, 'select2_args', array())
 		);
-		$this->set_display_strategy( new EE_Select2_Display_Strategy( $select2_args ) );
-		parent::__construct( array(), $input_settings );
+		$this->set_display_strategy(new EE_Select2_Display_Strategy($select2_args));
+		parent::__construct(array(), $input_settings);
 	}
 
 
@@ -138,34 +138,34 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function _set_raw_value( $value ) {
-		$values_for_options = (array)$value;
-		$value_field = $this->_get_model()->field_settings_for( $this->_value_field_name );
-		$display_field = $this->_get_model()->field_settings_for( $this->_display_field_name );
-		$this->_select_columns[] = $value_field->get_qualified_column() . ' AS ' . $this->_value_field_name;
-		$this->_select_columns[] = $display_field->get_qualified_column() . ' AS ' . $this->_display_field_name;
+	public function _set_raw_value($value) {
+		$values_for_options = (array) $value;
+		$value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
+		$display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
+		$this->_select_columns[] = $value_field->get_qualified_column().' AS '.$this->_value_field_name;
+		$this->_select_columns[] = $display_field->get_qualified_column().' AS '.$this->_display_field_name;
 		$display_values = $this->_get_model()->get_all_wpdb_results(
 			array(
 				array(
-					$this->_value_field_name => array( 'IN', $values_for_options )
+					$this->_value_field_name => array('IN', $values_for_options)
 				)
 			),
 			ARRAY_A,
-			implode( ',', $this->_select_columns )
+			implode(',', $this->_select_columns)
 		);
 		$select_options = array();
-		if( is_array( $select_options ) ) {
-			foreach( $display_values as $db_rows ) {
-				$db_rows = (array)$db_rows;
-				$select_options[ $db_rows[ $this->_value_field_name ] ] = apply_filters(
+		if (is_array($select_options)) {
+			foreach ($display_values as $db_rows) {
+				$db_rows = (array) $db_rows;
+				$select_options[$db_rows[$this->_value_field_name]] = apply_filters(
 					'FHEE__EE_Select_Ajax_Model_Rest_Input___set_raw_value__select_option_value',
-					$db_rows[ $this->_display_field_name ],
+					$db_rows[$this->_display_field_name],
 					$db_rows
 				);
 			}
 		}
-		$this->set_select_options( $select_options );
-		parent::_set_raw_value( $value );
+		$this->set_select_options($select_options);
+		parent::_set_raw_value($value);
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 	 * @throws EE_Error
 	 */
 	protected function _get_model() {
-		if( ! EE_Registry::instance()->is_model_name(  $this->_model_name ) ) {
+		if ( ! EE_Registry::instance()->is_model_name($this->_model_name)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -185,7 +185,7 @@ 
 				)
 			);
 		} else {
-			return EE_Registry::instance()->load_model( $this->_model_name );
+			return EE_Registry::instance()->load_model($this->_model_name);
 		}
 	}