eventespresso / event-espresso-core

core/EE_Registry.core.php

Doc Comments +1 added lines

@@ -278,6 +278,7 @@
 
 	/**
 	 * @param mixed string | EED_Module $module
+	 * @param string $module
 	 */
 	public function add_module( $module ) {
 		if ( $module instanceof EED_Module ) {

Spacing +191 added lines, -191 removed lines

@@ -178,10 +178,10 @@ 
 	 * @param  \EE_Dependency_Map $dependency_map
 	 * @return \EE_Registry instance
 	 */
-	public static function instance( \EE_Dependency_Map $dependency_map = null ) {
+	public static function instance(\EE_Dependency_Map $dependency_map = null) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Registry ) {
-			self::$_instance = new EE_Registry( $dependency_map );
+		if ( ! self::$_instance instanceof EE_Registry) {
+			self::$_instance = new EE_Registry($dependency_map);
 		}
 		return self::$_instance;
 	}
@@ -196,9 +196,9 @@ 
 	 * @param  \EE_Dependency_Map $dependency_map
 	 * @return \EE_Registry
 	 */
-	protected function __construct( \EE_Dependency_Map $dependency_map ) {
+	protected function __construct(\EE_Dependency_Map $dependency_map) {
 		$this->_dependency_map = $dependency_map;
-		add_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading', array( $this, 'initialize' ) );
+		add_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading', array($this, 'initialize'));
 	}
 
 
@@ -225,19 +225,19 @@ 
 		$this->modules = new StdClass();
 		$this->shortcodes = new StdClass();
 		$this->widgets = new StdClass();
-		$this->load_core( 'Base', array(), true );
+		$this->load_core('Base', array(), true);
 		// add our request and response objects to the cache
-		$request_loader = $this->_dependency_map->class_loader( 'EE_Request' );
+		$request_loader = $this->_dependency_map->class_loader('EE_Request');
 		$this->_set_cached_class(
 			$request_loader(),
 			'EE_Request'
 		);
-		$response_loader = $this->_dependency_map->class_loader( 'EE_Response' );
+		$response_loader = $this->_dependency_map->class_loader('EE_Response');
 		$this->_set_cached_class(
 			$response_loader(),
 			'EE_Response'
 		);
-		add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'init' ) );
+		add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'init'));
 	}
 
 
@@ -250,10 +250,10 @@ 
 	 */
 	public function init() {
 		// Get current page protocol
-		$protocol = isset( $_SERVER[ 'HTTPS' ] ) ? 'https://' : 'http://';
+		$protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
 		// Output admin-ajax.php URL with same protocol as current page
-		self::$i18n_js_strings[ 'ajax_url' ] = admin_url( 'admin-ajax.php', $protocol );
-		self::$i18n_js_strings[ 'wp_debug' ] = defined( 'WP_DEBUG' ) ? WP_DEBUG : false;
+		self::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php', $protocol);
+		self::$i18n_js_strings['wp_debug'] = defined('WP_DEBUG') ? WP_DEBUG : false;
 	}
 
 
