Inspection of "Configure wp global so its aliased to external pac..." - eventespresso/event-espresso-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — Gutenberg/master (#361)

by Darren

created 2018-04-27 14:50 UTC

Status

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,9 +21,12 @@
 block discarded – undo
 	<title><?php echo $title; ?></title>
 <?php if ( $enqueue_wp_assets ) : ?>
 	<?php wp_head(); ?>
-<?php else : ?>
+<?php else {
+	: ?>
 	<?php foreach ( $css as $url ) : ?>
-	<link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
+	<link rel="stylesheet" type="text/css" href="<?php echo $url;
+}
+?>">
 	<?php endforeach; ?>
 	<script type="text/javascript">
 		<?php echo $eei18n; ?>

Please login to merge, or discard this patch.

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -22,17 +22,17 @@  discard block
 block discarded – undo
 <html>
 <head>
 	<title><?php echo $title; ?></title>
-<?php if ( $enqueue_wp_assets ) : ?>
+<?php if ($enqueue_wp_assets) : ?>
 	<?php wp_head(); ?>
 <?php else : ?>
-	<?php foreach ( $css as $url ) : ?>
-	<link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
+	<?php foreach ($css as $url) : ?>
+	<link rel="stylesheet" type="text/css" href="<?php echo $url; ?>">
 	<?php endforeach; ?>
 	<script type="text/javascript">
 		<?php echo $eei18n; ?>
 	</script>
-	<?php foreach ( $header_js as $key => $url ) : ?>
-    <?php $header_attributes = isset($header_js_attributes[ $key ]) ? $header_js_attributes[ $key ] : ''; ?>
+	<?php foreach ($header_js as $key => $url) : ?>
+    <?php $header_attributes = isset($header_js_attributes[$key]) ? $header_js_attributes[$key] : ''; ?>
     <script type="text/javascript" src="<?php echo $url; ?>"<?php echo $header_attributes; ?>></script>
 	<?php endforeach; ?>
 <?php endif; ?>
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
     <div style="padding: 1em;">
         <?php echo $content; ?>
     </div>
-    <?php foreach ( $footer_js as $key => $url ) : ?>
-        <?php $footer_attributes = isset($footer_js_attributes[$key]) ? $footer_js_attributes[ $key ] : '';  ?>
-		<script type="text/javascript" src="<?php echo $url; ?>"<?php echo $footer_attributes;?>></script>
+    <?php foreach ($footer_js as $key => $url) : ?>
+        <?php $footer_attributes = isset($footer_js_attributes[$key]) ? $footer_js_attributes[$key] : ''; ?>
+		<script type="text/javascript" src="<?php echo $url; ?>"<?php echo $footer_attributes; ?>></script>
 	<?php endforeach; ?>
-<?php if ( $enqueue_wp_assets ) : ?>
+<?php if ($enqueue_wp_assets) : ?>
 	<?php wp_footer(); ?>
 <?php endif; ?>
 </body>

Please login to merge, or discard this patch.

payment_methods/Aim/help_tabs/payment_methods_overview_aim.help_tab.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 <?php _e('Adjust the settings for the Authorize.net AIM payment gateway.', 'event_espresso'); ?>
 </p>
 <p>
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso' ), "<a href='http://www.authorize.net/international/'  target='_blank'>","</a>" ); ?>
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso'), "<a href='http://www.authorize.net/international/'  target='_blank'>", "</a>"); ?>
 </p>
 <p><strong><?php _e('Authorize.net AIM Settings', 'event_espresso'); ?></strong></p>
 <ul>
@@ -28,16 +28,16 @@  discard block
 block discarded – undo
 <?php _e('By logging into Authorize.net, you can change which payment fields are required by Authorize.net when processing payments. These settings affect both the Advanced Integration Method (AIM, this) and the Simple Integration Method (SIM, different). The payment method settings "Excluded Payment Form Fields" and "Required Payment Form Fields" allow you to change the billing form in Event Espresso to reflect your payment form settings in Authorize.net.', 'event_espresso'); ?>
 <br>
 <?php printf( 
-		__( 'To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
+		__('To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
 		'<a href="http://authorize.net" target="_blank">',
 		'</a>',
 		'<a href="https://monosnap.com/file/nebVteOkEXcdDIos88SojStWOifP23" target="_blank">',
 		'<a href="https://monosnap.com/file/WyxGJtev87TcDmdGBEZ2oi1xaBIQAm" target="_blank">',
-		'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">');?>
+		'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">'); ?>
 </li>
 <li>
-	<strong><?php _e( 'Server', 'event_espresso');?></strong>
-	<?php _e( 'Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso' );?>
+	<strong><?php _e('Server', 'event_espresso'); ?></strong>
+	<?php _e('Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br />

Please login to merge, or discard this patch.

core/CPTs/EE_CPT_Default_Strategy.core.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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;
 	}
 

Please login to merge, or discard this patch.

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

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -1,4 +1,4 @@  discard block
 block discarded – undo
-<?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 @@  discard block
 block discarded – undo
  * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	 * @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;
 	}
 

Please login to merge, or discard this patch.

core/EE_Object_Collection.core.php 2 patches

Doc Comments +1 added lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
-<?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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object ) {
-		$this->detach( $object );
+	public function remove($object) {
+		$this->detach($object);
 		return true;
 	}
 
@@ -141,10 +141,10 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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();

Please login to merge, or discard this patch.

core/Psr4Autoloader.php 2 patches

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -132,7 +132,7 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 ) {

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -77,10 +77,10 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @return void
 	 */
 	public function register() {
-		spl_autoload_register( array( $this, 'loadClass' ) );
+		spl_autoload_register(array($this, 'loadClass'));
 	}
 
 
@@ -109,20 +109,20 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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;
 		}

