eventespresso / event-espresso-core

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

Indentation +144 added lines, -144 removed lines

@@ -19,154 +19,154 @@
  */
 class EspressoLegacyAdmin extends AdminRoute
 {
-    /**
-     * @var LegacyAccountingAssetManager|null $asset_manager
-     */
-    protected ?AssetManagerInterface $asset_manager = null;
+	/**
+	 * @var LegacyAccountingAssetManager|null $asset_manager
+	 */
+	protected ?AssetManagerInterface $asset_manager = null;
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        global $pagenow;
-        $page = $this->request->getRequestParam('page');
-        return ($pagenow === 'admin.php' || $pagenow === 'admin-ajax.php')
-               && (
-                   $page === 'pricing'
-                   || strpos($page, 'espresso') !== false
-                   || apply_filters(
-                       'FHEE__EspressoLegacyAdmin__matchesCurrentRequest__page',
-                       false,
-                       $page
-                   )
-               )
-               && parent::matchesCurrentRequest();
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		global $pagenow;
+		$page = $this->request->getRequestParam('page');
+		return ($pagenow === 'admin.php' || $pagenow === 'admin-ajax.php')
+			   && (
+				   $page === 'pricing'
+				   || strpos($page, 'espresso') !== false
+				   || apply_filters(
+					   'FHEE__EspressoLegacyAdmin__matchesCurrentRequest__page',
+					   false,
+					   $page
+				   )
+			   )
+			   && parent::matchesCurrentRequest();
+	}
 
 
-    /**
-     * @since 5.0.0.p
-     */
-    protected function registerDependencies()
-    {
-        $asset_manger_dependencies = [
-            'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-            'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
-            'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-        ];
-        $this->dependency_map->registerDependencies(JqueryAssetManager::class, $asset_manger_dependencies);
-        $this->dependency_map->registerDependencies(EspressoLegacyAdminAssetManager::class, $asset_manger_dependencies);
-        $this->dependency_map->registerDependencies(
-            LegacyAccountingAssetManager::class,
-            ['EE_Currency_Config' => EE_Dependency_Map::load_from_cache] + $asset_manger_dependencies
-        );
-        $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,
-                'EventEspresso\core\domain\services\capabilities\FeatureFlags' => 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',
-            [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration'                            => EE_Dependency_Map::load_from_cache,
-                null,
-            ]
-        );
-        $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,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\admin\AdminListTableFilters',
-            [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            ServiceChangesManager::class,
-            [
-                'EE_Dependency_Map'                                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\LoaderInterface' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-    }
+	/**
+	 * @since 5.0.0.p
+	 */
+	protected function registerDependencies()
+	{
+		$asset_manger_dependencies = [
+			'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+			'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
+			'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+		];
+		$this->dependency_map->registerDependencies(JqueryAssetManager::class, $asset_manger_dependencies);
+		$this->dependency_map->registerDependencies(EspressoLegacyAdminAssetManager::class, $asset_manger_dependencies);
+		$this->dependency_map->registerDependencies(
+			LegacyAccountingAssetManager::class,
+			['EE_Currency_Config' => EE_Dependency_Map::load_from_cache] + $asset_manger_dependencies
+		);
+		$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,
+				'EventEspresso\core\domain\services\capabilities\FeatureFlags' => 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',
+			[
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration'                            => EE_Dependency_Map::load_from_cache,
+				null,
+			]
+		);
+		$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,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\admin\AdminListTableFilters',
+			[
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			ServiceChangesManager::class,
+			[
+				'EE_Dependency_Map'                                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\LoaderInterface' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    protected function requestHandler(): bool
-    {
-        add_filter(
-            'admin_body_class',
-            function ($classes) {
-                if (strpos($classes, 'espresso-admin') === false) {
-                    $classes .= ' espresso-admin';
-                }
-                return $classes;
-            }
-        );
-        $this->loader->getShared(JqueryAssetManager::class);
-        $this->loader->getShared(EspressoLegacyAdminAssetManager::class);
-        $this->loader->getShared(LegacyAccountingAssetManager::class);
-        $this->loader->getShared(ServiceChangesManager::class);
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	protected function requestHandler(): bool
+	{
+		add_filter(
+			'admin_body_class',
+			function ($classes) {
+				if (strpos($classes, 'espresso-admin') === false) {
+					$classes .= ' espresso-admin';
+				}
+				return $classes;
+			}
+		);
+		$this->loader->getShared(JqueryAssetManager::class);
+		$this->loader->getShared(EspressoLegacyAdminAssetManager::class);
+		$this->loader->getShared(LegacyAccountingAssetManager::class);
+		$this->loader->getShared(ServiceChangesManager::class);
+		return true;
+	}
 }

core/domain/entities/routing/handlers/frontend/PublicRoute.php

Indentation +20 added lines, -20 removed lines

@@ -24,26 +24,26 @@
  */
 abstract class PublicRoute extends Route
 {
-    protected EE_Maintenance_Mode $maintenance_mode;
+	protected EE_Maintenance_Mode $maintenance_mode;
 
 
-    /**
-     * @param EE_Maintenance_Mode                   $maintenance_mode
-     * @param EE_Dependency_Map                     $dependency_map
-     * @param LoaderInterface                       $loader
-     * @param RequestInterface                      $request
-     * @param JsonDataNode|null                     $data_node
-     * @param RouteMatchSpecificationInterface|null $specification
-     */
-    public function __construct(
-        EE_Maintenance_Mode $maintenance_mode,
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        JsonDataNode $data_node = null,
-        RouteMatchSpecificationInterface $specification = null
-    ) {
-        $this->maintenance_mode = $maintenance_mode;
-        parent::__construct($dependency_map, $loader, $request, $data_node, $specification);
-    }
+	/**
+	 * @param EE_Maintenance_Mode                   $maintenance_mode
+	 * @param EE_Dependency_Map                     $dependency_map
+	 * @param LoaderInterface                       $loader
+	 * @param RequestInterface                      $request
+	 * @param JsonDataNode|null                     $data_node
+	 * @param RouteMatchSpecificationInterface|null $specification
+	 */
+	public function __construct(
+		EE_Maintenance_Mode $maintenance_mode,
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		JsonDataNode $data_node = null,
+		RouteMatchSpecificationInterface $specification = null
+	) {
+		$this->maintenance_mode = $maintenance_mode;
+		parent::__construct($dependency_map, $loader, $request, $data_node, $specification);
+	}
 }

core/domain/entities/routing/handlers/frontend/RegistrationCheckoutRequests.php

Indentation +41 added lines, -41 removed lines

@@ -14,45 +14,45 @@
  */
 class RegistrationCheckoutRequests extends FrontendRequests
 {
-    /**
-     * 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   5.0.0.p
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        return parent::matchesCurrentRequest()
-            && (
-                str_contains($this->request->requestUri(false, true), 'registration-checkout')
-                || $this->request->getRequestParam('action', '', DataType::STRING) === 'process_reg_step'
-                || $this->request->getRequestParam('action', '', DataType::STRING) === 'display_spco_reg_step'
-            );
-    }
-
-
-    /**
-     * @since 5.0.0.p
-     */
-    protected function registerDependencies()
-    {
-
-    }
-
-
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    protected function requestHandler(): bool
-    {
-        do_action(
-            'AHEE__EventEspresso_core_domain_entities_routing_handlers_frontend_RegistrationCheckoutRequests__requestHandler'
-        );
-        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   5.0.0.p
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		return parent::matchesCurrentRequest()
+			&& (
+				str_contains($this->request->requestUri(false, true), 'registration-checkout')
+				|| $this->request->getRequestParam('action', '', DataType::STRING) === 'process_reg_step'
+				|| $this->request->getRequestParam('action', '', DataType::STRING) === 'display_spco_reg_step'
+			);
+	}
+
+
+	/**
+	 * @since 5.0.0.p
+	 */
+	protected function registerDependencies()
+	{
+
+	}
+
+
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	protected function requestHandler(): bool
+	{
+		do_action(
+			'AHEE__EventEspresso_core_domain_entities_routing_handlers_frontend_RegistrationCheckoutRequests__requestHandler'
+		);
+		return true;
+	}
 }

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

Indentation +217 added lines, -217 removed lines

@@ -19,229 +19,229 @@
  */
 class GQLRequests extends Route
 {
-    private AssetManifestFactory $manifest_factory;
+	private AssetManifestFactory $manifest_factory;
 
 
-    /**
-     * AssetRequests constructor.
-     *
-     * @param EE_Dependency_Map    $dependency_map
-     * @param LoaderInterface      $loader
-     * @param RequestInterface     $request
-     * @param AssetManifestFactory $manifest_factory
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        AssetManifestFactory $manifest_factory
-    ) {
-        $this->manifest_factory = $manifest_factory;
-        parent::__construct($dependency_map, $loader, $request);
-    }
+	/**
+	 * AssetRequests constructor.
+	 *
+	 * @param EE_Dependency_Map    $dependency_map
+	 * @param LoaderInterface      $loader
+	 * @param RequestInterface     $request
+	 * @param AssetManifestFactory $manifest_factory
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		AssetManifestFactory $manifest_factory
+	) {
+		$this->manifest_factory = $manifest_factory;
+		parent::__construct($dependency_map, $loader, $request);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        global $pagenow;
-        return (
-                   $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'
-                       )
-                   ) || (
-                       $pagenow
-                       && (
-                           $pagenow === 'post-new.php'
-                           || (
-                               $pagenow === 'post.php'
-                               && $this->request->getRequestParam('action') === 'edit'
-                           )
-                       )
-                   )
-               );
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		global $pagenow;
+		return (
+				   $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'
+					   )
+				   ) || (
+					   $pagenow
+					   && (
+						   $pagenow === 'post-new.php'
+						   || (
+							   $pagenow === 'post.php'
+							   && $this->request->getRequestParam('action') === 'edit'
+						   )
+					   )
+				   )
+			   );
+	}
 
 
-    /**
-     * @since 5.0.0.p
-     */
-    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,
-                'EventEspresso\core\services\graphql\InterfaceManager'   => 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\services\graphql\InterfaceManager',
-            ['EventEspresso\core\services\graphql\interfaces\InterfaceCollection' => 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\FormElement',
-            ['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\FormSection',
-            ['EEM_Form_Section' => 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\RootQueryCountriesConnection',
-            ['EEM_Country' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryFormElementsConnection',
-            ['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryFormSectionsConnection',
-            ['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryStatesConnection',
-            ['EEM_State' => 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 5.0.0.p
+	 */
+	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,
+				'EventEspresso\core\services\graphql\InterfaceManager'   => 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\services\graphql\InterfaceManager',
+			['EventEspresso\core\services\graphql\interfaces\InterfaceCollection' => 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\FormElement',
+			['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\FormSection',
+			['EEM_Form_Section' => 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\RootQueryCountriesConnection',
+			['EEM_Country' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryFormElementsConnection',
+			['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryFormSectionsConnection',
+			['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryStatesConnection',
+			['EEM_State' => 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   5.0.0.p
-     */
-    protected function requestHandler(): bool
-    {
-        // load handler for EE GraphQL requests
-        $graphQL_manager = $this->loader->getShared(
-            'EventEspresso\core\services\graphql\GraphQLManager'
-        );
-        $graphQL_manager->init();
-        $manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
-        $manifest->initialize();
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	protected function requestHandler(): bool
+	{
+		// load handler for EE GraphQL requests
+		$graphQL_manager = $this->loader->getShared(
+			'EventEspresso\core\services\graphql\GraphQLManager'
+		);
+		$graphQL_manager->init();
+		$manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
+		$manifest->initialize();
+		return true;
+	}
 }

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

Indentation +131 added lines, -131 removed lines

@@ -22,145 +22,145 @@
  */
 class AssetRequests extends Route
 {
-    protected BaristaFactory $barista_factory;
+	protected BaristaFactory $barista_factory;
 
 
-    /**
-     * AssetRequests constructor.
-     *
-     * @param EE_Dependency_Map                $dependency_map
-     * @param LoaderInterface                  $loader
-     * @param RequestInterface                 $request
-     * @param BaristaFactory $barista_factory
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        BaristaFactory $barista_factory
-    ) {
-        $this->barista_factory = $barista_factory;
-        parent::__construct($dependency_map, $loader, $request);
-    }
+	/**
+	 * AssetRequests constructor.
+	 *
+	 * @param EE_Dependency_Map                $dependency_map
+	 * @param LoaderInterface                  $loader
+	 * @param RequestInterface                 $request
+	 * @param BaristaFactory $barista_factory
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		BaristaFactory $barista_factory
+	) {
+		$this->barista_factory = $barista_factory;
+		parent::__construct($dependency_map, $loader, $request);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        return $this->request->isAdmin()
-               || $this->request->isFrontend()
-               || $this->request->isIframe()
-               || $this->request->isWordPressApi();
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		return $this->request->isAdmin()
+			   || $this->request->isFrontend()
+			   || $this->request->isIframe()
+			   || $this->request->isWordPressApi();
+	}
 
 
-    /**
-     * @since 5.0.0.p
-     */
-    protected function registerDependencies()
-    {
-        $default_dependencies = [
-            'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-            'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
-            'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-        ];
-        $this->dependency_map->registerDependencies(JqueryAssetManager::class, $default_dependencies);
-        $this->dependency_map->registerDependencies(ReactAssetManager::class, $default_dependencies);
-        $this->dependency_map->registerDependencies(
-            CoreAssetManager::class,
-            [
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
-                '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\routing\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_new_object,
-                '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,
-                'EventEspresso\core\domain\services\graphql\enums\RegistrationStatusEnum' => 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,
-            ]
-        );
-        if (apply_filters('FHEE__load_Barista', true)) {
-            $this->dependency_map->registerDependencies(
-                'EventEspresso\core\services\assets\Barista',
-                ['EventEspresso\core\services\assets\AssetManifest' => EE_Dependency_Map::load_from_cache]
-            );
-        }
-    }
+	/**
+	 * @since 5.0.0.p
+	 */
+	protected function registerDependencies()
+	{
+		$default_dependencies = [
+			'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+			'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
+			'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+		];
+		$this->dependency_map->registerDependencies(JqueryAssetManager::class, $default_dependencies);
+		$this->dependency_map->registerDependencies(ReactAssetManager::class, $default_dependencies);
+		$this->dependency_map->registerDependencies(
+			CoreAssetManager::class,
+			[
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
+				'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\routing\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_new_object,
+				'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,
+				'EventEspresso\core\domain\services\graphql\enums\RegistrationStatusEnum' => 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,
+			]
+		);
+		if (apply_filters('FHEE__load_Barista', true)) {
+			$this->dependency_map->registerDependencies(
+				'EventEspresso\core\services\assets\Barista',
+				['EventEspresso\core\services\assets\AssetManifest' => EE_Dependency_Map::load_from_cache]
+			);
+		}
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    protected function requestHandler(): bool
-    {
-        if (apply_filters('FHEE__load_Barista', true)) {
-            $barista = $this->barista_factory->create();
-            if ($barista instanceof BaristaInterface) {
-                $barista->initialize();
-                $this->loader->getShared('EventEspresso\core\services\assets\Registry');
-            }
-        }
-        $this->loader->getShared(JqueryAssetManager::class);
-        $this->loader->getShared(CoreAssetManager::class);
-        if ($this->canLoadBlocks()) {
-            $this->loader->getShared(
-                'EventEspresso\core\services\editor\BlockRegistrationManager'
-            );
-        }
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	protected function requestHandler(): bool
+	{
+		if (apply_filters('FHEE__load_Barista', true)) {
+			$barista = $this->barista_factory->create();
+			if ($barista instanceof BaristaInterface) {
+				$barista->initialize();
+				$this->loader->getShared('EventEspresso\core\services\assets\Registry');
+			}
+		}
+		$this->loader->getShared(JqueryAssetManager::class);
+		$this->loader->getShared(CoreAssetManager::class);
+		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 5.0.0.p
-     */
-    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 5.0.0.p
+	 */
+	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);
+	}
 }

core/domain/entities/routing/handlers/shared/RegularRequests.php

Indentation +140 added lines, -140 removed lines

@@ -32,152 +32,152 @@
  */
 class RegularRequests extends PrimaryRoute
 {
-    /**
-     * called just before matchesCurrentRequest()
-     * and allows Route to perform any setup required such as calling setSpecification()
-     *
-     * @since 5.0.0.p
-     */
-    public function initialize()
-    {
-        $basic_nodes = [
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\Api',
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\Capabilities',
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\Locale',
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteUrls',
-        ];
-        foreach ($basic_nodes as $basic_node) {
-            $this->dependency_map->registerDependencies(
-                $basic_node,
-                ['EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache]
-            );
-        }
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\SitePermissions',
-            [
-                'EventEspresso\core\domain\services\capabilities\FeatureFlags' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator'       => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\GeneralSettings',
-            [
-                'EventEspresso\core\services\json\JsonDataNodeValidator'                => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\converters\date_time_formats\PhpToUnicode' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData',
-            [
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\Api'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\Config' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\JedLocaleData'                  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator'            => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\Config',
-            [
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\CurrentUser'        => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\EspressoCoreDomain' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\GeneralSettings'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\Locale'             => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteCurrency'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\SitePermissions'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteUrls'           => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator'                        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\CurrentUser',
-            [
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\Capabilities' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator'                  => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\EspressoCoreDomain',
-            [
-                'EventEspresso\core\domain\Domain'                       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteCurrency',
-            [
-                'EE_Currency_Config'                                     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->setDataNode(
-            $this->loader->getShared('EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData')
-        );
-    }
+	/**
+	 * called just before matchesCurrentRequest()
+	 * and allows Route to perform any setup required such as calling setSpecification()
+	 *
+	 * @since 5.0.0.p
+	 */
+	public function initialize()
+	{
+		$basic_nodes = [
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\Api',
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\Capabilities',
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\Locale',
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteUrls',
+		];
+		foreach ($basic_nodes as $basic_node) {
+			$this->dependency_map->registerDependencies(
+				$basic_node,
+				['EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache]
+			);
+		}
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\SitePermissions',
+			[
+				'EventEspresso\core\domain\services\capabilities\FeatureFlags' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator'       => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\GeneralSettings',
+			[
+				'EventEspresso\core\services\json\JsonDataNodeValidator'                => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\converters\date_time_formats\PhpToUnicode' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData',
+			[
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\Api'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\Config' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\JedLocaleData'                  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator'            => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\Config',
+			[
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\CurrentUser'        => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\EspressoCoreDomain' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\GeneralSettings'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\Locale'             => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteCurrency'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\SitePermissions'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteUrls'           => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator'                        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\CurrentUser',
+			[
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\Capabilities' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator'                  => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\EspressoCoreDomain',
+			[
+				'EventEspresso\core\domain\Domain'                       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteCurrency',
+			[
+				'EE_Currency_Config'                                     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->setDataNode(
+			$this->loader->getShared('EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData')
+		);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        return ! $this->request->isActivation() || $this->request->isUnitTesting();
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		return ! $this->request->isActivation() || $this->request->isUnitTesting();
+	}
 
 
-    /**
-     * @since 5.0.0.p
-     */
-    protected function registerDependencies()
-    {
-        $public = ['EE_Maintenance_Mode' => EE_Dependency_Map::load_from_cache] + Route::getDefaultDependencies();
+	/**
+	 * @since 5.0.0.p
+	 */
+	protected function registerDependencies()
+	{
+		$public = ['EE_Maintenance_Mode' => EE_Dependency_Map::load_from_cache] + Route::getDefaultDependencies();
 
-        $default_with_barista  = [BaristaFactory::class => EE_Dependency_Map::load_from_cache] +
-                                 Route::getDefaultDependencies();
-        $default_with_manifest = [AssetManifestFactory::class => EE_Dependency_Map::load_from_cache] +
-                                 Route::getDefaultDependencies();
+		$default_with_barista  = [BaristaFactory::class => EE_Dependency_Map::load_from_cache] +
+								 Route::getDefaultDependencies();
+		$default_with_manifest = [AssetManifestFactory::class => EE_Dependency_Map::load_from_cache] +
+								 Route::getDefaultDependencies();
 
-        $default_routes = [
-            // default dependencies
-            ShortcodeRequests::class            => Route::getDefaultDependencies(),
-            RestApiRequests::class              => Route::getDefaultDependencies(),
-            SessionRequests::class              => Route::getDefaultDependencies(),
-            WordPressHeartbeat::class           => Route::getDefaultDependencies(),
-            AssetRequests::class                => $default_with_barista,
-            GQLRequests::class                  => $default_with_manifest,
-            // admin dependencies
-            AdminRoute::class           => AdminRoute::getDefaultDependencies(),
-            EspressoBatchJob::class     => AdminRoute::getDefaultDependencies(),
-            EspressoEventsAdmin::class  => AdminRoute::getDefaultDependencies(),
-            EspressoEventEditor::class  => AdminRoute::getDefaultDependencies(),
-            EspressoLegacyAdmin::class  => AdminRoute::getDefaultDependencies(),
-            GutenbergEditor::class      => AdminRoute::getDefaultDependencies(),
-            NonEspressoAdminAjax::class => AdminRoute::getDefaultDependencies(),
-            WordPressPluginsPage::class => AdminRoute::getDefaultDependencies(),
-            WordPressPostsPage::class   => AdminRoute::getDefaultDependencies(),
-            WordPressProfilePage::class => AdminRoute::getDefaultDependencies(),
-            // public dependencies
-            PersonalDataRequests::class         => $public,
-            FrontendRequests::class             => $public,
-            RegistrationCheckoutRequests::class => $public,
-        ];
-        foreach ($default_routes as $route => $dependencies) {
-            $this->dependency_map->registerDependencies($route, $dependencies);
-        }
-    }
+		$default_routes = [
+			// default dependencies
+			ShortcodeRequests::class            => Route::getDefaultDependencies(),
+			RestApiRequests::class              => Route::getDefaultDependencies(),
+			SessionRequests::class              => Route::getDefaultDependencies(),
+			WordPressHeartbeat::class           => Route::getDefaultDependencies(),
+			AssetRequests::class                => $default_with_barista,
+			GQLRequests::class                  => $default_with_manifest,
+			// admin dependencies
+			AdminRoute::class           => AdminRoute::getDefaultDependencies(),
+			EspressoBatchJob::class     => AdminRoute::getDefaultDependencies(),
+			EspressoEventsAdmin::class  => AdminRoute::getDefaultDependencies(),
+			EspressoEventEditor::class  => AdminRoute::getDefaultDependencies(),
+			EspressoLegacyAdmin::class  => AdminRoute::getDefaultDependencies(),
+			GutenbergEditor::class      => AdminRoute::getDefaultDependencies(),
+			NonEspressoAdminAjax::class => AdminRoute::getDefaultDependencies(),
+			WordPressPluginsPage::class => AdminRoute::getDefaultDependencies(),
+			WordPressPostsPage::class   => AdminRoute::getDefaultDependencies(),
+			WordPressProfilePage::class => AdminRoute::getDefaultDependencies(),
+			// public dependencies
+			PersonalDataRequests::class         => $public,
+			FrontendRequests::class             => $public,
+			RegistrationCheckoutRequests::class => $public,
+		];
+		foreach ($default_routes as $route => $dependencies) {
+			$this->dependency_map->registerDependencies($route, $dependencies);
+		}
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    protected function requestHandler(): bool
-    {
-        $this->setRouteRequestType(PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR);
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	protected function requestHandler(): bool
+	{
+		$this->setRouteRequestType(PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR);
+		return true;
+	}
 }

core/domain/DomainBase.php

Indentation +233 added lines, -233 removed lines

@@ -16,237 +16,237 @@
  */
 abstract class DomainBase implements DomainInterface
 {
-    const ASSETS_FOLDER = 'assets/';
-
-    /**
-     * Equivalent to `__FILE__` for main plugin file.
-     *
-     * @var FilePath
-     */
-    private FilePath $plugin_file;
-
-    /**
-     * Value object indicating version for plugin
-     *
-     * @var Version
-     */
-    private Version $version;
-
-    private string $plugin_basename = '';
-
-    private string $plugin_path = '';
-
-    private string $plugin_url = '';
-
-    private string $asset_namespace = '';
-
-    private string $assets_path = '';
-
-    private string $assets_url = '';
-
-    protected bool $initialized = false;
-
-
-    /**
-     * Initializes internal properties.
-     *
-     * @param FilePath $plugin_file
-     * @param Version  $version
-     * @param string   $asset_namespace
-     */
-    public function __construct(
-        FilePath $plugin_file,
-        Version $version,
-        string $asset_namespace = Domain::ASSET_NAMESPACE
-    ) {
-        $this->plugin_file = $plugin_file;
-        $this->version     = $version;
-        $this->initialize($asset_namespace);
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     * @since 5.0.0.p
-     */
-    public function initialize(string $asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        if (! $this->initialized) {
-            $this->plugin_basename = plugin_basename($this->pluginFile());
-            $this->plugin_path     = plugin_dir_path($this->pluginFile());
-            $this->plugin_url      = plugin_dir_url($this->pluginFile());
-            $this->setAssetNamespace($asset_namespace);
-            $this->setDistributionAssetsPath();
-            $this->setDistributionAssetsUrl();
-            $this->initialized = true;
-        }
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     */
-    public function setAssetNamespace(string $asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        if (! $this->asset_namespace) {
-            $this->asset_namespace = sanitize_key(
-            // convert directory separators to dashes and remove file extension
-                str_replace(['/', '.php'], ['-', ''], $asset_namespace)
-            );
-        }
-    }
-
-
-    /**
-     * @throws DomainException
-     * @since 5.0.0.p
-     */
-    private function setDistributionAssetsPath()
-    {
-        $assets_folder_paths = [
-            $this->plugin_path . DomainBase::ASSETS_FOLDER,
-            $this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
-        ];
-        foreach ($assets_folder_paths as $assets_folder_path) {
-            if (is_readable($assets_folder_path)) {
-                $this->assets_path = trailingslashit($assets_folder_path);
-                // once we find a valid path, just break out of loop
-                break;
-            }
-        }
-    }
-
-
-    /**
-     * @throws DomainException
-     * @since 5.0.0.p
-     */
-    private function setDistributionAssetsUrl()
-    {
-        // $this->assets_path will already include the assets folder,
-        // but plugin_dir_url() removes it, so we need to add it again
-        $this->assets_url = $this->assets_path ? plugin_dir_url($this->assets_path) . DomainBase::ASSETS_FOLDER : '';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginFile(): string
-    {
-        return (string) $this->plugin_file;
-    }
-
-
-    /**
-     * @return FilePath
-     */
-    public function pluginFileObject(): FilePath
-    {
-        return $this->plugin_file;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginBasename(): string
-    {
-        return $this->plugin_basename;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function pluginPath(string $additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_path . $additional_path
-            : $this->plugin_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function pluginUrl(string $additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . $additional_path
-            : $this->plugin_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function version(): string
-    {
-        return (string) $this->version;
-    }
-
-
-    /**
-     * @return Version
-     */
-    public function versionValueObject(): Version
-    {
-        return $this->version;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function distributionAssetsFolder(): string
-    {
-        return DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsPath(string $additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
-            : $this->assets_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsUrl(string $additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_url . $additional_path
-            : $this->assets_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function assetNamespace(): string
-    {
-        return $this->asset_namespace;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function assetVersion(): string
-    {
-        return wp_get_environment_type() === 'production' ? $this->version() : (string) time();
-    }
+	const ASSETS_FOLDER = 'assets/';
+
+	/**
+	 * Equivalent to `__FILE__` for main plugin file.
+	 *
+	 * @var FilePath
+	 */
+	private FilePath $plugin_file;
+
+	/**
+	 * Value object indicating version for plugin
+	 *
+	 * @var Version
+	 */
+	private Version $version;
+
+	private string $plugin_basename = '';
+
+	private string $plugin_path = '';
+
+	private string $plugin_url = '';
+
+	private string $asset_namespace = '';
+
+	private string $assets_path = '';
+
+	private string $assets_url = '';
+
+	protected bool $initialized = false;
+
+
+	/**
+	 * Initializes internal properties.
+	 *
+	 * @param FilePath $plugin_file
+	 * @param Version  $version
+	 * @param string   $asset_namespace
+	 */
+	public function __construct(
+		FilePath $plugin_file,
+		Version $version,
+		string $asset_namespace = Domain::ASSET_NAMESPACE
+	) {
+		$this->plugin_file = $plugin_file;
+		$this->version     = $version;
+		$this->initialize($asset_namespace);
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 * @since 5.0.0.p
+	 */
+	public function initialize(string $asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		if (! $this->initialized) {
+			$this->plugin_basename = plugin_basename($this->pluginFile());
+			$this->plugin_path     = plugin_dir_path($this->pluginFile());
+			$this->plugin_url      = plugin_dir_url($this->pluginFile());
+			$this->setAssetNamespace($asset_namespace);
+			$this->setDistributionAssetsPath();
+			$this->setDistributionAssetsUrl();
+			$this->initialized = true;
+		}
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 */
+	public function setAssetNamespace(string $asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		if (! $this->asset_namespace) {
+			$this->asset_namespace = sanitize_key(
+			// convert directory separators to dashes and remove file extension
+				str_replace(['/', '.php'], ['-', ''], $asset_namespace)
+			);
+		}
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @since 5.0.0.p
+	 */
+	private function setDistributionAssetsPath()
+	{
+		$assets_folder_paths = [
+			$this->plugin_path . DomainBase::ASSETS_FOLDER,
+			$this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
+		];
+		foreach ($assets_folder_paths as $assets_folder_path) {
+			if (is_readable($assets_folder_path)) {
+				$this->assets_path = trailingslashit($assets_folder_path);
+				// once we find a valid path, just break out of loop
+				break;
+			}
+		}
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @since 5.0.0.p
+	 */
+	private function setDistributionAssetsUrl()
+	{
+		// $this->assets_path will already include the assets folder,
+		// but plugin_dir_url() removes it, so we need to add it again
+		$this->assets_url = $this->assets_path ? plugin_dir_url($this->assets_path) . DomainBase::ASSETS_FOLDER : '';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginFile(): string
+	{
+		return (string) $this->plugin_file;
+	}
+
+
+	/**
+	 * @return FilePath
+	 */
+	public function pluginFileObject(): FilePath
+	{
+		return $this->plugin_file;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginBasename(): string
+	{
+		return $this->plugin_basename;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function pluginPath(string $additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_path . $additional_path
+			: $this->plugin_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function pluginUrl(string $additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_url . $additional_path
+			: $this->plugin_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function version(): string
+	{
+		return (string) $this->version;
+	}
+
+
+	/**
+	 * @return Version
+	 */
+	public function versionValueObject(): Version
+	{
+		return $this->version;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsFolder(): string
+	{
+		return DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsPath(string $additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->assets_path . $additional_path
+			: $this->assets_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsUrl(string $additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->assets_url . $additional_path
+			: $this->assets_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function assetNamespace(): string
+	{
+		return $this->asset_namespace;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function assetVersion(): string
+	{
+		return wp_get_environment_type() === 'production' ? $this->version() : (string) time();
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
      */
     public function initialize(string $asset_namespace = Domain::ASSET_NAMESPACE)
     {
-        if (! $this->initialized) {
+        if ( ! $this->initialized) {
             $this->plugin_basename = plugin_basename($this->pluginFile());
             $this->plugin_path     = plugin_dir_path($this->pluginFile());
             $this->plugin_url      = plugin_dir_url($this->pluginFile());
@@ -90,7 +90,7 @@ 
      */
     public function setAssetNamespace(string $asset_namespace = Domain::ASSET_NAMESPACE)
     {
-        if (! $this->asset_namespace) {
+        if ( ! $this->asset_namespace) {
             $this->asset_namespace = sanitize_key(
             // convert directory separators to dashes and remove file extension
                 str_replace(['/', '.php'], ['-', ''], $asset_namespace)
@@ -106,8 +106,8 @@ 
     private function setDistributionAssetsPath()
     {
         $assets_folder_paths = [
-            $this->plugin_path . DomainBase::ASSETS_FOLDER,
-            $this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
+            $this->plugin_path.DomainBase::ASSETS_FOLDER,
+            $this->plugin_path.'src/'.DomainBase::ASSETS_FOLDER,
         ];
         foreach ($assets_folder_paths as $assets_folder_path) {
             if (is_readable($assets_folder_path)) {
@@ -127,7 +127,7 @@ 
     {
         // $this->assets_path will already include the assets folder,
         // but plugin_dir_url() removes it, so we need to add it again
-        $this->assets_url = $this->assets_path ? plugin_dir_url($this->assets_path) . DomainBase::ASSETS_FOLDER : '';
+        $this->assets_url = $this->assets_path ? plugin_dir_url($this->assets_path).DomainBase::ASSETS_FOLDER : '';
     }
 
 
@@ -165,7 +165,7 @@ 
     public function pluginPath(string $additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_path . $additional_path
+            ? $this->plugin_path.$additional_path
             : $this->plugin_path;
     }
 
@@ -177,7 +177,7 @@ 
     public function pluginUrl(string $additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . $additional_path
+            ? $this->plugin_url.$additional_path
             : $this->plugin_url;
     }
 
@@ -216,7 +216,7 @@ 
     public function distributionAssetsPath(string $additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
+            ? $this->assets_path.$additional_path
             : $this->assets_path;
     }
 
@@ -228,7 +228,7 @@ 
     public function distributionAssetsUrl(string $additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_url . $additional_path
+            ? $this->assets_url.$additional_path
             : $this->assets_url;
     }
 

core/domain/DomainFactory.php

Indentation +89 added lines, -89 removed lines

@@ -22,101 +22,101 @@
  */
 class DomainFactory
 {
-    /**
-     * @var DomainInterface[]
-     */
-    protected static array $domains = [];
+	/**
+	 * @var DomainInterface[]
+	 */
+	protected static array $domains = [];
 
 
-    /**
-     * @param string $domain_fqcn       [required] Fully Qualified Class Name for the Domain class
-     * @param string $main_file         [required] path to the main plugin file
-     * @param string $version           [required] version string for the plugin
-     * @return DomainInterface
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function create(string $domain_fqcn, string $main_file, string $version): DomainInterface
-    {
-        $fqcn = new FullyQualifiedName($domain_fqcn);
-        return DomainFactory::getDomain($fqcn->string(), [$main_file, $version]);
-    }
+	/**
+	 * @param string $domain_fqcn       [required] Fully Qualified Class Name for the Domain class
+	 * @param string $main_file         [required] path to the main plugin file
+	 * @param string $version           [required] version string for the plugin
+	 * @return DomainInterface
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function create(string $domain_fqcn, string $main_file, string $version): DomainInterface
+	{
+		$fqcn = new FullyQualifiedName($domain_fqcn);
+		return DomainFactory::getDomain($fqcn->string(), [$main_file, $version]);
+	}
 
 
-    /**
-     * @param FullyQualifiedName $domain_fqcn   [required] Fully Qualified Class Name for the Domain class
-     * @param array              $arguments     [required] array of arguments to be passed to the Domain class
-     *                                          constructor. Must at least include the following two value objects:
-     *                                          [
-     *                                              EventEspresso\core\domain\values\FilePath $plugin_file
-     *                                              EventEspresso\core\domain\values\Version $version
-     *                                          ]
-     * @return DomainInterface
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getShared(FullyQualifiedName $domain_fqcn, array $arguments): DomainInterface
-    {
-        return DomainFactory::getDomain($domain_fqcn->string(), $arguments);
-    }
+	/**
+	 * @param FullyQualifiedName $domain_fqcn   [required] Fully Qualified Class Name for the Domain class
+	 * @param array              $arguments     [required] array of arguments to be passed to the Domain class
+	 *                                          constructor. Must at least include the following two value objects:
+	 *                                          [
+	 *                                              EventEspresso\core\domain\values\FilePath $plugin_file
+	 *                                              EventEspresso\core\domain\values\Version $version
+	 *                                          ]
+	 * @return DomainInterface
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getShared(FullyQualifiedName $domain_fqcn, array $arguments): DomainInterface
+	{
+		return DomainFactory::getDomain($domain_fqcn->string(), $arguments);
+	}
 
 
-    /**
-     * @return DomainInterface
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     * @throws InvalidInterfaceException
-     */
-    public static function getEventEspressoCoreDomain(): DomainInterface
-    {
-        $fqcn = 'EventEspresso\core\domain\Domain';
-        if (! isset(DomainFactory::$domains[ $fqcn ])) {
-            DomainFactory::getDomain($fqcn, [EVENT_ESPRESSO_MAIN_FILE, espresso_version()]);
-        }
-        return DomainFactory::$domains[ $fqcn ];
-    }
+	/**
+	 * @return DomainInterface
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getEventEspressoCoreDomain(): DomainInterface
+	{
+		$fqcn = 'EventEspresso\core\domain\Domain';
+		if (! isset(DomainFactory::$domains[ $fqcn ])) {
+			DomainFactory::getDomain($fqcn, [EVENT_ESPRESSO_MAIN_FILE, espresso_version()]);
+		}
+		return DomainFactory::$domains[ $fqcn ];
+	}
 
 
-    /**
-     * @param string $fqcn
-     * @param array  $arguments
-     * @return DomainInterface
-     */
-    private static function getDomain(string $fqcn, array $arguments): DomainInterface
-    {
-        if (! isset(DomainFactory::$domains[ $fqcn ])) {
-            if (! isset($arguments[0], $arguments[1])) {
-                throw new InvalidArgumentException(
-                    esc_html__(
-                        'You need to pass at least two arguments, representing the addon plugin file and version, in order to generate a Domain class',
-                        'event_espresso'
-                    )
-                );
-            }
-            $filepath = $arguments[0] instanceof FilePath ? $arguments[0] : new FilePath($arguments[0]);
-            $version  = $arguments[1] instanceof Version ? $arguments[1] : Version::fromString($arguments[1]);
-            $domain   = new $fqcn($filepath, $version);
-            if (! $domain instanceof DomainBase || ! $domain instanceof $fqcn) {
-                throw new DomainException(
-                    sprintf(
-                        esc_html__(
-                            'The requested Domain class "%1$s" could not be loaded.',
-                            'event_espresso'
-                        ),
-                        $fqcn
-                    )
-                );
-            }
-            DomainFactory::$domains[ $fqcn ] = $domain;
-            // we still need to share this with the core loader to facilitate automatic dependency injection
-            LoaderFactory::getLoader()->share($fqcn, $domain, [$filepath, $version, $domain->assetNamespace()]);
-        }
-        return DomainFactory::$domains[ $fqcn ];
-    }
+	/**
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @return DomainInterface
+	 */
+	private static function getDomain(string $fqcn, array $arguments): DomainInterface
+	{
+		if (! isset(DomainFactory::$domains[ $fqcn ])) {
+			if (! isset($arguments[0], $arguments[1])) {
+				throw new InvalidArgumentException(
+					esc_html__(
+						'You need to pass at least two arguments, representing the addon plugin file and version, in order to generate a Domain class',
+						'event_espresso'
+					)
+				);
+			}
+			$filepath = $arguments[0] instanceof FilePath ? $arguments[0] : new FilePath($arguments[0]);
+			$version  = $arguments[1] instanceof Version ? $arguments[1] : Version::fromString($arguments[1]);
+			$domain   = new $fqcn($filepath, $version);
+			if (! $domain instanceof DomainBase || ! $domain instanceof $fqcn) {
+				throw new DomainException(
+					sprintf(
+						esc_html__(
+							'The requested Domain class "%1$s" could not be loaded.',
+							'event_espresso'
+						),
+						$fqcn
+					)
+				);
+			}
+			DomainFactory::$domains[ $fqcn ] = $domain;
+			// we still need to share this with the core loader to facilitate automatic dependency injection
+			LoaderFactory::getLoader()->share($fqcn, $domain, [$filepath, $version, $domain->assetNamespace()]);
+		}
+		return DomainFactory::$domains[ $fqcn ];
+	}
 }

core/domain/values/FilePath.php

Indentation +22 added lines, -22 removed lines

@@ -15,30 +15,30 @@
  */
 class FilePath
 {
-    private string $file_path;
+	private string $file_path;
 
 
-    /**
-     * FilePath constructor.
-     *
-     * @param string $file_path
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     */
-    public function __construct(string $file_path)
-    {
-        if (! is_readable($file_path)) {
-            throw new InvalidFilePathException($file_path);
-        }
-        $this->file_path = $file_path;
-    }
+	/**
+	 * FilePath constructor.
+	 *
+	 * @param string $file_path
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 */
+	public function __construct(string $file_path)
+	{
+		if (! is_readable($file_path)) {
+			throw new InvalidFilePathException($file_path);
+		}
+		$this->file_path = $file_path;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->file_path;
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->file_path;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      */
     public function __construct(string $file_path)
     {
-        if (! is_readable($file_path)) {
+        if ( ! is_readable($file_path)) {
             throw new InvalidFilePathException($file_path);
         }
         $this->file_path = $file_path;