eventespresso / event-espresso-core

core/services/route_match/RouteMatchSpecificationFactory.php

Indentation +39 added lines, -39 removed lines

@@ -24,46 +24,46 @@
 class RouteMatchSpecificationFactory extends FactoryWithDependencyResolver
 {
 
-    /**
-     * RouteMatchSpecificationFactory constructor
-     *
-     * @param RouteMatchSpecificationDependencyResolver $dependency_resolver
-     * @param LoaderInterface                           $loader
-     */
-    public function __construct(RouteMatchSpecificationDependencyResolver $dependency_resolver, LoaderInterface $loader)
-    {
-        parent::__construct($dependency_resolver, $loader);
-    }
+	/**
+	 * RouteMatchSpecificationFactory constructor
+	 *
+	 * @param RouteMatchSpecificationDependencyResolver $dependency_resolver
+	 * @param LoaderInterface                           $loader
+	 */
+	public function __construct(RouteMatchSpecificationDependencyResolver $dependency_resolver, LoaderInterface $loader)
+	{
+		parent::__construct($dependency_resolver, $loader);
+	}
 
-    /**
-     * @param $fqcn
-     * @return RouteMatchSpecification
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function createNewRouteMatchSpecification($fqcn)
-    {
-        $this->dependencyResolver()->resolveDependenciesForClass($fqcn);
-        return $this->loader()->getShared($fqcn);
-    }
+	/**
+	 * @param $fqcn
+	 * @return RouteMatchSpecification
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function createNewRouteMatchSpecification($fqcn)
+	{
+		$this->dependencyResolver()->resolveDependenciesForClass($fqcn);
+		return $this->loader()->getShared($fqcn);
+	}
 
 
-    /**
-     * @param $fqcn
-     * @return RouteMatchSpecification
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public static function create($fqcn)
-    {
-        /** @var RouteMatchSpecificationFactory $specification_factory */
-        $specification_factory = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\services\route_match\RouteMatchSpecificationFactory'
-        );
-        return $specification_factory->createNewRouteMatchSpecification($fqcn);
-    }
+	/**
+	 * @param $fqcn
+	 * @return RouteMatchSpecification
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public static function create($fqcn)
+	{
+		/** @var RouteMatchSpecificationFactory $specification_factory */
+		$specification_factory = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\services\route_match\RouteMatchSpecificationFactory'
+		);
+		return $specification_factory->createNewRouteMatchSpecification($fqcn);
+	}
 }

core/services/dependencies/DependencyResolverInterface.php

Indentation +11 added lines, -11 removed lines

@@ -15,16 +15,16 @@
  */
 interface DependencyResolverInterface
 {
-    /**
-     * Used to configure and/or setup any aliases or recursions required by the DependencyResolver
-     *
-     * @since $VID:$
-     */
-    public function initialize();
+	/**
+	 * Used to configure and/or setup any aliases or recursions required by the DependencyResolver
+	 *
+	 * @since $VID:$
+	 */
+	public function initialize();
 
-    /**
-     * @param string $fqcn Fully Qualified Class Name
-     * @since $VID:$
-     */
-    public function resolveDependenciesForClass($fqcn);
+	/**
+	 * @param string $fqcn Fully Qualified Class Name
+	 * @since $VID:$
+	 */
+	public function resolveDependenciesForClass($fqcn);
 }

core/services/dependencies/ClassAlias.php

Indentation +41 added lines, -41 removed lines

