eventespresso / event-espresso-core

core/domain/services/contexts/RequestTypeContextCheckerInterface.php

Indentation +83 added lines, -83 removed lines

@@ -14,115 +14,115 @@
 interface RequestTypeContextCheckerInterface
 {
 
-    /**
-     * true if the current request involves some form of activation
-     *
-     * @return bool
-     */
-    public function isActivation();
+	/**
+	 * true if the current request involves some form of activation
+	 *
+	 * @return bool
+	 */
+	public function isActivation();
 
 
-    /**
-     * @param $is_activation
-     * @return bool
-     */
-    public function setIsActivation($is_activation);
+	/**
+	 * @param $is_activation
+	 * @return bool
+	 */
+	public function setIsActivation($is_activation);
 
 
-    /**
-     * true if the current request is for the admin and is not being made via AJAX
-     *
-     * @return bool
-     */
-    public function isAdmin();
+	/**
+	 * true if the current request is for the admin and is not being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAdmin();
 
 
-    /**
-     * true if the current request is for the admin AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isAdminAjax();
+	/**
+	 * true if the current request is for the admin AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAdminAjax();
 
 
-    /**
-     * true if the current request is being made via AJAX... any AJAX
-     *
-     * @return bool
-     */
-    public function isAjax();
+	/**
+	 * true if the current request is being made via AJAX... any AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAjax();
 
 
-    /**
-     * true if the current request is for the EE REST API
-     *
-     * @return bool
-     */
-    public function isApi();
+	/**
+	 * true if the current request is for the EE REST API
+	 *
+	 * @return bool
+	 */
+	public function isApi();
 
 
-    /**
-     * true if the current request is from the command line
-     *
-     * @return bool
-     */
-    public function isCli();
+	/**
+	 * true if the current request is from the command line
+	 *
+	 * @return bool
+	 */
+	public function isCli();
 
 
-    /**
-     * true if the current request is for a WP_Cron
-     *
-     * @return bool
-     */
-    public function isCron();
+	/**
+	 * true if the current request is for a WP_Cron
+	 *
+	 * @return bool
+	 */
+	public function isCron();
 
 
-    /**
-     * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isEeAjax();
+	/**
+	 * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isEeAjax();
 
 
-    /**
-     * true if the current request is for a feed (ie: RSS)
-     *
-     * @return bool
-     */
-    public function isFeed();
+	/**
+	 * true if the current request is for a feed (ie: RSS)
+	 *
+	 * @return bool
+	 */
+	public function isFeed();
 
 
-    /**
-     * true if the current request is for the frontend and is not being made via AJAX
-     *
-     * @return bool
-     */
-    public function isFrontend();
+	/**
+	 * true if the current request is for the frontend and is not being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isFrontend();
 
 
-    /**
-     * @return bool
-     */
-    public function isFrontAjax();
+	/**
+	 * @return bool
+	 */
+	public function isFrontAjax();
 
 
-    /**
-     * @return bool
-     */
-    public function isIframe();
+	/**
+	 * @return bool
+	 */
+	public function isIframe();
 
 
-    /**
-     * true if the current request is being made via AJAX but is NOT for EE related logic
-     *
-     * @return bool
-     */
-    public function isOtherAjax();
+	/**
+	 * true if the current request is being made via AJAX but is NOT for EE related logic
+	 *
+	 * @return bool
+	 */
+	public function isOtherAjax();
 
 
-    /**
-     * @return string
-     */
-    public function slug();
+	/**
+	 * @return string
+	 */
+	public function slug();
 }

core/request_stack/EE_Request_Stack.core.php

Indentation +16 added lines, -16 removed lines

@@ -14,25 +14,25 @@
 
 
 	/**
-     * @deprecated  4.9.53
-     * @param 	EEI_Request_Decorator $application
+	 * @deprecated  4.9.53
+	 * @param 	EEI_Request_Decorator $application
 	 * @param 	array $middlewares
 	 */
 	public function __construct( EEI_Request_Decorator $application, $middlewares = array() ) {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\RequestStack',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.53'
-        );
-    }
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\RequestStack',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.53'
+		);
+	}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      * @param 	EEI_Request_Decorator $application
 	 * @param 	array $middlewares
 	 */
