eventespresso / event-espresso-core

core/services/request/InvalidRequestStackMiddlewareException.php

Indentation +29 added lines, -29 removed lines

@@ -15,33 +15,33 @@
 class InvalidRequestStackMiddlewareException extends InvalidDataTypeException
 {
 
-    /**
-     * @param  mixed    $middleware_app_class
-     * @param  string   $message
-     * @param int       $code
-     * @param Exception $previous
-     */
-    public function __construct($middleware_app_class, $message = '', $code = 0, Exception $previous = null)
-    {
-        if (is_array($middleware_app_class)) {
-            $middleware_app_class = reset($middleware_app_class);
-        }
-        if (empty($message)) {
-            $message = sprintf(
-                esc_html__(
-                    'The supplied Request Stack Middleware class "%1$s" is invalid or could no be found.',
-                    'event_espresso'
-                ),
-                $middleware_app_class
-            );
-        }
-        parent::__construct(
-            '$middleware_app_class',
-            $middleware_app_class,
-            'EventEspresso\core\services\request\middleware\Middleware',
-            $message,
-            $code,
-            $previous
-        );
-    }
+	/**
+	 * @param  mixed    $middleware_app_class
+	 * @param  string   $message
+	 * @param int       $code
+	 * @param Exception $previous
+	 */
+	public function __construct($middleware_app_class, $message = '', $code = 0, Exception $previous = null)
+	{
+		if (is_array($middleware_app_class)) {
+			$middleware_app_class = reset($middleware_app_class);
+		}
+		if (empty($message)) {
+			$message = sprintf(
+				esc_html__(
+					'The supplied Request Stack Middleware class "%1$s" is invalid or could no be found.',
+					'event_espresso'
+				),
+				$middleware_app_class
+			);
+		}
+		parent::__construct(
+			'$middleware_app_class',
+			$middleware_app_class,
+			'EventEspresso\core\services\request\middleware\Middleware',
+			$message,
+			$code,
+			$previous
+		);
+	}
 }

core/services/request/RequestStackBuilder.php

Indentation +87 added lines, -87 removed lines