@@ -15,45 +15,45 @@
 class ClassAlias
 {
 
-    /**
-     * @var string $alias
-     */
-    private $alias;
-
-    /**
-     * @var string $fqcn
-     */
-    private $fqcn;
-
-    /**
-     * DependencyAlias constructor.
-     *
-     * @param string $alias Interface specified by implementing class
-     * @param string $fqcn  Concrete class that satisfies interface
-     * @throws InvalidAliasException
-     */
-    public function __construct($alias, $fqcn)
-    {
-        if (! is_subclass_of($fqcn, $alias)) {
-            throw new InvalidAliasException($fqcn, $alias);
-        }
-        $this->alias = $alias;
-        $this->fqcn = $fqcn;
-    }
-
-    /**
-     * @return string
-     */
-    public function alias()
-    {
-        return $this->alias;
-    }
-
-    /**
-     * @return string
-     */
-    public function fqcn()
-    {
-        return $this->fqcn;
-    }
+	/**
+	 * @var string $alias
+	 */
+	private $alias;
+
+	/**
+	 * @var string $fqcn
+	 */
+	private $fqcn;
+
+	/**
+	 * DependencyAlias constructor.
+	 *
+	 * @param string $alias Interface specified by implementing class
+	 * @param string $fqcn  Concrete class that satisfies interface
+	 * @throws InvalidAliasException
+	 */
+	public function __construct($alias, $fqcn)
+	{
+		if (! is_subclass_of($fqcn, $alias)) {
+			throw new InvalidAliasException($fqcn, $alias);
+		}
+		$this->alias = $alias;
+		$this->fqcn = $fqcn;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function alias()
+	{
+		return $this->alias;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function fqcn()
+	{
+		return $this->fqcn;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public function __construct($alias, $fqcn)
     {
-        if (! is_subclass_of($fqcn, $alias)) {
+        if ( ! is_subclass_of($fqcn, $alias)) {
             throw new InvalidAliasException($fqcn, $alias);
         }
         $this->alias = $alias;

core/services/dependencies/DependencyResolver.php

Indentation +152 added lines, -152 removed lines

@@ -23,156 +23,156 @@
 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
-     */
-    private $aliases = array();
-
-    /**
-     * @var array $recursions
-     */
-    private $recursions = 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->fqcn() ] = $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 ]->alias()
-            : $this->classCache()->getFqnForAlias($param_fqcn);
-    }
-
-    /**
-     * Primarily used to indicate the base namespace 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 base namespace  of "Vendor\path\to\",
-     * then all classes that are descendants of that namespace
-     * will use DependencyResolver to acquire the classes they need
-     *
-     * @param string $base_namespace Partial namespace used for detecting other classes
-     *                               that should employ this same DependencyResolver
-     */
-    public function addRecursion($base_namespace)
-    {
-        $this->recursions[] = $base_namespace;
-    }
-
-    /**
-     * 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 $VID:$
-     */
-    public function dependencyRecursionExists($param_fqcn)
-    {
-        foreach ($this->recursions as $recursion) {
-            if (strpos($param_fqcn, $recursion) !== false) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @param string $fqcn Fully Qualified Class Name
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    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
+	 */
+	private $aliases = array();
+
+	/**
+	 * @var array $recursions
+	 */
+	private $recursions = 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->fqcn() ] = $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 ]->alias()
+			: $this->classCache()->getFqnForAlias($param_fqcn);
+	}
+
+	/**
+	 * Primarily used to indicate the base namespace 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 base namespace  of "Vendor\path\to\",
+	 * then all classes that are descendants of that namespace
+	 * will use DependencyResolver to acquire the classes they need
+	 *
+	 * @param string $base_namespace Partial namespace used for detecting other classes
+	 *                               that should employ this same DependencyResolver
+	 */
+	public function addRecursion($base_namespace)
+	{
+		$this->recursions[] = $base_namespace;
+	}
+
+	/**
+	 * 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 $VID:$
+	 */
+	public function dependencyRecursionExists($param_fqcn)
+	{
+		foreach ($this->recursions as $recursion) {
+			if (strpos($param_fqcn, $recursion) !== false) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param string $fqcn Fully Qualified Class Name
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	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);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -98,7 +98,7 @@ 
      */
     public function addAlias(ClassAlias $alias)
     {
-        $this->aliases[ $alias->fqcn() ] = $alias;
+        $this->aliases[$alias->fqcn()] = $alias;
     }
 
     /**
@@ -107,8 +107,8 @@ 
      */
     public function resolveAlias($param_fqcn)
     {
-        return isset($this->aliases[ $param_fqcn ])
-            ? $this->aliases[ $param_fqcn ]->alias()
+        return isset($this->aliases[$param_fqcn])
+            ? $this->aliases[$param_fqcn]->alias()
             : $this->classCache()->getFqnForAlias($param_fqcn);
     }
 
@@ -171,7 +171,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);
     }

core/services/editor/BlockRegistrationManager.php

Indentation +205 added lines, -205 removed lines

@@ -32,210 +32,210 @@
 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'));
-    }
-
-
-    /**
-     * @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\common',
-                        // 'EventEspresso\core\domain\entities\editor\blocks\editor',
-                        // 'EventEspresso\core\domain\entities\editor\blocks\widgets',
-                    )
-                ),
-                // 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'));
+	}
+
+
+	/**
+	 * @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\common',
+						// 'EventEspresso\core\domain\entities\editor\blocks\editor',
+						// 'EventEspresso\core\domain\entities\editor\blocks\widgets',
+					)
+				),
+				// 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);
+
+			}
+		}
+
+	}
 }
 

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);

core/services/factory/FactoryWithDependencyResolver.php

Indentation +33 added lines, -33 removed lines

@@ -18,41 +18,41 @@
  */
 abstract class FactoryWithDependencyResolver implements FactoryInterface
 {
-    /**
-     * @var DependencyResolverInterface $dependency_resolver
-     */
-    private $dependency_resolver;
+	/**
+	 * @var DependencyResolverInterface $dependency_resolver
+	 */
+	private $dependency_resolver;
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
-    /**
-     * FactoryWithDependencyResolver constructor.
-     *
-     * @param DependencyResolverInterface $dependency_resolver
-     * @param LoaderInterface             $loader
-     */
-    public function __construct(DependencyResolverInterface $dependency_resolver, LoaderInterface $loader)
-    {
-        $this->dependency_resolver = $dependency_resolver;
-        $this->loader = $loader;
-    }
+	/**
+	 * FactoryWithDependencyResolver constructor.
+	 *
+	 * @param DependencyResolverInterface $dependency_resolver
+	 * @param LoaderInterface             $loader
+	 */
+	public function __construct(DependencyResolverInterface $dependency_resolver, LoaderInterface $loader)
+	{
+		$this->dependency_resolver = $dependency_resolver;
+		$this->loader = $loader;
+	}
 
-    /**
-     * @return DependencyResolverInterface
-     */
-    public function dependencyResolver()
-    {
-        return $this->dependency_resolver;
-    }
+	/**
+	 * @return DependencyResolverInterface
+	 */
+	public function dependencyResolver()
+	{
+		return $this->dependency_resolver;
+	}
 
-    /**
-     * @return LoaderInterface
-     */
-    public function loader()
-    {
-        return $this->loader;
-    }
+	/**
+	 * @return LoaderInterface
+	 */
+	public function loader()
+	{
+		return $this->loader;
+	}
 }