Please login to merge, or discard this patch.

core/services/locators/LocatorInterface.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	 * @param array|string $location
 	 * @return \FilesystemIterator
 	 */
-	public function locate( $location );
+	public function locate($location);
 
 }
 // End of file LocatorInterface.php

Please login to merge, or discard this patch.

strategies/display/EE_Compound_Input_Display_Strategy.strategy.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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(
 					__(

Please login to merge, or discard this patch.

core/libraries/messages/EE_Message_To_Generate_From_Queue.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -25,12 +25,12 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	 *
 	 * @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();
 		}
 

Please login to merge, or discard this patch.

		@@ -77,10 +77,10 @@ discard block
		block discarded – undo
77	77	* @param string $prefix
78	78	* @return array
79	79	*/
80		- public function prefixes( $prefix = '' ) {
81		- if ( ! empty( $prefix ) ) {
	80	+ public function prefixes($prefix = '') {
	81	+ if ( ! empty($prefix)) {
82	82	// are there any base directories for this namespace prefix?
83		- return isset( $this->prefixes[ $prefix ] ) ? $this->prefixes[ $prefix ] : array();
	83	+ return isset($this->prefixes[$prefix]) ? $this->prefixes[$prefix] : array();
84	84	}
85	85	return $this->prefixes;
86	86	}
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	* @return void
94	94	*/
95	95	public function register() {
96		- spl_autoload_register( array( $this, 'loadClass' ) );
	96	+ spl_autoload_register(array($this, 'loadClass'));
97	97	}
98	98
99	99
		@@ -109,20 +109,20 @@ discard block
		block discarded – undo
109	109	* than last.
110	110	* @return void
111	111	*/
112		- public function addNamespace( $prefix, $base_dir, $prepend = false ) {
	112	+ public function addNamespace($prefix, $base_dir, $prepend = false) {
113	113	// normalize namespace prefix
114		- $prefix = trim( $prefix, Psr4Autoloader::NS ) . Psr4Autoloader::NS;
	114	+ $prefix = trim($prefix, Psr4Autoloader::NS).Psr4Autoloader::NS;
115	115	// normalize the base directory with a trailing separator
116		- $base_dir = \EEH_File::standardise_and_end_with_directory_separator( $base_dir );
	116	+ $base_dir = \EEH_File::standardise_and_end_with_directory_separator($base_dir);
117	117	// initialize the namespace prefix array
118		- if ( isset( $this->prefixes[ $prefix ] ) === false ) {
119		- $this->prefixes[ $prefix ] = array();
	118	+ if (isset($this->prefixes[$prefix]) === false) {
	119	+ $this->prefixes[$prefix] = array();
120	120	}
121	121	// retain the base directory for the namespace prefix
122		- if ( $prepend ) {
123		- array_unshift( $this->prefixes[ $prefix ], $base_dir );
	122	+ if ($prepend) {
	123	+ array_unshift($this->prefixes[$prefix], $base_dir);
124	124	} else {
125		- $this->prefixes[ $prefix ][] = $base_dir;
	125	+ $this->prefixes[$prefix][] = $base_dir;
126	126	}
127	127	}
128	128
		@@ -135,24 +135,24 @@ discard block
		block discarded – undo
135	135	* @return mixed The mapped file name on success, or boolean false on
136	136	* failure.
137	137	*/
138		- public function loadClass( $class ) {
	138	+ public function loadClass($class) {
139	139	// the current namespace prefix
140	140	$prefix = $class;
141	141	// work backwards through the namespace names of the fully-qualified
142	142	// class name to find a mapped file name
143		- while ( false !== $pos = strrpos( $prefix, Psr4Autoloader::NS ) ) {
	143	+ while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) {
144	144	// retain the trailing namespace separator in the prefix
145		- $prefix = substr( $class, 0, $pos + 1 );
	145	+ $prefix = substr($class, 0, $pos + 1);
146	146	// the rest is the relative class name
147		- $relative_class = substr( $class, $pos + 1 );
	147	+ $relative_class = substr($class, $pos + 1);
148	148	// try to load a mapped file for the prefix and relative class
149		- $mapped_file = $this->loadMappedFile( $prefix, $relative_class );
150		- if ( $mapped_file ) {
	149	+ $mapped_file = $this->loadMappedFile($prefix, $relative_class);
	150	+ if ($mapped_file) {
151	151	return $mapped_file;
152	152	}
153	153	// remove the trailing namespace separator for the next iteration
154	154	// of strrpos()
155		- $prefix = rtrim( $prefix, Psr4Autoloader::NS );
	155	+ $prefix = rtrim($prefix, Psr4Autoloader::NS);
156	156	}
157	157	// never found a mapped file
158	158	return false;
		@@ -168,17 +168,17 @@ discard block
		block discarded – undo
168	168	* @return mixed Boolean false if no mapped file can be loaded, or the
169	169	* name of the mapped file that was loaded.
170	170	*/
171		- protected function loadMappedFile( $prefix, $relative_class ) {
	171	+ protected function loadMappedFile($prefix, $relative_class) {
172	172	// look through base directories for this namespace prefix
173		- foreach ( $this->prefixes( $prefix ) as $base_dir ) {
	173	+ foreach ($this->prefixes($prefix) as $base_dir) {
174	174	// replace the namespace prefix with the base directory,
175	175	// replace namespace separators with directory separators
176	176	// in the relative class name, append with .php
177	177	$file = $base_dir
178		- . str_replace( Psr4Autoloader::NS, DS, $relative_class )
	178	+ . str_replace(Psr4Autoloader::NS, DS, $relative_class)
179	179	. '.php';
180	180	// if the mapped file exists, require it
181		- if ( $this->requireFile( $file ) ) {
	181	+ if ($this->requireFile($file)) {
182	182	// yes, we're done
183	183	return $file;
184	184	}
		@@ -195,8 +195,8 @@ discard block
		block discarded – undo
195	195	* @param string $file The file to require.
196	196	* @return bool True if the file exists, false if not.
197	197	*/
198		- protected function requireFile( $file ) {
199		- if ( file_exists( $file ) ) {
	198	+ protected function requireFile($file) {
	199	+ if (file_exists($file)) {
200	200	require $file;
201	201	return true;
202	202	}

		@@ -21,9 +21,12 @@
		block discarded – undo
21	21	<title><?php echo $title; ?></title>
22	22	<?php if ( $enqueue_wp_assets ) : ?>
23	23	<?php wp_head(); ?>
24		-<?php else : ?>
	24	+<?php else {
	25	+ : ?>
25	26	<?php foreach ( $css as $url ) : ?>
26		- <link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
	27	+ <link rel="stylesheet" type="text/css" href="<?php echo $url;
	28	+}
	29	+?>">
27	30	<?php endforeach; ?>
28	31	<script type="text/javascript">
29	32	<?php echo $eei18n; ?>

		@@ -22,17 +22,17 @@ discard block
		block discarded – undo
22	22	<html>
23	23	<head>
24	24	<title><?php echo $title; ?></title>
25		-<?php if ( $enqueue_wp_assets ) : ?>
	25	+<?php if ($enqueue_wp_assets) : ?>
26	26	<?php wp_head(); ?>
27	27	<?php else : ?>
28		- <?php foreach ( $css as $url ) : ?>
29		- <link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
	28	+ <?php foreach ($css as $url) : ?>
	29	+ <link rel="stylesheet" type="text/css" href="<?php echo $url; ?>">
30	30	<?php endforeach; ?>
31	31	<script type="text/javascript">
32	32	<?php echo $eei18n; ?>
33	33	</script>
34		- <?php foreach ( $header_js as $key => $url ) : ?>
35		- <?php $header_attributes = isset($header_js_attributes[ $key ]) ? $header_js_attributes[ $key ] : ''; ?>
	34	+ <?php foreach ($header_js as $key => $url) : ?>
	35	+ <?php $header_attributes = isset($header_js_attributes[$key]) ? $header_js_attributes[$key] : ''; ?>
36	36	<script type="text/javascript" src="<?php echo $url; ?>"<?php echo $header_attributes; ?>></script>
37	37	<?php endforeach; ?>
38	38	<?php endif; ?>
		@@ -42,11 +42,11 @@ discard block
		block discarded – undo
42	42	<div style="padding: 1em;">
43	43	<?php echo $content; ?>
44	44	</div>
45		- <?php foreach ( $footer_js as $key => $url ) : ?>
46		- <?php $footer_attributes = isset($footer_js_attributes[$key]) ? $footer_js_attributes[ $key ] : ''; ?>
47		- <script type="text/javascript" src="<?php echo $url; ?>"<?php echo $footer_attributes;?>></script>
	45	+ <?php foreach ($footer_js as $key => $url) : ?>
	46	+ <?php $footer_attributes = isset($footer_js_attributes[$key]) ? $footer_js_attributes[$key] : ''; ?>
	47	+ <script type="text/javascript" src="<?php echo $url; ?>"<?php echo $footer_attributes; ?>></script>
48	48	<?php endforeach; ?>
49		-<?php if ( $enqueue_wp_assets ) : ?>
	49	+<?php if ($enqueue_wp_assets) : ?>
50	50	<?php wp_footer(); ?>
51	51	<?php endif; ?>
52	52	</body>

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	<?php _e('Adjust the settings for the Authorize.net AIM payment gateway.', 'event_espresso'); ?>
4	4	</p>
5	5	<p>
6		-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso' ), "<a href='http://www.authorize.net/international/' target='_blank'>","</a>" ); ?>
	6	+<?php printf(__('See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso'), "<a href='http://www.authorize.net/international/' target='_blank'>", "</a>"); ?>
7	7	</p>
8	8	<p><strong><?php _e('Authorize.net AIM Settings', 'event_espresso'); ?></strong></p>
9	9	<ul>
		@@ -28,16 +28,16 @@ discard block
		block discarded – undo
28	28	<?php _e('By logging into Authorize.net, you can change which payment fields are required by Authorize.net when processing payments. These settings affect both the Advanced Integration Method (AIM, this) and the Simple Integration Method (SIM, different). The payment method settings "Excluded Payment Form Fields" and "Required Payment Form Fields" allow you to change the billing form in Event Espresso to reflect your payment form settings in Authorize.net.', 'event_espresso'); ?>
29	29	<br>
30	30	<?php printf(
31		- __( 'To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
	31	+ __('To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
32	32	'<a href="http://authorize.net" target="_blank">',
33	33	'</a>',
34	34	'<a href="https://monosnap.com/file/nebVteOkEXcdDIos88SojStWOifP23" target="_blank">',
35	35	'<a href="https://monosnap.com/file/WyxGJtev87TcDmdGBEZ2oi1xaBIQAm" target="_blank">',
36		- '<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">');?>
	36	+ '<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">'); ?>
37	37	</li>
38	38	<li>
39		- <strong><?php _e( 'Server', 'event_espresso');?></strong>
40		- <?php _e( 'Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso' );?>
	39	+ <strong><?php _e('Server', 'event_espresso'); ?></strong>
	40	+ <?php _e('Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso'); ?>
41	41	</li>
42	42	<li>
43	43	<strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br />

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3		- exit( 'No direct script access allowed' );
	2	+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
	3	+ exit('No direct script access allowed');
4	4	}
5	5
6	6
		@@ -35,8 +35,8 @@ discard block
		block discarded – undo
35	35	* @param array $arguments
36	36	* @return \EE_CPT_Default_Strategy
37	37	*/
38		- public function __construct( $arguments = array() ) {
39		- $this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : null;
	38	+ public function __construct($arguments = array()) {
	39	+ $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
40	40	// $WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : null;
41	41	//EEH_Debug_Tools::printr( $this->CPT, '$this->CPT <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
42	42	// add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 );
		@@ -52,9 +52,9 @@ discard block
		block discarded – undo
52	52	* @param \WP_Query $WP_Query
53	53	* @return \WP_Query
54	54	*/
55		- public function pre_get_posts( WP_Query $WP_Query ) {
	55	+ public function pre_get_posts(WP_Query $WP_Query) {
56	56	//EEH_Debug_Tools::printr( $WP_Query, '$WP_Query <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
57		- if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) {
	57	+ if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
58	58	return $WP_Query;
59	59	}
60	60	// $WP_Query->set( 'post_type', array( $this->CPT['post_type'] ));
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	* @param \WP_Query $WP_Query
73	73	* @return \WP_Post[]
74	74	*/
75		- public function the_posts( $posts, WP_Query $WP_Query ) {
	75	+ public function the_posts($posts, WP_Query $WP_Query) {
76	76	return $posts;
77	77	}
78	78
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	* @param string $single
89	89	* @return mixed
90	90	*/
91		- public function get_EE_post_type_metadata( $meta_value = null, $post_id, $meta_key, $single ) {
	91	+ public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single) {
92	92	return $meta_value;
93	93	}
94	94

		@@ -1,4 +1,4 @@ discard block
		block discarded – undo
1		-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
	1	+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2	2	/**
3	3	* Class EE_Select_Reveal_Input
4	4	*
		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	* @since 4.6
12	12	*
13	13	*/
14		-class EE_Select_Reveal_Input extends EE_Select_Input{
	14	+class EE_Select_Reveal_Input extends EE_Select_Input {
15	15
16	16	/**
17	17	* @param array $answer_options Array keys which match a sibling section's name
		@@ -26,8 +26,8 @@ discard block
		block discarded – undo
26	26	*
27	27	* @param array $input_settings
28	28	*/
29		- public function __construct( $answer_options, $input_settings = array() ){
30		- parent::__construct( $answer_options, $input_settings );
	29	+ public function __construct($answer_options, $input_settings = array()) {
	30	+ parent::__construct($answer_options, $input_settings);
31	31	}
32	32
33	33	/**
		@@ -36,17 +36,17 @@ discard block
		block discarded – undo
36	36	*/
37	37	public function sibling_sections_controlled() {
38	38	$sibling_sections = array();
39		- foreach( $this->options() as $sibling_section_name => $sibling_section ) {
	39	+ foreach ($this->options() as $sibling_section_name => $sibling_section) {
40	40	//if it's an empty string just leave it alone
41		- if( empty( $sibling_section_name ) ) {
	41	+ if (empty($sibling_section_name)) {
42	42	continue;
43	43	}
44		- $sibling_section = $this->find_section_from_path( '../' . $sibling_section_name );
45		- if(
	44	+ $sibling_section = $this->find_section_from_path('../'.$sibling_section_name);
	45	+ if (
46	46	$sibling_section instanceof EE_Form_Section_Base
47		- && ! empty( $sibling_section_name )
	47	+ && ! empty($sibling_section_name)
48	48	) {
49		- $sibling_sections[ $sibling_section_name ] = $sibling_section;
	49	+ $sibling_sections[$sibling_section_name] = $sibling_section;
50	50	}
51	51	}
52	52	return $sibling_sections;
		@@ -59,16 +59,16 @@ discard block
		block discarded – undo
59	59	* @param array $form_other_js_data
60	60	* @return array
61	61	*/
62		- public function get_other_js_data( $form_other_js_data = array() ) {
63		- $form_other_js_data = parent::get_other_js_data( $form_other_js_data );
64		- if( ! isset($form_other_js_data[ 'select_reveal_inputs' ] ) ) {
65		- $form_other_js_data[ 'select_reveal_inputs' ] = array();
	62	+ public function get_other_js_data($form_other_js_data = array()) {
	63	+ $form_other_js_data = parent::get_other_js_data($form_other_js_data);
	64	+ if ( ! isset($form_other_js_data['select_reveal_inputs'])) {
	65	+ $form_other_js_data['select_reveal_inputs'] = array();
66	66	}
67	67	$sibling_input_to_html_id_map = array();
68		- foreach( $this->sibling_sections_controlled() as $sibling_section_path => $sibling_section ) {
69		- $sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
	68	+ foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
	69	+ $sibling_input_to_html_id_map[$sibling_section_path] = $sibling_section->html_id();
70	70	}
71		- $form_other_js_data[ 'select_reveal_inputs' ][ $this->html_id() ] = $sibling_input_to_html_id_map;
	71	+ $form_other_js_data['select_reveal_inputs'][$this->html_id()] = $sibling_input_to_html_id_map;
72	72	return $form_other_js_data;
73	73	}
74	74

		@@ -84,6 +84,7 @@
		block discarded – undo
84	84	*
85	85	* @access public
86	86	* @param mixed
	87	+ * @param string $info
87	88	* @return null \| object
88	89	*/
89	90	public function get_by_info( $info ) {

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1		-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2		- exit( 'No direct script access allowed' );
	1	+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
	2	+ exit('No direct script access allowed');
3	3	}
4	4	/**
5	5	* Class EE_Object_Collection
		@@ -37,14 +37,14 @@ discard block
		block discarded – undo
37	37	* @param mixed $info
38	38	* @return bool
39	39	*/
40		- public function add( $object, $info = null ) {
	40	+ public function add($object, $info = null) {
41	41	$class = $this->interface;
42		- if ( ! $object instanceof $class ) {
	42	+ if ( ! $object instanceof $class) {
43	43	return false;
44	44	}
45		- $this->attach( $object );
46		- $this->set_info( $object, $info );
47		- return $this->contains( $object );
	45	+ $this->attach($object);
	46	+ $this->set_info($object, $info);
	47	+ return $this->contains($object);
48	48	}
49	49
50	50
		@@ -60,12 +60,12 @@ discard block
		block discarded – undo
60	60	* @param mixed $info
61	61	* @return bool
62	62	*/
63		- public function set_info( $object, $info = null ) {
64		- $info = ! empty( $info ) ? $info : spl_object_hash( $object );
	63	+ public function set_info($object, $info = null) {
	64	+ $info = ! empty($info) ? $info : spl_object_hash($object);
65	65	$this->rewind();
66		- while ( $this->valid() ) {
67		- if ( $object == $this->current() ) {
68		- $this->setInfo( $info );
	66	+ while ($this->valid()) {
	67	+ if ($object == $this->current()) {
	68	+ $this->setInfo($info);
69	69	$this->rewind();
70	70	return true;
71	71	}
		@@ -86,10 +86,10 @@ discard block
		block discarded – undo
86	86	* @param mixed
87	87	* @return null \| object
88	88	*/
89		- public function get_by_info( $info ) {
	89	+ public function get_by_info($info) {
90	90	$this->rewind();
91		- while ( $this->valid() ) {
92		- if ( $info === $this->getInfo() ) {
	91	+ while ($this->valid()) {
	92	+ if ($info === $this->getInfo()) {
93	93	$object = $this->current();
94	94	$this->rewind();
95	95	return $object;
		@@ -110,8 +110,8 @@ discard block
		block discarded – undo
110	110	* @param object $object
111	111	* @return bool
112	112	*/
113		- public function has( $object ) {
114		- return $this->contains( $object );
	113	+ public function has($object) {
	114	+ return $this->contains($object);
115	115	}
116	116
117	117
		@@ -125,8 +125,8 @@ discard block
		block discarded – undo
125	125	* @param $object
126	126	* @return bool
127	127	*/
128		- public function remove( $object ) {
129		- $this->detach( $object );
	128	+ public function remove($object) {
	129	+ $this->detach($object);
130	130	return true;
131	131	}
132	132
		@@ -141,10 +141,10 @@ discard block
		block discarded – undo
141	141	* @param $object
142	142	* @return void
143	143	*/
144		- public function set_current( $object ) {
	144	+ public function set_current($object) {
145	145	$this->rewind();
146		- while ( $this->valid() ) {
147		- if ( $this->current() === $object ) {
	146	+ while ($this->valid()) {
	147	+ if ($this->current() === $object) {
148	148	break;
149	149	}
150	150	$this->next();
		@@ -162,10 +162,10 @@ discard block
		block discarded – undo
162	162	* @param $info
163	163	* @return void
164	164	*/
165		- public function set_current_by_info( $info ) {
	165	+ public function set_current_by_info($info) {
166	166	$this->rewind();
167		- while ( $this->valid() ) {
168		- if ( $info === $this->getInfo() ) {
	167	+ while ($this->valid()) {
	168	+ if ($info === $this->getInfo()) {
169	169	break;
170	170	}
171	171	$this->next();

		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	* Loads the class file for a given class name.
133	133	*
134	134	* @param string $class The fully-qualified class name.
135		- * @return mixed The mapped file name on success, or boolean false on
	135	+ * @return string\|false The mapped file name on success, or boolean false on
136	136	* failure.
137	137	*/
138	138	public function loadClass( $class ) {
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	*
166	166	* @param string $prefix The namespace prefix.
167	167	* @param string $relative_class The relative class name.
168		- * @return mixed Boolean false if no mapped file can be loaded, or the
	168	+ * @return string\|false Boolean false if no mapped file can be loaded, or the
169	169	* name of the mapped file that was loaded.
170	170	*/
171	171	protected function loadMappedFile( $prefix, $relative_class ) {

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2	namespace EventEspresso\core\services\locators;
3	3
4		-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
5		- exit( 'No direct script access allowed' );
	4	+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
	5	+ exit('No direct script access allowed');
6	6	}
7	7
8	8
		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	* @param array\|string $location
23	23	* @return \FilesystemIterator
24	24	*/
25		- public function locate( $location );
	25	+ public function locate($location);
26	26
27	27	}
28	28	// End of file LocatorInterface.php

		@@ -25,12 +25,12 @@ discard block
		block discarded – undo
25	25	* @param EE_Messages_Queue $queue
26	26	* @param string $custom_subject Used if a custom subject is desired for the generated aggregate EE_Message object
27	27	*/
28		- public function __construct( $messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '' ) {
	28	+ public function __construct($messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '') {
29	29	$this->queue = $queue;
30		- parent::__construct( $messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle );
31		- if ( $this->valid() ) {
32		- $this->_message->set_content( $this->_get_content() );
33		- $this->_message->set_subject( $this->_get_subject( $custom_subject ) );
	30	+ parent::__construct($messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle);
	31	+ if ($this->valid()) {
	32	+ $this->_message->set_content($this->_get_content());
	33	+ $this->_message->set_subject($this->_get_subject($custom_subject));
34	34	}
35	35	}
36	36
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	protected function _get_content() {
45	45	$content = '';
46	46	$this->queue->get_message_repository()->rewind();
47		- while ( $this->queue->get_message_repository()->valid() ) {
	47	+ while ($this->queue->get_message_repository()->valid()) {
48	48	$content .= $this->queue->get_message_repository()->current()->content();
49	49	$this->queue->get_message_repository()->next();
50	50	}
		@@ -58,15 +58,15 @@ discard block
		block discarded – undo
58	58	*
59	59	* @return string
60	60	*/
61		- protected function _get_subject( $custom_subject = '' ) {
62		- if ( ! empty( $custom_subject ) ) {
	61	+ protected function _get_subject($custom_subject = '') {
	62	+ if ( ! empty($custom_subject)) {
63	63	return $custom_subject;
64	64	}
65	65	$this->queue->get_message_repository()->rewind();
66	66	$count_of_items = $this->queue->get_message_repository()->count();
67	67
68	68	//if $count of items in queue == 1, then let's just return the subject for that item.
69		- if ( $count_of_items === 1 ) {
	69	+ if ($count_of_items === 1) {
70	70	return $this->queue->get_message_repository()->current()->subject();
71	71	}
72	72

eventespresso / event-espresso-core

Pull Request — Gutenberg/master (#361)

Status

Category

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch