eventespresso / event-espresso-core

core/CPTs/EE_CPT_Default_Strategy.core.php

Spacing +8 added lines, -8 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');
 }
 
 
@@ -35,8 +35,8 @@ 
 	 * @param    array $arguments
 	 * @return    \EE_CPT_Default_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : null;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
 		// $WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : null;
 		//EEH_Debug_Tools::printr( $this->CPT, '$this->CPT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 );
@@ -52,9 +52,9 @@ 
 	 * @param    \WP_Query $WP_Query
 	 * @return    \WP_Query
 	 */
-	public function pre_get_posts( WP_Query $WP_Query ) {
+	public function pre_get_posts(WP_Query $WP_Query) {
 		//EEH_Debug_Tools::printr( $WP_Query, '$WP_Query  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) {
+		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
 			return $WP_Query;
 		}
 //		$WP_Query->set( 'post_type', array( $this->CPT['post_type'] ));
@@ -72,7 +72,7 @@ 
 	 * @param    \WP_Query  $WP_Query
 	 * @return    \WP_Post[]
 	 */
-	public function the_posts( $posts, WP_Query $WP_Query ) {
+	public function the_posts($posts, WP_Query $WP_Query) {
 		return $posts;
 	}
 
@@ -88,7 +88,7 @@ 
 	 * @param    string $single
 	 * @return    mixed
 	 */
-	public function get_EE_post_type_metadata( $meta_value = null, $post_id, $meta_key, $single ) {
+	public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single) {
 		return $meta_value;
 	}
 

core/CPTs/CptQueryModifier.php

Indentation +8 added lines, -8 removed lines

@@ -447,14 +447,14 @@
 			global $wpdb;
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
 			$SQL .= ' LEFT JOIN '
-			        . $this->meta_table->get_table_name()
-			        . ' ON ( '
-			        . $this->meta_table->get_table_name()
-			        . '.'
-			        . $this->meta_table->get_fk_on_table()
-			        . ' = '
-			        . $wpdb->posts
-			        . '.ID ) ';
+					. $this->meta_table->get_table_name()
+					. ' ON ( '
+					. $this->meta_table->get_table_name()
+					. '.'
+					. $this->meta_table->get_fk_on_table()
+					. ' = '
+					. $wpdb->posts
+					. '.ID ) ';
 		}
 		remove_filter( 'posts_join', array( $this, 'postsJoin' ) );
 		return $SQL;

Spacing +81 added lines, -81 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\CPTs;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -80,10 +80,10 @@ 
 		\WP_Query $WP_Query,
 		\EE_Request_Handler $request
 	) {
-		$this->setRequest( $request );
-		$this->setWpQuery( $WP_Query );
-		$this->setPostType( $post_type );
-		$this->setCptDetails( $cpt_details );
+		$this->setRequest($request);
+		$this->setWpQuery($WP_Query);
+		$this->setPostType($post_type);
+		$this->setCptDetails($cpt_details);
 		$this->init();
 	}
 
@@ -101,7 +101,7 @@ 
 	/**
 	 * @param string $post_type
 	 */