core/services/loaders/ClassInterfaceCache.php

Indentation +161 added lines, -161 removed lines

@@ -17,165 +17,165 @@
 class ClassInterfaceCache
 {
 
-    /**
-     * array of interfaces indexed by FQCNs where values are arrays of interface FQNs
-     *
-     * @var string[][] $interfaces
-     */
-    private $interfaces = array();
-
-    /**
-     * @type string[][] $aliases
-     */
-    protected $aliases = array();
-
-
-    /**
-     * @param string $fqn
-     * @return string
-     */
-    public function getFqn($fqn)
-    {
-        $fqn = $fqn instanceof FullyQualifiedName ? $fqn->string() : $fqn;
-        return ltrim($fqn, '\\');
-    }
-
-
-    /**
-     * @param string $fqn
-     * @return array
-     */
-    public function getInterfaces($fqn)
-    {
-        $fqn = $this->getFqn($fqn);
-        // have we already seen this FQCN ?
-        if (! array_key_exists($fqn, $this->interfaces)) {
-            $this->interfaces[ $fqn ] = array();
-            if (class_exists($fqn)) {
-                $this->interfaces[ $fqn ] = class_implements($fqn, false);
-                $this->interfaces[ $fqn ] = $this->interfaces[ $fqn ] !== false
-                    ? $this->interfaces[ $fqn ]
-                    : array();
-            }
-        }
-        return $this->interfaces[ $fqn ];
-    }
-
-
-    /**
-     * @param string $fqn
-     * @param string $interface
-     * @return bool
-     */
-    public function hasInterface($fqn, $interface)
-    {
-        $fqn        = $this->getFqn($fqn);
-        $interfaces = $this->getInterfaces($fqn);
-        return in_array($interface, $interfaces, true);
-    }
-
-
-    /**
-     * adds an alias for a classname
-     *
-     * @param string $fqn       the class name that should be used (concrete class to replace interface)
-     * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
-     * @param string $for_class the class that has the dependency (is type hinting for the interface)
-     * @throws InvalidAliasException
-     */
-    public function addAlias($fqn, $alias, $for_class = '')
-    {
-        $fqn   = $this->getFqn($fqn);
-        $alias = $this->getFqn($alias);
-        if(strpos($alias, '\\') !== false && ! is_subclass_of($fqn, $alias)) {
-            throw new InvalidAliasException($fqn, $alias);
-        }
-        // are we adding an alias for a specific class?
-        if ($for_class !== '') {
-            // make sure it's set up as an array
-            if (! isset($this->aliases[ $for_class ])) {
-                $this->aliases[ $for_class ] = array();
-            }
-            $this->aliases[ $for_class ][ $alias ] = $fqn;
-            return;
-        }
-        $this->aliases[ $alias ] = $fqn;
-    }
-
-
-    /**
-     * returns TRUE if the provided FQN is an alias
-     *
-     * @param string $fqn
-     * @param string $for_class
-     * @return bool
-     */
-    public function isAlias($fqn = '', $for_class = '')
-    {
-        $fqn = $this->getFqn($fqn);
-        if ($this->isAliasForClass($fqn, $for_class)) {
-            return true;
-        }
-        if ($for_class === '' && $this->isDirectAlias($fqn)) {
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * returns TRUE if the provided FQN is an alias
-     *
-     * @param string $fqn
-     * @return bool
-     */
-    protected function isDirectAlias($fqn = '')
-    {
-        return isset($this->aliases[ (string) $fqn ]) && ! is_array($this->aliases[ (string) $fqn ]);
-    }
-
-
-    /**
-     * returns TRUE if the provided FQN is an alias for the specified class
-     *
-     * @param string $fqn
-     * @param string $for_class
-     * @return bool
-     */
-    protected function isAliasForClass($fqn = '', $for_class = '')
-    {
-        return (
-            $for_class !== ''
-            && isset($this->aliases[ (string) $for_class ][ (string) $fqn ])
-        );
-    }
-
-
-    /**
-     * returns FQN for provided alias if one exists, otherwise returns the original FQN
-     * functions recursively, so that multiple aliases can be used to drill down to a FQN
-     *  for example:
-     *      if the following two entries were added to the aliases array:
-     *          array(
-     *              'interface_alias'           => 'some\namespace\interface'
-     *              'some\namespace\interface'  => 'some\namespace\classname'
-     *          )
-     *      then one could use Loader::getNew( 'interface_alias' )
-     *      to load an instance of 'some\namespace\classname'
-     *
-     * @param string $alias
-     * @param string $for_class
-     * @return string
-     */
-    public function getFqnForAlias($alias = '', $for_class = '')
-    {
-        $alias = $this->getFqn($alias);
-        if ($this->isAliasForClass($alias, $for_class)) {
-            return $this->getFqnForAlias($this->aliases[ (string) $for_class ][ (string) $alias ], $for_class);
-        }
-        if ($this->isDirectAlias($alias)) {
-            return $this->getFqnForAlias($this->aliases[ (string) $alias ], '');
-        }
-        return $alias;
-    }
+	/**
+	 * array of interfaces indexed by FQCNs where values are arrays of interface FQNs
+	 *
+	 * @var string[][] $interfaces
+	 */
+	private $interfaces = array();
+
+	/**
+	 * @type string[][] $aliases
+	 */
+	protected $aliases = array();
+
+
+	/**
+	 * @param string $fqn
+	 * @return string
+	 */
+	public function getFqn($fqn)
+	{
+		$fqn = $fqn instanceof FullyQualifiedName ? $fqn->string() : $fqn;
+		return ltrim($fqn, '\\');
+	}
+
+
+	/**
+	 * @param string $fqn
+	 * @return array
+	 */
+	public function getInterfaces($fqn)
+	{
+		$fqn = $this->getFqn($fqn);
+		// have we already seen this FQCN ?
+		if (! array_key_exists($fqn, $this->interfaces)) {
+			$this->interfaces[ $fqn ] = array();
+			if (class_exists($fqn)) {
+				$this->interfaces[ $fqn ] = class_implements($fqn, false);
+				$this->interfaces[ $fqn ] = $this->interfaces[ $fqn ] !== false
+					? $this->interfaces[ $fqn ]
+					: array();
+			}
+		}
+		return $this->interfaces[ $fqn ];
+	}
+
+
+	/**
+	 * @param string $fqn
+	 * @param string $interface
+	 * @return bool
+	 */
+	public function hasInterface($fqn, $interface)
+	{
+		$fqn        = $this->getFqn($fqn);
+		$interfaces = $this->getInterfaces($fqn);
+		return in_array($interface, $interfaces, true);
+	}
+
+
+	/**
+	 * adds an alias for a classname
+	 *
+	 * @param string $fqn       the class name that should be used (concrete class to replace interface)
+	 * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
+	 * @param string $for_class the class that has the dependency (is type hinting for the interface)
+	 * @throws InvalidAliasException
+	 */
+	public function addAlias($fqn, $alias, $for_class = '')
+	{
+		$fqn   = $this->getFqn($fqn);
+		$alias = $this->getFqn($alias);
+		if(strpos($alias, '\\') !== false && ! is_subclass_of($fqn, $alias)) {
+			throw new InvalidAliasException($fqn, $alias);
+		}
+		// are we adding an alias for a specific class?
+		if ($for_class !== '') {
+			// make sure it's set up as an array
+			if (! isset($this->aliases[ $for_class ])) {
+				$this->aliases[ $for_class ] = array();
+			}
+			$this->aliases[ $for_class ][ $alias ] = $fqn;
+			return;
+		}
+		$this->aliases[ $alias ] = $fqn;
+	}
+
+
+	/**
+	 * returns TRUE if the provided FQN is an alias
+	 *
+	 * @param string $fqn
+	 * @param string $for_class
+	 * @return bool
+	 */
+	public function isAlias($fqn = '', $for_class = '')
+	{
+		$fqn = $this->getFqn($fqn);
+		if ($this->isAliasForClass($fqn, $for_class)) {
+			return true;
+		}
+		if ($for_class === '' && $this->isDirectAlias($fqn)) {
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * returns TRUE if the provided FQN is an alias
+	 *
+	 * @param string $fqn
+	 * @return bool
+	 */
+	protected function isDirectAlias($fqn = '')
+	{
+		return isset($this->aliases[ (string) $fqn ]) && ! is_array($this->aliases[ (string) $fqn ]);
+	}
+
+
+	/**
+	 * returns TRUE if the provided FQN is an alias for the specified class
+	 *
+	 * @param string $fqn
+	 * @param string $for_class
+	 * @return bool
+	 */
+	protected function isAliasForClass($fqn = '', $for_class = '')
+	{
+		return (
+			$for_class !== ''
+			&& isset($this->aliases[ (string) $for_class ][ (string) $fqn ])
+		);
+	}
+
+
+	/**
+	 * returns FQN for provided alias if one exists, otherwise returns the original FQN
+	 * functions recursively, so that multiple aliases can be used to drill down to a FQN
+	 *  for example:
+	 *      if the following two entries were added to the aliases array:
+	 *          array(
+	 *              'interface_alias'           => 'some\namespace\interface'
+	 *              'some\namespace\interface'  => 'some\namespace\classname'
+	 *          )
+	 *      then one could use Loader::getNew( 'interface_alias' )
+	 *      to load an instance of 'some\namespace\classname'
+	 *
+	 * @param string $alias
+	 * @param string $for_class
+	 * @return string
+	 */
+	public function getFqnForAlias($alias = '', $for_class = '')
+	{
+		$alias = $this->getFqn($alias);
+		if ($this->isAliasForClass($alias, $for_class)) {
+			return $this->getFqnForAlias($this->aliases[ (string) $for_class ][ (string) $alias ], $for_class);
+		}
+		if ($this->isDirectAlias($alias)) {
+			return $this->getFqnForAlias($this->aliases[ (string) $alias ], '');
+		}
+		return $alias;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -49,16 +49,16 @@ 
     {
         $fqn = $this->getFqn($fqn);
         // have we already seen this FQCN ?
-        if (! array_key_exists($fqn, $this->interfaces)) {
-            $this->interfaces[ $fqn ] = array();
+        if ( ! array_key_exists($fqn, $this->interfaces)) {
+            $this->interfaces[$fqn] = array();
             if (class_exists($fqn)) {
-                $this->interfaces[ $fqn ] = class_implements($fqn, false);
-                $this->interfaces[ $fqn ] = $this->interfaces[ $fqn ] !== false
-                    ? $this->interfaces[ $fqn ]
+                $this->interfaces[$fqn] = class_implements($fqn, false);
+                $this->interfaces[$fqn] = $this->interfaces[$fqn] !== false
+                    ? $this->interfaces[$fqn]
                     : array();
             }
         }
-        return $this->interfaces[ $fqn ];
+        return $this->interfaces[$fqn];
     }
 
 
@@ -87,19 +87,19 @@ 
     {
         $fqn   = $this->getFqn($fqn);
         $alias = $this->getFqn($alias);
-        if(strpos($alias, '\\') !== false && ! is_subclass_of($fqn, $alias)) {
+        if (strpos($alias, '\\') !== false && ! is_subclass_of($fqn, $alias)) {
             throw new InvalidAliasException($fqn, $alias);
         }
         // are we adding an alias for a specific class?
         if ($for_class !== '') {
             // make sure it's set up as an array
-            if (! isset($this->aliases[ $for_class ])) {
-                $this->aliases[ $for_class ] = array();
+            if ( ! isset($this->aliases[$for_class])) {
+                $this->aliases[$for_class] = array();
             }
-            $this->aliases[ $for_class ][ $alias ] = $fqn;
+            $this->aliases[$for_class][$alias] = $fqn;
             return;
         }
-        $this->aliases[ $alias ] = $fqn;
+        $this->aliases[$alias] = $fqn;
     }
 
 
@@ -131,7 +131,7 @@ 
      */
     protected function isDirectAlias($fqn = '')
     {
-        return isset($this->aliases[ (string) $fqn ]) && ! is_array($this->aliases[ (string) $fqn ]);
+        return isset($this->aliases[(string) $fqn]) && ! is_array($this->aliases[(string) $fqn]);
     }
 
 
@@ -146,7 +146,7 @@ 
     {
         return (
             $for_class !== ''
-            && isset($this->aliases[ (string) $for_class ][ (string) $fqn ])
+            && isset($this->aliases[(string) $for_class][(string) $fqn])
         );
     }
 
@@ -171,10 +171,10 @@ 
     {
         $alias = $this->getFqn($alias);
         if ($this->isAliasForClass($alias, $for_class)) {
-            return $this->getFqnForAlias($this->aliases[ (string) $for_class ][ (string) $alias ], $for_class);
+            return $this->getFqnForAlias($this->aliases[(string) $for_class][(string) $alias], $for_class);
         }
         if ($this->isDirectAlias($alias)) {
-            return $this->getFqnForAlias($this->aliases[ (string) $alias ], '');
+            return $this->getFqnForAlias($this->aliases[(string) $alias], '');
         }
         return $alias;
     }

core/domain/services/factories/FactoryInterface.php

Indentation +6 added lines, -6 removed lines

@@ -11,10 +11,10 @@
 interface FactoryInterface
 {
 
-    /**
-     * @param mixed $arguments Either a Fully Qualified Class Name
-     *                         or array of data required for construction
-     * @return mixed
-     */
-    public static function create($arguments);
+	/**
+	 * @param mixed $arguments Either a Fully Qualified Class Name
+	 *                         or array of data required for construction
+	 * @return mixed
+	 */
+	public static function create($arguments);
 }

core/domain/entities/route_match/MatchAnyRouteSpecification.php

Indentation +15 added lines, -15 removed lines

@@ -14,19 +14,19 @@
 class MatchAnyRouteSpecification extends MultiRouteSpecification
 {
 
-    /**
-     * returns true if current request matches specification
-     *
-     * @since $VID:$
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        foreach ($this->specifications as $specification) {
-            if ($specification->isMatchingRoute()) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since $VID:$
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		foreach ($this->specifications as $specification) {
+			if ($specification->isMatchingRoute()) {
+				return true;
+			}
+		}
+		return false;
+	}
 }