-	public function __construct( EEI_Request_Decorator $application, $middlewares = array() ) {
+	public function __construct(EEI_Request_Decorator $application, $middlewares = array()) {
         EE_Error::doing_it_wrong(
             __METHOD__,
             sprintf(

core/services/request/RequestStack.php

Indentation +45 added lines, -45 removed lines

@@ -19,59 +19,59 @@
 class RequestStack
 {
 
-    /**
-     * @var RequestDecoratorInterface $request_stack_app
-     */
-    protected $request_stack_app;
+	/**
+	 * @var RequestDecoratorInterface $request_stack_app
+	 */
+	protected $request_stack_app;
 
-    /**
-     * @var RequestStackCoreAppInterface $core_app
-     */
-    protected $core_app;
+	/**
+	 * @var RequestStackCoreAppInterface $core_app
+	 */
+	protected $core_app;
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
 
 
-    /**
-     * @param RequestDecoratorInterface    $request_stack_app
-     * @param RequestStackCoreAppInterface $core_app
-     */
-    public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app)
-    {
-        $this->request_stack_app = $request_stack_app;
-        $this->core_app      = $core_app;
-    }
+	/**
+	 * @param RequestDecoratorInterface    $request_stack_app
+	 * @param RequestStackCoreAppInterface $core_app
+	 */
+	public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app)
+	{
+		$this->request_stack_app = $request_stack_app;
+		$this->core_app      = $core_app;
+	}
 
 
-    /**
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request  = $request;
-        $this->response = $response;
-        return $this->request_stack_app->handleRequest($request, $response);
-    }
+	/**
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request  = $request;
+		$this->response = $response;
+		return $this->request_stack_app->handleRequest($request, $response);
+	}
 
 
-    /**
-     * handle_response
-     * executes the handle_response() method on the RequestStackCoreAppInterface object
-     * after the request stack has been fully processed
-     */
-    public function handleResponse()
-    {
-        $this->core_app->handleResponse($this->request, $this->response);
-    }
+	/**
+	 * handle_response
+	 * executes the handle_response() method on the RequestStackCoreAppInterface object
+	 * after the request stack has been fully processed
+	 */
+	public function handleResponse()
+	{
+		$this->core_app->handleResponse($this->request, $this->response);
+	}
 }
 // Location: RequestStack.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app)
     {
         $this->request_stack_app = $request_stack_app;
-        $this->core_app      = $core_app;
+        $this->core_app = $core_app;
     }
 
 

core/services/request/RequestDecoratorInterface.php

Indentation +17 added lines, -17 removed lines

@@ -16,22 +16,22 @@
 interface RequestDecoratorInterface
 {
 
-    /**
-     * converts a Request to a Response
-     * can perform their logic either before or after the core application has run like so:
-     *    public function handle_request( EE_Request $request, EE_Response $response ) {
-     *        $this->request = $request;
-     *        $this->response = $response;
-     *      // logic performed BEFORE core app has run
-     *      $this->process_request_stack( $this->request, $this->response );
-     *      // logic performed AFTER core app has run
-     *      return $response;
-     *    }
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface      $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response);
+	/**
+	 * converts a Request to a Response
+	 * can perform their logic either before or after the core application has run like so:
+	 *    public function handle_request( EE_Request $request, EE_Response $response ) {
+	 *        $this->request = $request;
+	 *        $this->response = $response;
+	 *      // logic performed BEFORE core app has run
+	 *      $this->process_request_stack( $this->request, $this->response );
+	 *      // logic performed AFTER core app has run
+	 *      return $response;
+	 *    }
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface      $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response);
 }
 // Location: RequestDecoratorInterface.php

core/services/request/middleware/Middleware.php

Indentation +50 added lines, -50 removed lines

@@ -29,56 +29,56 @@
 abstract class Middleware implements RequestDecoratorInterface
 {
 
-    /**
-     * @var RequestDecoratorInterface $request_stack_app
-     */
-    protected $request_stack_app;
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
-
-    /**
-     * @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;
-    }
-
-
-
-    /**
-     * 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;
-    }
+	/**
+	 * @var RequestDecoratorInterface $request_stack_app
+	 */
+	protected $request_stack_app;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
+
+	/**
+	 * @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;
+	}
+
+
+
+	/**
+	 * 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

@@ -74,7 +74,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/request/middleware/SetRequestTypeContextChecker.php

Indentation +32 added lines, -32 removed lines

@@ -22,36 +22,36 @@
 class SetRequestTypeContextChecker extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidArgumentException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request  = $request;
-        $this->response = $response;
-        /** @var RequestTypeContextDetector $request_type_context_detector */
-        $request_type_context_detector = $this->loader->getShared(
-            'EventEspresso\core\domain\services\contexts\RequestTypeContextDetector',
-            array(
-                $this->request,
-                $this->loader->getShared(
-                    'EventEspresso\core\domain\services\contexts\RequestTypeContextFactory',
-                    array($this->loader)
-                ),
-            )
-        );
-        $request_type_context          = $request_type_context_detector->detectRequestTypeContext();
-        $request_type_context_checker  = $this->loader->getShared(
-            'EventEspresso\core\domain\services\contexts\RequestTypeContextChecker',
-            array($request_type_context)
-        );
-        $this->request->setRequestTypeContextChecker($request_type_context_checker);
-        $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
+	 * @throws InvalidArgumentException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request  = $request;
+		$this->response = $response;
+		/** @var RequestTypeContextDetector $request_type_context_detector */
+		$request_type_context_detector = $this->loader->getShared(
+			'EventEspresso\core\domain\services\contexts\RequestTypeContextDetector',
+			array(
+				$this->request,
+				$this->loader->getShared(
+					'EventEspresso\core\domain\services\contexts\RequestTypeContextFactory',
+					array($this->loader)
+				),
+			)
+		);
+		$request_type_context          = $request_type_context_detector->detectRequestTypeContext();
+		$request_type_context_checker  = $this->loader->getShared(
+			'EventEspresso\core\domain\services\contexts\RequestTypeContextChecker',
+			array($request_type_context)
+		);
+		$this->request->setRequestTypeContextChecker($request_type_context_checker);
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 }

core/services/request/middleware/DetectLogin.php

Indentation +25 added lines, -25 removed lines

@@ -20,31 +20,31 @@
 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/RequestStackCoreApp.php

Spacing +4 added lines, -4 removed lines

@@ -59,10 +59,10 @@ 
     {
         $this->request  = $request;
         $this->response = $response;
-        espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
-        espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
+        espresso_load_required('EE_Base', EE_CORE.'EE_Base.core.php');
+        espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
         // workarounds for PHP < 5.3
-        espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
+        espresso_load_required('EEH_Class_Tools', EE_HELPERS.'EEH_Class_Tools.helper.php');
         do_action(
             'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
         );
@@ -86,7 +86,7 @@ 
     {
         espresso_load_required(
             'EE_Bootstrap',
-            EE_CORE . 'EE_Bootstrap.core.php'
+            EE_CORE.'EE_Bootstrap.core.php'
         );
         add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
         add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);

Indentation +85 added lines, -85 removed lines

@@ -27,91 +27,91 @@
 class RequestStackCoreApp implements RequestDecoratorInterface, RequestStackCoreAppInterface
 {
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
-
-
-
-
-    /**
-     * handle
-     * sets hooks for running rest of system
-     * provides "AHEE__EE_System__construct__complete" hook for EE Addons to use as their starting point
-     * starting EE Addons from any other point may lead to problems
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidClassException
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request  = $request;
-        $this->response = $response;
-        espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
-        espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
-        // workarounds for PHP < 5.3
-        espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
-        do_action(
-            'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
-        );
-        // legacy action for backwards compatibility
-        do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
-        $this->setupFramework();
-        $loader = LoaderFactory::getLoader();
-        $loader->getShared(
-            'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'
-        );
-        // WP cron jobs
-        $loader->getShared('EE_Cron_Tasks');
-        $loader->getShared('EE_System');
-        return $this->response;
-    }
-
-
-    /**
-     * set framework for the rest of EE to hook into when loading
-     *
-     * @throws EE_Error
-     */
-    private function setupFramework()
-    {
-        espresso_load_required(
-            'EE_Bootstrap',
-            EE_CORE . 'EE_Bootstrap.core.php'
-        );
-        add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
-        add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);
-        add_action('plugins_loaded', array('EE_Bootstrap', 'load_core_configuration'), 5);
-        add_action('plugins_loaded', array('EE_Bootstrap', 'register_shortcodes_modules_and_widgets'), 7);
-        add_action('plugins_loaded', array('EE_Bootstrap', 'brew_espresso'), 9);
-    }
-
-
-    /**
-     * called after the request stack has been fully processed
-     * if any of the middleware apps has requested the plugin be deactivated, then we do that now
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     */
-    public function handleResponse(RequestInterface $request, ResponseInterface $response)
-    {
-        if ($response->pluginDeactivated()) {
-            espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
-        }
-    }
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
+
+
+
+
+	/**
+	 * handle
+	 * sets hooks for running rest of system
+	 * provides "AHEE__EE_System__construct__complete" hook for EE Addons to use as their starting point
+	 * starting EE Addons from any other point may lead to problems
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidClassException
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request  = $request;
+		$this->response = $response;
+		espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
+		espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
+		// workarounds for PHP < 5.3
+		espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
+		do_action(
+			'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
+		);
+		// legacy action for backwards compatibility
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
+		$this->setupFramework();
+		$loader = LoaderFactory::getLoader();
+		$loader->getShared(
+			'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'
+		);
+		// WP cron jobs
+		$loader->getShared('EE_Cron_Tasks');
+		$loader->getShared('EE_System');
+		return $this->response;
+	}
+
+
+	/**
+	 * set framework for the rest of EE to hook into when loading
+	 *
+	 * @throws EE_Error
+	 */
+	private function setupFramework()
+	{
+		espresso_load_required(
+			'EE_Bootstrap',
+			EE_CORE . 'EE_Bootstrap.core.php'
+		);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_core_configuration'), 5);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'register_shortcodes_modules_and_widgets'), 7);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'brew_espresso'), 9);
+	}
+
+
+	/**
+	 * called after the request stack has been fully processed
+	 * if any of the middleware apps has requested the plugin be deactivated, then we do that now
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 */
+	public function handleResponse(RequestInterface $request, ResponseInterface $response)
+	{
+		if ($response->pluginDeactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
+		}
+	}
 
 }
 // Location: RequestStackCoreApp.php

core/middleware/EE_Middleware.core.php

Indentation +16 added lines, -16 removed lines

@@ -19,27 +19,27 @@
 abstract class EE_Middleware implements EEI_Request_Decorator {
 
 	/**
-     * @deprecated
+	 * @deprecated
 	 * @param 	EE_Request $request
 	 * @param    EE_Response   $response
 	 * @return    EE_Response
 	 */
 	protected function process_request_stack( EE_Request $request, EE_Response $response ) {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\Middleware',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52'
-        );
-        return $response;
-    }
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\Middleware',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52'
+		);
+		return $response;
+	}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * @param    EE_Response   $response
 	 * @return    EE_Response
 	 */
-	protected function process_request_stack( EE_Request $request, EE_Response $response ) {
+	protected function process_request_stack(EE_Request $request, EE_Response $response) {
         EE_Error::doing_it_wrong(
             __METHOD__,
             sprintf(