eventespresso / event-espresso-core

core/domain/entities/routes/handlers/frontend/ShortcodeRequests.php

Indentation +64 added lines, -64 removed lines

@@ -16,72 +16,72 @@
 class ShortcodeRequests extends Route
 {
 
-    /**
-     * 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->request->isFrontend() || $this->request->isIframe() || $this->request->isAjax();
-    }
+	/**
+	 * 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->request->isFrontend() || $this->request->isIframe() || $this->request->isAjax();
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\shortcodes\EspressoCancelled',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\shortcodes\EspressoCheckout',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\shortcodes\EspressoEventAttendees',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\shortcodes\EspressoEvents',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\shortcodes\EspressoThankYou',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\shortcodes\EspressoTicketSelector',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\shortcodes\EspressoTxnPage',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\shortcodes\EspressoCancelled',
+			[ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\shortcodes\EspressoCheckout',
+			[ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\shortcodes\EspressoEventAttendees',
+			[ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\shortcodes\EspressoEvents',
+			[ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\shortcodes\EspressoThankYou',
+			[ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\shortcodes\EspressoTicketSelector',
+			[ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\shortcodes\EspressoTxnPage',
+			[ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        // load, register, and add shortcodes the new way
-        $this->loader->getShared(
-            'EventEspresso\core\services\shortcodes\ShortcodesManager',
-            [
-                // and the old way, but we'll put it under control of the new system
-                EE_Config::getLegacyShortcodesManager(),
-            ]
-        );
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		// load, register, and add shortcodes the new way
+		$this->loader->getShared(
+			'EventEspresso\core\services\shortcodes\ShortcodesManager',
+			[
+				// and the old way, but we'll put it under control of the new system
+				EE_Config::getLegacyShortcodesManager(),
+			]
+		);
+		return true;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -37,31 +37,31 @@
     {
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\entities\shortcodes\EspressoCancelled',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\entities\shortcodes\EspressoCheckout',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\entities\shortcodes\EspressoEventAttendees',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\entities\shortcodes\EspressoEvents',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\entities\shortcodes\EspressoThankYou',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\entities\shortcodes\EspressoTicketSelector',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\entities\shortcodes\EspressoTxnPage',
-            [ 'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache]
         );
     }
 

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

Indentation +131 added lines, -131 removed lines

@@ -19,135 +19,135 @@
 abstract class Route implements RouteInterface
 {
 
-    // /** will most likely need this for routes 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()
-    {
-        // \EEH_Debug_Tools::printr(get_called_class(), __FUNCTION__, __FILE__, __LINE__);
-        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()) {
-            // \EEH_Debug_Tools::printr(get_called_class(), __FUNCTION__, __FILE__, __LINE__);
-            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.',
-                        'eventespresso'
-                    )
-                );
-            }
-            $this->setHandled($handled);
-        }
-        return $this->handled;
-    }
+	// /** will most likely need this for routes 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()
+	{
+		// \EEH_Debug_Tools::printr(get_called_class(), __FUNCTION__, __FILE__, __LINE__);
+		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()) {
+			// \EEH_Debug_Tools::printr(get_called_class(), __FUNCTION__, __FILE__, __LINE__);
+			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.',
+						'eventespresso'
+					)
+				);
+			}
+			$this->setHandled($handled);
+		}
+		return $this->handled;
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -133,12 +133,12 @@
      */
     final public function handleRequest()
     {
-        if (! $this->isHandled() && $this->matchesCurrentRequest()) {
+        if ( ! $this->isHandled() && $this->matchesCurrentRequest()) {
             // \EEH_Debug_Tools::printr(get_called_class(), __FUNCTION__, __FILE__, __LINE__);
             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/routes/handlers/RouteHandlersDependencyMap.php

Indentation +51 added lines, -51 removed lines

@@ -15,57 +15,57 @@
  */
 class RouteHandlersDependencyMap extends DependencyMapRegistrar
 {
-    /**
-     * @return bool
-     * @see   EE_Dependency_Map::registerDependencies()
-     * @since $VID:$
-     */
-    public function registerDependencies()
-    {
-        $default_dependencies = [
-            'EE_Dependency_Map'                           => EE_Dependency_Map::load_from_cache,
-            'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-            'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-        ];
-        $frontend_dependencies = [
-            'EE_Dependency_Map'                           => EE_Dependency_Map::load_from_cache,
-            'EE_Maintenance_Mode'                         => EE_Dependency_Map::load_from_cache,
-            'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-            'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-        ];
-        $routes = [
-            'EventEspresso\core\domain\entities\routes\handlers\admin\EspressoEventEditor',
-            'EventEspresso\core\domain\entities\routes\handlers\admin\EspressoLegacyAdmin',
-            'EventEspresso\core\domain\entities\routes\handlers\admin\PueRequests',
-            'EventEspresso\core\domain\entities\routes\handlers\admin\WordPressPluginsPage',
-            'EventEspresso\core\domain\entities\routes\handlers\frontend\ShortcodeRequests',
-            'EventEspresso\core\domain\entities\routes\handlers\shared\AssetRequests',
-            'EventEspresso\core\domain\entities\routes\handlers\shared\GQLRequests',
-            'EventEspresso\core\domain\entities\routes\handlers\shared\RestApiRequests',
-            'EventEspresso\core\domain\entities\routes\handlers\shared\SessionRequests',
-            'EventEspresso\core\domain\entities\routes\handlers\shared\WordPressHeartbeat',
-        ];
-        // set initially to true but toggled permanently to false if anything fails
-        $registered = true;
-        foreach ($routes as $route) {
-            $registered = $this->dependency_map->registerDependencies($route, $default_dependencies )
-                ? $registered // keep previous value whether it is true or false
-                : false; // toggle value to false
-        }
-        $registered = $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routes\handlers\admin\PersonalDataRequests',
-            $frontend_dependencies
-        )
-            ? $registered // keep previous value whether it is true or false
-            : false; // toggle value to false
+	/**
+	 * @return bool
+	 * @see   EE_Dependency_Map::registerDependencies()
+	 * @since $VID:$
+	 */
+	public function registerDependencies()
+	{
+		$default_dependencies = [
+			'EE_Dependency_Map'                           => EE_Dependency_Map::load_from_cache,
+			'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+			'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+		];
+		$frontend_dependencies = [
+			'EE_Dependency_Map'                           => EE_Dependency_Map::load_from_cache,
+			'EE_Maintenance_Mode'                         => EE_Dependency_Map::load_from_cache,
+			'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+			'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+		];
+		$routes = [
+			'EventEspresso\core\domain\entities\routes\handlers\admin\EspressoEventEditor',
+			'EventEspresso\core\domain\entities\routes\handlers\admin\EspressoLegacyAdmin',
+			'EventEspresso\core\domain\entities\routes\handlers\admin\PueRequests',
+			'EventEspresso\core\domain\entities\routes\handlers\admin\WordPressPluginsPage',
+			'EventEspresso\core\domain\entities\routes\handlers\frontend\ShortcodeRequests',
+			'EventEspresso\core\domain\entities\routes\handlers\shared\AssetRequests',
+			'EventEspresso\core\domain\entities\routes\handlers\shared\GQLRequests',
+			'EventEspresso\core\domain\entities\routes\handlers\shared\RestApiRequests',
+			'EventEspresso\core\domain\entities\routes\handlers\shared\SessionRequests',
+			'EventEspresso\core\domain\entities\routes\handlers\shared\WordPressHeartbeat',
+		];
+		// set initially to true but toggled permanently to false if anything fails
+		$registered = true;
+		foreach ($routes as $route) {
+			$registered = $this->dependency_map->registerDependencies($route, $default_dependencies )
+				? $registered // keep previous value whether it is true or false
+				: false; // toggle value to false
+		}
+		$registered = $this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routes\handlers\admin\PersonalDataRequests',
+			$frontend_dependencies
+		)
+			? $registered // keep previous value whether it is true or false
+			: false; // toggle value to false
 
-        $registered = $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routes\handlers\frontend\FrontendRequests',
-            $frontend_dependencies
-        )
-            ? $registered // keep previous value whether it is true or false
-            : false; // toggle value to false
+		$registered = $this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routes\handlers\frontend\FrontendRequests',
+			$frontend_dependencies
+		)
+			? $registered // keep previous value whether it is true or false
+			: false; // toggle value to false
 
-        return $registered;
-    }
+		return $registered;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         // set initially to true but toggled permanently to false if anything fails
         $registered = true;
         foreach ($routes as $route) {
-            $registered = $this->dependency_map->registerDependencies($route, $default_dependencies )
+            $registered = $this->dependency_map->registerDependencies($route, $default_dependencies)
                 ? $registered // keep previous value whether it is true or false
                 : false; // toggle value to false
         }

core/domain/entities/routes/handlers/shared/WordPressHeartbeat.php

Indentation +45 added lines, -45 removed lines

@@ -15,49 +15,49 @@
 class WordPressHeartbeat extends Route
 {
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return $this->request->isWordPressHeartbeat();
-    }
-
-
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\ajax\WordpressHeartbeat',
-            [
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat',
-            [
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-                'EE_Environment_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\domain\services\admin\ajax\WordpressHeartbeat');
-        return true;
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return $this->request->isWordPressHeartbeat();
+	}
+
+
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\ajax\WordpressHeartbeat',
+			[
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat',
+			[
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+				'EE_Environment_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\domain\services\admin\ajax\WordpressHeartbeat');
+		return true;
+	}
 }
\ No newline at end of file

core/domain/entities/routes/handlers/shared/SessionRequests.php

Indentation +43 added lines, -43 removed lines

@@ -16,52 +16,52 @@
 class SessionRequests extends Route
 {
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EE_Session',
-            [
-                'EventEspresso\core\services\cache\TransientCacheStorage'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\session\SessionStartHandler'  => EE_Dependency_Map::load_from_cache,
-                'EE_Encryption'                                            => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\session\SessionStartHandler',
-            [ 'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache ]
-        );
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EE_Session',
+			[
+				'EventEspresso\core\services\cache\TransientCacheStorage'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\session\SessionStartHandler'  => EE_Dependency_Map::load_from_cache,
+				'EE_Encryption'                                            => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\session\SessionStartHandler',
+			[ 'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache ]
+		);
 
-    }
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        $this->loader->getShared('EE_Session');
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		$this->loader->getShared('EE_Session');
+		return true;
+	}
 
 
-    /**
-     * 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->request->isAdmin() || $this->request->isEeAjax() || $this->request->isFrontend();
-    }
+	/**
+	 * 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->request->isAdmin() || $this->request->isEeAjax() || $this->request->isFrontend();
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\services\session\SessionStartHandler',
-            [ 'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache]
         );
 
     }

core/domain/entities/routes/handlers/shared/RestApiRequests.php

Indentation +61 added lines, -61 removed lines

@@ -15,69 +15,69 @@
 class RestApiRequests extends Route
 {
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\libraries\rest_api\CalculatedModelFields',
-            [
-                'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory' => EE_Dependency_Map::load_from_cache
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory',
-            [ 'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\libraries\rest_api\controllers\model\Read',
-            [ 'EventEspresso\core\libraries\rest_api\CalculatedModelFields' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\libraries\rest_api\calculations\Datetime',
-            [
-                'EEM_Datetime'     => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration' => EE_Dependency_Map::load_from_cache
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\libraries\rest_api\calculations\Event',
-            [
-                'EEM_Event'        => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration' => EE_Dependency_Map::load_from_cache
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\libraries\rest_api\calculations\Registration',
-            [ 'EEM_Registration' => EE_Dependency_Map::load_from_cache ]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\libraries\rest_api\CalculatedModelFields',
+			[
+				'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory' => EE_Dependency_Map::load_from_cache
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory',
+			[ 'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\libraries\rest_api\controllers\model\Read',
+			[ 'EventEspresso\core\libraries\rest_api\CalculatedModelFields' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\libraries\rest_api\calculations\Datetime',
+			[
+				'EEM_Datetime'     => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration' => EE_Dependency_Map::load_from_cache
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\libraries\rest_api\calculations\Event',
+			[
+				'EEM_Event'        => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration' => EE_Dependency_Map::load_from_cache
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\libraries\rest_api\calculations\Registration',
+			[ 'EEM_Registration' => EE_Dependency_Map::load_from_cache ]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        // rest api handled by module for now
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		// rest api handled by module for now
+		return true;
+	}
 
 
-    /**
-     * 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->request->isWordPressApi();
-    }
+	/**
+	 * 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->request->isWordPressApi();
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -28,11 +28,11 @@ 
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory',
-            [ 'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\libraries\rest_api\controllers\model\Read',
-            [ 'EventEspresso\core\libraries\rest_api\CalculatedModelFields' => EE_Dependency_Map::load_from_cache ]
+            ['EventEspresso\core\libraries\rest_api\CalculatedModelFields' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\libraries\rest_api\calculations\Datetime',
@@ -50,7 +50,7 @@ 
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\libraries\rest_api\calculations\Registration',
-            [ 'EEM_Registration' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Registration' => EE_Dependency_Map::load_from_cache]
         );
     }
 

core/domain/entities/routes/handlers/shared/GQLRequests.php

Indentation +164 added lines, -164 removed lines

@@ -16,173 +16,173 @@
 class GQLRequests extends Route
 {
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\GraphQLManager',
-            [
-                'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\TypesManager',
-            [
-                'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\InputsManager',
-            [
-                'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\EnumsManager',
-            [
-                'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\ConnectionsManager',
-            [
-                'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\DataLoaderManager',
-            [
-                'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Datetime',
-            [ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Attendee',
-            [ 'EEM_Attendee' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Event',
-            [ 'EEM_Event' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Ticket',
-            [ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Price',
-            [ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\PriceType',
-            [ 'EEM_Price_Type' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Venue',
-            [ 'EEM_Venue' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\State',
-            [ 'EEM_State' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Country',
-            [ 'EEM_Country' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
-            [ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
-            [ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
-            [ 'EEM_Attendee' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
-            [ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
-            [ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
-            [ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
-            [ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
-            [ 'EEM_Price_Type' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
-            [ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
-            [ 'EEM_Venue' => EE_Dependency_Map::load_from_cache ]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\GraphQLManager',
+			[
+				'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\TypesManager',
+			[
+				'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\InputsManager',
+			[
+				'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\EnumsManager',
+			[
+				'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\ConnectionsManager',
+			[
+				'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\DataLoaderManager',
+			[
+				'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Datetime',
+			[ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Attendee',
+			[ 'EEM_Attendee' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Event',
+			[ 'EEM_Event' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Ticket',
+			[ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Price',
+			[ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\PriceType',
+			[ 'EEM_Price_Type' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Venue',
+			[ 'EEM_Venue' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\State',
+			[ 'EEM_State' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Country',
+			[ 'EEM_Country' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
+			[ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
+			[ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
+			[ 'EEM_Attendee' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
+			[ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
+			[ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
+			[ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
+			[ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
+			[ 'EEM_Price_Type' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
+			[ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
+			[ 'EEM_Venue' => EE_Dependency_Map::load_from_cache ]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
 
-        if (! class_exists('WPGraphQL')) {
-            require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
-        }
-        // load handler for EE GraphQL requests
-        $graphQL_manager = $this->loader->getShared(
-            'EventEspresso\core\services\graphql\GraphQLManager'
-        );
-        $graphQL_manager->init();
-        return true;
-    }
+		if (! class_exists('WPGraphQL')) {
+			require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
+		}
+		// load handler for EE GraphQL requests
+		$graphQL_manager = $this->loader->getShared(
+			'EventEspresso\core\services\graphql\GraphQLManager'
+		);
+		$graphQL_manager->init();
+		return true;
+	}
 
 
-    /**
-     * 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 PHP_VERSION_ID > 70000
-               && (
-                   $this->request->isGQL()
-                   || $this->request->isUnitTesting()
-                   || (
-                       $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
+	 * 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 PHP_VERSION_ID > 70000
+			   && (
+				   $this->request->isGQL()
+				   || $this->request->isUnitTesting()
+				   || (
+					   $this->request->isAdmin()
+					   && $this->request->getRequestParam('page') === 'espresso_events'
+					   && (
+						   $this->request->getRequestParam('action') === 'create_new'
+						   || $this->request->getRequestParam('action') === 'edit'
+					   )
+				   )
+			   );
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -63,79 +63,79 @@ 
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\Datetime',
-            [ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\Attendee',
-            [ 'EEM_Attendee' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\Event',
-            [ 'EEM_Event' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Event' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\Ticket',
-            [ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\Price',
-            [ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\PriceType',
-            [ 'EEM_Price_Type' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\Venue',
-            [ 'EEM_Venue' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\State',
-            [ 'EEM_State' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_State' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\types\Country',
-            [ 'EEM_Country' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Country' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
-            [ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
-            [ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
-            [ 'EEM_Attendee' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
-            [ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
-            [ 'EEM_Ticket' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
-            [ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
-            [ 'EEM_Price' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
-            [ 'EEM_Price_Type' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
-            [ 'EEM_Datetime' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
         );
         $this->dependency_map->registerDependencies(
             'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
-            [ 'EEM_Venue' => EE_Dependency_Map::load_from_cache ]
+            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
         );
     }
 
@@ -149,8 +149,8 @@ 
     protected function requestHandler()
     {
 
-        if (! class_exists('WPGraphQL')) {
-            require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
+        if ( ! class_exists('WPGraphQL')) {
+            require_once EE_THIRD_PARTY.'wp-graphql/wp-graphql.php';
         }
         // load handler for EE GraphQL requests
         $graphQL_manager = $this->loader->getShared(

core/domain/entities/routes/handlers/shared/AssetRequests.php

Indentation +103 added lines, -103 removed lines

@@ -16,113 +16,113 @@
 class AssetRequests extends Route
 {
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $default_dependencies = [
-            '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\assets\ReactAssetManager',
-            $default_dependencies
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\assets\CoreAssetManager',
-            [
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EE_Currency_Config'                                 => EE_Dependency_Map::load_from_cache,
-                'EE_Template_Config'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\editor\BlockRegistrationManager',
-            [
-                'EventEspresso\core\services\assets\BlockAssetManagerCollection'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\editor\BlockCollection'         => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routes\RouteMatchSpecificationManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                       => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager',
-            [
-                '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\blocks\EventAttendeesBlockRenderer',
-            [
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-                'EEM_Attendee'                     => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\editor\blocks\EventAttendees',
-            [
-                'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                           => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$default_dependencies = [
+			'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\assets\ReactAssetManager',
+			$default_dependencies
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\assets\CoreAssetManager',
+			[
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EE_Currency_Config'                                 => EE_Dependency_Map::load_from_cache,
+				'EE_Template_Config'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\editor\BlockRegistrationManager',
+			[
+				'EventEspresso\core\services\assets\BlockAssetManagerCollection'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\editor\BlockCollection'         => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routes\RouteMatchSpecificationManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                       => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager',
+			[
+				'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\blocks\EventAttendeesBlockRenderer',
+			[
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+				'EEM_Attendee'                     => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\editor\blocks\EventAttendees',
+			[
+				'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                           => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer' => 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\assets\Registry');
-        $this->loader->getShared('EventEspresso\core\domain\services\assets\CoreAssetManager');
-        if ($this->canLoadBlocks()) {
-            $this->loader->getShared(
-                'EventEspresso\core\services\editor\BlockRegistrationManager'
-            );
-        }
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		$this->loader->getShared('EventEspresso\core\services\assets\Registry');
+		$this->loader->getShared('EventEspresso\core\domain\services\assets\CoreAssetManager');
+		if ($this->canLoadBlocks()) {
+			$this->loader->getShared(
+				'EventEspresso\core\services\editor\BlockRegistrationManager'
+			);
+		}
+		return true;
+	}
 
 
-    /**
-     * Return whether blocks can be registered/loaded or not.
-     *
-     * @return bool
-     * @since $VID:$
-     */
-    private function canLoadBlocks()
-    {
-        return apply_filters('FHEE__EE_System__canLoadBlocks', true)
-               && function_exists('register_block_type')
-               // don't load blocks if in the Divi page builder editor context
-               // @see https://github.com/eventespresso/event-espresso-core/issues/814
-               && ! $this->request->getRequestParam('et_fb', false);
-    }
+	/**
+	 * Return whether blocks can be registered/loaded or not.
+	 *
+	 * @return bool
+	 * @since $VID:$
+	 */
+	private function canLoadBlocks()
+	{
+		return apply_filters('FHEE__EE_System__canLoadBlocks', true)
+			   && function_exists('register_block_type')
+			   // don't load blocks if in the Divi page builder editor context
+			   // @see https://github.com/eventespresso/event-espresso-core/issues/814
+			   && ! $this->request->getRequestParam('et_fb', false);
+	}
 
 
-    /**
-     * 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->request->isAdmin()
-               || $this->request->isFrontend()
-               || $this->request->isIframe()
-               || $this->request->isWordPressApi();
-    }
+	/**
+	 * 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->request->isAdmin()
+			   || $this->request->isFrontend()
+			   || $this->request->isIframe()
+			   || $this->request->isWordPressApi();
+	}
 }

core/domain/entities/routes/specifications/admin/WordPressPluginsPage.php

Indentation +8 added lines, -8 removed lines

@@ -15,12 +15,12 @@
 class WordPressPluginsPage extends RouteMatchSpecification
 {
 
-    /**
-     * @inheritDoc
-     */
-    public function isMatchingRoute()
-    {
-        return $this->request->isAdmin()
-               && strpos($this->request->requestUri(), 'wp-admin/plugins.php') !== false;
-    }
+	/**
+	 * @inheritDoc
+	 */
+	public function isMatchingRoute()
+	{
+		return $this->request->isAdmin()
+			   && strpos($this->request->requestUri(), 'wp-admin/plugins.php') !== false;
+	}
 }