-	protected function setPostType( $post_type ) {
+	protected function setPostType($post_type) {
 		$this->post_type = $post_type;
 	}
 
@@ -119,7 +119,7 @@ 
 	/**
 	 * @param array $cpt_details
 	 */
-	protected function setCptDetails( $cpt_details ) {
+	protected function setCptDetails($cpt_details) {
 		$this->cpt_details = $cpt_details;
 	}
 
@@ -137,7 +137,7 @@ 
 	/**
 	 * @param \EE_Table_Base[] $model_tables
 	 */
-	protected function setModelTables( $model_tables ) {
+	protected function setModelTables($model_tables) {
 		$this->model_tables = $model_tables;
 	}
 
@@ -147,7 +147,7 @@ 
 	 * @return array
 	 */
 	public function taxonomies() {
-		if ( empty( $this->taxonomies ) ) {
+		if (empty($this->taxonomies)) {
 			$this->initializeTaxonomies();
 		}
 		return $this->taxonomies;
@@ -158,7 +158,7 @@ 
 	/**
 	 * @param array $taxonomies
 	 */
-	protected function setTaxonomies( array $taxonomies ) {
+	protected function setTaxonomies(array $taxonomies) {
 		$this->taxonomies = $taxonomies;
 	}
 
@@ -176,7 +176,7 @@ 
 	/**
 	 * @param \EE_Secondary_Table $meta_table
 	 */
-	public function setMetaTable( \EE_Secondary_Table $meta_table ) {
+	public function setMetaTable(\EE_Secondary_Table $meta_table) {
 		$this->meta_table = $meta_table;
 	}
 
@@ -194,7 +194,7 @@ 
 	/**
 	 * @param \EEM_Base $CPT_model
 	 */
-	protected function setModel( \EEM_Base $CPT_model ) {
+	protected function setModel(\EEM_Base $CPT_model) {
 		$this->model = $CPT_model;
 	}
 
@@ -212,7 +212,7 @@ 
 	/**
 	 * @param \EE_Request_Handler $request
 	 */
-	protected function setRequest( \EE_Request_Handler $request ) {
+	protected function setRequest(\EE_Request_Handler $request) {
 		$this->request = $request;
 	}
 
@@ -230,7 +230,7 @@ 
 	/**
 	 * @param \WP_Query $wp_query
 	 */
-	public function setWpQuery( \WP_Query $wp_query ) {
+	public function setWpQuery(\WP_Query $wp_query) {
 		$this->wp_query = $wp_query;
 	}
 
@@ -245,22 +245,22 @@ 
 	protected function initializeTaxonomies() {
 		// check if taxonomies have already been set and that this CPT has taxonomies registered for it
 		if (
-			empty( $this->taxonomies )
-			&& isset( $this->cpt_details['args'], $this->cpt_details['args']['taxonomies'] )
+			empty($this->taxonomies)
+			&& isset($this->cpt_details['args'], $this->cpt_details['args']['taxonomies'])
 		) {
 			// if so then grab them, but we want the taxonomy name as the key
-			$taxonomies = array_flip( $this->cpt_details['args']['taxonomies'] );
+			$taxonomies = array_flip($this->cpt_details['args']['taxonomies']);
 			// then grab the list of ALL taxonomies
 			$all_taxonomies = \EE_Register_CPTs::get_taxonomies();
-			foreach ( $taxonomies as $taxonomy => &$details ) {
+			foreach ($taxonomies as $taxonomy => &$details) {
 				// add details to our taxonomies if they exist
-				$details = isset( $all_taxonomies[ $taxonomy ] )
-					? $all_taxonomies[ $taxonomy ]
+				$details = isset($all_taxonomies[$taxonomy])
+					? $all_taxonomies[$taxonomy]
 					: array();
 			}
 			// ALWAYS unset() variables that were passed by reference
-			unset( $details );
-			$this->setTaxonomies( $taxonomies );
+			unset($details);
+			$this->setTaxonomies($taxonomies);
 		}
 	}
 
@@ -270,11 +270,11 @@ 
 		$this->setAdditionalCptDetails();
 		$this->setRequestVarsIfCpt();
 		// convert post_type to model name
-		$model_name = str_replace( 'EE_', '', $this->cpt_details['class_name'] );
+		$model_name = str_replace('EE_', '', $this->cpt_details['class_name']);
 		// load all tables related to CPT
-		$this->setupModelsAndTables( $model_name );
+		$this->setupModelsAndTables($model_name);
 		// load and instantiate CPT_*_Strategy
-		$CPT_Strategy = $this->cptStrategyClass( $model_name );
+		$CPT_Strategy = $this->cptStrategyClass($model_name);
 		// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
 		// here's the list of available filters in the WP_Query object
 		// 'posts_where_paged'
@@ -285,17 +285,17 @@ 
 		// 'post_limits'
 		// 'posts_fields'
 		// 'posts_join'
-		add_filter( 'posts_fields', array( $this, 'postsFields' ) );
-		add_filter( 'posts_join', array( $this, 'postsJoin' ) );
+		add_filter('posts_fields', array($this, 'postsFields'));
+		add_filter('posts_join', array($this, 'postsJoin'));
 		add_filter(
-			'get_' . $this->post_type . '_metadata',
-			array( $CPT_Strategy, 'get_EE_post_type_metadata' ),
+			'get_'.$this->post_type.'_metadata',
+			array($CPT_Strategy, 'get_EE_post_type_metadata'),
 			1,
 			4
 		);
-		add_filter( 'the_posts', array( $this, 'thePosts' ), 1, 1 );
-		if ( $this->wp_query->is_main_query() ) {
-			add_filter( 'get_edit_post_link', array( $this, 'getEditPostLink' ), 10, 2 );
+		add_filter('the_posts', array($this, 'thePosts'), 1, 1);
+		if ($this->wp_query->is_main_query()) {
+			add_filter('get_edit_post_link', array($this, 'getEditPostLink'), 10, 2);
 			$this->addTemplateFilters();
 		}
 	}
@@ -312,18 +312,18 @@ 
 		// the post or category or term that is triggering EE
 		$this->cpt_details['espresso_page'] = $this->request->is_espresso_page();
 		// requested post name
-		$this->cpt_details['post_name'] = $this->request->get( 'post_name' );
+		$this->cpt_details['post_name'] = $this->request->get('post_name');
 		// add support for viewing 'private', 'draft', or 'pending' posts
 		if (
-			isset( $this->wp_query->query_vars['p'] )
+			isset($this->wp_query->query_vars['p'])
 			&& $this->wp_query->query_vars['p'] !== 0
 			&& is_user_logged_in()
-			&& current_user_can( 'edit_post', $this->wp_query->query_vars['p'] )
+			&& current_user_can('edit_post', $this->wp_query->query_vars['p'])
 		) {
 			// we can just inject directly into the WP_Query object
-			$this->wp_query->query['post_status'] = array( 'publish', 'private', 'draft', 'pending' );
+			$this->wp_query->query['post_status'] = array('publish', 'private', 'draft', 'pending');
 			// now set the main 'ee' request var so that the appropriate module can load the appropriate template(s)
-			$this->request->set( 'ee', $this->cpt_details['singular_slug'] );
+			$this->request->set('ee', $this->cpt_details['singular_slug']);
 		}
 	}
 
@@ -340,15 +340,15 @@ 
 	 */
 	public function setRequestVarsIfCpt() {
 		// check if ee action var has been set
-		if ( ! $this->request->is_set( 'ee' ) ) {
+		if ( ! $this->request->is_set('ee')) {
 			// check that route exists for CPT archive slug
-			if ( is_archive() && \EE_Config::get_route( $this->cpt_details['plural_slug'] ) ) {
+			if (is_archive() && \EE_Config::get_route($this->cpt_details['plural_slug'])) {
 				// ie: set "ee" to "events"
-				$this->request->set( 'ee', $this->cpt_details['plural_slug'] );
+				$this->request->set('ee', $this->cpt_details['plural_slug']);
 				// or does it match a single page CPT like /event/
-			} else if ( is_single() && \EE_Config::get_route( $this->cpt_details['singular_slug'] ) ) {
+			} else if (is_single() && \EE_Config::get_route($this->cpt_details['singular_slug'])) {
 				// ie: set "ee" to "event"
-				$this->request->set( 'ee', $this->cpt_details['singular_slug'] );
+				$this->request->set('ee', $this->cpt_details['singular_slug']);
 			}
 		}
 	}
@@ -362,11 +362,11 @@ 
 	 * @param string $model_name
 	 * @throws \EE_Error
 	 */
-	protected function setupModelsAndTables( $model_name ) {
+	protected function setupModelsAndTables($model_name) {
 		// get CPT table data via CPT Model
-		$model = \EE_Registry::instance()->load_model( $model_name );
-		if ( ! $model instanceof \EEM_Base ) {
-			throw new \EE_Error (
+		$model = \EE_Registry::instance()->load_model($model_name);
+		if ( ! $model instanceof \EEM_Base) {
+			throw new \EE_Error(
 				sprintf(
 					__(
 						'The "%1$s" model could not be loaded.',
@@ -376,14 +376,14 @@ 
 				)
 			);
 		}
-		$this->setModel( $model );
-		$this->setModelTables( $this->model->get_tables() );
+		$this->setModel($model);
+		$this->setModelTables($this->model->get_tables());
 		// is there a Meta Table for this CPT?
 		if (
-			isset( $this->cpt_details['tables'][ $model_name . '_Meta' ] )
-			&& $this->cpt_details['tables'][ $model_name . '_Meta' ] instanceof \EE_Secondary_Table
+			isset($this->cpt_details['tables'][$model_name.'_Meta'])
+			&& $this->cpt_details['tables'][$model_name.'_Meta'] instanceof \EE_Secondary_Table
 		) {
-			$this->setMetaTable( $this->cpt_details['tables'][ $model_name . '_Meta' ] );
+			$this->setMetaTable($this->cpt_details['tables'][$model_name.'_Meta']);
 		}
 	}
 
@@ -396,18 +396,18 @@ 
 	 * @param  string $model_name
 	 * @return string
 	 */
-	protected function cptStrategyClass( $model_name ) {
+	protected function cptStrategyClass($model_name) {
 		// creates classname like:  CPT_Event_Strategy
-		$CPT_Strategy_class_name = 'CPT_' . $model_name . '_Strategy';
+		$CPT_Strategy_class_name = 'CPT_'.$model_name.'_Strategy';
 		// load and instantiate
 		$CPT_Strategy = \EE_Registry::instance()->load_core(
 			$CPT_Strategy_class_name,
-			array( 'WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details )
+			array('WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details)
 		);
-		if ( $CPT_Strategy === null ) {
+		if ($CPT_Strategy === null) {
 			$CPT_Strategy = \EE_Registry::instance()->load_core(
 				'CPT_Default_Strategy',
-				array( 'WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details )
+				array('WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details)
 			);
 		}
 		return $CPT_Strategy;
@@ -422,13 +422,13 @@ 
 	 * @param  $SQL
 	 * @return string
 	 */
-	public function postsFields( $SQL ) {
+	public function postsFields($SQL) {
 		// does this CPT have a meta table ?
-		if ( $this->meta_table instanceof \EE_Secondary_Table ) {
+		if ($this->meta_table instanceof \EE_Secondary_Table) {
 			// adds something like ", wp_esp_event_meta.* " to WP Query SELECT statement
-			$SQL .= ', ' . $this->meta_table->get_table_name() . '.* ';
+			$SQL .= ', '.$this->meta_table->get_table_name().'.* ';
 		}
-		remove_filter( 'posts_fields', array( $this, 'postsFields' ) );
+		remove_filter('posts_fields', array($this, 'postsFields'));
 		return $SQL;
 	}
 
@@ -441,9 +441,9 @@ 
 	 * @param  $SQL
 	 * @return string
 	 */
-	public function postsJoin( $SQL ) {
+	public function postsJoin($SQL) {
 		// does this CPT have a meta table ?
-		if ( $this->meta_table instanceof \EE_Secondary_Table ) {
+		if ($this->meta_table instanceof \EE_Secondary_Table) {
 			global $wpdb;
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
 			$SQL .= ' LEFT JOIN '
@@ -456,7 +456,7 @@ 
 			        . $wpdb->posts
 			        . '.ID ) ';
 		}
-		remove_filter( 'posts_join', array( $this, 'postsJoin' ) );
+		remove_filter('posts_join', array($this, 'postsJoin'));
 		return $SQL;
 	}
 
@@ -469,17 +469,17 @@ 
 	 * @param  \WP_Post[] $posts
 	 * @return \WP_Post[]
 	 */
-	public function thePosts( $posts ) {
+	public function thePosts($posts) {
 		$CPT_class = $this->cpt_details['class_name'];
 		// loop thru posts
-		if ( is_array( $posts ) && $this->model instanceof \EEM_CPT_Base ) {
-			foreach ( $posts as $key => $post ) {
-				if ( $post->post_type === $this->post_type ) {
-					$post->{$CPT_class} = $this->model->instantiate_class_from_post_object( $post );
+		if (is_array($posts) && $this->model instanceof \EEM_CPT_Base) {
+			foreach ($posts as $key => $post) {
+				if ($post->post_type === $this->post_type) {
+					$post->{$CPT_class} = $this->model->instantiate_class_from_post_object($post);
 				}
 			}
 		}
-		remove_filter( 'the_posts', array( $this, 'thePosts' ), 1 );
+		remove_filter('the_posts', array($this, 'thePosts'), 1);
 		return $posts;
 	}
 
@@ -490,7 +490,7 @@ 
 	 * @param $ID
 	 * @return string
 	 */
-	public function getEditPostLink( $url, $ID ) {
+	public function getEditPostLink($url, $ID) {
 		// need to make sure we only edit links if our cpt
 		global $post;
 		//notice if the cpt is registered with `show_ee_ui` set to false, we take that to mean that the WordPress core ui
@@ -499,7 +499,7 @@ 
 			! $post instanceof \WP_Post
 			|| $post->post_type !== $this->post_type
 			|| (
-				isset( $this->cpt_details['args']['show_ee_ui'] )
+				isset($this->cpt_details['args']['show_ee_ui'])
 				&& ! $this->cpt_details['args']['show_ee_ui']
 			)
 		) {
@@ -508,8 +508,8 @@ 
 		//k made it here so all is good.
 		return wp_nonce_url(
 			add_query_arg(
-				array( 'page' => $this->post_type, 'post' => $ID, 'action' => 'edit' ),
-				admin_url( 'admin.php' )
+				array('page' => $this->post_type, 'post' => $ID, 'action' => 'edit'),
+				admin_url('admin.php')
 			),
 			'edit',
 			'edit_nonce'
@@ -526,9 +526,9 @@ 
 	 */
 	public function addTemplateFilters() {
 		// if requested cpt supports page_templates and it's the main query
-		if ( ! empty( $this->cpt_details['args']['page_templates'] ) && $this->wp_query->is_main_query() ) {
+		if ( ! empty($this->cpt_details['args']['page_templates']) && $this->wp_query->is_main_query()) {
 			// then let's hook into the appropriate query_template hook
-			add_filter( 'single_template', array( $this, 'singleCptTemplate' ) );
+			add_filter('single_template', array($this, 'singleCptTemplate'));
 		}
 	}
 
@@ -542,20 +542,20 @@ 
 	 * @param string $current_template Existing default template path derived for this page call.
 	 * @return string the path to the full template file.
 	 */
-	public function singleCptTemplate( $current_template ) {
+	public function singleCptTemplate($current_template) {
 		$object = get_queried_object();
 		//does this called object HAVE a page template set that is something other than the default.
-		$template = get_post_meta( $object->ID, '_wp_page_template', true );
+		$template = get_post_meta($object->ID, '_wp_page_template', true);
 		//exit early if default or not set or invalid path (accounts for theme changes)
 		if (
 			$template === 'default'
-			|| empty( $template )
-			|| ! is_readable( get_stylesheet_directory() . '/' . $template )
+			|| empty($template)
+			|| ! is_readable(get_stylesheet_directory().'/'.$template)
 		) {
 			return $current_template;
 		}
 		//made it here so we SHOULD be able to just locate the template and then return it.
-		return locate_template( array( $template ) );
+		return locate_template(array($template));
 	}
 
 

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

Spacing +17 added lines, -17 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_Reveal_Input
  *
@@ -11,7 +11,7 @@ 
  * @since 				4.6
  *
  */
-class EE_Select_Reveal_Input extends EE_Select_Input{
+class EE_Select_Reveal_Input extends EE_Select_Input {
 
 	/**
 	 * @param array $answer_options Array keys which match a sibling section's name
@@ -26,8 +26,8 @@ 
 	 *
 	 * @param array $input_settings
 	 */
-	public function __construct( $answer_options, $input_settings = array() ){
-		parent::__construct( $answer_options, $input_settings );
+	public function __construct($answer_options, $input_settings = array()) {
+		parent::__construct($answer_options, $input_settings);
 	}
 
 	/**
@@ -36,17 +36,17 @@ 
 	 */
 	public function sibling_sections_controlled() {
 		$sibling_sections = array();
-		foreach( $this->options() as $sibling_section_name => $sibling_section ) {
+		foreach ($this->options() as $sibling_section_name => $sibling_section) {
 			//if it's an empty string just leave it alone
-			if( empty( $sibling_section_name ) ) {
+			if (empty($sibling_section_name)) {
 				continue;
 			}
-			$sibling_section = $this->find_section_from_path( '../' . $sibling_section_name );
-			if(
+			$sibling_section = $this->find_section_from_path('../'.$sibling_section_name);
+			if (
 				$sibling_section instanceof EE_Form_Section_Base
-				&& ! empty( $sibling_section_name ) 
+				&& ! empty($sibling_section_name) 
 			) {
-				$sibling_sections[ $sibling_section_name ] = $sibling_section;
+				$sibling_sections[$sibling_section_name] = $sibling_section;
 			}
 		}
 		return $sibling_sections;
@@ -59,16 +59,16 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		$form_other_js_data = parent::get_other_js_data( $form_other_js_data );
-		if( ! isset($form_other_js_data[ 'select_reveal_inputs' ] ) ) {
-			$form_other_js_data[ 'select_reveal_inputs' ] = array();
+	public function get_other_js_data($form_other_js_data = array()) {
+		$form_other_js_data = parent::get_other_js_data($form_other_js_data);
+		if ( ! isset($form_other_js_data['select_reveal_inputs'])) {
+			$form_other_js_data['select_reveal_inputs'] = array();
 		}
 		$sibling_input_to_html_id_map = array();
-		foreach( $this->sibling_sections_controlled() as $sibling_section_path => $sibling_section ) {
-			$sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
+		foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
+			$sibling_input_to_html_id_map[$sibling_section_path] = $sibling_section->html_id();
 		}
-		$form_other_js_data[ 'select_reveal_inputs' ][ $this->html_id() ] = $sibling_input_to_html_id_map;
+		$form_other_js_data['select_reveal_inputs'][$this->html_id()] = $sibling_input_to_html_id_map;
 		return $form_other_js_data;
 	}
 

core/middleware/EE_Detect_Login.php

Spacing +6 added lines, -6 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');
 }
 
 
@@ -26,20 +26,20 @@ 
 	 * @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;
 		global $pagenow;
 		if (
 			in_array(
 				$pagenow,
-				array( 'wp-login.php', 'wp-register.php' )
+				array('wp-login.php', 'wp-register.php')
 			)
-			&& ! $request->get( 'ee_load_on_login' )
+			&& ! $request->get('ee_load_on_login')
 		) {
 			$this->_response->terminate_request();
 		}
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
 		return $this->_response;
 	}
 

core/EE_Object_Collection.core.php

Doc Comments +1 added lines

@@ -84,6 +84,7 @@
 	 *
 	 * @access public
 	 * @param mixed
+	 * @param string $info
 	 * @return null | object
 	 */
 	public function get_by_info( $info ) {

Spacing +25 added lines, -25 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');
 }
 /**
  * Class EE_Object_Collection
@@ -37,14 +37,14 @@ 
 	 * @param mixed $info
 	 * @return bool
 	 */
-	public function add( $object, $info = null ) {
+	public function add($object, $info = null) {
 		$class = $this->interface;
-		if ( ! $object instanceof $class ) {
+		if ( ! $object instanceof $class) {
 			return false;
 		}
-		$this->attach( $object );
-		$this->set_info( $object, $info );
-		return $this->contains( $object );
+		$this->attach($object);
+		$this->set_info($object, $info);
+		return $this->contains($object);
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 * @param mixed $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null ) {
-		$info = ! empty( $info ) ? $info : spl_object_hash( $object );
+	public function set_info($object, $info = null) {
+		$info = ! empty($info) ? $info : spl_object_hash($object);
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $object == $this->current() ) {
-				$this->setInfo( $info );
+		while ($this->valid()) {
+			if ($object == $this->current()) {
+				$this->setInfo($info);
 				$this->rewind();
 				return true;
 			}
@@ -86,10 +86,10 @@ 
 	 * @param mixed
 	 * @return null | object
 	 */
-	public function get_by_info( $info ) {
+	public function get_by_info($info) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $info === $this->getInfo() ) {
+		while ($this->valid()) {
+			if ($info === $this->getInfo()) {
 				$object = $this->current();
 				$this->rewind();
 				return $object;
@@ -110,8 +110,8 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object ) {
-		return $this->contains( $object );
+	public function has($object) {
+		return $this->contains($object);
 	}
 
 
@@ -125,8 +125,8 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object ) {
-		$this->detach( $object );
+	public function remove($object) {
+		$this->detach($object);
 		return true;
 	}
 
@@ -141,10 +141,10 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
+	public function set_current($object) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $this->current() === $object ) {
+		while ($this->valid()) {
+			if ($this->current() === $object) {
 				break;
 			}
 			$this->next();
@@ -162,10 +162,10 @@ 
 	 * @param $info
 	 * @return void
 	 */
-	public function set_current_by_info( $info ) {
+	public function set_current_by_info($info) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $info === $this->getInfo() ) {
+		while ($this->valid()) {
+			if ($info === $this->getInfo()) {
 				break;
 			}
 			$this->next();

core/Psr4Autoloader.php

Doc Comments +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
 	 * Loads the class file for a given class name.
 	 *
 	 * @param string $class The fully-qualified class name.
-	 * @return mixed The mapped file name on success, or boolean false on
+	 * @return string|false The mapped file name on success, or boolean false on
 	 * failure.
 	 */
 	public function loadClass( $class ) {
@@ -165,7 +165,7 @@ 
 	 *
 	 * @param string $prefix The namespace prefix.
 	 * @param string $relative_class The relative class name.
-	 * @return mixed Boolean false if no mapped file can be loaded, or the
+	 * @return string|false Boolean false if no mapped file can be loaded, or the
 	 * name of the mapped file that was loaded.
 	 */
 	protected function loadMappedFile( $prefix, $relative_class ) {

Spacing +25 added lines, -25 removed lines

@@ -77,10 +77,10 @@ 
 	 * @param string $prefix
 	 * @return array
 	 */
-	public function prefixes( $prefix = '' ) {
-		if ( ! empty( $prefix ) ) {
+	public function prefixes($prefix = '') {
+		if ( ! empty($prefix)) {
 			// are there any base directories for this namespace prefix?
-			return isset( $this->prefixes[ $prefix ] ) ? $this->prefixes[ $prefix ] : array();
+			return isset($this->prefixes[$prefix]) ? $this->prefixes[$prefix] : array();
 		}
 		return $this->prefixes;
 	}
@@ -93,7 +93,7 @@ 
 	 * @return void
 	 */
 	public function register() {
-		spl_autoload_register( array( $this, 'loadClass' ) );
+		spl_autoload_register(array($this, 'loadClass'));
 	}
 
 
@@ -109,20 +109,20 @@ 
 	 * than last.
 	 * @return void
 	 */
-	public function addNamespace( $prefix, $base_dir, $prepend = false ) {
+	public function addNamespace($prefix, $base_dir, $prepend = false) {
 		// normalize namespace prefix
-		$prefix = trim( $prefix, Psr4Autoloader::NS ) . Psr4Autoloader::NS;
+		$prefix = trim($prefix, Psr4Autoloader::NS).Psr4Autoloader::NS;
 		// normalize the base directory with a trailing separator
-		$base_dir = \EEH_File::standardise_and_end_with_directory_separator( $base_dir );
+		$base_dir = \EEH_File::standardise_and_end_with_directory_separator($base_dir);
 		// initialize the namespace prefix array
-		if ( isset( $this->prefixes[ $prefix ] ) === false ) {
-			$this->prefixes[ $prefix ] = array();
+		if (isset($this->prefixes[$prefix]) === false) {
+			$this->prefixes[$prefix] = array();
 		}
 		// retain the base directory for the namespace prefix
-		if ( $prepend ) {
-			array_unshift( $this->prefixes[ $prefix ], $base_dir );
+		if ($prepend) {
+			array_unshift($this->prefixes[$prefix], $base_dir);
 		} else {
-			$this->prefixes[ $prefix ][] = $base_dir;
+			$this->prefixes[$prefix][] = $base_dir;
 		}
 	}
 
@@ -135,24 +135,24 @@ 
 	 * @return mixed The mapped file name on success, or boolean false on
 	 * failure.
 	 */
-	public function loadClass( $class ) {
+	public function loadClass($class) {
 		// the current namespace prefix
 		$prefix = $class;
 		// work backwards through the namespace names of the fully-qualified
 		// class name to find a mapped file name
-		while ( false !== $pos = strrpos( $prefix, Psr4Autoloader::NS ) ) {
+		while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) {
 			// retain the trailing namespace separator in the prefix
-			$prefix = substr( $class, 0, $pos + 1 );
+			$prefix = substr($class, 0, $pos + 1);
 			// the rest is the relative class name
-			$relative_class = substr( $class, $pos + 1 );
+			$relative_class = substr($class, $pos + 1);
 			// try to load a mapped file for the prefix and relative class
-			$mapped_file = $this->loadMappedFile( $prefix, $relative_class );
-			if ( $mapped_file ) {
+			$mapped_file = $this->loadMappedFile($prefix, $relative_class);
+			if ($mapped_file) {
 				return $mapped_file;
 			}
 			// remove the trailing namespace separator for the next iteration
 			// of strrpos()
-			$prefix = rtrim( $prefix, Psr4Autoloader::NS );
+			$prefix = rtrim($prefix, Psr4Autoloader::NS);
 		}
 		// never found a mapped file
 		return false;
@@ -168,17 +168,17 @@ 
 	 * @return mixed Boolean false if no mapped file can be loaded, or the
 	 * name of the mapped file that was loaded.
 	 */
-	protected function loadMappedFile( $prefix, $relative_class ) {
+	protected function loadMappedFile($prefix, $relative_class) {
 		// look through base directories for this namespace prefix
-		foreach ( $this->prefixes( $prefix ) as $base_dir ) {
+		foreach ($this->prefixes($prefix) as $base_dir) {
 			// replace the namespace prefix with the base directory,
 			// replace namespace separators with directory separators
 			// in the relative class name, append with .php
 			$file = $base_dir
-				. str_replace( Psr4Autoloader::NS, DS, $relative_class )
+				. str_replace(Psr4Autoloader::NS, DS, $relative_class)
 				. '.php';
 			// if the mapped file exists, require it
-			if ( $this->requireFile( $file ) ) {
+			if ($this->requireFile($file)) {
 				// yes, we're done
 				return $file;
 			}
@@ -195,8 +195,8 @@ 
 	 * @param string $file The file to require.
 	 * @return bool True if the file exists, false if not.
 	 */
-	protected function requireFile( $file ) {
-		if ( file_exists( $file ) ) {
+	protected function requireFile($file) {
+		if (file_exists($file)) {
 			require $file;
 			return true;
 		}

core/services/locators/LocatorInterface.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\locators;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -22,7 +22,7 @@ 
 	 * @param array|string $location
 	 * @return \FilesystemIterator
 	 */
-	public function locate( $location );
+	public function locate($location);
 
 }
 // End of file LocatorInterface.php

core/libraries/form_sections/strategies/display/EE_Compound_Input_Display_Strategy.strategy.php

Spacing +8 added lines, -8 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');
 }
 
 
@@ -27,8 +27,8 @@ 
 	 * @param bool   $add_pound_sign
 	 * @return string
 	 */
-	public function get_sub_input_id( $option_value, $add_pound_sign = false ) {
-		return $this->_append_chars( $this->_input->html_id( $add_pound_sign ), '-' ) . sanitize_key( $option_value );
+	public function get_sub_input_id($option_value, $add_pound_sign = false) {
+		return $this->_append_chars($this->_input->html_id($add_pound_sign), '-').sanitize_key($option_value);
 	}
 
 
@@ -40,10 +40,10 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function get_html_input_ids( $add_pound_sign = false ) {
+	public function get_html_input_ids($add_pound_sign = false) {
 		$html_input_ids = array();
-		foreach( $this->get_input()->options() as $value => $display ) {
-			$html_input_ids[] = $this->get_sub_input_id( $value, $add_pound_sign );
+		foreach ($this->get_input()->options() as $value => $display) {
+			$html_input_ids[] = $this->get_sub_input_id($value, $add_pound_sign);
 		}
 		return $html_input_ids;
 	}
@@ -58,7 +58,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function get_input() {
-		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base ){
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
 			throw new EE_Error(
 				sprintf(
 					__(

core/libraries/messages/EE_Message_To_Generate_From_Queue.php

Spacing +9 added lines, -9 removed lines

@@ -25,12 +25,12 @@ 
 	 * @param EE_Messages_Queue $queue
 	 * @param string            $custom_subject  Used if a custom subject is desired for the generated aggregate EE_Message object
 	 */
-	public function __construct( $messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '' ) {
+	public function __construct($messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '') {
 		$this->queue = $queue;
-		parent::__construct( $messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle );
-		if ( $this->valid() ) {
-			$this->_message->set_content( $this->_get_content() );
-			$this->_message->set_subject( $this->_get_subject( $custom_subject ) );
+		parent::__construct($messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle);
+		if ($this->valid()) {
+			$this->_message->set_content($this->_get_content());
+			$this->_message->set_subject($this->_get_subject($custom_subject));
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 	protected function _get_content() {
 		$content = '';
 		$this->queue->get_message_repository()->rewind();
-		while ( $this->queue->get_message_repository()->valid() ) {
+		while ($this->queue->get_message_repository()->valid()) {
 			$content .= $this->queue->get_message_repository()->current()->content();
 			$this->queue->get_message_repository()->next();
 		}
@@ -58,15 +58,15 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_subject( $custom_subject = '' ) {
-		if ( ! empty( $custom_subject ) ) {
+	protected function _get_subject($custom_subject = '') {
+		if ( ! empty($custom_subject)) {
 			return $custom_subject;
 		}
 		$this->queue->get_message_repository()->rewind();
 		$count_of_items = $this->queue->get_message_repository()->count();
 
 		//if $count of items in queue == 1, then let's just return the subject for that item.
-		if ( $count_of_items === 1 ) {
+		if ($count_of_items === 1) {
 			return $this->queue->get_message_repository()->current()->subject();
 		}