eventespresso / event-espresso-core

core/domain/entities/routing/handlers/Route.php

Indentation +129 added lines, -129 removed lines

@@ -23,133 +23,133 @@
 abstract class Route implements RouteInterface
 {
 
-    // /** will most likely need this for routing so pencilled it in for now
-    //  * @type CommandBusInterface $command_bus
-    //  */
-    // protected $command_bus;
-
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
-
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var RouteMatchSpecificationInterface $specification
-     */
-    private $specification;
-
-    /**
-     * @var boolean $handled
-     */
-    private $handled = false;
-
-
-    /**
-     * Route constructor.
-     *
-     * @param EE_Dependency_Map                $dependency_map
-     * @param LoaderInterface                  $loader
-     * @param RequestInterface                 $request
-     * @param RouteMatchSpecificationInterface $specification
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        RouteMatchSpecificationInterface $specification = null
-    ) {
-        $this->dependency_map = $dependency_map;
-        $this->loader = $loader;
-        $this->request = $request;
-        $this->specification = $specification;
-    }
-
-
-    /**
-     * @since $VID:$
-     */
-    abstract protected function registerDependencies();
-
-
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    abstract protected function requestHandler();
-
-
-    /**
-     * returns true if the current request matches this route
-     * child classes can override and use Request directly to match route with request
-     * or supply a RouteMatchSpecification class and just use the below
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return $this->specification instanceof RouteMatchSpecificationInterface
-            ? $this->specification->isMatchingRoute()
-            : false;
-    }
-
-
-    /**
-     * @return bool
-     */
-    final public function isHandled()
-    {
-        return $this->handled;
-    }
-
-
-    /**
-     * @param bool $handled
-     */
-    private function setHandled($handled)
-    {
-        $this->handled = filter_var($handled, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * runs route requestHandler() if
-     *      - route has not previously been handled
-     *      - route specification matches for current request
-     * sets route handled property based on results returned by requestHandler()
-     *
-     * @return bool
-     * @throws DomainException
-     * @since   $VID:$
-     */
-    final public function handleRequest()
-    {
-        if (! $this->isHandled() && $this->matchesCurrentRequest()) {
-            do_action('AHEE__EventEspresso_core_domain_entities_routes_handlers_Route__handleRequest', $this);
-            $this->registerDependencies();
-            $handled = $this->requestHandler();
-            if (! is_bool($handled)) {
-                throw new DomainException(
-                    esc_html__(
-                        'Route::requestHandler() must return a boolean to indicate whether the request has been handled or not.',
-                        'event_espresso'
-                    )
-                );
-            }
-            $this->setHandled($handled);
-        }
-        return $this->handled;
-    }
+	// /** will most likely need this for routing so pencilled it in for now
+	//  * @type CommandBusInterface $command_bus
+	//  */
+	// protected $command_bus;
+
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
+
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var RouteMatchSpecificationInterface $specification
+	 */
+	private $specification;
+
+	/**
+	 * @var boolean $handled
+	 */
+	private $handled = false;
+
+
+	/**
+	 * Route constructor.
+	 *
+	 * @param EE_Dependency_Map                $dependency_map
+	 * @param LoaderInterface                  $loader
+	 * @param RequestInterface                 $request
+	 * @param RouteMatchSpecificationInterface $specification
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		RouteMatchSpecificationInterface $specification = null
+	) {
+		$this->dependency_map = $dependency_map;
+		$this->loader = $loader;
+		$this->request = $request;
+		$this->specification = $specification;
+	}
+
+
+	/**
+	 * @since $VID:$
+	 */
+	abstract protected function registerDependencies();
+
+
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	abstract protected function requestHandler();
+
+
+	/**
+	 * returns true if the current request matches this route
+	 * child classes can override and use Request directly to match route with request
+	 * or supply a RouteMatchSpecification class and just use the below
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return $this->specification instanceof RouteMatchSpecificationInterface
+			? $this->specification->isMatchingRoute()
+			: false;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	final public function isHandled()
+	{
+		return $this->handled;
+	}
+
+
+	/**
+	 * @param bool $handled
+	 */
+	private function setHandled($handled)
+	{
+		$this->handled = filter_var($handled, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * runs route requestHandler() if
+	 *      - route has not previously been handled
+	 *      - route specification matches for current request
+	 * sets route handled property based on results returned by requestHandler()
+	 *
+	 * @return bool
+	 * @throws DomainException
+	 * @since   $VID:$
+	 */
+	final public function handleRequest()
+	{
+		if (! $this->isHandled() && $this->matchesCurrentRequest()) {
+			do_action('AHEE__EventEspresso_core_domain_entities_routes_handlers_Route__handleRequest', $this);
+			$this->registerDependencies();
+			$handled = $this->requestHandler();
+			if (! is_bool($handled)) {
+				throw new DomainException(
+					esc_html__(
+						'Route::requestHandler() must return a boolean to indicate whether the request has been handled or not.',
+						'event_espresso'
+					)
+				);
+			}
+			$this->setHandled($handled);
+		}
+		return $this->handled;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -136,11 +136,11 @@
      */
     final public function handleRequest()
     {
-        if (! $this->isHandled() && $this->matchesCurrentRequest()) {
+        if ( ! $this->isHandled() && $this->matchesCurrentRequest()) {
             do_action('AHEE__EventEspresso_core_domain_entities_routes_handlers_Route__handleRequest', $this);
             $this->registerDependencies();
             $handled = $this->requestHandler();
-            if (! is_bool($handled)) {
+            if ( ! is_bool($handled)) {
                 throw new DomainException(
                     esc_html__(
                         'Route::requestHandler() must return a boolean to indicate whether the request has been handled or not.',

core/domain/entities/routing/handlers/admin/EspressoEventEditor.php

Indentation +110 added lines, -110 removed lines

@@ -16,118 +16,118 @@
 class EspressoEventEditor extends Route
 {
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return $this->request->isAdmin()
-               && $this->request->getRequestParam('page') === 'espresso_events'
-               && (
-                   $this->request->getRequestParam('action') === 'create_new'
-                   || $this->request->getRequestParam('action') === 'edit'
-               );
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return $this->request->isAdmin()
+			   && $this->request->getRequestParam('page') === 'espresso_events'
+			   && (
+				   $this->request->getRequestParam('action') === 'create_new'
+				   || $this->request->getRequestParam('action') === 'edit'
+			   );
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\assets\EspressoEditorAssetManager',
-            [
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\events\editor\EventEditor',
-            [
-                'EE_Admin_Config'                                                               => EE_Dependency_Map::load_from_cache,
-                'EE_Event'                                                                      => EE_Dependency_Map::not_registered,
-                'EventEspresso\core\domain\entities\admin\GraphQLData\CurrentUser'              =>
-                    EE_Dependency_Map::not_registered,
-                'EventEspresso\core\domain\services\admin\events\editor\EventEditorGraphQLData' =>
-                    EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\admin\GraphQLData\GeneralSettings'          =>
-                    EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\JedLocaleData'                              => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\events\default_settings\AdvancedEditorAdminFormSection',
-            ['EE_Admin_Config' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\events\editor\EventEditorGraphQLData',
-            [
-                'EventEspresso\core\domain\entities\admin\GraphQLData\Datetimes'                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\admin\GraphQLData\Prices'                    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\admin\GraphQLData\PriceTypes'                => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\admin\GraphQLData\Tickets'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\admin\events\editor\NewEventDefaultEntities' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\admin\events\editor\EventEntityRelations'    => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\events\editor\EventEntityRelations',
-            [
-                'EEM_Datetime'   => EE_Dependency_Map::load_from_cache,
-                'EEM_Event'      => EE_Dependency_Map::load_from_cache,
-                'EEM_Price'      => EE_Dependency_Map::load_from_cache,
-                'EEM_Price_Type' => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'     => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\events\editor\NewEventDefaultEntities',
-            [
-                'EEM_Datetime'                                                       => EE_Dependency_Map::load_from_cache,
-                'EEM_Event'                                                          => EE_Dependency_Map::load_from_cache,
-                'EEM_Price'                                                          => EE_Dependency_Map::load_from_cache,
-                'EEM_Price_Type'                                                     => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'                                                         => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\admin\entities\DefaultDatetimes' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\entities\DefaultDatetimes',
-            [
-                'EventEspresso\core\domain\services\admin\entities\DefaultTickets' => EE_Dependency_Map::load_from_cache,
-                'EEM_Datetime'                                                     => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\entities\DefaultTickets',
-            [
-                'EventEspresso\core\domain\services\admin\entities\DefaultPrices' => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'                                                      => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\entities\DefaultPrices',
-            [
-                'EEM_Price'      => EE_Dependency_Map::load_from_cache,
-                'EEM_Price_Type' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\assets\EspressoEditorAssetManager',
+			[
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\events\editor\EventEditor',
+			[
+				'EE_Admin_Config'                                                               => EE_Dependency_Map::load_from_cache,
+				'EE_Event'                                                                      => EE_Dependency_Map::not_registered,
+				'EventEspresso\core\domain\entities\admin\GraphQLData\CurrentUser'              =>
+					EE_Dependency_Map::not_registered,
+				'EventEspresso\core\domain\services\admin\events\editor\EventEditorGraphQLData' =>
+					EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\admin\GraphQLData\GeneralSettings'          =>
+					EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\JedLocaleData'                              => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\events\default_settings\AdvancedEditorAdminFormSection',
+			['EE_Admin_Config' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\events\editor\EventEditorGraphQLData',
+			[
+				'EventEspresso\core\domain\entities\admin\GraphQLData\Datetimes'                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\admin\GraphQLData\Prices'                    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\admin\GraphQLData\PriceTypes'                => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\admin\GraphQLData\Tickets'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\admin\events\editor\NewEventDefaultEntities' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\admin\events\editor\EventEntityRelations'    => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\events\editor\EventEntityRelations',
+			[
+				'EEM_Datetime'   => EE_Dependency_Map::load_from_cache,
+				'EEM_Event'      => EE_Dependency_Map::load_from_cache,
+				'EEM_Price'      => EE_Dependency_Map::load_from_cache,
+				'EEM_Price_Type' => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'     => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\events\editor\NewEventDefaultEntities',
+			[
+				'EEM_Datetime'                                                       => EE_Dependency_Map::load_from_cache,
+				'EEM_Event'                                                          => EE_Dependency_Map::load_from_cache,
+				'EEM_Price'                                                          => EE_Dependency_Map::load_from_cache,
+				'EEM_Price_Type'                                                     => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'                                                         => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\admin\entities\DefaultDatetimes' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\entities\DefaultDatetimes',
+			[
+				'EventEspresso\core\domain\services\admin\entities\DefaultTickets' => EE_Dependency_Map::load_from_cache,
+				'EEM_Datetime'                                                     => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\entities\DefaultTickets',
+			[
+				'EventEspresso\core\domain\services\admin\entities\DefaultPrices' => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'                                                      => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\entities\DefaultPrices',
+			[
+				'EEM_Price'      => EE_Dependency_Map::load_from_cache,
+				'EEM_Price_Type' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        return false;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		return false;
+	}
 }

core/domain/entities/routing/handlers/admin/PueRequests.php

Indentation +63 added lines, -63 removed lines

@@ -15,71 +15,71 @@
 class PueRequests extends Route
 {
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return $this->request->isAdmin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', true);
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return $this->request->isAdmin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', true);
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\licensing\LicenseService',
-            [
-                'EventEspresso\core\domain\services\pue\Stats'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\pue\Config' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\pue\Stats',
-            [
-                'EventEspresso\core\domain\services\pue\Config'        => EE_Dependency_Map::load_from_cache,
-                'EE_Maintenance_Mode'                                  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\pue\StatsGatherer' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\pue\Config',
-            [
-                'EE_Network_Config' => EE_Dependency_Map::load_from_cache,
-                'EE_Config'         => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\pue\StatsGatherer',
-            [
-                'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache,
-                'EEM_Event'          => EE_Dependency_Map::load_from_cache,
-                'EEM_Datetime'       => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'         => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration'   => EE_Dependency_Map::load_from_cache,
-                'EEM_Transaction'    => EE_Dependency_Map::load_from_cache,
-                'EE_Config'          => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\licensing\LicenseService',
+			[
+				'EventEspresso\core\domain\services\pue\Stats'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\pue\Config' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\pue\Stats',
+			[
+				'EventEspresso\core\domain\services\pue\Config'        => EE_Dependency_Map::load_from_cache,
+				'EE_Maintenance_Mode'                                  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\pue\StatsGatherer' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\pue\Config',
+			[
+				'EE_Network_Config' => EE_Dependency_Map::load_from_cache,
+				'EE_Config'         => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\pue\StatsGatherer',
+			[
+				'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache,
+				'EEM_Event'          => EE_Dependency_Map::load_from_cache,
+				'EEM_Datetime'       => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'         => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration'   => EE_Dependency_Map::load_from_cache,
+				'EEM_Transaction'    => EE_Dependency_Map::load_from_cache,
+				'EE_Config'          => EE_Dependency_Map::load_from_cache,
+			]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        // pew pew pew
-        $this->loader->getShared('EventEspresso\core\services\licensing\LicenseService');
-        do_action('AHEE__EE_System__brew_espresso__after_pue_init');
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		// pew pew pew
+		$this->loader->getShared('EventEspresso\core\services\licensing\LicenseService');
+		do_action('AHEE__EE_System__brew_espresso__after_pue_init');
+		return true;
+	}
 }

core/domain/entities/routing/handlers/admin/EspressoLegacyAdmin.php

Indentation +101 added lines, -101 removed lines

@@ -16,109 +16,109 @@
 class EspressoLegacyAdmin extends Route
 {
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return $this->request->isAdmin() || $this->request->isAdminAjax();
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return $this->request->isAdmin() || $this->request->isAdminAjax();
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\assets\EspressoLegacyAdminAssetManager',
-            [
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EE_Admin_Transactions_List_Table',
-            [
-                null,
-                'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\caffeinated\modules\recaptcha_invisible\RecaptchaAdminSettings',
-            ['EE_Registration_Config' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\admin_pages\general_settings\OrganizationSettings',
-            [
-                'EE_Registry'                                             => EE_Dependency_Map::load_from_cache,
-                'EE_Organization_Config'                                  => EE_Dependency_Map::load_from_cache,
-                'EE_Core_Config'                                          => EE_Dependency_Map::load_from_cache,
-                'EE_Network_Core_Config'                                  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\address\CountrySubRegionDao' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\address\CountrySubRegionDao',
-            [
-                'EEM_State'                                            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\validators\JsonValidator' => EE_Dependency_Map::load_from_cache
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\registrations\list_table\QueryBuilder',
-            [
-                null,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration'                            => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\AttendeeFilterHeader',
-            [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Attendee'                                => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\DateFilterHeader',
-            [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Datetime'                                => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\EventFilterHeader',
-            [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Event'                                   => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\TicketFilterHeader',
-            [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'                                  => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\assets\EspressoLegacyAdminAssetManager',
+			[
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EE_Admin_Transactions_List_Table',
+			[
+				null,
+				'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\caffeinated\modules\recaptcha_invisible\RecaptchaAdminSettings',
+			['EE_Registration_Config' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\admin_pages\general_settings\OrganizationSettings',
+			[
+				'EE_Registry'                                             => EE_Dependency_Map::load_from_cache,
+				'EE_Organization_Config'                                  => EE_Dependency_Map::load_from_cache,
+				'EE_Core_Config'                                          => EE_Dependency_Map::load_from_cache,
+				'EE_Network_Core_Config'                                  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\address\CountrySubRegionDao' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\address\CountrySubRegionDao',
+			[
+				'EEM_State'                                            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\validators\JsonValidator' => EE_Dependency_Map::load_from_cache
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\registrations\list_table\QueryBuilder',
+			[
+				null,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration'                            => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\AttendeeFilterHeader',
+			[
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Attendee'                                => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\DateFilterHeader',
+			[
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Datetime'                                => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\EventFilterHeader',
+			[
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Event'                                   => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\TicketFilterHeader',
+			[
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'                                  => EE_Dependency_Map::load_from_cache,
+			]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
-        $this->loader->getShared('EventEspresso\core\domain\services\assets\EspressoLegacyAdminAssetManager');
-        $this->loader->getShared('EE_Admin');
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
+		$this->loader->getShared('EventEspresso\core\domain\services\assets\EspressoLegacyAdminAssetManager');
+		$this->loader->getShared('EE_Admin');
+		return true;
+	}
 }

core/domain/entities/routing/handlers/admin/PersonalDataRequests.php

Indentation +97 added lines, -97 removed lines

@@ -19,109 +19,109 @@
 class PersonalDataRequests extends Route
 {
 
-    /**
-     * @var EE_Maintenance_Mode $maintenance_mode
-     */
-    private $maintenance_mode;
+	/**
+	 * @var EE_Maintenance_Mode $maintenance_mode
+	 */
+	private $maintenance_mode;
 
 
-    /**
-     * Route constructor.
-     *
-     * @param EE_Dependency_Map   $dependency_map
-     * @param EE_Maintenance_Mode $maintenance_mode
-     * @param LoaderInterface     $loader
-     * @param RequestInterface    $request
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        EE_Maintenance_Mode $maintenance_mode,
-        LoaderInterface $loader,
-        RequestInterface $request
-    ) {
-        $this->maintenance_mode = $maintenance_mode;
-        parent::__construct($dependency_map, $loader, $request);
-    }
+	/**
+	 * Route constructor.
+	 *
+	 * @param EE_Dependency_Map   $dependency_map
+	 * @param EE_Maintenance_Mode $maintenance_mode
+	 * @param LoaderInterface     $loader
+	 * @param RequestInterface    $request
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		EE_Maintenance_Mode $maintenance_mode,
+		LoaderInterface $loader,
+		RequestInterface $request
+	) {
+		$this->maintenance_mode = $maintenance_mode;
+		parent::__construct($dependency_map, $loader, $request);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return ($this->request->isAdmin() || $this->request->isAjax()) && $this->maintenance_mode->models_can_query();
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return ($this->request->isAdmin() || $this->request->isAjax()) && $this->maintenance_mode->models_can_query();
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy',
-            [
-                'EEM_Payment_Method'                                       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportAttendee',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportAttendeeBillingData',
-            [
-                'EEM_Attendee'       => EE_Dependency_Map::load_from_cache,
-                'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportCheckins',
-            ['EEM_Checkin' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportRegistration',
-            ['EEM_Registration' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportTransaction',
-            ['EEM_Transaction' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\erasure\EraseAttendeeData',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\erasure\EraseAnswers',
-            [
-                'EEM_Answer'   => EE_Dependency_Map::load_from_cache,
-                'EEM_Question' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler',
-            [
-                'EE_Registry' => EE_Dependency_Map::load_from_cache,
-                'EE_Config'   => EE_Dependency_Map::load_from_cache
-            ]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy',
+			[
+				'EEM_Payment_Method'                                       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportAttendee',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportAttendeeBillingData',
+			[
+				'EEM_Attendee'       => EE_Dependency_Map::load_from_cache,
+				'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportCheckins',
+			['EEM_Checkin' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportRegistration',
+			['EEM_Registration' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportTransaction',
+			['EEM_Transaction' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\erasure\EraseAttendeeData',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\erasure\EraseAnswers',
+			[
+				'EEM_Answer'   => EE_Dependency_Map::load_from_cache,
+				'EEM_Question' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler',
+			[
+				'EE_Registry' => EE_Dependency_Map::load_from_cache,
+				'EE_Config'   => EE_Dependency_Map::load_from_cache
+			]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        $this->loader->getShared('EventEspresso\core\services\privacy\erasure\PersonalDataEraserManager');
-        $this->loader->getShared('EventEspresso\core\services\privacy\export\PersonalDataExporterManager');
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		$this->loader->getShared('EventEspresso\core\services\privacy\erasure\PersonalDataEraserManager');
+		$this->loader->getShared('EventEspresso\core\services\privacy\export\PersonalDataExporterManager');
+		return true;
+	}
 }

core/domain/entities/routing/handlers/admin/WordPressPluginsPage.php

Indentation +48 added lines, -48 removed lines

@@ -17,56 +17,56 @@
 class WordPressPluginsPage extends Route
 {
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return $this->request->isAdmin()
-               && strpos($this->request->requestUri(), 'wp-admin/plugins.php') !== false;
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return $this->request->isAdmin()
+			   && strpos($this->request->requestUri(), 'wp-admin/plugins.php') !== false;
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\assets\WordpressPluginsPageAssetManager',
-            [
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\admin\ExitModal' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\ExitModal',
-            ['EventEspresso\core\services\assets\Registry' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\PluginUpsells',
-            ['EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\assets\WordpressPluginsPageAssetManager',
+			[
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\admin\ExitModal' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\ExitModal',
+			['EventEspresso\core\services\assets\Registry' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\PluginUpsells',
+			['EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        $this->loader->getShared('EventEspresso\core\domain\services\assets\WordpressPluginsPageAssetManager');
-        /** @var PluginUpsells $plugin_upsells */
-        $plugin_upsells = $this->loader->getShared('EventEspresso\core\domain\services\admin\PluginUpsells');
-        $plugin_upsells->decafUpsells();
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		$this->loader->getShared('EventEspresso\core\domain\services\assets\WordpressPluginsPageAssetManager');
+		/** @var PluginUpsells $plugin_upsells */
+		$plugin_upsells = $this->loader->getShared('EventEspresso\core\domain\services\admin\PluginUpsells');
+		$plugin_upsells->decafUpsells();
+		return true;
+	}
 }

core/domain/entities/routing/handlers/RouteInterface.php

Indentation +18 added lines, -18 removed lines

@@ -14,24 +14,24 @@
 interface RouteInterface
 {
 
-    /**
-     * final method called by RouteHandler on Route which in turn calls requestHandler()
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function handleRequest();
+	/**
+	 * final method called by RouteHandler on Route which in turn calls requestHandler()
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function handleRequest();
 
-    /**
-     * @return bool
-     */
-    public function isHandled();
+	/**
+	 * @return bool
+	 */
+	public function isHandled();
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest();
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest();
 }