eventespresso / event-espresso-core

core/services/editor/BlockRegistrationManager.php

Spacing +7 added lines, -7 removed lines

@@ -145,7 +145,7 @@ 
             foreach ($this->blocks as $block) {
                 $block->initialize();
                 $this->trackAssetManagersForBlocks($block);
-                if (! $this->block_asset_manager_collection->has($block->assetManager())) {
+                if ( ! $this->block_asset_manager_collection->has($block->assetManager())) {
                     $this->block_asset_manager_collection->add($block->assetManager());
                     $block->assetManager()->setAssetHandles();
                 }
@@ -167,7 +167,7 @@ 
         $supported_routes = $block->supportedRoutes();
         foreach ($supported_routes as $supported_route) {
             if ($this->route_manager->routeMatchesCurrentRequest($supported_route)) {
-                $this->block_asset_managers[ $block->blockType() ] = $block->assetManager()->assetNamespace();
+                $this->block_asset_managers[$block->blockType()] = $block->assetManager()->assetNamespace();
             }
         }
     }
@@ -183,10 +183,10 @@ 
      */
     public function matchesRoute(BlockInterface $block)
     {
-        if (isset($this->block_asset_managers[ $block->blockType() ])) {
+        if (isset($this->block_asset_managers[$block->blockType()])) {
             return true;
         }
-        unset($this->block_asset_managers[ $block->blockType() ]);
+        unset($this->block_asset_managers[$block->blockType()]);
         return false;
     }
 
@@ -202,12 +202,12 @@ 
         try {
             // cycle thru block loader folders
             foreach ($this->blocks as $block) {
-                if (! $this->matchesRoute($block)) {
+                if ( ! $this->matchesRoute($block)) {
                     continue;
                 }
                 // perform any setup required for the block
                 $block_type = $block->registerBlock();
-                if (! $block_type instanceof WP_Block_Type) {
+                if ( ! $block_type instanceof WP_Block_Type) {
                     throw new InvalidEntityException($block_type, 'WP_Block_Type');
                 }
                 do_action(
@@ -226,7 +226,7 @@ 
         $assets = array_flip($this->block_asset_managers);
         foreach ($this->block_asset_manager_collection as $asset_manager) {
             // if there are no longer any blocks that require these assets,
-            if (! isset($assets[ $asset_manager->assetNamespace() ])) {
+            if ( ! isset($assets[$asset_manager->assetNamespace()])) {
                 // then unset asset enqueueing and bail
                 remove_action('wp_enqueue_scripts', array($asset_manager, 'addManifestFile'), 0);
                 remove_action('admin_enqueue_scripts', array($asset_manager, 'addManifestFile'), 0);

Indentation +219 added lines, -219 removed lines

@@ -31,223 +31,223 @@
  */
 class BlockRegistrationManager extends BlockManager
 {
-    /**
-     * @var BlockAssetManagerCollection $block_asset_manager_collection
-     */
-    protected $block_asset_manager_collection;
-
-    /**
-     * @var RouteMatchSpecificationManager $route_manager
-     */
-    protected $route_manager;
-
-    /**
-     * array for tracking asset managers required by blocks for the current route
-     *
-     * @var array $block_asset_managers
-     */
-    protected $block_asset_managers = array();
-
-
-    /**
-     * BlockRegistrationManager constructor.
-     *
-     * @param BlockAssetManagerCollection    $block_asset_manager_collection
-     * @param BlockCollection                $blocks
-     * @param RouteMatchSpecificationManager $route_manager
-     * @param RequestInterface               $request
-     */
-    public function __construct(
-        BlockAssetManagerCollection $block_asset_manager_collection,
-        BlockCollection $blocks,
-        RouteMatchSpecificationManager $route_manager,
-        RequestInterface $request
-    ) {
-        $this->block_asset_manager_collection = $block_asset_manager_collection;
-        $this->route_manager = $route_manager;
-        parent::__construct($blocks, $request);
-    }
-
-
-    /**
-     *  Returns the name of a hookpoint to be used to call initialize()
-     *
-     * @return string
-     */
-    public function initHook()
-    {
-        return 'AHEE__EE_System__initialize';
-    }
-
-
-    /**
-     * Perform any early setup required for block editors to functions
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function initialize()
-    {
-        $this->initializeBlocks();
-        add_action('AHEE__EE_System__initialize_last', array($this, 'registerBlocks'));
-        add_action('wp_loaded', array($this, 'unloadAssets'));
-        add_filter('block_categories_all', array($this, 'addEspressoBlockCategories'));
-    }
-
-
-    /**
-     * @param array $categories
-     * @since 4.9.71.p
-     * @return array
-     */
-    public function addEspressoBlockCategories(array $categories)
-    {
-        return array_merge(
-            $categories,
-            array(
-                array(
-                    'slug' => 'event-espresso',
-                    'title' => esc_html__('Event Espresso', 'event_espresso'),
-                ),
-            )
-        );
-    }
-
-
-    /**
-     * @return CollectionInterface|BlockInterface[]
-     * @throws CollectionLoaderException
-     * @throws CollectionDetailsException
-     */
-    protected function populateBlockCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-                // collection name
-                'editor_blocks',
-                // collection interface
-                'EventEspresso\core\domain\entities\editor\BlockInterface',
-                // FQCNs for classes to add (all classes within each namespace will be loaded)
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_editor_BlockManager__populateBlockCollection__collection_FQCNs',
-                    array('EventEspresso\core\domain\entities\editor\blocks')
-                ),
-                // filepaths to classes to add
-                array(),
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            ),
-            $this->blocks
-        );
-        return $loader->getCollection();
-    }
-
-
-    /**
-     * populates the BlockCollection and calls initialize() on all installed blocks
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function initializeBlocks()
-    {
-        try {
-            $this->populateBlockCollection();
-            // cycle thru block loaders and initialize each loader
-            foreach ($this->blocks as $block) {
-                $block->initialize();
-                $this->trackAssetManagersForBlocks($block);
-                if (! $this->block_asset_manager_collection->has($block->assetManager())) {
-                    $this->block_asset_manager_collection->add($block->assetManager());
-                    $block->assetManager()->setAssetHandles();
-                }
-            }
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * track blocks with routes that match the current request
-     *
-     * @param BlockInterface $block
-     * @throws InvalidClassException
-     */
-    private function trackAssetManagersForBlocks(BlockInterface $block)
-    {
-        $supported_routes = $block->supportedRoutes();
-        foreach ($supported_routes as $supported_route) {
-            if ($this->route_manager->routeMatchesCurrentRequest($supported_route)) {
-                $this->block_asset_managers[ $block->blockType() ] = $block->assetManager()->assetNamespace();
-            }
-        }
-    }
-
-
-    /**
-     * returns true if the block should be registered for the current request
-     * else removes block from block_routes array and returns false
-     *
-     * @param BlockInterface $block
-     * @return boolean
-     * @throws InvalidClassException
-     */
-    public function matchesRoute(BlockInterface $block)
-    {
-        if (isset($this->block_asset_managers[ $block->blockType() ])) {
-            return true;
-        }
-        unset($this->block_asset_managers[ $block->blockType() ]);
-        return false;
-    }
-
-
-    /**
-     * calls registerBlock() and load assets for all installed blocks
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function registerBlocks()
-    {
-        try {
-            // cycle thru block loader folders
-            foreach ($this->blocks as $block) {
-                if (! $this->matchesRoute($block)) {
-                    continue;
-                }
-                // perform any setup required for the block
-                $block_type = $block->registerBlock();
-                if (! $block_type instanceof WP_Block_Type) {
-                    throw new InvalidEntityException($block_type, 'WP_Block_Type');
-                }
-                do_action(
-                    'FHEE__EventEspresso_core_services_editor_BlockManager__registerBlocks__block_type_registered',
-                    $block,
-                    $block_type
-                );
-            }
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-    public function unloadAssets()
-    {
-        $assets = array_flip($this->block_asset_managers);
-        foreach ($this->block_asset_manager_collection as $asset_manager) {
-            // if there are no longer any blocks that require these assets,
-            if (! isset($assets[ $asset_manager->assetNamespace() ])) {
-                // then unset asset enqueueing and bail
-                remove_action('wp_enqueue_scripts', array($asset_manager, 'addManifestFile'), 0);
-                remove_action('admin_enqueue_scripts', array($asset_manager, 'addManifestFile'), 0);
-                remove_action('wp_enqueue_scripts', array($asset_manager, 'addAssets'), 2);
-                remove_action('admin_enqueue_scripts', array($asset_manager, 'addAssets'), 2);
-            }
-        }
-    }
+	/**
+	 * @var BlockAssetManagerCollection $block_asset_manager_collection
+	 */
+	protected $block_asset_manager_collection;
+
+	/**
+	 * @var RouteMatchSpecificationManager $route_manager
+	 */
+	protected $route_manager;
+
+	/**
+	 * array for tracking asset managers required by blocks for the current route
+	 *
+	 * @var array $block_asset_managers
+	 */
+	protected $block_asset_managers = array();
+
+
+	/**
+	 * BlockRegistrationManager constructor.
+	 *
+	 * @param BlockAssetManagerCollection    $block_asset_manager_collection
+	 * @param BlockCollection                $blocks
+	 * @param RouteMatchSpecificationManager $route_manager
+	 * @param RequestInterface               $request
+	 */
+	public function __construct(
+		BlockAssetManagerCollection $block_asset_manager_collection,
+		BlockCollection $blocks,
+		RouteMatchSpecificationManager $route_manager,
+		RequestInterface $request
+	) {
+		$this->block_asset_manager_collection = $block_asset_manager_collection;
+		$this->route_manager = $route_manager;
+		parent::__construct($blocks, $request);
+	}
+
+
+	/**
+	 *  Returns the name of a hookpoint to be used to call initialize()
+	 *
+	 * @return string
+	 */
+	public function initHook()
+	{
+		return 'AHEE__EE_System__initialize';
+	}
+
+
+	/**
+	 * Perform any early setup required for block editors to functions
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function initialize()
+	{
+		$this->initializeBlocks();
+		add_action('AHEE__EE_System__initialize_last', array($this, 'registerBlocks'));
+		add_action('wp_loaded', array($this, 'unloadAssets'));
+		add_filter('block_categories_all', array($this, 'addEspressoBlockCategories'));
+	}
+
+
+	/**
+	 * @param array $categories
+	 * @since 4.9.71.p
+	 * @return array
+	 */
+	public function addEspressoBlockCategories(array $categories)
+	{
+		return array_merge(
+			$categories,
+			array(
+				array(
+					'slug' => 'event-espresso',
+					'title' => esc_html__('Event Espresso', 'event_espresso'),
+				),
+			)
+		);
+	}
+
+
+	/**
+	 * @return CollectionInterface|BlockInterface[]
+	 * @throws CollectionLoaderException
+	 * @throws CollectionDetailsException
+	 */
+	protected function populateBlockCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+				// collection name
+				'editor_blocks',
+				// collection interface
+				'EventEspresso\core\domain\entities\editor\BlockInterface',
+				// FQCNs for classes to add (all classes within each namespace will be loaded)
+				apply_filters(
+					'FHEE__EventEspresso_core_services_editor_BlockManager__populateBlockCollection__collection_FQCNs',
+					array('EventEspresso\core\domain\entities\editor\blocks')
+				),
+				// filepaths to classes to add
+				array(),
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			),
+			$this->blocks
+		);
+		return $loader->getCollection();
+	}
+
+
+	/**
+	 * populates the BlockCollection and calls initialize() on all installed blocks
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function initializeBlocks()
+	{
+		try {
+			$this->populateBlockCollection();
+			// cycle thru block loaders and initialize each loader
+			foreach ($this->blocks as $block) {
+				$block->initialize();
+				$this->trackAssetManagersForBlocks($block);
+				if (! $this->block_asset_manager_collection->has($block->assetManager())) {
+					$this->block_asset_manager_collection->add($block->assetManager());
+					$block->assetManager()->setAssetHandles();
+				}
+			}
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * track blocks with routes that match the current request
+	 *
+	 * @param BlockInterface $block
+	 * @throws InvalidClassException
+	 */
+	private function trackAssetManagersForBlocks(BlockInterface $block)
+	{
+		$supported_routes = $block->supportedRoutes();
+		foreach ($supported_routes as $supported_route) {
+			if ($this->route_manager->routeMatchesCurrentRequest($supported_route)) {
+				$this->block_asset_managers[ $block->blockType() ] = $block->assetManager()->assetNamespace();
+			}
+		}
+	}
+
+
+	/**
+	 * returns true if the block should be registered for the current request
+	 * else removes block from block_routes array and returns false
+	 *
+	 * @param BlockInterface $block
+	 * @return boolean
+	 * @throws InvalidClassException
+	 */
+	public function matchesRoute(BlockInterface $block)
+	{
+		if (isset($this->block_asset_managers[ $block->blockType() ])) {
+			return true;
+		}
+		unset($this->block_asset_managers[ $block->blockType() ]);
+		return false;
+	}
+
+
+	/**
+	 * calls registerBlock() and load assets for all installed blocks
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function registerBlocks()
+	{
+		try {
+			// cycle thru block loader folders
+			foreach ($this->blocks as $block) {
+				if (! $this->matchesRoute($block)) {
+					continue;
+				}
+				// perform any setup required for the block
+				$block_type = $block->registerBlock();
+				if (! $block_type instanceof WP_Block_Type) {
+					throw new InvalidEntityException($block_type, 'WP_Block_Type');
+				}
+				do_action(
+					'FHEE__EventEspresso_core_services_editor_BlockManager__registerBlocks__block_type_registered',
+					$block,
+					$block_type
+				);
+			}
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+	public function unloadAssets()
+	{
+		$assets = array_flip($this->block_asset_managers);
+		foreach ($this->block_asset_manager_collection as $asset_manager) {
+			// if there are no longer any blocks that require these assets,
+			if (! isset($assets[ $asset_manager->assetNamespace() ])) {
+				// then unset asset enqueueing and bail
+				remove_action('wp_enqueue_scripts', array($asset_manager, 'addManifestFile'), 0);
+				remove_action('admin_enqueue_scripts', array($asset_manager, 'addManifestFile'), 0);
+				remove_action('wp_enqueue_scripts', array($asset_manager, 'addAssets'), 2);
+				remove_action('admin_enqueue_scripts', array($asset_manager, 'addAssets'), 2);
+			}
+		}
+	}
 }

core/domain/services/pue/Config.php

Indentation +127 added lines, -127 removed lines

@@ -16,131 +16,131 @@
  */
 class Config
 {
-    /**
-     * @var EE_Network_Config
-     */
-    private $network_config;
-
-
-    /**
-     * @var EE_Config
-     */
-    private $ee_config;
-
-
-    public function __construct(EE_Network_Config $network_config, EE_Config $ee_config)
-    {
-        $this->network_config = $network_config;
-        $this->ee_config = $ee_config;
-    }
-
-
-    /**
-     * Get the site license key for the site.
-     */
-    public function siteLicenseKey()
-    {
-        return $this->network_config->core->site_license_key;
-    }
-
-
-    public function i18nDomain()
-    {
-        return 'event_espresso';
-    }
-
-
-    public function checkPeriod()
-    {
-        return 24;
-    }
-
-
-    public function optionKey()
-    {
-        return 'ee_site_license_key';
-    }
-
-
-    public function optionsPageSlug()
-    {
-        return 'espresso_general_settings';
-    }
-
-
-    public function hostServerUrl()
-    {
-        return defined('PUE_UPDATES_ENDPOINT')
-            ? PUE_UPDATES_ENDPOINT
-            : 'https://eventespresso.com';
-    }
-
-
-    public function pluginSlug()
-    {
-        // Note: PUE uses a simple preg_match to determine what type is currently installed based on version number.
-        //  So it's important that you use a key for the version type that is unique and not found in another key.
-        // For example:
-        // $plugin_slug['premium']['p'] = 'some-premium-slug';
-        // $plugin_slug['prerelease']['pr'] = 'some-pre-release-slug';
-        // The above would not work because "p" is found in both keys for the version type. ( i.e 1.0.p vs 1.0.pr )
-        // so doing something like:
-        // $plugin_slug['premium']['p'] = 'some-premium-slug';
-        // $plugin_slug['prerelease']['b'] = 'some-pre-release-slug';
-        // ..WOULD work!
-        return array(
-            'free'       => array('decaf' => 'event-espresso-core-decaf'),
-            'premium'    => array('p' => 'event-espresso-core-reg'),
-            'prerelease' => array('beta' => 'event-espresso-core-pr'),
-        );
-    }
-
-
-    /**
-     * Return whether the site is opted in for UXIP or not.
-     *
-     * @return bool
-     */
-    public function isOptedInForUxip()
-    {
-        return filter_var($this->ee_config->core->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * Return whether the site has been notified about UXIP or not.
-     *
-     * @return bool
-     */
-    public function hasNotifiedForUxip()
-    {
-        return filter_var($this->ee_config->core->ee_ueip_has_notified, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * Set the site opted in for UXIP.
-     */
-    public function setHasOptedInForUxip()
-    {
-        $this->ee_config->core->ee_ueip_optin = true;
-        $this->ee_config->update_espresso_config(false, false);
-    }
-
-
-    /**
-     * Set the site opted out for UXIP
-     */
-    public function setHasOptedOutForUxip()
-    {
-        $this->ee_config->core->ee_ueip_optin = false;
-        $this->ee_config->update_espresso_config(false, false);
-    }
-
-
-    public function setHasNotifiedAboutUxip()
-    {
-        $this->ee_config->core->ee_ueip_has_notified = true;
-        $this->ee_config->update_espresso_config(false, false);
-    }
+	/**
+	 * @var EE_Network_Config
+	 */
+	private $network_config;
+
+
+	/**
+	 * @var EE_Config
+	 */
+	private $ee_config;
+
+
+	public function __construct(EE_Network_Config $network_config, EE_Config $ee_config)
+	{
+		$this->network_config = $network_config;
+		$this->ee_config = $ee_config;
+	}
+
+
+	/**
+	 * Get the site license key for the site.
+	 */
+	public function siteLicenseKey()
+	{
+		return $this->network_config->core->site_license_key;
+	}
+
+
+	public function i18nDomain()
+	{
+		return 'event_espresso';
+	}
+
+
+	public function checkPeriod()
+	{
+		return 24;
+	}
+
+
+	public function optionKey()
+	{
+		return 'ee_site_license_key';
+	}
+
+
+	public function optionsPageSlug()
+	{
+		return 'espresso_general_settings';
+	}
+
+
+	public function hostServerUrl()
+	{
+		return defined('PUE_UPDATES_ENDPOINT')
+			? PUE_UPDATES_ENDPOINT
+			: 'https://eventespresso.com';
+	}
+
+
+	public function pluginSlug()
+	{
+		// Note: PUE uses a simple preg_match to determine what type is currently installed based on version number.
+		//  So it's important that you use a key for the version type that is unique and not found in another key.
+		// For example:
+		// $plugin_slug['premium']['p'] = 'some-premium-slug';
+		// $plugin_slug['prerelease']['pr'] = 'some-pre-release-slug';
+		// The above would not work because "p" is found in both keys for the version type. ( i.e 1.0.p vs 1.0.pr )
+		// so doing something like:
+		// $plugin_slug['premium']['p'] = 'some-premium-slug';
+		// $plugin_slug['prerelease']['b'] = 'some-pre-release-slug';
+		// ..WOULD work!
+		return array(
+			'free'       => array('decaf' => 'event-espresso-core-decaf'),
+			'premium'    => array('p' => 'event-espresso-core-reg'),
+			'prerelease' => array('beta' => 'event-espresso-core-pr'),
+		);
+	}
+
+
+	/**
+	 * Return whether the site is opted in for UXIP or not.
+	 *
+	 * @return bool
+	 */
+	public function isOptedInForUxip()
+	{
+		return filter_var($this->ee_config->core->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * Return whether the site has been notified about UXIP or not.
+	 *
+	 * @return bool
+	 */
+	public function hasNotifiedForUxip()
+	{
+		return filter_var($this->ee_config->core->ee_ueip_has_notified, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * Set the site opted in for UXIP.
+	 */
+	public function setHasOptedInForUxip()
+	{
+		$this->ee_config->core->ee_ueip_optin = true;
+		$this->ee_config->update_espresso_config(false, false);
+	}
+
+
+	/**
+	 * Set the site opted out for UXIP
+	 */
+	public function setHasOptedOutForUxip()
+	{
+		$this->ee_config->core->ee_ueip_optin = false;
+		$this->ee_config->update_espresso_config(false, false);
+	}
+
+
+	public function setHasNotifiedAboutUxip()
+	{
+		$this->ee_config->core->ee_ueip_has_notified = true;
+		$this->ee_config->update_espresso_config(false, false);
+	}
 }

core/services/dependencies/DependencyResolver.php

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
      */
     public function addAlias(ClassAlias $alias)
     {
-        $this->aliases[ $alias->alias() ] = $alias;
+        $this->aliases[$alias->alias()] = $alias;
     }
 
     /**
@@ -106,8 +106,8 @@ 
      */
     public function resolveAlias($param_fqcn)
     {
-        return isset($this->aliases[ $param_fqcn ])
-            ? $this->aliases[ $param_fqcn ]->fqcn()
+        return isset($this->aliases[$param_fqcn])
+            ? $this->aliases[$param_fqcn]->fqcn()
             : $this->classCache()->getFqnForAlias($param_fqcn);
     }
 
@@ -170,7 +170,7 @@ 
                 $this->resolveDependenciesForClass($param_class);
             }
             $param_class = $this->resolveAlias($param_class);
-            $dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
+            $dependencies[$param_class] = EE_Dependency_Map::load_from_cache;
         }
         $this->dependencyMap()->registerDependencies($fqcn, $dependencies);
     }

Indentation +151 added lines, -151 removed lines

@@ -22,155 +22,155 @@
  */
 abstract class DependencyResolver implements DependencyResolverInterface
 {
-    /**
-     * @var Mirror $mirror
-     */
-    private $mirror;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    private $dependency_map;
-
-    /**
-     * @var ClassAlias[] $aliases
-     */
-    protected $aliases = array();
-
-    /**
-     * @var array $namespace_roots
-     */
-    protected $namespace_roots = array();
-
-
-    /**
-     * RouteMatchSpecificationDependencyResolver constructor.
-     *
-     * @param Mirror              $mirror
-     * @param ClassInterfaceCache $class_cache
-     * @param EE_Dependency_Map   $dependency_map
-     */
-    public function __construct(
-        Mirror $mirror,
-        ClassInterfaceCache $class_cache,
-        EE_Dependency_Map $dependency_map
-    ) {
-        $this->mirror = $mirror;
-        $this->class_cache = $class_cache;
-        $this->dependency_map = $dependency_map;
-        $this->initialize();
-    }
-
-    /**
-     * @return Mirror
-     */
-    public function mirror()
-    {
-        return $this->mirror;
-    }
-
-    /**
-     * @return ClassInterfaceCache
-     */
-    public function classCache()
-    {
-        return $this->class_cache;
-    }
-
-    /**
-     * @return EE_Dependency_Map
-     */
-    public function dependencyMap()
-    {
-        return $this->dependency_map;
-    }
-
-    /**
-     * @param ClassAlias $alias
-     * @throws InvalidAliasException
-     */
-    public function addAlias(ClassAlias $alias)
-    {
-        $this->aliases[ $alias->alias() ] = $alias;
-    }
-
-    /**
-     * @param string $param_fqcn Fully Qualified Class Name for dependency parameter
-     * @return string
-     */
-    public function resolveAlias($param_fqcn)
-    {
-        return isset($this->aliases[ $param_fqcn ])
-            ? $this->aliases[ $param_fqcn ]->fqcn()
-            : $this->classCache()->getFqnForAlias($param_fqcn);
-    }
-
-    /**
-     * Primarily used to indicate the namespace root for composite objects
-     * so that dependencies requiring the same DependencyResolver can be acquired
-     * for example:
-     * Vendor\path\to\class\A, Vendor\path\to\class\B, and Vendor\path\to\class\C
-     * may all implement Vendor\path\to\Interface,
-     * but Vendor\path\to\class\C could be a composite object
-     * that requires Vendor\path\to\class\A and Vendor\path\to\class\B,
-     * and needs both of those dependencies resolved, which would therefore require
-     * the use of the same DependencyResolver.
-     *
-     * By specifying a namespace root of "Vendor\path\to\",
-     * then all classes that are descendants of that namespace
-     * will use DependencyResolver to acquire the classes they need
-     *
-     * @param string $namespace_root Partial namespace used for detecting other classes
-     *                               that should employ this same DependencyResolver
-     */
-    public function addNamespaceRoot($namespace_root)
-    {
-        $this->namespace_roots[] = $namespace_root;
-    }
-
-    /**
-     * Returns true if the parameter FQCN belongs to one of
-     * the namespaces that utilizes this DependencyResolver
-     *
-     * @param string $param_fqcn Fully Qualified Class Name for dependency parameter
-     * @return boolean
-     * @since 4.9.71.p
-     */
-    public function dependencyRecursionExists($param_fqcn)
-    {
-        foreach ($this->namespace_roots as $namespace_root) {
-            if (strpos($param_fqcn, $namespace_root) !== false) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @param string $fqcn Fully Qualified Class Name
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     * @since 4.9.71.p
-     */
-    public function resolveDependenciesForClass($fqcn)
-    {
-        $dependencies = array();
-        $params = $this->mirror()->getParameters($fqcn);
-        foreach ($params as $index => $param) {
-            // is this a dependency for a specific class ?
-            $param_class = $this->mirror()->getParameterClassName($param, $fqcn, $index);
-            if ($this->dependencyRecursionExists($param_class)) {
-                $this->resolveDependenciesForClass($param_class);
-            }
-            $param_class = $this->resolveAlias($param_class);
-            $dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
-        }
-        $this->dependencyMap()->registerDependencies($fqcn, $dependencies);
-    }
+	/**
+	 * @var Mirror $mirror
+	 */
+	private $mirror;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	private $dependency_map;
+
+	/**
+	 * @var ClassAlias[] $aliases
+	 */
+	protected $aliases = array();
+
+	/**
+	 * @var array $namespace_roots
+	 */
+	protected $namespace_roots = array();
+
+
+	/**
+	 * RouteMatchSpecificationDependencyResolver constructor.
+	 *
+	 * @param Mirror              $mirror
+	 * @param ClassInterfaceCache $class_cache
+	 * @param EE_Dependency_Map   $dependency_map
+	 */
+	public function __construct(
+		Mirror $mirror,
+		ClassInterfaceCache $class_cache,
+		EE_Dependency_Map $dependency_map
+	) {
+		$this->mirror = $mirror;
+		$this->class_cache = $class_cache;
+		$this->dependency_map = $dependency_map;
+		$this->initialize();
+	}
+
+	/**
+	 * @return Mirror
+	 */
+	public function mirror()
+	{
+		return $this->mirror;
+	}
+
+	/**
+	 * @return ClassInterfaceCache
+	 */
+	public function classCache()
+	{
+		return $this->class_cache;
+	}
+
+	/**
+	 * @return EE_Dependency_Map
+	 */
+	public function dependencyMap()
+	{
+		return $this->dependency_map;
+	}
+
+	/**
+	 * @param ClassAlias $alias
+	 * @throws InvalidAliasException
+	 */
+	public function addAlias(ClassAlias $alias)
+	{
+		$this->aliases[ $alias->alias() ] = $alias;
+	}
+
+	/**
+	 * @param string $param_fqcn Fully Qualified Class Name for dependency parameter
+	 * @return string
+	 */
+	public function resolveAlias($param_fqcn)
+	{
+		return isset($this->aliases[ $param_fqcn ])
+			? $this->aliases[ $param_fqcn ]->fqcn()
+			: $this->classCache()->getFqnForAlias($param_fqcn);
+	}
+
+	/**
+	 * Primarily used to indicate the namespace root for composite objects
+	 * so that dependencies requiring the same DependencyResolver can be acquired
+	 * for example:
+	 * Vendor\path\to\class\A, Vendor\path\to\class\B, and Vendor\path\to\class\C
+	 * may all implement Vendor\path\to\Interface,
+	 * but Vendor\path\to\class\C could be a composite object
+	 * that requires Vendor\path\to\class\A and Vendor\path\to\class\B,
+	 * and needs both of those dependencies resolved, which would therefore require
+	 * the use of the same DependencyResolver.
+	 *
+	 * By specifying a namespace root of "Vendor\path\to\",
+	 * then all classes that are descendants of that namespace
+	 * will use DependencyResolver to acquire the classes they need
+	 *
+	 * @param string $namespace_root Partial namespace used for detecting other classes
+	 *                               that should employ this same DependencyResolver
+	 */
+	public function addNamespaceRoot($namespace_root)
+	{
+		$this->namespace_roots[] = $namespace_root;
+	}
+
+	/**
+	 * Returns true if the parameter FQCN belongs to one of
+	 * the namespaces that utilizes this DependencyResolver
+	 *
+	 * @param string $param_fqcn Fully Qualified Class Name for dependency parameter
+	 * @return boolean
+	 * @since 4.9.71.p
+	 */
+	public function dependencyRecursionExists($param_fqcn)
+	{
+		foreach ($this->namespace_roots as $namespace_root) {
+			if (strpos($param_fqcn, $namespace_root) !== false) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param string $fqcn Fully Qualified Class Name
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 * @since 4.9.71.p
+	 */
+	public function resolveDependenciesForClass($fqcn)
+	{
+		$dependencies = array();
+		$params = $this->mirror()->getParameters($fqcn);
+		foreach ($params as $index => $param) {
+			// is this a dependency for a specific class ?
+			$param_class = $this->mirror()->getParameterClassName($param, $fqcn, $index);
+			if ($this->dependencyRecursionExists($param_class)) {
+				$this->resolveDependenciesForClass($param_class);
+			}
+			$param_class = $this->resolveAlias($param_class);
+			$dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
+		}
+		$this->dependencyMap()->registerDependencies($fqcn, $dependencies);
+	}
 }

core/domain/entities/route_match/MultiRouteSpecification.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public function __construct(array $specifications, RequestInterface $request)
     {
         foreach ($specifications as $specification) {
-            if (! $specification instanceof RouteMatchSpecificationInterface) {
+            if ( ! $specification instanceof RouteMatchSpecificationInterface) {
                 throw new InvalidEntityException(
                     $specification,
                     'EventEspresso\core\domain\entities\route_match\RouteMatchSpecificationInterface'

Indentation +24 added lines, -24 removed lines

@@ -15,29 +15,29 @@
  */
 abstract class MultiRouteSpecification extends RouteMatchSpecification
 {
-    /**
-     * @var RouteMatchSpecificationInterface[] $specifications
-     */
-    protected $specifications;
+	/**
+	 * @var RouteMatchSpecificationInterface[] $specifications
+	 */
+	protected $specifications;
 
-    /**
-     * MultiRouteSpecification constructor.
-     *
-     * @param RouteMatchSpecificationInterface[] $specifications
-     * @param RequestInterface                   $request
-     * @throws InvalidEntityException
-     */
-    public function __construct(array $specifications, RequestInterface $request)
-    {
-        foreach ($specifications as $specification) {
-            if (! $specification instanceof RouteMatchSpecificationInterface) {
-                throw new InvalidEntityException(
-                    $specification,
-                    'EventEspresso\core\domain\entities\route_match\RouteMatchSpecificationInterface'
-                );
-            }
-        }
-        $this->specifications = $specifications;
-        parent::__construct($request);
-    }
+	/**
+	 * MultiRouteSpecification constructor.
+	 *
+	 * @param RouteMatchSpecificationInterface[] $specifications
+	 * @param RequestInterface                   $request
+	 * @throws InvalidEntityException
+	 */
+	public function __construct(array $specifications, RequestInterface $request)
+	{
+		foreach ($specifications as $specification) {
+			if (! $specification instanceof RouteMatchSpecificationInterface) {
+				throw new InvalidEntityException(
+					$specification,
+					'EventEspresso\core\domain\entities\route_match\RouteMatchSpecificationInterface'
+				);
+			}
+		}
+		$this->specifications = $specifications;
+		parent::__construct($request);
+	}
 }

core/domain/entities/route_match/specifications/admin/WordPressPostsEditor.php

Indentation +18 added lines, -18 removed lines

@@ -18,22 +18,22 @@
  */
 class WordPressPostsEditor extends MatchAnyRouteSpecification
 {
-    /**
-     * WordPressPostsEditor constructor.
-     *
-     * @param WordPressPostsEditorEdit $edit_post_route_match
-     * @param WordPressPostsEditorAddNew $create_post_route_match
-     * @param RequestInterface           $request
-     * @throws \EventEspresso\core\exceptions\InvalidEntityException
-     */
-    public function __construct(
-        WordPressPostsEditorEdit $edit_post_route_match,
-        WordPressPostsEditorAddNew $create_post_route_match,
-        RequestInterface $request
-    ) {
-        parent::__construct(
-            array($edit_post_route_match, $create_post_route_match),
-            $request
-        );
-    }
+	/**
+	 * WordPressPostsEditor constructor.
+	 *
+	 * @param WordPressPostsEditorEdit $edit_post_route_match
+	 * @param WordPressPostsEditorAddNew $create_post_route_match
+	 * @param RequestInterface           $request
+	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
+	 */
+	public function __construct(
+		WordPressPostsEditorEdit $edit_post_route_match,
+		WordPressPostsEditorAddNew $create_post_route_match,
+		RequestInterface $request
+	) {
+		parent::__construct(
+			array($edit_post_route_match, $create_post_route_match),
+			$request
+		);
+	}
 }

core/domain/entities/route_match/specifications/admin/EspressoEventEditor.php

Indentation +18 added lines, -18 removed lines

@@ -19,22 +19,22 @@
  */
 class EspressoEventEditor extends MatchAnyRouteSpecification
 {
-    /**
-     * EspressoEventEditor constructor.
-     *
-     * @param EspressoEventEditorEdit   $edit_event_route_match
-     * @param EspressoEventEditorAddNew $create_event_route_match
-     * @param RequestInterface          $request
-     * @throws InvalidEntityException
-     */
-    public function __construct(
-        EspressoEventEditorEdit $edit_event_route_match,
-        EspressoEventEditorAddNew $create_event_route_match,
-        RequestInterface $request
-    ) {
-        parent::__construct(
-            array($edit_event_route_match, $create_event_route_match),
-            $request
-        );
-    }
+	/**
+	 * EspressoEventEditor constructor.
+	 *
+	 * @param EspressoEventEditorEdit   $edit_event_route_match
+	 * @param EspressoEventEditorAddNew $create_event_route_match
+	 * @param RequestInterface          $request
+	 * @throws InvalidEntityException
+	 */
+	public function __construct(
+		EspressoEventEditorEdit $edit_event_route_match,
+		EspressoEventEditorAddNew $create_event_route_match,
+		RequestInterface $request
+	) {
+		parent::__construct(
+			array($edit_event_route_match, $create_event_route_match),
+			$request
+		);
+	}
 }

core/domain/entities/route_match/specifications/admin/EspressoVenueEditor.php

Indentation +18 added lines, -18 removed lines

@@ -19,22 +19,22 @@
  */
 class EspressoVenueEditor extends MatchAnyRouteSpecification
 {
-    /**
-     * EspressoVenueEditor constructor.
-     *
-     * @param EspressoVenueEditorEdit $edit_venue_route_match
-     * @param EspressoVenueEditorAddNew $create_venue_route_match
-     * @param RequestInterface          $request
-     * @throws InvalidEntityException
-     */
-    public function __construct(
-        EspressoVenueEditorEdit $edit_venue_route_match,
-        EspressoVenueEditorAddNew $create_venue_route_match,
-        RequestInterface $request
-    ) {
-        parent::__construct(
-            array($edit_venue_route_match, $create_venue_route_match),
-            $request
-        );
-    }
+	/**
+	 * EspressoVenueEditor constructor.
+	 *
+	 * @param EspressoVenueEditorEdit $edit_venue_route_match
+	 * @param EspressoVenueEditorAddNew $create_venue_route_match
+	 * @param RequestInterface          $request
+	 * @throws InvalidEntityException
+	 */
+	public function __construct(
+		EspressoVenueEditorEdit $edit_venue_route_match,
+		EspressoVenueEditorAddNew $create_venue_route_match,
+		RequestInterface $request
+	) {
+		parent::__construct(
+			array($edit_venue_route_match, $create_venue_route_match),
+			$request
+		);
+	}
 }

core/domain/entities/route_match/specifications/admin/EspressoPostTypeEditor.php

Indentation +18 added lines, -18 removed lines

@@ -18,22 +18,22 @@
  */
 class EspressoPostTypeEditor extends MatchAnyRouteSpecification
 {
-    /**
-     * EspressoEventEditor constructor.
-     *
-     * @param EspressoStandardPostTypeEditor $standard_route_match
-     * @param EspressoAttendeePostTypeEditor $attendee_route_match
-     * @param RequestInterface          $request
-     * @throws InvalidEntityException
-     */
-    public function __construct(
-        EspressoStandardPostTypeEditor $standard_route_match,
-        EspressoAttendeePostTypeEditor $attendee_route_match,
-        RequestInterface $request
-    ) {
-        parent::__construct(
-            array($standard_route_match, $attendee_route_match),
-            $request
-        );
-    }
+	/**
+	 * EspressoEventEditor constructor.
+	 *
+	 * @param EspressoStandardPostTypeEditor $standard_route_match
+	 * @param EspressoAttendeePostTypeEditor $attendee_route_match
+	 * @param RequestInterface          $request
+	 * @throws InvalidEntityException
+	 */
+	public function __construct(
+		EspressoStandardPostTypeEditor $standard_route_match,
+		EspressoAttendeePostTypeEditor $attendee_route_match,
+		RequestInterface $request
+	) {
+		parent::__construct(
+			array($standard_route_match, $attendee_route_match),
+			$request
+		);
+	}
 }

core/domain/entities/route_match/specifications/admin/WordPressPageEditor.php

Indentation +18 added lines, -18 removed lines

@@ -18,22 +18,22 @@
  */
 class WordPressPageEditor extends MatchAnyRouteSpecification
 {
-    /**
-     * WordPressPostsEditor constructor.
-     *
-     * @param WordPressPostsEditorEdit $edit_page_route_match
-     * @param WordPressPostsEditorAddNew $create_page_route_match
-     * @param RequestInterface           $request
-     * @throws \EventEspresso\core\exceptions\InvalidEntityException
-     */
-    public function __construct(
-        WordPressPageEditorEdit $edit_page_route_match,
-        WordPressPageEditorAddNew $create_page_route_match,
-        RequestInterface $request
-    ) {
-        parent::__construct(
-            array($edit_page_route_match, $create_page_route_match),
-            $request
-        );
-    }
+	/**
+	 * WordPressPostsEditor constructor.
+	 *
+	 * @param WordPressPostsEditorEdit $edit_page_route_match
+	 * @param WordPressPostsEditorAddNew $create_page_route_match
+	 * @param RequestInterface           $request
+	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
+	 */
+	public function __construct(
+		WordPressPageEditorEdit $edit_page_route_match,
+		WordPressPageEditorAddNew $create_page_route_match,
+		RequestInterface $request
+	) {
+		parent::__construct(
+			array($edit_page_route_match, $create_page_route_match),
+			$request
+		);
+	}
 }