@@ -20,97 +20,97 @@
 class RequestStackBuilder extends SplDoublyLinkedList
 {
 
-    /**
-     * @type LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * RequestStackBuilder constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-        $this->setIteratorMode(SplDoublyLinkedList::IT_MODE_LIFO | SplDoublyLinkedList::IT_MODE_KEEP);
-    }
+	/**
+	 * RequestStackBuilder constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+		$this->setIteratorMode(SplDoublyLinkedList::IT_MODE_LIFO | SplDoublyLinkedList::IT_MODE_KEEP);
+	}
 
 
-    /**
-     * builds decorated middleware stack
-     * by continuously injecting previous middleware app into the next
-     *
-     * @param RequestStackCoreAppInterface $application
-     * @return RequestStack
-     * @throws Exception
-     */
-    public function resolve(RequestStackCoreAppInterface $application)
-    {
-        $core_app = $application;
-        // NOW... because the RequestStack is following the decorator pattern,
-        // the first stack app we add will end up at the center of the stack,
-        // and will end up being the last item to actually run, but we don't want that!
-        // Basically we're dealing with TWO stacks, and transferring items from one to the other,
-        // BUT... we want the final stack to be in the same order as the first.
-        // So we need to reverse the iterator mode when transferring items,
-        // because if we don't, the second stack will end  up in the incorrect order.
-        $this->setIteratorMode(SplDoublyLinkedList::IT_MODE_FIFO | SplDoublyLinkedList::IT_MODE_KEEP);
-        for ($this->rewind(); $this->valid(); $this->next()) {
-            try {
-                $middleware_app = $this->validateMiddlewareAppDetails($this->current(), true);
-                $middleware_app_class = array_shift($middleware_app);
-                $middleware_app_args = is_array($middleware_app) ? $middleware_app : array();
-                $middleware_app_args = array($application, $this->loader) + $middleware_app_args;
-                $application = $this->loader->getShared($middleware_app_class, $middleware_app_args);
-            } catch (InvalidRequestStackMiddlewareException $exception) {
-                if (WP_DEBUG) {
-                    new ExceptionStackTraceDisplay($exception);
-                    continue;
-                }
-                error_log($exception->getMessage());
-            }
-        }
-        return new RequestStack($application, $core_app);
-    }
+	/**
+	 * builds decorated middleware stack
+	 * by continuously injecting previous middleware app into the next
+	 *
+	 * @param RequestStackCoreAppInterface $application
+	 * @return RequestStack
+	 * @throws Exception
+	 */
+	public function resolve(RequestStackCoreAppInterface $application)
+	{
+		$core_app = $application;
+		// NOW... because the RequestStack is following the decorator pattern,
+		// the first stack app we add will end up at the center of the stack,
+		// and will end up being the last item to actually run, but we don't want that!
+		// Basically we're dealing with TWO stacks, and transferring items from one to the other,
+		// BUT... we want the final stack to be in the same order as the first.
+		// So we need to reverse the iterator mode when transferring items,
+		// because if we don't, the second stack will end  up in the incorrect order.
+		$this->setIteratorMode(SplDoublyLinkedList::IT_MODE_FIFO | SplDoublyLinkedList::IT_MODE_KEEP);
+		for ($this->rewind(); $this->valid(); $this->next()) {
+			try {
+				$middleware_app = $this->validateMiddlewareAppDetails($this->current(), true);
+				$middleware_app_class = array_shift($middleware_app);
+				$middleware_app_args = is_array($middleware_app) ? $middleware_app : array();
+				$middleware_app_args = array($application, $this->loader) + $middleware_app_args;
+				$application = $this->loader->getShared($middleware_app_class, $middleware_app_args);
+			} catch (InvalidRequestStackMiddlewareException $exception) {
+				if (WP_DEBUG) {
+					new ExceptionStackTraceDisplay($exception);
+					continue;
+				}
+				error_log($exception->getMessage());
+			}
+		}
+		return new RequestStack($application, $core_app);
+	}
 
 
-    /**
-     * Ensures that the app details that have been pushed onto RequestStackBuilder
-     * are all ordered correctly so that the middleware can be properly constructed
-     *
-     * @param array $middleware_app
-     * @param bool  $recurse
-     * @return array
-     * @throws InvalidRequestStackMiddlewareException
-     */
-    protected function validateMiddlewareAppDetails(array $middleware_app, $recurse = false)
-    {
-        $middleware_app_class = reset($middleware_app);
-        // is array empty ?
-        if ($middleware_app_class === false) {
-            throw new InvalidRequestStackMiddlewareException($middleware_app_class);
-        }
-        // are the class and arguments in the wrong order ?
-        if (is_array($middleware_app_class)) {
-            if ($recurse === true) {
-                return $this->validateMiddlewareAppDetails(array_reverse($middleware_app));
-            }
-            throw new InvalidRequestStackMiddlewareException($middleware_app_class);
-        }
-        // is filter callback working like legacy middleware and sending a numerically indexed array ?
-        if (is_int($middleware_app_class)) {
-            if ($recurse === true) {
-                $middleware_app = array_reverse($middleware_app);
-                return $this->validateMiddlewareAppDetails(array(reset($middleware_app), array()));
-            }
-            throw new InvalidRequestStackMiddlewareException($middleware_app_class);
-        }
-        // is $middleware_app_class a valid FQCN (or class is already loaded) ?
-        if (! class_exists($middleware_app_class)) {
-            throw new InvalidRequestStackMiddlewareException($middleware_app_class);
-        }
-        return $middleware_app;
-    }
+	/**
+	 * Ensures that the app details that have been pushed onto RequestStackBuilder
+	 * are all ordered correctly so that the middleware can be properly constructed
+	 *
+	 * @param array $middleware_app
+	 * @param bool  $recurse
+	 * @return array
+	 * @throws InvalidRequestStackMiddlewareException
+	 */
+	protected function validateMiddlewareAppDetails(array $middleware_app, $recurse = false)
+	{
+		$middleware_app_class = reset($middleware_app);
+		// is array empty ?
+		if ($middleware_app_class === false) {
+			throw new InvalidRequestStackMiddlewareException($middleware_app_class);
+		}
+		// are the class and arguments in the wrong order ?
+		if (is_array($middleware_app_class)) {
+			if ($recurse === true) {
+				return $this->validateMiddlewareAppDetails(array_reverse($middleware_app));
+			}
+			throw new InvalidRequestStackMiddlewareException($middleware_app_class);
+		}
+		// is filter callback working like legacy middleware and sending a numerically indexed array ?
+		if (is_int($middleware_app_class)) {
+			if ($recurse === true) {
+				$middleware_app = array_reverse($middleware_app);
+				return $this->validateMiddlewareAppDetails(array(reset($middleware_app), array()));
+			}
+			throw new InvalidRequestStackMiddlewareException($middleware_app_class);
+		}
+		// is $middleware_app_class a valid FQCN (or class is already loaded) ?
+		if (! class_exists($middleware_app_class)) {
+			throw new InvalidRequestStackMiddlewareException($middleware_app_class);
+		}
+		return $middleware_app;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
             throw new InvalidRequestStackMiddlewareException($middleware_app_class);
         }
         // is $middleware_app_class a valid FQCN (or class is already loaded) ?
-        if (! class_exists($middleware_app_class)) {
+        if ( ! class_exists($middleware_app_class)) {
             throw new InvalidRequestStackMiddlewareException($middleware_app_class);
         }
         return $middleware_app;

core/services/request/middleware/BotDetector.php

Indentation +19 added lines, -19 removed lines

@@ -17,23 +17,23 @@
 class BotDetector extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        /** @var CrawlerDetect $CrawlerDetect */
-        $CrawlerDetect = $this->loader->getShared('EventEspressoVendor\Jaybizzle\CrawlerDetect\CrawlerDetect');
-        // Check and record the user agent of the current 'visitor'
-        $this->request->setIsBot($CrawlerDetect->isCrawler());
-        $this->request->setUserAgent($CrawlerDetect->userAgent());
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		/** @var CrawlerDetect $CrawlerDetect */
+		$CrawlerDetect = $this->loader->getShared('EventEspressoVendor\Jaybizzle\CrawlerDetect\CrawlerDetect');
+		// Check and record the user agent of the current 'visitor'
+		$this->request->setIsBot($CrawlerDetect->isCrawler());
+		$this->request->setUserAgent($CrawlerDetect->userAgent());
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 }

core/services/request/middleware/RecommendedVersions.php

Indentation +172 added lines, -172 removed lines

@@ -19,182 +19,182 @@
 class RecommendedVersions extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidDataTypeException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
-            $this->request->unSetRequestParam('activate', true);
-            add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
-            $this->response->terminateRequest();
-            $this->response->deactivatePlugin();
-        }
-        // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
-            $this->displayMinimumRecommendedPhpVersionNotice();
-        }
-        // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
-            $this->displayUpcomingRequiredVersion();
-        }
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
-
-
-    /**
-     * Helper method to assess installed wp version against given values.
-     * By default this compares the required minimum version of WP for EE against the installed version of WP
-     * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
-     * against) so consider that when sending in your values.
-     *
-     * @param string $version_to_check
-     * @param string $operator
-     * @return bool
-     */
-    public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
-    {
-        global $wp_version;
-        return version_compare(
-            // first account for wp_version being pre-release
-            // (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
-            strpos($wp_version, '-') > 0
-                ? substr($wp_version, 0, strpos($wp_version, '-'))
-                : $wp_version,
-            $version_to_check,
-            $operator
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumWordPressVersionRequired()
-    {
-        return RecommendedVersions::compareWordPressVersion();
-    }
-
-
-    /**
-     * @param string $min_version
-     * @return boolean
-     */
-    private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
-    {
-        return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumPhpVersionRecommended()
-    {
-        return $this->checkPhpVersion();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function minimumWpVersionError()
-    {
-        global $wp_version;
-        ?>
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		// check required WP version
+		if (! $this->minimumWordPressVersionRequired()) {
+			$this->request->unSetRequestParam('activate', true);
+			add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
+			$this->response->terminateRequest();
+			$this->response->deactivatePlugin();
+		}
+		// check recommended PHP version
+		if (! $this->minimumPhpVersionRecommended()) {
+			$this->displayMinimumRecommendedPhpVersionNotice();
+		}
+		// upcoming required version
+		if (! $this->upcomingRequiredPhpVersion()) {
+			$this->displayUpcomingRequiredVersion();
+		}
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
+
+
+	/**
+	 * Helper method to assess installed wp version against given values.
+	 * By default this compares the required minimum version of WP for EE against the installed version of WP
+	 * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
+	 * against) so consider that when sending in your values.
+	 *
+	 * @param string $version_to_check
+	 * @param string $operator
+	 * @return bool
+	 */
+	public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
+	{
+		global $wp_version;
+		return version_compare(
+			// first account for wp_version being pre-release
+			// (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
+			strpos($wp_version, '-') > 0
+				? substr($wp_version, 0, strpos($wp_version, '-'))
+				: $wp_version,
+			$version_to_check,
+			$operator
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumWordPressVersionRequired()
+	{
+		return RecommendedVersions::compareWordPressVersion();
+	}
+
+
+	/**
+	 * @param string $min_version
+	 * @return boolean
+	 */
+	private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
+	{
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumPhpVersionRecommended()
+	{
+		return $this->checkPhpVersion();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function minimumWpVersionError()
+	{
+		global $wp_version;
+		?>
         <div class="error">
             <p>
                 <?php
-                printf(
-                    __(
-                        'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_WP_VER_REQUIRED,
-                    $wp_version,
-                    '<br/>',
-                    '<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
-                );
-                ?>
+				printf(
+					__(
+						'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_WP_VER_REQUIRED,
+					$wp_version,
+					'<br/>',
+					'<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-
-
-    /**
-     *    _display_minimum_recommended_php_version_notice
-     *
-     * @access private
-     * @return void
-     * @throws InvalidDataTypeException
-     */
-    private function displayMinimumRecommendedPhpVersionNotice()
-    {
-        if ($this->request->isAdmin()) {
-            new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
-                sprintf(
-                    esc_html__(
-                        'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_PHP_VER_RECOMMENDED,
-                    PHP_VERSION,
-                    '<br/>',
-                    '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Returns whether the provided php version number is less than the current version of php installed on the server.
-     *
-     * @param string $version_required
-     * @return bool
-     */
-    private function upcomingRequiredPhpVersion($version_required = '5.5')
-    {
-        return true;
-        // return $this->checkPhpVersion($version_required);
-    }
-
-
-    /**
-     *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
-     */
-    private function displayUpcomingRequiredVersion()
-    {
-        if ($this->request->isAdmin()
-            && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
-            && current_user_can('update_plugins')
-        ) {
-            add_action('admin_notices', function () {
-                echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
-                     . sprintf(
-                         esc_html__(
-                             'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
-                             'event_espresso'
-                         ),
-                         '<strong>',
-                         '</strong>',
-                         PHP_VERSION,
-                         '<a href="https://wordpress.org/support/upgrade-php/">',
-                         '</a>'
-                     )
-                     . '</p></div>';
-            });
-        }
-    }
+	}
+
+
+	/**
+	 *    _display_minimum_recommended_php_version_notice
+	 *
+	 * @access private
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
+	private function displayMinimumRecommendedPhpVersionNotice()
+	{
+		if ($this->request->isAdmin()) {
+			new PersistentAdminNotice(
+				'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+				sprintf(
+					esc_html__(
+						'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_PHP_VER_RECOMMENDED,
+					PHP_VERSION,
+					'<br/>',
+					'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Returns whether the provided php version number is less than the current version of php installed on the server.
+	 *
+	 * @param string $version_required
+	 * @return bool
+	 */
+	private function upcomingRequiredPhpVersion($version_required = '5.5')
+	{
+		return true;
+		// return $this->checkPhpVersion($version_required);
+	}
+
+
+	/**
+	 *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
+	 */
+	private function displayUpcomingRequiredVersion()
+	{
+		if ($this->request->isAdmin()
+			&& apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
+			&& current_user_can('update_plugins')
+		) {
+			add_action('admin_notices', function () {
+				echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
+					 . sprintf(
+						 esc_html__(
+							 'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
+							 'event_espresso'
+						 ),
+						 '<strong>',
+						 '</strong>',
+						 PHP_VERSION,
+						 '<a href="https://wordpress.org/support/upgrade-php/">',
+						 '</a>'
+					 )
+					 . '</p></div>';
+			});
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -32,18 +32,18 @@ 
         $this->request = $request;
         $this->response = $response;
         // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
+        if ( ! $this->minimumWordPressVersionRequired()) {
             $this->request->unSetRequestParam('activate', true);
             add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
             $this->response->terminateRequest();
             $this->response->deactivatePlugin();
         }
         // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
+        if ( ! $this->minimumPhpVersionRecommended()) {
             $this->displayMinimumRecommendedPhpVersionNotice();
         }
         // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
+        if ( ! $this->upcomingRequiredPhpVersion()) {
             $this->displayUpcomingRequiredVersion();
         }
         $this->response = $this->processRequestStack($this->request, $this->response);
@@ -142,7 +142,7 @@ 
     {
         if ($this->request->isAdmin()) {
             new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+                'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
                 sprintf(
                     esc_html__(
                         'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
@@ -180,7 +180,7 @@ 
             && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
             && current_user_can('update_plugins')
         ) {
-            add_action('admin_notices', function () {
+            add_action('admin_notices', function() {
                 echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
                      . sprintf(
                          esc_html__(

core/services/request/middleware/DetectLogin.php

Indentation +24 added lines, -24 removed lines

@@ -16,28 +16,28 @@
 class DetectLogin extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        global $pagenow;
-        if (in_array(
-            $pagenow,
-            array('wp-login.php', 'wp-register.php'),
-            true
-        )
-            && ! filter_var($request->getRequestParam('ee_load_on_login'), FILTER_VALIDATE_BOOLEAN)
-        ) {
-            $this->response->terminateRequest();
-        }
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		global $pagenow;
+		if (in_array(
+			$pagenow,
+			array('wp-login.php', 'wp-register.php'),
+			true
+		)
+			&& ! filter_var($request->getRequestParam('ee_load_on_login'), FILTER_VALIDATE_BOOLEAN)
+		) {
+			$this->response->terminateRequest();
+		}
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 }

core/services/request/middleware/Middleware.php

Indentation +41 added lines, -41 removed lines

@@ -25,52 +25,52 @@
 abstract class Middleware implements RequestDecoratorInterface
 {
 
-    /**
-     * @var RequestDecoratorInterface $request_stack_app
-     */
-    protected $request_stack_app;
+	/**
+	 * @var RequestDecoratorInterface $request_stack_app
+	 */
+	protected $request_stack_app;
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
 
-    /**
-     * @var LoaderInterface
-     */
-    protected $loader;
+	/**
+	 * @var LoaderInterface
+	 */
+	protected $loader;
 
 
-    /**
-     * @param RequestDecoratorInterface $request_stack_app
-     * @param LoaderInterface           $loader
-     */
-    public function __construct(RequestDecoratorInterface $request_stack_app, LoaderInterface $loader)
-    {
-        $this->request_stack_app = $request_stack_app;
-        $this->loader = $loader;
-    }
+	/**
+	 * @param RequestDecoratorInterface $request_stack_app
+	 * @param LoaderInterface           $loader
+	 */
+	public function __construct(RequestDecoratorInterface $request_stack_app, LoaderInterface $loader)
+	{
+		$this->request_stack_app = $request_stack_app;
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * process_request_stack
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    protected function processRequestStack(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        if (! $this->response->requestTerminated()) {
-            $this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
-        }
-        return $this->response;
-    }
+	/**
+	 * process_request_stack
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	protected function processRequestStack(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		if (! $this->response->requestTerminated()) {
+			$this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
+		}
+		return $this->response;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     {
         $this->request = $request;
         $this->response = $response;
-        if (! $this->response->requestTerminated()) {
+        if ( ! $this->response->requestTerminated()) {
             $this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
         }
         return $this->response;

core/services/collections/LooseCollection.php

Indentation +31 added lines, -31 removed lines

@@ -16,37 +16,37 @@
 {
 
 
-    /**
-     * setCollectionInterface
-     *
-     * @access protected
-     * @param  string $collection_interface
-     */
-    protected function setCollectionInterface($collection_interface)
-    {
-        $this->collection_interface = '';
-    }
+	/**
+	 * setCollectionInterface
+	 *
+	 * @access protected
+	 * @param  string $collection_interface
+	 */
+	protected function setCollectionInterface($collection_interface)
+	{
+		$this->collection_interface = '';
+	}
 
 
-    /**
-     * add
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_identifier()
-     *
-     * @access public
-     * @param  mixed $object
-     * @param  mixed $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     */
-    public function add($object, $identifier = null)
-    {
-        if (! is_object($object)) {
-            throw new InvalidEntityException($object, 'object');
-        }
-        $this->attach($object);
-        $this->setIdentifier($object, $identifier);
-        return $this->contains($object);
-    }
+	/**
+	 * add
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_identifier()
+	 *
+	 * @access public
+	 * @param  mixed $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 */
+	public function add($object, $identifier = null)
+	{
+		if (! is_object($object)) {
+			throw new InvalidEntityException($object, 'object');
+		}
+		$this->attach($object);
+		$this->setIdentifier($object, $identifier);
+		return $this->contains($object);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function add($object, $identifier = null)
     {
-        if (! is_object($object)) {
+        if ( ! is_object($object)) {
             throw new InvalidEntityException($object, 'object');
         }
         $this->attach($object);

core/services/notices/NoticeConverter.php

Indentation +67 added lines, -67 removed lines

@@ -12,71 +12,71 @@
 abstract class NoticeConverter implements NoticeConverterInterface
 {
 
-    /**
-     * @var NoticesContainerInterface $notices
-     */
-    private $notices;
-
-    /**
-     * if set to true, then errors will be thrown as exceptions
-     *
-     * @var boolean $throw_exceptions
-     */
-    private $throw_exceptions;
-
-
-    /**
-     * NoticeConverter constructor.
-     *
-     * @param bool $throw_exceptions
-     */
-    public function __construct($throw_exceptions = false)
-    {
-        $this->throw_exceptions = $throw_exceptions;
-    }
-
-
-    /**
-     * @return NoticesContainerInterface
-     */
-    public function getNotices()
-    {
-        return $this->notices;
-    }
-
-
-    /**
-     * @param NoticesContainerInterface $notices
-     */
-    protected function setNotices(NoticesContainerInterface $notices)
-    {
-        $this->notices = $notices;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getThrowExceptions()
-    {
-        return $this->throw_exceptions;
-    }
-
-
-    /**
-     * @param bool $throw_exceptions
-     */
-    public function setThrowExceptions($throw_exceptions)
-    {
-        $this->throw_exceptions = filter_var($throw_exceptions, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return void;
-     */
-    public function clearNotices()
-    {
-        $this->notices = null;
-    }
+	/**
+	 * @var NoticesContainerInterface $notices
+	 */
+	private $notices;
+
+	/**
+	 * if set to true, then errors will be thrown as exceptions
+	 *
+	 * @var boolean $throw_exceptions
+	 */
+	private $throw_exceptions;
+
+
+	/**
+	 * NoticeConverter constructor.
+	 *
+	 * @param bool $throw_exceptions
+	 */
+	public function __construct($throw_exceptions = false)
+	{
+		$this->throw_exceptions = $throw_exceptions;
+	}
+
+
+	/**
+	 * @return NoticesContainerInterface
+	 */
+	public function getNotices()
+	{
+		return $this->notices;
+	}
+
+
+	/**
+	 * @param NoticesContainerInterface $notices
+	 */
+	protected function setNotices(NoticesContainerInterface $notices)
+	{
+		$this->notices = $notices;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getThrowExceptions()
+	{
+		return $this->throw_exceptions;
+	}
+
+
+	/**
+	 * @param bool $throw_exceptions
+	 */
+	public function setThrowExceptions($throw_exceptions)
+	{
+		$this->throw_exceptions = filter_var($throw_exceptions, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return void;
+	 */
+	public function clearNotices()
+	{
+		$this->notices = null;
+	}
 }

core/services/notices/AdminNotice.php

Indentation +115 added lines, -115 removed lines

@@ -13,119 +13,119 @@
 class AdminNotice
 {
 
-    const ERROR = 'notice-error';
-
-    const WARNING = 'notice-warning';
-
-    const SUCCESS = 'notice-success';
-
-    const INFORMATION = 'notice-info';
-
-    const DISMISSABLE = ' is-dismissible';
-
-    /**
-     * generic system notice to be converted into a WP admin notice
-     *
-     * @var NoticeInterface $notice
-     */
-    private $notice;
-
-
-    /**
-     * AdminNotice constructor.
-     *
-     * @param NoticeInterface $notice
-     * @param bool            $display_now
-     */
-    public function __construct(NoticeInterface $notice, $display_now = true)
-    {
-        $this->notice = $notice;
-        if (! did_action('admin_notices')) {
-            add_action('admin_notices', array($this, 'displayNotice'));
-        } elseif ($display_now) {
-            $this->displayNotice();
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    public function displayNotice()
-    {
-        echo $this->getNotice();
-    }
-
-
-    /**
-     * produces something  like:
-     *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
-     *      <p>YOU DID IT!</p>
-     *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
-     *      notice.</span></button>
-     *  </div>
-     *
-     * @return string
-     */
-    public function getNotice()
-    {
-        return sprintf(
-            '<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
-            $this->getType(),
-            $this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
-            $this->getMessage()
-        );
-    }
-
-
-    /**
-     * @return string
-     */
-    private function getType()
-    {
-        switch ($this->notice->type()) {
-            case Notice::ERROR:
-                return AdminNotice::ERROR;
-                break;
-            case Notice::ATTENTION:
-                return AdminNotice::WARNING;
-                break;
-            case Notice::SUCCESS:
-                return AdminNotice::SUCCESS;
-                break;
-            case Notice::INFORMATION:
-            default:
-                return AdminNotice::INFORMATION;
-                break;
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function getMessage()
-    {
-        $message = $this->notice->message();
-        if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
-        }
-        return $message;
-    }
-
-
-    /**
-     * create error code from filepath, function name,
-     * and line number where notice was generated
-     *
-     * @return string
-     */
-    protected function generateErrorCode()
-    {
-        $file = explode('.', basename($this->notice->file()));
-        $error_code = ! empty($file[0]) ? $file[0] : '';
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
-        $error_code .= ' - ' . $this->notice->line();
-        return $error_code;
-    }
+	const ERROR = 'notice-error';
+
+	const WARNING = 'notice-warning';
+
+	const SUCCESS = 'notice-success';
+
+	const INFORMATION = 'notice-info';
+
+	const DISMISSABLE = ' is-dismissible';
+
+	/**
+	 * generic system notice to be converted into a WP admin notice
+	 *
+	 * @var NoticeInterface $notice
+	 */
+	private $notice;
+
+
+	/**
+	 * AdminNotice constructor.
+	 *
+	 * @param NoticeInterface $notice
+	 * @param bool            $display_now
+	 */
+	public function __construct(NoticeInterface $notice, $display_now = true)
+	{
+		$this->notice = $notice;
+		if (! did_action('admin_notices')) {
+			add_action('admin_notices', array($this, 'displayNotice'));
+		} elseif ($display_now) {
+			$this->displayNotice();
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function displayNotice()
+	{
+		echo $this->getNotice();
+	}
+
+
+	/**
+	 * produces something  like:
+	 *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
+	 *      <p>YOU DID IT!</p>
+	 *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
+	 *      notice.</span></button>
+	 *  </div>
+	 *
+	 * @return string
+	 */
+	public function getNotice()
+	{
+		return sprintf(
+			'<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
+			$this->getType(),
+			$this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
+			$this->getMessage()
+		);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	private function getType()
+	{
+		switch ($this->notice->type()) {
+			case Notice::ERROR:
+				return AdminNotice::ERROR;
+				break;
+			case Notice::ATTENTION:
+				return AdminNotice::WARNING;
+				break;
+			case Notice::SUCCESS:
+				return AdminNotice::SUCCESS;
+				break;
+			case Notice::INFORMATION:
+			default:
+				return AdminNotice::INFORMATION;
+				break;
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function getMessage()
+	{
+		$message = $this->notice->message();
+		if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
+			$message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
+		}
+		return $message;
+	}
+
+
+	/**
+	 * create error code from filepath, function name,
+	 * and line number where notice was generated
+	 *
+	 * @return string
+	 */
+	protected function generateErrorCode()
+	{
+		$file = explode('.', basename($this->notice->file()));
+		$error_code = ! empty($file[0]) ? $file[0] : '';
+		$error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
+		$error_code .= ' - ' . $this->notice->line();
+		return $error_code;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
     public function __construct(NoticeInterface $notice, $display_now = true)
     {
         $this->notice = $notice;
-        if (! did_action('admin_notices')) {
+        if ( ! did_action('admin_notices')) {
             add_action('admin_notices', array($this, 'displayNotice'));
         } elseif ($display_now) {
             $this->displayNotice();
@@ -108,7 +108,7 @@ 
     {
         $message = $this->notice->message();
         if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
+            $message .= '<br/><span class="tiny-text">'.$this->generateErrorCode().'</span>';
         }
         return $message;
     }
@@ -124,8 +124,8 @@ 
     {
         $file = explode('.', basename($this->notice->file()));
         $error_code = ! empty($file[0]) ? $file[0] : '';
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
-        $error_code .= ' - ' . $this->notice->line();
+        $error_code .= ! empty($error_code) ? ' - '.$this->notice->func() : $this->notice->func();
+        $error_code .= ' - '.$this->notice->line();
         return $error_code;
     }
 }