@@ -264,14 +264,14 @@ 
 	 * @return string
 	 */
 	public static function localize_i18n_js_strings() {
-		$i18n_js_strings = (array)EE_Registry::$i18n_js_strings;
-		foreach ( $i18n_js_strings as $key => $value ) {
-			if ( is_scalar( $value ) ) {
-				$i18n_js_strings[ $key ] = html_entity_decode( (string)$value, ENT_QUOTES, 'UTF-8' );
+		$i18n_js_strings = (array) EE_Registry::$i18n_js_strings;
+		foreach ($i18n_js_strings as $key => $value) {
+			if (is_scalar($value)) {
+				$i18n_js_strings[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 		}
 
-		return "/* <![CDATA[ */ var eei18n = " . wp_json_encode( $i18n_js_strings ) . '; /* ]]> */';
+		return "/* <![CDATA[ */ var eei18n = ".wp_json_encode($i18n_js_strings).'; /* ]]> */';
 	}
 
 
@@ -279,15 +279,15 @@ 
 	/**
 	 * @param mixed string | EED_Module $module
 	 */
-	public function add_module( $module ) {
-		if ( $module instanceof EED_Module ) {
-			$module_class = get_class( $module );
+	public function add_module($module) {
+		if ($module instanceof EED_Module) {
+			$module_class = get_class($module);
 			$this->modules->{$module_class} = $module;
 		} else {
-			if ( ! class_exists( 'EE_Module_Request_Router' ) ) {
-				$this->load_core( 'Module_Request_Router' );
+			if ( ! class_exists('EE_Module_Request_Router')) {
+				$this->load_core('Module_Request_Router');
 			}
-			$this->modules->{$module} = EE_Module_Request_Router::module_factory( $module );
+			$this->modules->{$module} = EE_Module_Request_Router::module_factory($module);
 		}
 	}
 
@@ -297,8 +297,8 @@ 
 	 * @param string $module_name
 	 * @return mixed EED_Module | NULL
 	 */
-	public function get_module( $module_name = '' ) {
-		return isset( $this->modules->{$module_name} ) ? $this->modules->{$module_name} : null;
+	public function get_module($module_name = '') {
+		return isset($this->modules->{$module_name} ) ? $this->modules->{$module_name} : null;
 	}
 
 
@@ -312,20 +312,20 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_core( $class_name, $arguments = array(), $load_only = false ) {
+	public function load_core($class_name, $arguments = array(), $load_only = false) {
 		$core_paths = apply_filters(
 			'FHEE__EE_Registry__load_core__core_paths',
 			array(
 				EE_CORE,
 				EE_ADMIN,
 				EE_CPTS,
-				EE_CORE . 'data_migration_scripts' . DS,
-				EE_CORE . 'request_stack' . DS,
-				EE_CORE . 'middleware' . DS,
+				EE_CORE.'data_migration_scripts'.DS,
+				EE_CORE.'request_stack'.DS,
+				EE_CORE.'middleware'.DS,
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $core_paths, 'EE_', $class_name, 'core', $arguments, false, true, $load_only );
+		return $this->_load($core_paths, 'EE_', $class_name, 'core', $arguments, false, true, $load_only);
 	}
 
 
@@ -339,15 +339,15 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_service( $class_name, $arguments = array(), $load_only = false ) {
+	public function load_service($class_name, $arguments = array(), $load_only = false) {
 		$service_paths = apply_filters(
 			'FHEE__EE_Registry__load_service__service_paths',
 			array(
-				EE_CORE . 'services' . DS,
+				EE_CORE.'services'.DS,
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $service_paths, 'EE_', $class_name, 'class', $arguments, false, true, $load_only );
+		return $this->_load($service_paths, 'EE_', $class_name, 'class', $arguments, false, true, $load_only);
 	}
 
 
@@ -360,9 +360,9 @@ 
 	 * @param mixed $arguments
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function load_dms( $class_name, $arguments = array() ) {
+	public function load_dms($class_name, $arguments = array()) {
 		// retrieve instantiated class
-		return $this->_load( EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, false, false, false );
+		return $this->_load(EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, false, false, false);
 	}
 
 
@@ -377,14 +377,14 @@ 
 	 * @param bool $load_only whether or not to just load the file and NOT instantiate, or load AND instantiate (default)
 	 * @return EE_Base_Class | bool
 	 */
-	public function load_class( $class_name, $arguments = array(), $from_db = false, $cache = true, $load_only = false ) {
-		$paths = apply_filters( 'FHEE__EE_Registry__load_class__paths', array(
+	public function load_class($class_name, $arguments = array(), $from_db = false, $cache = true, $load_only = false) {
+		$paths = apply_filters('FHEE__EE_Registry__load_class__paths', array(
 			EE_CORE,
 			EE_CLASSES,
 			EE_BUSINESS
-		) );
+		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only);
 	}
 
 
@@ -397,11 +397,11 @@ 
 	 * @param bool $load_only
 	 * @return EEH_Base | bool
 	 */
-	public function load_helper( $class_name, $arguments = array(), $load_only = true ) {
+	public function load_helper($class_name, $arguments = array(), $load_only = true) {
 		// todo: add doing_it_wrong() in a few versions after all addons have had calls to this method removed
-		$helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array( EE_HELPERS ) );
+		$helper_paths = apply_filters('FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS));
 		// retrieve instantiated class
-		return $this->_load( $helper_paths, 'EEH_', $class_name, 'helper', $arguments, false, true, $load_only );
+		return $this->_load($helper_paths, 'EEH_', $class_name, 'helper', $arguments, false, true, $load_only);
 	}
 
 
@@ -416,16 +416,16 @@ 
 	 * @param bool $cache  whether to cache the object or not.
 	 * @return mixed
 	 */
-	public function load_lib( $class_name, $arguments = array(), $load_only = false, $cache = true ) {
+	public function load_lib($class_name, $arguments = array(), $load_only = false, $cache = true) {
 		$paths = array(
 			EE_LIBRARIES,
-			EE_LIBRARIES . 'messages' . DS,
-			EE_LIBRARIES . 'shortcodes' . DS,
-			EE_LIBRARIES . 'qtips' . DS,
-			EE_LIBRARIES . 'payment_methods' . DS,
+			EE_LIBRARIES.'messages'.DS,
+			EE_LIBRARIES.'shortcodes'.DS,
+			EE_LIBRARIES.'qtips'.DS,
+			EE_LIBRARIES.'payment_methods'.DS,
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, 'lib', $arguments, false, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'lib', $arguments, false, $cache, $load_only);
 	}
 
 
@@ -438,13 +438,13 @@ 
 	 * @param bool $load_only
 	 * @return EEM_Base | bool
 	 */
-	public function load_model( $class_name, $arguments = array(), $load_only = false ) {
-		$paths = apply_filters( 'FHEE__EE_Registry__load_model__paths', array(
+	public function load_model($class_name, $arguments = array(), $load_only = false) {
+		$paths = apply_filters('FHEE__EE_Registry__load_model__paths', array(
 			EE_MODELS,
 			EE_CORE
-		) );
+		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EEM_', $class_name, 'model', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EEM_', $class_name, 'model', $arguments, false, true, $load_only);
 	}
 
 
@@ -457,15 +457,15 @@ 
 	 * @param bool $load_only
 	 * @return mixed | bool
 	 */
-	public function load_model_class( $class_name, $arguments = array(), $load_only = true ) {
+	public function load_model_class($class_name, $arguments = array(), $load_only = true) {
 		$paths = array(
-			EE_MODELS . 'fields' . DS,
-			EE_MODELS . 'helpers' . DS,
-			EE_MODELS . 'relations' . DS,
-			EE_MODELS . 'strategies' . DS
+			EE_MODELS.'fields'.DS,
+			EE_MODELS.'helpers'.DS,
+			EE_MODELS.'relations'.DS,
+			EE_MODELS.'strategies'.DS
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, '', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, '', $arguments, false, true, $load_only);
 	}
 
 
@@ -475,8 +475,8 @@ 
 	 * @param string $model_name like Event, Attendee, Question_Group_Question, etc.
 	 * @return boolean
 	 */
-	public function is_model_name( $model_name ) {
-		return isset( $this->models[ $model_name ] ) ? true : false;
+	public function is_model_name($model_name) {
+		return isset($this->models[$model_name]) ? true : false;
 	}
 
 
@@ -491,9 +491,9 @@ 
 	 * @param bool $load_only
 	 * @return mixed
 	 */
-	public function load_file( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = true ) {
+	public function load_file($path_to_file, $file_name, $type = '', $arguments = array(), $load_only = true) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, '', $file_name, $type, $arguments, false, true, $load_only );
+		return $this->_load($path_to_file, '', $file_name, $type, $arguments, false, true, $load_only);
 	}
 
 
@@ -508,9 +508,9 @@ 
 	 * @param bool $load_only
 	 * @return EE_Addon
 	 */
-	public function load_addon( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = false ) {
+	public function load_addon($path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = false) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, 'addon', $class_name, $type, $arguments, false, true, $load_only );
+		return $this->_load($path_to_file, 'addon', $class_name, $type, $arguments, false, true, $load_only);
 	}
 
 
@@ -541,46 +541,46 @@ 
 		$load_only = false
 	) {
 		// strip php file extension
-		$class_name = str_replace( '.php', '', trim( $class_name ) );
+		$class_name = str_replace('.php', '', trim($class_name));
 		// does the class have a prefix ?
-		if ( ! empty( $class_prefix ) && $class_prefix != 'addon' ) {
+		if ( ! empty($class_prefix) && $class_prefix != 'addon') {
 			// make sure $class_prefix is uppercase
-			$class_prefix = strtoupper( trim( $class_prefix ) );
+			$class_prefix = strtoupper(trim($class_prefix));
 			// add class prefix ONCE!!!
-			$class_name = $class_prefix . str_replace( $class_prefix, '', $class_name );
+			$class_name = $class_prefix.str_replace($class_prefix, '', $class_name);
 		}
-		$class_exists = class_exists( $class_name );
+		$class_exists = class_exists($class_name);
 		// if we're only loading the class and it already exists, then let's just return true immediately
-		if ( $load_only && $class_exists ) {
+		if ($load_only && $class_exists) {
 			return true;
 		}
 		// $this->_cache_on is toggled during the recursive loading that can occur with dependency injection
 		// $cache is controlled by individual calls to separate Registry loader methods like load_class()
 		// $load_only is also controlled by individual calls to separate Registry loader methods like load_file()
-		if ( $this->_cache_on && $cache && ! $load_only ) {
+		if ($this->_cache_on && $cache && ! $load_only) {
 			// return object if it's already cached
-			$cached_class = $this->_get_cached_class( $class_name, $class_prefix );
-			if ( $cached_class !== null ) {
+			$cached_class = $this->_get_cached_class($class_name, $class_prefix);
+			if ($cached_class !== null) {
 				return $cached_class;
 			}
 		}
 		// if the class doesn't already exist.. then we need to try and find the file and load it
-		if ( ! $class_exists ) {
+		if ( ! $class_exists) {
 			// get full path to file
-			$path = $this->_resolve_path( $class_name, $type, $file_paths );
+			$path = $this->_resolve_path($class_name, $type, $file_paths);
 			// load the file
-			$loaded = $this->_require_file( $path, $class_name, $type, $file_paths );
+			$loaded = $this->_require_file($path, $class_name, $type, $file_paths);
 			// if loading failed, or we are only loading a file but NOT instantiating an object
-			if ( ! $loaded || $load_only ) {
+			if ( ! $loaded || $load_only) {
 				// return boolean if only loading, or null if an object was expected
 				return $load_only ? $loaded : null;
 			}
 		}
 		// instantiate the requested object
-		$class_obj = $this->_create_object( $class_name, $arguments, $type, $from_db );
-		if ( $this->_cache_on && $cache ) {
+		$class_obj = $this->_create_object($class_name, $arguments, $type, $from_db);
+		if ($this->_cache_on && $cache) {
 			// save it for later... kinda like gum  { : $
-			$this->_set_cached_class( $class_obj, $class_name, $class_prefix, $from_db );
+			$this->_set_cached_class($class_obj, $class_name, $class_prefix, $from_db);
 		}
 		$this->_cache_on = true;
 		return $class_obj;
@@ -603,21 +603,21 @@ 
 	 * @param string $class_prefix
 	 * @return null|object
 	 */
-	protected function _get_cached_class( $class_name, $class_prefix = '' ) {
-		if ( isset( $this->_class_abbreviations[ $class_name ] ) ) {
-			$class_abbreviation = $this->_class_abbreviations[ $class_name ];
+	protected function _get_cached_class($class_name, $class_prefix = '') {
+		if (isset($this->_class_abbreviations[$class_name])) {
+			$class_abbreviation = $this->_class_abbreviations[$class_name];
 		} else {
 			// have to specify something, but not anything that will conflict
 			$class_abbreviation = 'FANCY_BATMAN_PANTS';
 		}
 		// check if class has already been loaded, and return it if it has been
-		if ( isset( $this->{$class_abbreviation} ) && ! is_null( $this->{$class_abbreviation} ) ) {
+		if (isset($this->{$class_abbreviation} ) && ! is_null($this->{$class_abbreviation} )) {
 			return $this->{$class_abbreviation};
-		} else if ( isset ( $this->{$class_name} ) ) {
+		} else if (isset ($this->{$class_name} )) {
 			return $this->{$class_name};
-		} else if ( isset ( $this->LIB->{$class_name} ) ) {
+		} else if (isset ($this->LIB->{$class_name} )) {
 			return $this->LIB->{$class_name};
-		} else if ( $class_prefix == 'addon' && isset ( $this->addons->{$class_name} ) ) {
+		} else if ($class_prefix == 'addon' && isset ($this->addons->{$class_name} )) {
 			return $this->addons->{$class_name};
 		}
 		return null;
@@ -638,20 +638,20 @@ 
 	 * @param array $file_paths
 	 * @return string | bool
 	 */
-	protected function _resolve_path( $class_name, $type = '', $file_paths = array() ) {
+	protected function _resolve_path($class_name, $type = '', $file_paths = array()) {
 		// make sure $file_paths is an array
-		$file_paths = is_array( $file_paths ) ? $file_paths : array( $file_paths );
+		$file_paths = is_array($file_paths) ? $file_paths : array($file_paths);
 		// cycle thru paths
-		foreach ( $file_paths as $key => $file_path ) {
+		foreach ($file_paths as $key => $file_path) {
 			// convert all separators to proper DS, if no filepath, then use EE_CLASSES
-			$file_path = $file_path ? str_replace( array( '/', '\\' ), DS, $file_path ) : EE_CLASSES;
+			$file_path = $file_path ? str_replace(array('/', '\\'), DS, $file_path) : EE_CLASSES;
 			// prep file type
-			$type = ! empty( $type ) ? trim( $type, '.' ) . '.' : '';
+			$type = ! empty($type) ? trim($type, '.').'.' : '';
 			// build full file path
-			$file_paths[ $key ] = rtrim( $file_path, DS ) . DS . $class_name . '.' . $type . 'php';
+			$file_paths[$key] = rtrim($file_path, DS).DS.$class_name.'.'.$type.'php';
 			//does the file exist and can be read ?
-			if ( is_readable( $file_paths[ $key ] ) ) {
-				return $file_paths[ $key ];
+			if (is_readable($file_paths[$key])) {
+				return $file_paths[$key];
 			}
 		}
 		return false;
@@ -673,29 +673,29 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	protected function _require_file( $path, $class_name, $type = '', $file_paths = array() ) {
+	protected function _require_file($path, $class_name, $type = '', $file_paths = array()) {
 		// don't give up! you gotta...
 		try {
 			//does the file exist and can it be read ?
-			if ( ! $path ) {
+			if ( ! $path) {
 				// so sorry, can't find the file
-				throw new EE_Error (
+				throw new EE_Error(
 					sprintf(
-						__( 'The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso' ),
-						trim( $type, '.' ),
+						__('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso'),
+						trim($type, '.'),
 						$class_name,
-						'<br />' . implode( ',<br />', $file_paths )
+						'<br />'.implode(',<br />', $file_paths)
 					)
 				);
 			}
 			// get the file
-			require_once( $path );
+			require_once($path);
 			// if the class isn't already declared somewhere
-			if ( class_exists( $class_name, false ) === false ) {
+			if (class_exists($class_name, false) === false) {
 				// so sorry, not a class
 				throw new EE_Error(
 					sprintf(
-						__( 'The %s file %s does not appear to contain the %s Class.', 'event_espresso' ),
+						__('The %s file %s does not appear to contain the %s Class.', 'event_espresso'),
 						$type,
 						$path,
 						$class_name
@@ -703,7 +703,7 @@ 
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 			return false;
 		}
@@ -735,55 +735,55 @@ 
 	 * @return null | object
 	 * @throws \EE_Error
 	 */
-	protected function _create_object( $class_name, $arguments = array(), $type = '', $from_db = false ) {
+	protected function _create_object($class_name, $arguments = array(), $type = '', $from_db = false) {
 		$class_obj = null;
 		// don't give up! you gotta...
 		try {
 			// create reflection
-			$reflector = $this->get_ReflectionClass( $class_name );
+			$reflector = $this->get_ReflectionClass($class_name);
 			// make sure arguments are an array
-			$arguments = is_array( $arguments ) ? $arguments : array( $arguments );
+			$arguments = is_array($arguments) ? $arguments : array($arguments);
 			// and if arguments array is numerically and sequentially indexed, then we want it to remain as is,
 			// else wrap it in an additional array so that it doesn't get split into multiple parameters
-			$arguments = $this->_array_is_numerically_and_sequentially_indexed( $arguments )
+			$arguments = $this->_array_is_numerically_and_sequentially_indexed($arguments)
 				? $arguments
-				: array( $arguments );
+				: array($arguments);
 			// attempt to inject dependencies ?
-			if ( $this->_dependency_map->has( $class_name ) ) {
-				$arguments = $this->_resolve_dependencies( $reflector, $class_name, $arguments );
+			if ($this->_dependency_map->has($class_name)) {
+				$arguments = $this->_resolve_dependencies($reflector, $class_name, $arguments);
 			}
 			// instantiate the class and add to the LIB array for tracking
 			// EE_Base_Classes are instantiated via new_instance by default (models call them via new_instance_from_db)
-			if ( $reflector->getConstructor() === null || $reflector->isAbstract() ) {
+			if ($reflector->getConstructor() === null || $reflector->isAbstract()) {
 				// no constructor = static methods only... nothing to instantiate, loading file was enough
 				//$instantiation_mode = "no constructor";
 				$class_obj = true;
-			} else if ( $from_db && method_exists( $class_name, 'new_instance_from_db' ) ) {
+			} else if ($from_db && method_exists($class_name, 'new_instance_from_db')) {
 				//$instantiation_mode = "new_instance_from_db";
-				$class_obj = call_user_func_array( array( $class_name, 'new_instance_from_db' ), $arguments );
-			} else if ( method_exists( $class_name, 'new_instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance_from_db'), $arguments);
+			} else if (method_exists($class_name, 'new_instance')) {
 				//$instantiation_mode = "new_instance";
-				$class_obj = call_user_func_array( array( $class_name, 'new_instance' ), $arguments );
-			} else if ( method_exists( $class_name, 'instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance'), $arguments);
+			} else if (method_exists($class_name, 'instance')) {
 				//$instantiation_mode = "instance";
-				$class_obj = call_user_func_array( array( $class_name, 'instance' ), $arguments );
-			} else if ( $reflector->isInstantiable() ) {
+				$class_obj = call_user_func_array(array($class_name, 'instance'), $arguments);
+			} else if ($reflector->isInstantiable()) {
 				//$instantiation_mode = "isInstantiable";
-				$class_obj = $reflector->newInstanceArgs( $arguments );
+				$class_obj = $reflector->newInstanceArgs($arguments);
 			} else {
 				// heh ? something's not right !
 				//$instantiation_mode = 'none';
 				throw new EE_Error(
 					sprintf(
-						__( 'The %s file %s could not be instantiated.', 'event_espresso' ),
+						__('The %s file %s could not be instantiated.', 'event_espresso'),
 						$type,
 						$class_name
 					)
 				);
 			}
-		} catch ( Exception $e ) {
-			if ( ! $e instanceof EE_Error ) {
-				$e = new EE_Error( $e->getMessage() );
+		} catch (Exception $e) {
+			if ( ! $e instanceof EE_Error) {
+				$e = new EE_Error($e->getMessage());
 			}
 			$e->get_error();
 		}
@@ -797,8 +797,8 @@ 
 	 * @param array $array
 	 * @return bool
 	 */
-	protected function _array_is_numerically_and_sequentially_indexed( array $array ) {
-		return ! empty( $array ) ? array_keys( $array ) === range( 0, count( $array ) - 1 ) : true;
+	protected function _array_is_numerically_and_sequentially_indexed(array $array) {
+		return ! empty($array) ? array_keys($array) === range(0, count($array) - 1) : true;
 	}
 
 
@@ -813,14 +813,14 @@ 
 	 * @param string $class_name
 	 * @return ReflectionClass
 	 */
-	public function get_ReflectionClass( $class_name ) {
+	public function get_ReflectionClass($class_name) {
 		if (
-			! isset( $this->_reflectors[ $class_name ] )
-			|| ! $this->_reflectors[ $class_name ] instanceof ReflectionClass
+			! isset($this->_reflectors[$class_name])
+			|| ! $this->_reflectors[$class_name] instanceof ReflectionClass
 		) {
-			$this->_reflectors[ $class_name ] = new ReflectionClass( $class_name );
+			$this->_reflectors[$class_name] = new ReflectionClass($class_name);
 		}
-		return $this->_reflectors[ $class_name ];
+		return $this->_reflectors[$class_name];
 	}
 
 
@@ -845,45 +845,45 @@ 
 	 * @param array $arguments
 	 * @return array
 	 */
-	protected function _resolve_dependencies( ReflectionClass $reflector, $class_name, $arguments = array() ) {
+	protected function _resolve_dependencies(ReflectionClass $reflector, $class_name, $arguments = array()) {
 		// let's examine the constructor
 		$constructor = $reflector->getConstructor();
 		// whu? huh? nothing?
-		if ( ! $constructor ) {
+		if ( ! $constructor) {
 			return $arguments;
 		}
 		// get constructor parameters
 		$params = $constructor->getParameters();
 		// and the keys for the incoming arguments array so that we can compare existing arguments with what is expected
-		$argument_keys = array_keys( $arguments );
+		$argument_keys = array_keys($arguments);
 		// now loop thru all of the constructors expected parameters
-		foreach ( $params as $index => $param ) {
+		foreach ($params as $index => $param) {
 			// is this a dependency for a specific class ?
 			$param_class = $param->getClass() ? $param->getClass()->name : null;
 			if (
 				// param is not even a class
-				empty( $param_class )
+				empty($param_class)
 				// and something already exists in the incoming arguments for this param
-				&& isset( $argument_keys[ $index ], $arguments[ $argument_keys[ $index ] ] )
+				&& isset($argument_keys[$index], $arguments[$argument_keys[$index]])
 			) {
 				// so let's skip this argument and move on to the next
 				continue;
 			} else if (
 				// parameter is type hinted as a class, exists as an incoming argument, AND it's the correct class
-				! empty( $param_class )
-				&& isset( $argument_keys[ $index ], $arguments[ $argument_keys[ $index ] ] )
-				&& $arguments[ $argument_keys[ $index ] ] instanceof $param_class
+				! empty($param_class)
+				&& isset($argument_keys[$index], $arguments[$argument_keys[$index]])
+				&& $arguments[$argument_keys[$index]] instanceof $param_class
 			) {
 				// skip this argument and move on to the next
 				continue;
 			} else if (
 				// parameter is type hinted as a class, and should be injected
-				! empty( $param_class )
-				&& $this->_dependency_map->has_dependency_for_class( $class_name, $param_class )
+				! empty($param_class)
+				&& $this->_dependency_map->has_dependency_for_class($class_name, $param_class)
 			) {
-				$arguments = $this->_resolve_dependency( $class_name, $param_class, $arguments, $index );
+				$arguments = $this->_resolve_dependency($class_name, $param_class, $arguments, $index);
 			} else {
-				$arguments[ $index ] = $param->getDefaultValue();
+				$arguments[$index] = $param->getDefaultValue();
 			}
 
 		}
@@ -900,7 +900,7 @@ 
 	 * @param mixed $index
 	 * @return array
 	 */
-	protected function _resolve_dependency( $class_name, $param_class , $arguments, $index ) {
+	protected function _resolve_dependency($class_name, $param_class, $arguments, $index) {
 		$dependency = null;
 		// should dependency be loaded from cache ?
 		$cache_on = $this->_dependency_map->loading_strategy_for_class_dependency(
@@ -910,30 +910,30 @@ 
 			: false;
 		// we might have a dependency...
 		// let's MAYBE try and find it in our cache if that's what's been requested
-		$cached_class = $cache_on ? $this->_get_cached_class( $param_class ) : null;
+		$cached_class = $cache_on ? $this->_get_cached_class($param_class) : null;
 		// and grab it if it exists
-		if ( $cached_class instanceof $param_class ) {
+		if ($cached_class instanceof $param_class) {
 			$dependency = $cached_class;
-		} else if ( $param_class != $class_name ) {
+		} else if ($param_class != $class_name) {
 			// obtain the loader method from the dependency map
-			$loader = $this->_dependency_map->class_loader( $param_class );
+			$loader = $this->_dependency_map->class_loader($param_class);
 			// is loader a custom closure ?
-			if ( $loader instanceof Closure ) {
+			if ($loader instanceof Closure) {
 				$dependency = $loader();
 			} else {
 				// set the cache on property for the recursive loading call
 				$this->_cache_on = $cache_on;
 				// if not, then let's try and load it via the registry
-				$dependency = $this->{$loader}( $param_class );
+				$dependency = $this->{$loader}($param_class);
 			}
 		}
 		// did we successfully find the correct dependency ?
-		if ( $dependency instanceof $param_class ) {
+		if ($dependency instanceof $param_class) {
 			// then let's inject it into the incoming array of arguments at the correct location
-			if ( isset( $argument_keys[ $index ] ) ) {
-				$arguments[ $argument_keys[ $index ] ] = $dependency;
+			if (isset($argument_keys[$index])) {
+				$arguments[$argument_keys[$index]] = $dependency;
 			} else {
-				$arguments[ $index ] = $dependency;
+				$arguments[$index] = $dependency;
 			}
 		}
 		return $arguments;
@@ -958,16 +958,16 @@ 
 	 * @param bool $from_db
 	 * @return void
 	 */
-	protected function _set_cached_class( $class_obj, $class_name, $class_prefix = '', $from_db = false ) {
+	protected function _set_cached_class($class_obj, $class_name, $class_prefix = '', $from_db = false) {
 		// return newly instantiated class
-		if ( isset( $this->_class_abbreviations[ $class_name ] ) ) {
-			$class_abbreviation = $this->_class_abbreviations[ $class_name ];
+		if (isset($this->_class_abbreviations[$class_name])) {
+			$class_abbreviation = $this->_class_abbreviations[$class_name];
 			$this->{$class_abbreviation} = $class_obj;
-		} else if ( property_exists( $this, $class_name ) ) {
+		} else if (property_exists($this, $class_name)) {
 			$this->{$class_name} = $class_obj;
-		} else if ( $class_prefix == 'addon' ) {
+		} else if ($class_prefix == 'addon') {
 			$this->addons->{$class_name} = $class_obj;
-		} else if ( ! $from_db ) {
+		} else if ( ! $from_db) {
 			$this->LIB->{$class_name} = $class_obj;
 		}
 	}
@@ -984,12 +984,12 @@ 
 	 * @param array  $arguments
 	 * @return object
 	 */
-	public static function factory( $classname, $arguments = array() ) {
-		$loader = self::instance()->_dependency_map->class_loader( $classname );
-		if ( $loader instanceof Closure ) {
-			return $loader( $arguments );
-		} else if ( method_exists( EE_Registry::instance(), $loader ) ) {
-			return EE_Registry::instance()->{$loader}( $classname, $arguments );
+	public static function factory($classname, $arguments = array()) {
+		$loader = self::instance()->_dependency_map->class_loader($classname);
+		if ($loader instanceof Closure) {
+			return $loader($arguments);
+		} else if (method_exists(EE_Registry::instance(), $loader)) {
+			return EE_Registry::instance()->{$loader}($classname, $arguments);
 		}
 		return null;
 	}
@@ -1002,9 +1002,9 @@ 
 	 * @param string $name
 	 * @return EE_Addon
 	 */
-	public function get_addon_by_name( $name ) {
-		foreach ( $this->addons as $addon ) {
-			if ( $addon->name() == $name ) {
+	public function get_addon_by_name($name) {
+		foreach ($this->addons as $addon) {
+			if ($addon->name() == $name) {
 				return $addon;
 			}
 		}
@@ -1020,8 +1020,8 @@ 
 	 */
 	public function get_addons_by_name() {
 		$addons = array();
-		foreach ( $this->addons as $addon ) {
-			$addons[ $addon->name() ] = $addon;
+		foreach ($this->addons as $addon) {
+			$addons[$addon->name()] = $addon;
 		}
 		return $addons;
 	}
@@ -1036,14 +1036,14 @@ 
 	 * @return \EEM_Base
 	 * @throws \EE_Error
 	 */
-	public function reset_model( $model_name ) {
-		$model = $this->load_model( $model_name );
-		$model_class_name = get_class( $model );
+	public function reset_model($model_name) {
+		$model = $this->load_model($model_name);
+		$model_class_name = get_class($model);
 		//get that model reset it and make sure we nuke the old reference to it
-		if ( $model instanceof $model_class_name && is_callable( array( $model_class_name, 'reset' ))) {
+		if ($model instanceof $model_class_name && is_callable(array($model_class_name, 'reset'))) {
 			$this->LIB->{$model_class_name} = $model::reset();
 		} else {
-			throw new EE_Error( sprintf( __( 'Model %s does not have a method "reset"', 'event_espresso' ), $model_name ) );
+			throw new EE_Error(sprintf(__('Model %s does not have a method "reset"', 'event_espresso'), $model_name));
 		}
 		return $this->LIB->{$model_class_name};
 	}
@@ -1061,15 +1061,15 @@ 
 	 * currently reinstantiate the singletons at the moment)
 	 * @return EE_Registry
 	 */
-	public static function reset( $hard = false, $reinstantiate = true ) {
+	public static function reset($hard = false, $reinstantiate = true) {
 		$instance = self::instance();
 		EEH_Activation::reset();
 		$instance->_cache_on = true;
-		$instance->CFG = EE_Config::reset( $hard, $reinstantiate );
+		$instance->CFG = EE_Config::reset($hard, $reinstantiate);
 		$instance->LIB->EE_Data_Migration_Manager = EE_Data_Migration_Manager::reset();
 		$instance->LIB = new stdClass();
-		foreach ( array_keys( $instance->non_abstract_db_models ) as $model_name ) {
-			$instance->reset_model( $model_name );
+		foreach (array_keys($instance->non_abstract_db_models) as $model_name) {
+			$instance->reset_model($model_name);
 		}
 		return $instance;
 	}
@@ -1089,7 +1089,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __call( $a, $b ) {
+	final function __call($a, $b) {
 	}
 
 
@@ -1097,7 +1097,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __get( $a ) {
+	final function __get($a) {
 	}
 
 
@@ -1106,7 +1106,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __set( $a, $b ) {
+	final function __set($a, $b) {
 	}
 
 
@@ -1114,7 +1114,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __isset( $a ) {
+	final function __isset($a) {
 	}
 
 
@@ -1122,7 +1122,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final function __unset( $a ) {
+	final function __unset($a) {
 	}
 
 
@@ -1169,7 +1169,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final static function __callStatic( $a, $b ) {
+	final static function __callStatic($a, $b) {
 	}
 
 	/**
@@ -1178,9 +1178,9 @@ 
 	 */
 	public function cpt_models() {
 		$cpt_models = array();
-		foreach( $this->non_abstract_db_models as $short_name => $classname ) {
-			if( is_subclass_of(  $classname, 'EEM_CPT_Base' ) ) {
-				$cpt_models[ $short_name ] = $classname;
+		foreach ($this->non_abstract_db_models as $short_name => $classname) {
+			if (is_subclass_of($classname, 'EEM_CPT_Base')) {
+				$cpt_models[$short_name] = $classname;
 			}
 		}
 		return $cpt_models;

core/EE_Request_Handler.core.php

Doc Comments +4 added lines, -4 removed lines

@@ -351,7 +351,7 @@ 
 	 *    remove param
 	 *
 	 * @access    public
-	 * @param $key
+	 * @param string $key
 	 * @return    void
 	 */
 	public function un_set( $key ) {
@@ -391,7 +391,7 @@ 
 	 *    add_output
 	 *
 	 * @access    public
-	 * @param $string
+	 * @param string $string
 	 * @return    void
 	 */
 	public function add_output( $string ) {
@@ -456,14 +456,14 @@ 
 
 
 	/**
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function __clone() {}
 
 
 
 	/**
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function __wakeup() {}
 

Spacing +78 added lines, -78 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * class EE_Request_Handler
  *
@@ -50,13 +50,13 @@ 
 	 * @param  EE_Request $request
 	 * @return \EE_Request_Handler
 	 */
-	public function __construct( EE_Request $request ) {
+	public function __construct(EE_Request $request) {
 		// grab request vars
 		$this->_params = $request->params();
 		// AJAX ???
-		$this->ajax = defined( 'DOING_AJAX' ) && DOING_AJAX ? true : false;
-		$this->front_ajax = defined( 'EE_FRONT_AJAX' ) && EE_FRONT_AJAX ? true : false;
-		do_action( 'AHEE__EE_Request_Handler__construct__complete' );
+		$this->ajax = defined('DOING_AJAX') && DOING_AJAX ? true : false;
+		$this->front_ajax = defined('EE_FRONT_AJAX') && EE_FRONT_AJAX ? true : false;
+		do_action('AHEE__EE_Request_Handler__construct__complete');
 	}
 
 
@@ -68,12 +68,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);
 	}
 
 
@@ -85,14 +85,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();
 		}
@@ -107,19 +107,19 @@ 
 	 * @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 ) && is_numeric( basename( $wp->request ))) {
-			$post_id = basename( $wp->request );
+		if ( ! $post_id && isset($wp->request) && is_numeric(basename($wp->request))) {
+			$post_id = basename($wp->request);
 		}
 		return $post_id;
 	}
@@ -133,35 +133,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;
 			}
 		}
@@ -177,11 +177,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;
 	}
 
 
@@ -191,18 +191,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;
@@ -219,41 +219,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;
 			}
 		}
@@ -269,7 +269,7 @@ 
 	 * @param null|bool $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;
 	}
@@ -283,7 +283,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;
 	}
 
 
@@ -307,14 +307,14 @@ 
 	 * @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 )
+			($key === 'ee' && empty($this->_params['ee']))
+			|| ($key === 'ee' && ! empty($this->_params['ee']) && $override_ee)
 		) {
-			$this->_params[ $key ] = $value;
+			$this->_params[$key] = $value;
 		}
 	}
 
@@ -328,8 +328,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;
 	}
 
 
@@ -341,8 +341,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;
 	}
 
 
@@ -354,8 +354,8 @@ 
 	 * @param $key
 	 * @return    void
 	 */
-	public function un_set( $key ) {
-		unset( $this->_params[ $key ] );
+	public function un_set($key) {
+		unset($this->_params[$key]);
 	}
 
 
@@ -368,8 +368,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;
 	}
 
 
@@ -381,8 +381,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;
 	}
 
 
@@ -394,7 +394,7 @@ 
 	 * @param $string
 	 * @return    void
 	 */
-	public function add_output( $string ) {
+	public function add_output($string) {
 		$this->_output .= $string;
 	}
 
@@ -416,8 +416,8 @@ 
 	 * @param $item
 	 * @param $key
 	 */
-	public function sanitize_text_field_for_array_walk( &$item, &$key ) {
-		$item = strpos( $item, 'email' ) !== false ? sanitize_email( $item ) : sanitize_text_field( $item );
+	public function sanitize_text_field_for_array_walk(&$item, &$key) {
+		$item = strpos($item, 'email') !== false ? sanitize_email($item) : sanitize_text_field($item);
 	}
 
 
@@ -427,7 +427,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return false; }
+	public function __set($a, $b) { return false; }
 
 
 

core/EE_Load_Espresso_Core.core.php

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -65,26 +65,26 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 		// info about how to load classes required by other classes
 		$this->dependency_map = $this->_load_dependency_map();
 		// central repository for classes
 		$this->registry = $this->_load_registry();
-		do_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading' );
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
 		// PSR4 Autoloaders
-		$this->registry->load_core( 'EE_Psr4AutoloaderInit' );
+		$this->registry->load_core('EE_Psr4AutoloaderInit');
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// WP cron jobs
-		$this->registry->load_core( 'Cron_Tasks' );
-		$this->registry->load_core( 'EE_Request_Handler' );
-		$this->registry->load_core( 'EE_System' );
+		$this->registry->load_core('Cron_Tasks');
+		$this->registry->load_core('EE_Request_Handler');
+		$this->registry->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -114,11 +114,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function dependency_map() {
-		if ( ! $this->dependency_map instanceof EE_Dependency_Map ) {
+		if ( ! $this->dependency_map instanceof EE_Dependency_Map) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Dependency_Map: "%1$s"', 'event_espresso' ),
-					print_r( $this->dependency_map, true )
+					__('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
+					print_r($this->dependency_map, true)
 				)
 			);
 		}
@@ -132,11 +132,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function registry() {
-		if ( ! $this->registry instanceof EE_Registry ) {
+		if ( ! $this->registry instanceof EE_Registry) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Registry: "%1$s"', 'event_espresso' ),
-					print_r( $this->registry, true )
+					__('Invalid EE_Registry: "%1$s"', 'event_espresso'),
+					print_r($this->registry, true)
 				)
 			);
 		}
@@ -152,15 +152,15 @@ 
 	 * 	@return EE_Dependency_Map
 	 */
 	private function _load_dependency_map() {
-		if ( ! is_readable( EE_CORE . 'EE_Dependency_Map.core.php' ) ) {
+		if ( ! is_readable(EE_CORE.'EE_Dependency_Map.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Dependency_Map core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Dependency_Map.core.php' );
-		return EE_Dependency_Map::instance( $this->request, $this->response );
+		require_once(EE_CORE.'EE_Dependency_Map.core.php');
+		return EE_Dependency_Map::instance($this->request, $this->response);
 	}
 
 
@@ -172,15 +172,15 @@ 
 	 * 	@return EE_Registry
 	 */
 	private function _load_registry() {
-		if ( ! is_readable( EE_CORE . 'EE_Registry.core.php' )) {
+		if ( ! is_readable(EE_CORE.'EE_Registry.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Registry core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Registry core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Registry.core.php' );
-		return EE_Registry::instance( $this->dependency_map );
+		require_once(EE_CORE.'EE_Registry.core.php');
+		return EE_Registry::instance($this->dependency_map);
 	}
 
 
@@ -191,13 +191,13 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( ! is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
+		if ( ! is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
 			EE_Error::add_error(
-				__( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' ),
+				__('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
-		require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 	}
 
 
@@ -211,13 +211,13 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//\EEH_Debug_Tools::printr( __FUNCTION__, __CLASS__, __FILE__, __LINE__, 2 );
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();
-		if ( $response->plugin_deactivated() ) {
-			espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
+		if ($response->plugin_deactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
 		}
 	}
 

shortcodes/espresso_thank_you/EES_Espresso_Thank_You.shortcode.php

Spacing +135 added lines, -135 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -91,7 +91,7 @@ 
 	 * @return    void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EES_Espresso_Thank_You', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EES_Espresso_Thank_You', 'set_definitions'), 2);
 	}
 
 
@@ -104,22 +104,22 @@ 
 	 */
 	public static function set_hooks_admin() {
 		// AJAX for IPN monitoring
-		add_filter( 'heartbeat_received', array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ), 10, 3 );
+		add_filter('heartbeat_received', array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'), 10, 3);
 		add_filter(
 			'heartbeat_nopriv_received',
-			array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ),
+			array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'),
 			10,
 			3
 		);
 		add_action(
 			'wp_ajax_espresso_resend_reg_confirmation_email',
-			array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ),
+			array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'),
 			10,
 			2
 		);
 		add_action(
 			'wp_ajax_nopriv_espresso_resend_reg_confirmation_email',
-			array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ),
+			array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'),
 			10,
 			2
 		);
@@ -134,8 +134,8 @@ 
 	 * @return    void
 	 */
 	public static function set_definitions() {
-		define( 'THANK_YOU_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'THANK_YOU_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ ) ) . 'templates' . DS );
+		define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -147,13 +147,13 @@ 
 	 * @return    EE_Transaction
 	 */
 	public function get_txn() {
-		if ( $this->_current_txn instanceof EE_Transaction ) {
+		if ($this->_current_txn instanceof EE_Transaction) {
 			return $this->_current_txn;
 		}
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
-		if ( ! $TXN_model instanceof EEM_Transaction ) {
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
+		if ( ! $TXN_model instanceof EEM_Transaction) {
 			EE_Error::add_error(
-				__( 'The transaction model could not be established.', 'event_espresso' ),
+				__('The transaction model could not be established.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -161,9 +161,9 @@ 
 			return null;
 		}
 		//get the transaction. yes, we may have just loaded it, but it may have been updated, or this may be via an ajax request
-		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link( $this->_reg_url_link );
+		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link($this->_reg_url_link);
 		// verify TXN
-		if ( WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction ) {
+		if (WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction) {
 			EE_Error::add_error(
 				__(
 					'No transaction information could be retrieved or the transaction data is not of the correct type.',
@@ -187,16 +187,16 @@ 
 	 * @param int $since
 	 * @return    mixed array of EE_Payment || FALSE
 	 */
-	public function get_txn_payments( $since = 0 ) {
-		if ( ! $this->get_txn() ) {
+	public function get_txn_payments($since = 0) {
+		if ( ! $this->get_txn()) {
 			return false;
 		}
-		$args = array( 'order_by' => array( 'PAY_timestamp' => 'ASC' ) );
-		if ( $since > 0 ) {
-			$args[0] = array( 'PAY_timestamp' => array( '>', $since ) );
+		$args = array('order_by' => array('PAY_timestamp' => 'ASC'));
+		if ($since > 0) {
+			$args[0] = array('PAY_timestamp' => array('>', $since));
 		}
 		// get array of payments with most recent first
-		return $this->_current_txn->payments( $args );
+		return $this->_current_txn->payments($args);
 	}
 
 
@@ -208,11 +208,11 @@ 
 	 * @return    void
 	 */
 	private function _get_reg_url_link() {
-		if ( ! empty( $this->_reg_url_link ) ) {
+		if ( ! empty($this->_reg_url_link)) {
 			return;
 		}
 		// only do thank you page stuff if we have a REG_url_link in the url
-		if ( WP_DEBUG && ! EE_Registry::instance()->REQ->is_set( 'e_reg_url_link' ) ) {
+		if (WP_DEBUG && ! EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
 			EE_Error::add_error(
 				__(
 					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
@@ -225,7 +225,7 @@ 
 			return;
 		}
 		// check for reg_url_link
-		$this->_reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link' );
+		$this->_reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link');
 	}
 
 
@@ -237,8 +237,8 @@ 
 	 * @param    string $reg_url_link
 	 * @return    string
 	 */
-	public function set_reg_url_link( $reg_url_link = null ) {
-		$this->_reg_url_link = ! empty( $reg_url_link ) ? $reg_url_link : $this->_reg_url_link;
+	public function set_reg_url_link($reg_url_link = null) {
+		$this->_reg_url_link = ! empty($reg_url_link) ? $reg_url_link : $this->_reg_url_link;
 	}
 
 
@@ -251,28 +251,28 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 		// remove site_url() from thank you page URL
-		$thank_you_page_URL = substr( EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen( home_url() ) );
+		$thank_you_page_URL = substr(EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen(home_url()));
 		// remove other non-essential details from URL
-		$thank_you_page_URL = trim( parse_url( $thank_you_page_URL, PHP_URL_PATH ), '/' );
+		$thank_you_page_URL = trim(parse_url($thank_you_page_URL, PHP_URL_PATH), '/');
 		// ensure this shortcode doesn't trigger on anything BUT the thank you page
-		if ( isset( $WP->request ) && trim( $WP->request, '/' ) !== $thank_you_page_URL ) {
+		if (isset($WP->request) && trim($WP->request, '/') !== $thank_you_page_URL) {
 			return;
 		} else if (
-			isset( $WP->query_vars['page_id'] )
-			&& (int)$WP->query_vars['page_id'] !== (int)EE_Registry::instance()->CFG->core->thank_you_page_id
+			isset($WP->query_vars['page_id'])
+			&& (int) $WP->query_vars['page_id'] !== (int) EE_Registry::instance()->CFG->core->thank_you_page_id
 		) {
 			return;
 		}
 		$this->_get_reg_url_link();
 		// resend_reg_confirmation_email ?
-		if ( EE_Registry::instance()->REQ->is_set( 'resend' ) ) {
+		if (EE_Registry::instance()->REQ->is_set('resend')) {
 			EES_Espresso_Thank_You::resend_reg_confirmation_email();
 		}
 		// load assets
-		add_action( 'wp_enqueue_scripts', array( $this, 'load_js' ), 10 );
-		EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		add_action('wp_enqueue_scripts', array($this, 'load_js'), 10);
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		$this->_translate_strings();
 	}
 
@@ -326,12 +326,12 @@ 
 	public function load_js() {
 		wp_register_script(
 			'thank_you_page',
-			THANK_YOU_ASSETS_URL . 'thank_you_page.js',
-			array( 'espresso_core', 'heartbeat' ),
+			THANK_YOU_ASSETS_URL.'thank_you_page.js',
+			array('espresso_core', 'heartbeat'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
-		wp_enqueue_script( 'thank_you_page' );
+		wp_enqueue_script('thank_you_page');
 	}
 
 
@@ -345,9 +345,9 @@ 
 	 */
 	public function init() {
 		$this->_get_reg_url_link();
-		if ( ! $this->get_txn() ) {
+		if ( ! $this->get_txn()) {
 			echo EEH_HTML::div(
-				EEH_HTML::h4( __( 'We\'re sorry...', 'event_espresso' ), '', '' ) .
+				EEH_HTML::h4(__('We\'re sorry...', 'event_espresso'), '', '').
 				sprintf(
 					__(
 						'This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s',
@@ -361,8 +361,8 @@ 
 			return null;
 		}
 		// if we've made it to the Thank You page, then let's toggle any "Failed" transactions to "Incomplete"
-		if ( $this->_current_txn->status_ID() === EEM_Transaction::failed_status_code ) {
-			$this->_current_txn->set_status( EEM_Transaction::incomplete_status_code );
+		if ($this->_current_txn->status_ID() === EEM_Transaction::failed_status_code) {
+			$this->_current_txn->set_status(EEM_Transaction::incomplete_status_code);
 			$this->_current_txn->save();
 		}
 		$this->_primary_registrant = $this->_current_txn->primary_registration() instanceof EE_Registration
@@ -375,15 +375,15 @@ 
 		);
 		$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
 		// txn status ?
-		if ( $this->_current_txn->is_completed() ) {
+		if ($this->_current_txn->is_completed()) {
 			$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
 		} else if (
 			$this->_current_txn->is_incomplete()
-			&& ( $this->_primary_registrant->is_approved()
-			|| $this->_primary_registrant->is_pending_payment() )
+			&& ($this->_primary_registrant->is_approved()
+			|| $this->_primary_registrant->is_pending_payment())
 		) {
 			$this->_show_try_pay_again_link = true;
-		} else if ( $this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment() ) {
+		} else if ($this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment()) {
 			// its pending
 			$this->_show_try_pay_again_link = isset(
 				EE_Registry::instance()->CFG->registration->show_pending_payment_options
@@ -409,21 +409,21 @@ 
 		}
 		// link to SPCO
 		$revisit_spco_url = add_query_arg(
-			array( 'ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link ),
+			array('ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
 		// link to SPCO payment_options
 		$this->_SPCO_payment_options_url = $this->_primary_registrant instanceof EE_Registration
 			? $this->_primary_registrant->payment_overview_url()
 			: add_query_arg(
-				array( 'step' => 'payment_options' ),
+				array('step' => 'payment_options'),
 				$revisit_spco_url
 			);
 		// link to SPCO attendee_information
 		$this->_SPCO_attendee_information_url = $this->_primary_registrant instanceof EE_Registration
 			? $this->_primary_registrant->edit_attendee_information_url()
 			: false;
-		do_action( 'AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn );
+		do_action('AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn);
 		// set no cache headers and constants
 		EE_System::do_not_cache();
 	}
@@ -438,15 +438,15 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		$this->init();
-		if ( ! $this->_current_txn instanceof EE_Transaction ) {
+		if ( ! $this->_current_txn instanceof EE_Transaction) {
 			return EE_Error::get_notices();
 		}
 		//EEH_Debug_Tools::log( __CLASS__, __FUNCTION__, __LINE__, array( $this->_current_txn ), true, 	'EE_Transaction: ' . $this->_current_txn->ID() );
 		// link to receipt
-		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url( 'html' );
-		if ( ! empty( $template_args['TXN_receipt_url'] ) ) {
+		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url('html');
+		if ( ! empty($template_args['TXN_receipt_url'])) {
 			$template_args['order_conf_desc'] = __(
 				'%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.',
 				'event_espresso'
@@ -458,13 +458,13 @@ 
 			);
 		}
 		$template_args['transaction'] = $this->_current_txn;
-		$template_args['revisit'] = EE_Registry::instance()->REQ->get( 'revisit', false );
-		add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_registration_details' ) );
-		if ( $this->_is_primary && ! $this->_current_txn->is_free() ) {
-			add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_ajax_content' ) );
+		$template_args['revisit'] = EE_Registry::instance()->REQ->get('revisit', false);
+		add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_registration_details'));
+		if ($this->_is_primary && ! $this->_current_txn->is_free()) {
+			add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
 		}
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-overview.template.php',
 			$template_args,
 			true,
 			true
@@ -485,15 +485,15 @@ 
 	 * @return    array
 	 * @throws \EE_Error
 	 */
-	public static function thank_you_page_IPN_monitor( $response = array(), $data = array() ) {
+	public static function thank_you_page_IPN_monitor($response = array(), $data = array()) {
 		// does this heartbeat contain our data ?
-		if ( ! isset( $data['espresso_thank_you_page'] ) ) {
+		if ( ! isset($data['espresso_thank_you_page'])) {
 			return $response;
 		}
 		// check for reg_url_link in the incoming heartbeat data
-		if ( ! isset( $data['espresso_thank_you_page']['e_reg_url_link'] ) ) {
+		if ( ! isset($data['espresso_thank_you_page']['e_reg_url_link'])) {
 			$response['espresso_thank_you_page'] = array(
-			'errors' => ! empty( $notices['errors'] )
+			'errors' => ! empty($notices['errors'])
 				? $notices['errors']
 				: __(
 					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
@@ -508,15 +508,15 @@ 
 		EES_Espresso_Thank_You::set_definitions();
 		/** @var $espresso_thank_you_page EES_Espresso_Thank_You */
 		$espresso_thank_you_page = EES_Espresso_Thank_You::instance();
-		$espresso_thank_you_page->set_reg_url_link( $data['espresso_thank_you_page']['e_reg_url_link'] );
+		$espresso_thank_you_page->set_reg_url_link($data['espresso_thank_you_page']['e_reg_url_link']);
 		$espresso_thank_you_page->init();
 		//get TXN
 		$TXN = $espresso_thank_you_page->get_txn();
 		// no TXN? then get out
-		if ( ! $TXN instanceof EE_Transaction ) {
+		if ( ! $TXN instanceof EE_Transaction) {
 			$notices = EE_Error::get_notices();
 			$response['espresso_thank_you_page'] = array(
-			'errors' => ! empty( $notices['errors'] )
+			'errors' => ! empty($notices['errors'])
 				? $notices['errors']
 				: sprintf(
 					__(
@@ -529,13 +529,13 @@ 
 			return $response;
 		}
 		// grab transient of TXN's status
-		$txn_status = isset( $data['espresso_thank_you_page']['txn_status'] )
+		$txn_status = isset($data['espresso_thank_you_page']['txn_status'])
 			? $data['espresso_thank_you_page']['txn_status']
 			: null;
 		// has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
-		if ( $txn_status !== $TXN->status_ID() ) {
+		if ($txn_status !== $TXN->status_ID()) {
 			// switch between two possible basic outcomes
-			switch ( $TXN->status_ID() ) {
+			switch ($TXN->status_ID()) {
 				// TXN has been updated in some way
 				case EEM_Transaction::overpaid_status_code:
 				case EEM_Transaction::complete_status_code:
@@ -550,25 +550,25 @@ 
 				case EEM_Transaction::failed_status_code:
 				default:
 					// keep on waiting...
-					return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
+					return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
 			}
 			// or is the TXN still failed (never been updated) ???
-		} else if ( $TXN->failed() ) {
+		} else if ($TXN->failed()) {
 			// keep on waiting...
-			return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
+			return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
 		}
 		// TXN is happening so let's get the payments now
 		// if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
-		$since = isset( $data['espresso_thank_you_page']['get_payments_since'] )
+		$since = isset($data['espresso_thank_you_page']['get_payments_since'])
 			? $data['espresso_thank_you_page']['get_payments_since']
 			: 0;
 		// then check for payments
-		$payments = $espresso_thank_you_page->get_txn_payments( $since );
+		$payments = $espresso_thank_you_page->get_txn_payments($since);
 		// has a payment been processed ?
-		if ( ! empty( $payments ) || $espresso_thank_you_page->_is_offline_payment_method ) {
-			if ( $since ) {
+		if ( ! empty($payments) || $espresso_thank_you_page->_is_offline_payment_method) {
+			if ($since) {
 				$response['espresso_thank_you_page'] = array(
-					'new_payments'        => $espresso_thank_you_page->get_new_payments( $payments ),
+					'new_payments'        => $espresso_thank_you_page->get_new_payments($payments),
 					'transaction_details' => $espresso_thank_you_page->get_transaction_details(),
 					'txn_status'          => $TXN->status_ID()
 				);
@@ -594,9 +594,9 @@ 
 	 * @param    array $thank_you_page_data thank you page portion of the incoming JSON array from the WP heartbeat data
 	 * @return    array
 	 */
-	private function _update_server_wait_time( $thank_you_page_data = array() ) {
+	private function _update_server_wait_time($thank_you_page_data = array()) {
 		$response['espresso_thank_you_page'] = array(
-			'still_waiting' => isset( $thank_you_page_data['initial_access'] )
+			'still_waiting' => isset($thank_you_page_data['initial_access'])
 				? time() - $thank_you_page_data['initial_access']
 				: 0,
 			'txn_status'    => $this->_current_txn->status_ID()
@@ -621,17 +621,17 @@ 
 		$template_args['is_primary'] = $this->_is_primary;
 		$template_args['SPCO_attendee_information_url'] = $this->_SPCO_attendee_information_url;
 		$template_args['resend_reg_confirmation_url'] = add_query_arg(
-			array( 'token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true' ),
+			array('token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true'),
 			EE_Registry::instance()->CFG->core->thank_you_page_url()
 		);
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['SPCO_attendee_information_url'],
 			'$SPCO_attendee_information_url'
 		);
 		echo EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-registration-details.template.php',
 			$template_args,
 			true,
 			true
@@ -644,16 +644,16 @@ 
 	 *    resend_reg_confirmation_email
 	 */
 	public static function resend_reg_confirmation_email() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		$reg_url_link = EE_Registry::instance()->REQ->get( 'token' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		$reg_url_link = EE_Registry::instance()->REQ->get('token');
 		// was a REG_ID passed ?
-		if ( $reg_url_link ) {
-			$registration = EE_Registry::instance()->load_model( 'Registration' )->get_one(
-				array( array( 'REG_url_link' => $reg_url_link ) )
+		if ($reg_url_link) {
+			$registration = EE_Registry::instance()->load_model('Registration')->get_one(
+				array(array('REG_url_link' => $reg_url_link))
 			);
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				// resend email
-				EED_Messages::process_resend( array( '_REG_ID' => $registration->ID() ) );
+				EED_Messages::process_resend(array('_REG_ID' => $registration->ID()));
 			} else {
 				EE_Error::add_error(
 					__(
@@ -677,16 +677,16 @@ 
 			);
 		}
 		// request sent via AJAX ?
-		if ( EE_FRONT_AJAX ) {
-			echo json_encode( EE_Error::get_notices( false ) );
+		if (EE_FRONT_AJAX) {
+			echo json_encode(EE_Error::get_notices(false));
 			die();
 			// or was JS disabled ?
 		} else {
 			// save errors so that they get picked up on the next request
-			EE_Error::get_notices( true, true );
+			EE_Error::get_notices(true, true);
 			wp_safe_redirect(
 				add_query_arg(
-					array( 'e_reg_url_link' => $reg_url_link ),
+					array('e_reg_url_link' => $reg_url_link),
 					EE_Registry::instance()->CFG->core->thank_you_page_url()
 				)
 			);
@@ -702,26 +702,26 @@ 
 	 * @return    void
 	 */
 	public function get_ajax_content() {
-		if ( ! $this->get_txn() ) {
+		if ( ! $this->get_txn()) {
 			return;
 		}
 		// first determine which event(s) require pre-approval or not
 		$events = array();
 		$events_requiring_pre_approval = array();
-		foreach ( $this->_current_txn->registrations() as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		foreach ($this->_current_txn->registrations() as $registration) {
+			if ($registration instanceof EE_Registration) {
 				$event = $registration->event();
-				if ( $event instanceof EE_Event ) {
-					if ( $registration->is_not_approved() && $registration->event() instanceof EE_Event ) {
-						$events_requiring_pre_approval[ $event->ID() ] = $event;
+				if ($event instanceof EE_Event) {
+					if ($registration->is_not_approved() && $registration->event() instanceof EE_Event) {
+						$events_requiring_pre_approval[$event->ID()] = $event;
 					} else {
-						$events[ $event->ID() ] = $event;
+						$events[$event->ID()] = $event;
 					}
 				}
 			}
 		}
-		$this->display_details_for_events_requiring_pre_approval( $events_requiring_pre_approval );
-		$this->display_details_for_events( $events );
+		$this->display_details_for_events_requiring_pre_approval($events_requiring_pre_approval);
+		$this->display_details_for_events($events);
 	}
 
 
@@ -733,8 +733,8 @@ 
 	 * @param EE_Event[] $events
 	 * @return string
 	 */
-	public function display_details_for_events( $events = array() ) {
-		if ( ! empty( $events ) ) {
+	public function display_details_for_events($events = array()) {
+		if ( ! empty($events)) {
 			?>
 			<div id="espresso-thank-you-page-ajax-content-dv">
 				<div id="espresso-thank-you-page-ajax-transaction-dv"></div>
@@ -746,7 +746,7 @@ 
 							'event_espresso'
 							); ?></span>
 					</div>
-					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed ) : ?>
+					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed) : ?>
 						<p id="ee-ajax-loading-pg" class="highlight-bg small-text clear">
 							<?php echo apply_filters(
 								'EES_Espresso_Thank_You__get_ajax_content__waiting_for_IPN_msg',
@@ -757,7 +757,7 @@ 
 							); ?>
 							<br/>
 							<span class="jst-rght ee-block small-text lt-grey-text">
-								<?php _e( 'current wait time ', 'event_espresso' ); ?>
+								<?php _e('current wait time ', 'event_espresso'); ?>
 							<span id="espresso-thank-you-page-ajax-time-dv">00:00:00</span></span>
 						</p>
 					<?php endif; ?>
@@ -777,11 +777,11 @@ 
 	 * @param EE_Event[] $events
 	 * @return string
 	 */
-	public function display_details_for_events_requiring_pre_approval( $events = array() ) {
-		if ( ! empty( $events ) ) {
+	public function display_details_for_events_requiring_pre_approval($events = array()) {
+		if ( ! empty($events)) {
 			?>
 			<div id="espresso-thank-you-page-not-approved-message-dv">
-				<h4 class="orange-text"><?php _e( 'Important Notice:', 'event_espresso' ); ?></h4>
+				<h4 class="orange-text"><?php _e('Important Notice:', 'event_espresso'); ?></h4>
 				<p id="events-requiring-pre-approval-pg" class="small-text">
 					<?php echo apply_filters(
 						'AHEE__EES_Espresso_Thank_You__get_ajax_content__not_approved_message',
@@ -792,8 +792,8 @@ 
 					); ?>
 				</p>
 				<ul class="events-requiring-pre-approval-ul">
-					<?php foreach ( $events as $event ) {
-						if ( $event instanceof EE_Event ) {
+					<?php foreach ($events as $event) {
+						if ($event instanceof EE_Event) {
 							echo '<li><span class="dashicons dashicons-marker ee-icon-size-16 orange-text"></span>',
 								$event->name(),
 								'</li>';
@@ -820,12 +820,12 @@ 
 		$template_args = array();
 		$template_args['transaction'] = $this->_current_txn;
 		$template_args['reg_url_link'] = $this->_reg_url_link;
-		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name( true );
+		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name(true);
 		// link to SPCO payment_options
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['show_try_pay_again_link'],
 			'$show_try_pay_again_link'
@@ -835,7 +835,7 @@ 
 			'$SPCO_payment_options_url'
 		);
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-transaction-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-transaction-details.template.php',
 			$template_args,
 			true,
 			true
@@ -852,9 +852,9 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_payment_row_html( $payment = null ) {
+	public function get_payment_row_html($payment = null) {
 		$html = '';
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			if (
 				$payment->payment_method() instanceof EE_Payment_Method
 				&& $payment->status() === EEM_Payment::status_id_failed
@@ -863,31 +863,31 @@ 
 				// considering the registrant has made it to the Thank You page,
 				// any failed payments may actually be pending and the IPN is just slow
 				// so let's
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 			}
 			$payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined
-				? '<br /><span class="small-text">' . $payment->gateway_response() . '</span>'
+				? '<br /><span class="small-text">'.$payment->gateway_response().'</span>'
 				: '';
 			$html .= '
 				<tr>
 					<td>
-						' . $payment->timestamp() . '
+						' . $payment->timestamp().'
 					</td>
 					<td>
 						' . (
 								$payment->payment_method() instanceof EE_Payment_Method
 									? $payment->payment_method()->name()
-									: __( 'Unknown', 'event_espresso' )
-							) . '
+									: __('Unknown', 'event_espresso')
+							).'
 					</td>
 					<td class="jst-rght">
-						' . EEH_Template::format_currency( $payment->amount() ) . '
+						' . EEH_Template::format_currency($payment->amount()).'
 					</td>
 					<td class="jst-rght" style="line-height:1;">
-						' . $payment->pretty_status( true ) . $payment_declined_msg . '
+						' . $payment->pretty_status(true).$payment_declined_msg.'
 					</td>
 				</tr>';
-			do_action( 'AHEE__thank_you_page_payment_details_template__after_each_payment', $payment );
+			do_action('AHEE__thank_you_page_payment_details_template__after_each_payment', $payment);
 		}
 		return $html;
 	}
@@ -902,14 +902,14 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_payment_details( $payments = array() ) {
+	public function get_payment_details($payments = array()) {
 		//prepare variables for displaying
 		$template_args = array();
 		$template_args['transaction'] = $this->_current_txn;
 		$template_args['reg_url_link'] = $this->_reg_url_link;
 		$template_args['payments'] = array();
-		foreach ( $payments as $payment ) {
-			$template_args['payments'][] = $this->get_payment_row_html( $payment );
+		foreach ($payments as $payment) {
+			$template_args['payments'][] = $this->get_payment_row_html($payment);
 		}
 		//create a hacky payment object, but dont save it
 		$payment = EE_Payment::new_instance(
@@ -922,8 +922,8 @@ 
 			)
 		);
 		$payment_method = $this->_current_txn->payment_method();
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content( $payment );
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base) {
+			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content($payment);
 		} else {
 			$template_args['gateway_content'] = '';
 		}
@@ -931,19 +931,19 @@ 
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['payments'], '$payments' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null($template_args['payments'], '$payments');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['show_try_pay_again_link'],
 			'$show_try_pay_again_link'
 		);
-		EEH_Template_Validator::verify_isnt_null( $template_args['gateway_content'], '$gateway_content' );
+		EEH_Template_Validator::verify_isnt_null($template_args['gateway_content'], '$gateway_content');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['SPCO_payment_options_url'],
 			'$SPCO_payment_options_url'
 		);
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-payment-details.template.php',
 			$template_args,
 			true,
 			true
@@ -960,11 +960,11 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_new_payments( $payments = array() ) {
+	public function get_new_payments($payments = array()) {
 		$payments_html = '';
 		//prepare variables for displaying
-		foreach ( $payments as $payment ) {
-			$payments_html .= $this->get_payment_row_html( $payment );
+		foreach ($payments as $payment) {
+			$payments_html .= $this->get_payment_row_html($payment);
 		}
 		return $payments_html;
 	}

core/libraries/payment_methods/EE_Payment_Method_Manager.lib.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 +78 added lines, -78 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  *
  * Class EE_Payment_Method_Manager
@@ -35,7 +35,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Payment_Method_Manager ) {
+		if ( ! self::$_instance instanceof EE_Payment_Method_Manager) {
 			self::$_instance = new self();
 		}
 		EE_Registry::instance()->load_lib('PMT_Base');
@@ -46,7 +46,7 @@ 
 	 * Resets the instance and returns a new one
 	 * @return EE_Payment_Method_Manager
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance = NULL;
 		return self::instance();
 	}
@@ -57,12 +57,12 @@ 
 	 * or just re-use the PMTs we found last time we checked during this request (if
 	 * we have not yet checked during this request, then we need to check anyways)
 	 */
-	public function maybe_register_payment_methods( $force_recheck = FALSE ){
-		if( ! $this->_payment_method_types || $force_recheck ){
+	public function maybe_register_payment_methods($force_recheck = FALSE) {
+		if ( ! $this->_payment_method_types || $force_recheck) {
 			$this->_register_payment_methods();
 			//if in admin lets ensure caps are set.
-			if ( is_admin() ) {
-				add_filter( 'FHEE__EE_Capabilities__init_caps_map__caps', array( $this, 'add_payment_method_caps' ) );
+			if (is_admin()) {
+				add_filter('FHEE__EE_Capabilities__init_caps_map__caps', array($this, 'add_payment_method_caps'));
 				EE_Registry::instance()->CAP->init_caps();
 			}
 		}
@@ -75,19 +75,19 @@ 
 	 */
 	protected function _register_payment_methods() {
 		// grab list of installed modules
-		$pm_to_register = glob( EE_PAYMENT_METHODS . '*', GLOB_ONLYDIR );
+		$pm_to_register = glob(EE_PAYMENT_METHODS.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$pm_to_register = apply_filters( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', $pm_to_register );
+		$pm_to_register = apply_filters('FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', $pm_to_register);
 
 		// loop through folders
-		foreach ( $pm_to_register as $pm_path ) {
-				$this->register_payment_method( $pm_path );
+		foreach ($pm_to_register as $pm_path) {
+				$this->register_payment_method($pm_path);
 		}
-		do_action( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods' );
+		do_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods');
 		// filter list of installed modules
 		//keep them organized alphabetically by the payment method type's name
-		ksort( $this->_payment_method_types );
-		return apply_filters( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__installed_payment_methods', $this->_payment_method_types );
+		ksort($this->_payment_method_types);
+		return apply_filters('FHEE__EE_Payment_Method_Manager__register_payment_methods__installed_payment_methods', $this->_payment_method_types);
 	}
 
 
@@ -99,35 +99,35 @@ 
 	 * @param string $payment_method_path - full path up to and including payment method folder
 	 * @return boolean
 	 */
-	public function register_payment_method( $payment_method_path = '' ) {
-		do_action( 'AHEE__EE_Payment_Method_Manager__register_payment_method__begin',$payment_method_path );
+	public function register_payment_method($payment_method_path = '') {
+		do_action('AHEE__EE_Payment_Method_Manager__register_payment_method__begin', $payment_method_path);
 		$module_ext = '.pm.php';
 		// make all separators match
-		$payment_method_path = rtrim( str_replace( '/\\', DS, $payment_method_path ), DS );
+		$payment_method_path = rtrim(str_replace('/\\', DS, $payment_method_path), DS);
 		// grab and sanitize module name
-		$module_dir = basename( $payment_method_path );
+		$module_dir = basename($payment_method_path);
 		// create classname from module directory name
-		$module = str_replace( ' ', '_', str_replace( '_', ' ', $module_dir ));
+		$module = str_replace(' ', '_', str_replace('_', ' ', $module_dir));
 		// add class prefix
-		$module_class = 'EE_PMT_' . $module;
+		$module_class = 'EE_PMT_'.$module;
 		// does the module exist ?
-		if ( ! is_readable( $payment_method_path . DS . $module_class . $module_ext )) {
-			$msg = sprintf( __( 'The requested %s payment method file could not be found or is not readable due to file permissions.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($payment_method_path.DS.$module_class.$module_ext)) {
+			$msg = sprintf(__('The requested %s payment method file could not be found or is not readable due to file permissions.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( WP_DEBUG === TRUE ) { EEH_Debug_Tools::instance()->start_timer(); }
+		if (WP_DEBUG === TRUE) { EEH_Debug_Tools::instance()->start_timer(); }
 		// load the module class file
-		require_once( $payment_method_path . DS . $module_class . $module_ext );
-		if ( WP_DEBUG === TRUE ) { EEH_Debug_Tools::instance()->stop_timer("Requiring payment method $module_class"); }
+		require_once($payment_method_path.DS.$module_class.$module_ext);
+		if (WP_DEBUG === TRUE) { EEH_Debug_Tools::instance()->stop_timer("Requiring payment method $module_class"); }
 		// verify that class exists
-		if ( ! class_exists( $module_class )) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// add to array of registered modules
-		$this->_payment_method_types[ $module ] = $payment_method_path . DS . $module_class . $module_ext;
+		$this->_payment_method_types[$module] = $payment_method_path.DS.$module_class.$module_ext;
 		return TRUE;
 	}
 	/**
@@ -136,18 +136,18 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return boolean
 	 */
-	public function payment_method_type_exists($payment_method_name, $force_recheck = FALSE){
+	public function payment_method_type_exists($payment_method_name, $force_recheck = FALSE) {
 		if (
 			$force_recheck
-			|| ! is_array( $this->_payment_method_types )
-			|| ! isset( $this->_payment_method_types[$payment_method_name] )
+			|| ! is_array($this->_payment_method_types)
+			|| ! isset($this->_payment_method_types[$payment_method_name])
 		) {
 			$this->maybe_register_payment_methods($force_recheck);
 		}
-		if(isset($this->_payment_method_types[$payment_method_name])){
+		if (isset($this->_payment_method_types[$payment_method_name])) {
 			require_once($this->_payment_method_types[$payment_method_name]);
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -158,16 +158,16 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return array
 	 */
-	public function payment_method_type_names($with_prefixes = FALSE, $force_recheck = FALSE ){
+	public function payment_method_type_names($with_prefixes = FALSE, $force_recheck = FALSE) {
 		$this->maybe_register_payment_methods($force_recheck);
-		if($with_prefixes){
+		if ($with_prefixes) {
 			$classnames = array_keys($this->_payment_method_types);
 			$payment_methods = array();
-			foreach($classnames as $classname){
+			foreach ($classnames as $classname) {
 				$payment_methods[] = $this->payment_method_class_from_type($classname);
 			}
 			return $payment_methods;
-		}else{
+		} else {
 			return array_keys($this->_payment_method_types);
 		}
 	}
@@ -177,10 +177,10 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return EE_PMT_Base[]
 	 */
-	public function payment_method_types( $force_recheck = FALSE ){
+	public function payment_method_types($force_recheck = FALSE) {
 		$this->maybe_register_payment_methods($force_recheck);
 		$pmt_objs = array();
-		foreach($this->payment_method_type_names(true) as $classname){
+		foreach ($this->payment_method_type_names(true) as $classname) {
 			$pmt_objs[] = new $classname;
 		}
 		return $pmt_objs;
@@ -192,8 +192,8 @@ 
 	 * @param string $classname
 	 * @return string
 	 */
-	public function payment_method_type_sans_class_prefix($classname){
-		return str_replace( "EE_PMT_", "", $classname );
+	public function payment_method_type_sans_class_prefix($classname) {
+		return str_replace("EE_PMT_", "", $classname);
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	public function payment_method_class_from_type($type){
+	public function payment_method_class_from_type($type) {
 		$this->maybe_register_payment_methods();
 		return "EE_PMT_".$type;
 	}
@@ -215,39 +215,39 @@ 
 	 * @return \EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function activate_a_payment_method_of_type( $payment_method_type ){
+	public function activate_a_payment_method_of_type($payment_method_type) {
 		$payment_method = EEM_Payment_Method::instance()->get_one_of_type($payment_method_type);
-		if( ! $payment_method instanceof EE_Payment_Method ){
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			$pm_type_class = $this->payment_method_class_from_type($payment_method_type);
-			if(class_exists($pm_type_class)){
+			if (class_exists($pm_type_class)) {
 				/** @var $pm_type_obj EE_PMT_Base */
 				$pm_type_obj = new $pm_type_class;
 				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug($pm_type_obj->system_name());
-				if( ! $payment_method){
-					$payment_method = $this->create_payment_method_of_type( $pm_type_obj );
+				if ( ! $payment_method) {
+					$payment_method = $this->create_payment_method_of_type($pm_type_obj);
 				}
-				$payment_method->set_type( $payment_method_type );
-				$this->initialize_payment_method( $payment_method );
+				$payment_method->set_type($payment_method_type);
+				$this->initialize_payment_method($payment_method);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'There is no payment method of type %1$s, so it could not be activated', 'event_espresso'),
+						__('There is no payment method of type %1$s, so it could not be activated', 'event_espresso'),
 						$pm_type_class )
 				);
 			}
 		}
 		$payment_method->set_active();
 		$payment_method->save();
-		$this->set_usable_currencies_on_payment_method( $payment_method );
-		if( $payment_method->type() === 'Invoice' ){
+		$this->set_usable_currencies_on_payment_method($payment_method);
+		if ($payment_method->type() === 'Invoice') {
 			/** @type EE_Message_Resource_Manager $message_resource_manager */
-			$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-			$message_resource_manager->ensure_message_type_is_active( 'invoice', 'html' );
-			$message_resource_manager->ensure_messenger_is_active( 'pdf' );
+			$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$message_resource_manager->ensure_message_type_is_active('invoice', 'html');
+			$message_resource_manager->ensure_messenger_is_active('pdf');
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Note, when the invoice payment method is activated, the invoice message type, html messenger, and pdf messenger are activated as well for the %1$smessages system%2$s.', 'event_espresso' ),
-					'<a href="' . admin_url( 'admin.php?page=espresso_messages') . '">',
+					__('Note, when the invoice payment method is activated, the invoice message type, html messenger, and pdf messenger are activated as well for the %1$smessages system%2$s.', 'event_espresso'),
+					'<a href="'.admin_url('admin.php?page=espresso_messages').'">',
 					'</a>'
 				)
 			);
@@ -265,17 +265,17 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function create_payment_method_of_type( $pm_type_obj ) {
+	public function create_payment_method_of_type($pm_type_obj) {
 		global $current_user;
 		$payment_method = EE_Payment_Method::new_instance(
 			array(
 				'PMD_type' 		 => $pm_type_obj->system_name(),
 				'PMD_name' 		 => $pm_type_obj->pretty_name(),
 				'PMD_admin_name' => $pm_type_obj->pretty_name(),
-				'PMD_slug' 		 => $pm_type_obj->system_name(),//automatically converted to slug
+				'PMD_slug' 		 => $pm_type_obj->system_name(), //automatically converted to slug
 				'PMD_wp_user' 	 => $current_user->ID,
 				'PMD_order' 	 => EEM_Payment_Method::instance()->count(
-					array( array( 'PMD_type' => array( '!=', 'Admin_Only' )))
+					array(array('PMD_type' => array('!=', 'Admin_Only')))
 				) * 10,
 			)
 		);
@@ -291,21 +291,21 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function initialize_payment_method( $payment_method ) {
+	public function initialize_payment_method($payment_method) {
 		$pm_type_obj = $payment_method->type_obj();
-		$payment_method->set_description( $pm_type_obj->default_description() );
-		if( ! $payment_method->button_url() ){
-			$payment_method->set_button_url( $pm_type_obj->default_button_url() );
+		$payment_method->set_description($pm_type_obj->default_description());
+		if ( ! $payment_method->button_url()) {
+			$payment_method->set_button_url($pm_type_obj->default_button_url());
 		}
 		//now add setup its default extra meta properties
 		$extra_metas = $pm_type_obj->settings_form()->extra_meta_inputs();
-		if ( ! empty( $extra_metas ) ) {
+		if ( ! empty($extra_metas)) {
 			//verify the payment method has an ID before adding extra meta
-			if ( ! $payment_method->ID() ) {
+			if ( ! $payment_method->ID()) {
 				$payment_method->save();
 			}
-			foreach ( $extra_metas as $meta_name => $input ) {
-				$payment_method->update_extra_meta( $meta_name, $input->raw_value() );
+			foreach ($extra_metas as $meta_name => $input) {
+				$payment_method->update_extra_meta($meta_name, $input->raw_value());
 			}
 		}
 		return $payment_method;
@@ -320,8 +320,8 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function set_usable_currencies_on_payment_method( $payment_method ) {
-		foreach($payment_method->get_all_usable_currencies() as $currency_obj){
+	public function set_usable_currencies_on_payment_method($payment_method) {
+		foreach ($payment_method->get_all_usable_currencies() as $currency_obj) {
 			$payment_method->_add_relation_to($currency_obj, 'Currency');
 		}
 		return $payment_method;
@@ -339,19 +339,19 @@ 
 	 *
 	 * @return int count of rows updated.
 	 */
-	public function deactivate_payment_method( $payment_method_slug ) {
+	public function deactivate_payment_method($payment_method_slug) {
 		EE_Log::instance()->log(
 				__FILE__,
 				__FUNCTION__,
 				sprintf(
-					__( 'Payment method with slug %1$s is being deactivated by site admin', 'event_espresso' ),
+					__('Payment method with slug %1$s is being deactivated by site admin', 'event_espresso'),
 					$payment_method_slug
 				),
 				'payment_method_change'
 			);
 		$count_updated = EEM_Payment_Method::instance()->update(
-			array( 'PMD_scope' => array() ),
-			array( array( 'PMD_slug' => $payment_method_slug ) )
+			array('PMD_scope' => array()),
+			array(array('PMD_slug' => $payment_method_slug))
 		);
 		return $count_updated;
 	}
@@ -365,7 +365,7 @@ 
 	 * @param array $caps capabilities being filtered
 	 * @return array
 	 */
-	public function add_payment_method_caps( $caps ) {
+	public function add_payment_method_caps($caps) {
 		/* add dynamic caps from payment methods
 		 * at the time of writing, october 20 2014, these are the caps added:
 		 * ee_payment_method_admin_only
@@ -380,7 +380,7 @@ 
 		 * their related capability automatically added too, so long as they are
 		 * registered properly using EE_Register_Payment_Method::register()
 		 */
-		foreach( $this->payment_method_types() as $payment_method_type_obj ){
+		foreach ($this->payment_method_types() as $payment_method_type_obj) {
 			$caps['administrator'][] = $payment_method_type_obj->cap_name();
 		}
 		return $caps;

core/db_classes/EE_Payment_Method.class.php

Spacing +51 added lines, -51 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * Event Espresso
  *
@@ -23,7 +23,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Payment_Method extends EE_Base_Class{
+class EE_Payment_Method extends EE_Base_Class {
 
 	/**
 	 * Payment Method type object, which has all the info about this type of payment method,
@@ -39,9 +39,9 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public static function new_instance( $props_n_values = array()) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, FALSE);
 	}
 
 
@@ -51,8 +51,8 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public static function new_instance_from_db ( $props_n_values = array()) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -81,7 +81,7 @@ 
 	 * @return boolean
 	 */
 	public function active() {
-		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()),$this->scope());
+		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()), $this->scope());
 	}
 
 
@@ -92,10 +92,10 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public function set_active(){
+	public function set_active() {
 		$default_scopes = array(EEM_Payment_Method::scope_cart);
-		if($this->type_obj() &&
-			$this->type_obj()->payment_occurs() === EE_PMT_Base::offline){
+		if ($this->type_obj() &&
+			$this->type_obj()->payment_occurs() === EE_PMT_Base::offline) {
 			$default_scopes[] = EEM_Payment_Method::scope_admin;
 		}
 		$this->set_scope($default_scopes);
@@ -106,7 +106,7 @@ 
 	/**
 	 * Makes this payment method apply to NO scopes at all. DOES NOT SAVE it.
 	 */
-	public function deactivate(){
+	public function deactivate() {
 		$this->set_scope(array());
 	}
 
@@ -297,8 +297,8 @@ 
 	 * @param mixed $field_value
 	 * @param boolean $use_default
 	 */
-	public function set( $field_name, $field_value, $use_default = FALSE ){
-		if( $field_name === 'PMD_type' ){
+	public function set($field_name, $field_value, $use_default = FALSE) {
+		if ($field_name === 'PMD_type') {
 			//the type has probably changed, so forget about its old type object
 			$this->_type_obj = NULL;
 		}
@@ -372,26 +372,26 @@ 
 	 * @return EE_PMT_Base
 	 * @throws EE_Error
 	 */
-	public function type_obj(){
-		if( ! $this->_type_obj ) {
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $this->type() )) {
-				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type( $this->type() );
-				if ( ! class_exists( $class_name )) {
+	public function type_obj() {
+		if ( ! $this->_type_obj) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($this->type())) {
+				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type($this->type());
+				if ( ! class_exists($class_name)) {
 					throw new EE_Error(
 						sprintf(
-							__( 'An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso' ),
+							__('An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso'),
 							$class_name,
 							'<br />',
-							'<a href="' . admin_url('plugins.php') . '">',
+							'<a href="'.admin_url('plugins.php').'">',
 							'</a>'
 						)
 					);
 				}
-				$r = new ReflectionClass( $class_name );
-					$this->_type_obj = $r->newInstanceArgs( array( $this ));
+				$r = new ReflectionClass($class_name);
+					$this->_type_obj = $r->newInstanceArgs(array($this));
 			} else {
-				throw new EE_Error( sprintf( __( 'A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso' ), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names() ) ) );
+				throw new EE_Error(sprintf(__('A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso'), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names())));
 			}
 		}
 		return $this->_type_obj;
@@ -404,18 +404,18 @@ 
 	 * and the extra meta. Mostly used for passing off ot gateways.	 *
 	 * @return array
 	 */
-	public function settings_array(){
+	public function settings_array() {
 		$fields = $this->model_field_array();
 		$extra_meta = $this->all_extra_meta_array();
 		//remove the model's prefix from the fields
 		$combined_settings_array = array();
-		foreach($fields as $key => $value){
-			if(strpos($key, 'PMD_')===0){
+		foreach ($fields as $key => $value) {
+			if (strpos($key, 'PMD_') === 0) {
 				$key_sans_model_prefix = str_replace('PMD_', '', $key);
 				$combined_settings_array [$key_sans_model_prefix] = $value;
 			}
 		}
-		$combined_settings_array = array_merge( $extra_meta,$combined_settings_array );
+		$combined_settings_array = array_merge($extra_meta, $combined_settings_array);
 		return $combined_settings_array;
 	}
 
@@ -429,12 +429,12 @@ 
 	 * @return string of HTML for displaying the button
 	 * @throws \EE_Error
 	 */
-	public function button_html( $url = '', $css_class = '' ){
+	public function button_html($url = '', $css_class = '') {
 		$payment_occurs = $this->type_obj()->payment_occurs();
 		return '
-		 <div id="' . $this->slug() . '-payment-option-dv" class="'. $payment_occurs .'-payment-gateway reg-page-payment-option-dv' . $css_class . '">
-			<a id="payment-gateway-button-' . $this->slug() . '" class="reg-page-payment-option-lnk" rel="' . $this->slug() . '" href="' . $url . '" >
-				<img src="' . $this->button_url() . '" alt="' . sprintf( esc_attr__( 'Pay using %s', 'event_espresso' ), $this->get_pretty('PMD_name','form_input') ) . '" />
+		 <div id="' . $this->slug().'-payment-option-dv" class="'.$payment_occurs.'-payment-gateway reg-page-payment-option-dv'.$css_class.'">
+			<a id="payment-gateway-button-' . $this->slug().'" class="reg-page-payment-option-lnk" rel="'.$this->slug().'" href="'.$url.'" >
+				<img src="' . $this->button_url().'" alt="'.sprintf(esc_attr__('Pay using %s', 'event_espresso'), $this->get_pretty('PMD_name', 'form_input')).'" />
 			</a>
 		</div>
 ';
@@ -449,7 +449,7 @@ 
 	 * @return EE_Currency[]
 	 * @throws \EE_Error
 	 */
-	public function get_all_usable_currencies(){
+	public function get_all_usable_currencies() {
 		return EEM_Currency::instance()->get_all_currencies_usable_by($this->type_obj());
 	}
 
@@ -462,9 +462,9 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function usable_for_currency( $currency_code ) {
-		foreach( $this->get_all_usable_currencies() as $currency_obj ) {
-			if( $currency_obj->ID() === $currency_code ){
+	public function usable_for_currency($currency_code) {
+		foreach ($this->get_all_usable_currencies() as $currency_obj) {
+			if ($currency_obj->ID() === $currency_code) {
 				return TRUE;
 			}
 		}
@@ -479,7 +479,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function is_on_site(){
+	public function is_on_site() {
 		return $this->type_obj()->payment_occurs() === EE_PMT_Base::onsite;
 	}
 
@@ -491,7 +491,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function is_off_site(){
+	public function is_off_site() {
 		return $this->type_obj()->payment_occurs() === EE_PMT_Base::offsite;
 	}
 
@@ -503,7 +503,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function is_off_line(){
+	public function is_off_line() {
 		return $this->type_obj()->payment_occurs() === EE_PMT_Base::offline;
 	}
 
@@ -513,10 +513,10 @@ 
 	 * to load the required classes, and don't need them at the time of unserialization
 	 * @return array
 	 */
-	public function __sleep(){
-		$properties =  get_object_vars( $this );
-		unset( $properties[ '_type_obj' ] );
-		return array_keys( $properties );
+	public function __sleep() {
+		$properties = get_object_vars($this);
+		unset($properties['_type_obj']);
+		return array_keys($properties);
 	}
 
 
@@ -528,17 +528,17 @@ 
 	 * @return int @see EE_Base_Class::save()
 	 * @throws \EE_Error
 	 */
-	public function save( $set_cols_n_values = array() ) {
-		$results =  parent::save( $set_cols_n_values );
-		if( $this->get_original( 'PMD_scope' ) !== $this->get( 'PMD_scope' ) ) {
+	public function save($set_cols_n_values = array()) {
+		$results = parent::save($set_cols_n_values);
+		if ($this->get_original('PMD_scope') !== $this->get('PMD_scope')) {
 			EE_Log::instance()->log(
 				__FILE__,
 				__FUNCTION__,
 				sprintf(
-					__( 'Set new scope on payment method %1$s to %2$s from %3$s on URL %4$s', 'event_espresso' ),
+					__('Set new scope on payment method %1$s to %2$s from %3$s on URL %4$s', 'event_espresso'),
 					$this->name(),
-					serialize( $this->get_original(  'PMD_scope' ) ),
-					serialize( $this->get( 'PMD_scope' ) ),
+					serialize($this->get_original('PMD_scope')),
+					serialize($this->get('PMD_scope')),
 					EE_Registry::instance()->REQ->get_current_page_permalink()
 				),
 				'payment_method_change'

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

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
+<?php  if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  * Class EE_Select_Input
  *
@@ -10,22 +10,22 @@ 
  * @since 				4.6
  *
  */
-class EE_Select_Input extends EE_Form_Input_With_Options_Base{
+class EE_Select_Input extends EE_Form_Input_With_Options_Base {
 
 	/**
 	 * @param array $answer_options
 	 * @param array $input_settings
 	 */
-	public function __construct( $answer_options, $input_settings = array() ) {
-		$this->_set_display_strategy( new EE_Select_Display_Strategy( $answer_options ) );
+	public function __construct($answer_options, $input_settings = array()) {
+		$this->_set_display_strategy(new EE_Select_Display_Strategy($answer_options));
 		$this->_add_validation_strategy(
 			new EE_Enum_Validation_Strategy(
-				isset( $input_settings['validation_error_message'] )
+				isset($input_settings['validation_error_message'])
 					? $input_settings['validation_error_message']
 					: null
 			)
 		);
-		parent::__construct( $answer_options, $input_settings );
+		parent::__construct($answer_options, $input_settings);
 	}
 
 }
\ No newline at end of file

core/libraries/form_sections/strategies/validation/EE_Conditionally_Required_Validation_Strategy.strategy.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 +38 added lines, -38 removed lines

@@ -8,7 +8,7 @@ 
  * @since 				4.6
  *
  */
-class EE_Conditionally_Required_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Conditionally_Required_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 * Array describing conditions necessary to make the input required.
@@ -24,12 +24,12 @@ 
 	 * @param string $validation_error_message
 	 * @param array $requirement_conditions
 	 */
-	public function __construct( $validation_error_message = null, $requirement_conditions = array() ) {
-		if( ! $validation_error_message ){
+	public function __construct($validation_error_message = null, $requirement_conditions = array()) {
+		if ( ! $validation_error_message) {
 			$validation_error_message = __("This field is required.", "event_espresso");
 		}
-		$this->set_requirement_conditions( $requirement_conditions );
-		parent::__construct( $validation_error_message );
+		$this->set_requirement_conditions($requirement_conditions);
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -44,7 +44,7 @@ 
 	 * @throws \EE_Validation_Error
 	 */
 	public function validate($normalized_value) {
-		if(
+		if (
 			(
 				$normalized_value === ''
 				|| $normalized_value === null
@@ -52,8 +52,8 @@ 
 			)
 			&& $this->_input_is_required_server_side()
 		) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
-		}else{
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		} else {
 			return true;
 		}
 	}
@@ -64,7 +64,7 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function get_jquery_validation_rule_array(){
+	public function get_jquery_validation_rule_array() {
 		return array(
 			'required'=> $this->_get_jquery_requirement_value(),
 			'messages' => array(
@@ -82,7 +82,7 @@ 
 	 *
 	 * @param array $requirement_conditions
 	 */
-	public function set_requirement_conditions( $requirement_conditions ) {
+	public function set_requirement_conditions($requirement_conditions) {
 		$this->requirement_conditions = (array) $requirement_conditions;
 	}
 
@@ -108,10 +108,10 @@ 
 	protected function _get_jquery_requirement_value() {
 		$requirement_value = '';
 		$conditions = $this->get_requirement_conditions();
-		if( ! is_array( $conditions ) ){
+		if ( ! is_array($conditions)) {
 			EE_Error::throw_exception_if_debugging(
 				sprintf(
-					__( 'Input requirement conditions must be an array. You provided %1$s', 'event_espresso' ),
+					__('Input requirement conditions must be an array. You provided %1$s', 'event_espresso'),
 					$this->_input->name()
 				),
 				__FILE__,
@@ -120,10 +120,10 @@ 
 			);
 			return true;
 		}
-		if( count( $conditions ) > 1 ) {
+		if (count($conditions) > 1) {
 			EE_Error::throw_exception_if_debugging(
 				sprintf(
-					__( 'Required Validation Strategy does not yet support multiple conditions. You should add it! The related input is %1$s', 'event_espresso' ),
+					__('Required Validation Strategy does not yet support multiple conditions. You should add it! The related input is %1$s', 'event_espresso'),
 					$this->_input->name()
 				),
 				__FILE__,
@@ -131,12 +131,12 @@ 
 				__LINE__
 			);
 		}
-		foreach( $conditions as $input_path => $op_and_value ) {
-			$input = $this->_input->find_section_from_path( $input_path );
-			if( ! $input instanceof EE_Form_Input_Base ) {
+		foreach ($conditions as $input_path => $op_and_value) {
+			$input = $this->_input->find_section_from_path($input_path);
+			if ( ! $input instanceof EE_Form_Input_Base) {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input'),
+						__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input'),
 						$this->_input->name(),
 						$input_path
 					),
@@ -146,14 +146,14 @@ 
 				);
 				return false;
 			}
-			list( $op, $value ) = $this->_validate_op_and_value( $op_and_value );
+			list($op, $value) = $this->_validate_op_and_value($op_and_value);
 			//ok now the jquery dependency expression depends on the input's display strategy.
-			if( ! $input->get_display_strategy() instanceof EE_Select_Display_Strategy ) {
+			if ( ! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso' ),
+						__('Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso'),
 						$input->name(),
-						get_class( $input->get_display_strategy() ),
+						get_class($input->get_display_strategy()),
 						$this->_input->name()
 					),
 					__FILE__,
@@ -161,7 +161,7 @@ 
 					__LINE__
 				);
 			}
-			$requirement_value = $input->html_id( true ) . ' option[value="' . $value . '"]:selected';
+			$requirement_value = $input->html_id(true).' option[value="'.$value.'"]:selected';
 		}
 		return $requirement_value;
 	}
@@ -179,12 +179,12 @@ 
 	protected function _input_is_required_server_side() {
 		$meets_all_requirements = true;
 		$conditions = $this->get_requirement_conditions();
-		foreach( $conditions as $input_path => $op_and_value ) {
-			$input = $this->_input->find_section_from_path( $input_path );
-			if( ! $input instanceof EE_Form_Input_Base ) {
+		foreach ($conditions as $input_path => $op_and_value) {
+			$input = $this->_input->find_section_from_path($input_path);
+			if ( ! $input instanceof EE_Form_Input_Base) {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input'),
+						__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input'),
 						$this->_input->name(),
 						$input_path
 					),
@@ -194,13 +194,13 @@ 
 				);
 				return false;
 			}
-			list( $op, $value ) = $this->_validate_op_and_value( $op_and_value );
-			switch( $op ) {
+			list($op, $value) = $this->_validate_op_and_value($op_and_value);
+			switch ($op) {
 				case '=':
 				default:
 					$meets_all_requirements = $input->normalized_value() === $value;
 			}
-			if( ! $meets_all_requirements ) {
+			if ( ! $meets_all_requirements) {
 				break;
 			}
 		}
@@ -217,11 +217,11 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	protected function _validate_op_and_value( $op_and_value ) {
-		if( ! isset( $op_and_value[ 0 ], $op_and_value[ 1 ] ) ) {
+	protected function _validate_op_and_value($op_and_value) {
+		if ( ! isset($op_and_value[0], $op_and_value[1])) {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso' ),
+						__('Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso'),
 						$this->_input->name()
 					),
 					__FILE__,
@@ -229,12 +229,12 @@ 
 					__LINE__
 				);
 			}
-			$operator = $op_and_value[ 0 ];
-			$value = (string) $op_and_value[ 1 ];
-			if( $operator !== '=' ) {
+			$operator = $op_and_value[0];
+			$value = (string) $op_and_value[1];
+			if ($operator !== '=') {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Required Validation Strategy conditions can currently only use the equals operator. If you need others, please add support for it! The related input is %1$s', 'event_espresso' ),
+						__('Required Validation Strategy conditions can currently only use the equals operator. If you need others, please add support for it! The related input is %1$s', 'event_espresso'),
 						$this->_input->name()
 					),
 					__FILE__,
@@ -242,7 +242,7 @@ 
 					__LINE__
 				);
 			}
-			return array( $operator, $value );
+			return array($operator, $value);
 
 	}
 }

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

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -22,9 +22,9 @@ 
 	/**
 	 * @param null $validation_error_message
 	 */
-	public function __construct( $validation_error_message = null ) {
+	public function __construct($validation_error_message = null) {
 		$this->_validation_error_message = $validation_error_message === null
-			? __( 'Input invalid', 'event_espresso' )
+			? __('Input invalid', 'event_espresso')
 			: $validation_error_message;
 		parent::__construct();
 	}
@@ -41,7 +41,7 @@ 
 	 *                                this validation strategy is the 'required' validation strategy,
 	 *                                most should be OK with a null, empty string, etc)
 	 */
-	public function validate( $normalized_value ) {
+	public function validate($normalized_value) {
 		//by default, the validation strategy does no validation. this should be implemented
 	}