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->currentRequestMatches($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 +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->currentRequestMatches($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->currentRequestMatches($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/services/editor/BlockManager.php

Indentation +42 added lines, -42 removed lines

@@ -18,46 +18,46 @@
 abstract class BlockManager
 {
 
-    /**
-     * @var CollectionInterface|BlockInterface[] $blocks
-     */
-    protected $blocks;
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-
-
-    /**
-     * BlockManager constructor.
-     *
-     * @param BlockCollection   $blocks
-     * @param RequestInterface  $request
-     */
-    public function __construct(
-        BlockCollection $blocks,
-        RequestInterface $request
-    ) {
-        $this->blocks            = $blocks;
-        $this->request           = $request;
-        add_action($this->initHook(), array($this, 'initialize'));
-    }
-
-
-    /**
-     *  Returns the name of a hookpoint to be used to call initialize()
-     *
-     * @return string
-     */
-    abstract public function initHook();
-
-
-    /**
-     * Perform any early setup required for block editors to functions
-     *
-     * @return void
-     */
-    abstract public function initialize();
+	/**
+	 * @var CollectionInterface|BlockInterface[] $blocks
+	 */
+	protected $blocks;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+
+
+	/**
+	 * BlockManager constructor.
+	 *
+	 * @param BlockCollection   $blocks
+	 * @param RequestInterface  $request
+	 */
+	public function __construct(
+		BlockCollection $blocks,
+		RequestInterface $request
+	) {
+		$this->blocks            = $blocks;
+		$this->request           = $request;
+		add_action($this->initHook(), array($this, 'initialize'));
+	}
+
+
+	/**
+	 *  Returns the name of a hookpoint to be used to call initialize()
+	 *
+	 * @return string
+	 */
+	abstract public function initHook();
+
+
+	/**
+	 * Perform any early setup required for block editors to functions
+	 *
+	 * @return void
+	 */
+	abstract public function initialize();
 }

core/services/route_match/RouteMatchSpecificationCollection.php

Indentation +32 added lines, -32 removed lines

@@ -16,36 +16,36 @@
 class RouteMatchSpecificationCollection extends Collection
 {
 
-    const COLLECTION_NAME = 'route_match_specifications';
-
-
-    /**
-     * RouteMatchSpecificationCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            'EventEspresso\core\domain\entities\route_match\RouteMatchSpecificationInterface',
-            RouteMatchSpecificationCollection::COLLECTION_NAME
-        );
-    }
-
-
-    /**
-     * getIdentifier
-     * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
-     * If no $identifier is supplied, then the  fully qualified class name is used
-     *
-     * @param        $object
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function getIdentifier($object, $identifier = null)
-    {
-        return ! empty($identifier)
-            ? $identifier
-            : get_class($object);
-    }
+	const COLLECTION_NAME = 'route_match_specifications';
+
+
+	/**
+	 * RouteMatchSpecificationCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			'EventEspresso\core\domain\entities\route_match\RouteMatchSpecificationInterface',
+			RouteMatchSpecificationCollection::COLLECTION_NAME
+		);
+	}
+
+
+	/**
+	 * getIdentifier
+	 * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
+	 * If no $identifier is supplied, then the  fully qualified class name is used
+	 *
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function getIdentifier($object, $identifier = null)
+	{
+		return ! empty($identifier)
+			? $identifier
+			: get_class($object);
+	}
 }

core/services/route_match/RouteMatchSpecificationManager.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
         foreach ($this->specifications as $specification) {
             /** @var RouteMatchSpecificationInterface $specification */
             if ($specification->routeMatches()) {
-                $matches[] = get_class($specification );
+                $matches[] = get_class($specification);
             }
         }
         return $matches;

Indentation +107 added lines, -107 removed lines

@@ -25,122 +25,122 @@
  */
 class RouteMatchSpecificationManager
 {
-    /**
-     * @var CollectionInterface[]|RouteMatchSpecificationInterface[] $specifications
-     */
-    private $specifications;
+	/**
+	 * @var CollectionInterface[]|RouteMatchSpecificationInterface[] $specifications
+	 */
+	private $specifications;
 
-    /**
-     * @var RouteMatchSpecificationFactory $specifications_factory
-     */
-    private $specifications_factory;
+	/**
+	 * @var RouteMatchSpecificationFactory $specifications_factory
+	 */
+	private $specifications_factory;
 
 
-    /**
-     * RouteMatchSpecificationManager constructor.
-     *
-     * @param RouteMatchSpecificationCollection $specifications
-     * @param RouteMatchSpecificationFactory    $specifications_factory
-     */
-    public function __construct(
-        RouteMatchSpecificationCollection $specifications,
-        RouteMatchSpecificationFactory $specifications_factory
-    ) {
-        $this->specifications = $specifications;
-        $this->specifications_factory = $specifications_factory;
-        add_action('AHEE__EE_System__loadRouteMatchSpecifications', array($this, 'initialize'));
-    }
+	/**
+	 * RouteMatchSpecificationManager constructor.
+	 *
+	 * @param RouteMatchSpecificationCollection $specifications
+	 * @param RouteMatchSpecificationFactory    $specifications_factory
+	 */
+	public function __construct(
+		RouteMatchSpecificationCollection $specifications,
+		RouteMatchSpecificationFactory $specifications_factory
+	) {
+		$this->specifications = $specifications;
+		$this->specifications_factory = $specifications_factory;
+		add_action('AHEE__EE_System__loadRouteMatchSpecifications', array($this, 'initialize'));
+	}
 
 
-    /**
-     * Perform any early setup required for block editors to functions
-     *
-     * @return void
-     * @throws CollectionLoaderException
-     * @throws CollectionDetailsException
-     */
-    public function initialize()
-    {
-        $this->populateSpecificationCollection();
-    }
+	/**
+	 * Perform any early setup required for block editors to functions
+	 *
+	 * @return void
+	 * @throws CollectionLoaderException
+	 * @throws CollectionDetailsException
+	 */
+	public function initialize()
+	{
+		$this->populateSpecificationCollection();
+	}
 
 
-    /**
-     * @return CollectionInterface|RouteMatchSpecificationInterface[]
-     * @throws CollectionLoaderException
-     * @throws CollectionDetailsException
-     * @since $VID:$
-     */
-    private function populateSpecificationCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-            // collection name
-                RouteMatchSpecificationCollection::COLLECTION_NAME,
-                // collection interface
-                'EventEspresso\core\domain\entities\route_match\RouteMatchSpecificationInterface',
-                // FQCNs for classes to add (all classes within each namespace will be loaded)
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_route_match_RouteMatchSpecificationManager__populateSpecificationCollection__collection_FQCNs',
-                    array(
-                        'EventEspresso\core\domain\entities\route_match\specifications\admin',
-                        // 'EventEspresso\core\domain\entities\route_match\specifications\public',
-                    )
-                ),
-                // 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->specifications,
-            null,
-            $this->specifications_factory
-        );
-        return $loader->getCollection();
-    }
+	/**
+	 * @return CollectionInterface|RouteMatchSpecificationInterface[]
+	 * @throws CollectionLoaderException
+	 * @throws CollectionDetailsException
+	 * @since $VID:$
+	 */
+	private function populateSpecificationCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+			// collection name
+				RouteMatchSpecificationCollection::COLLECTION_NAME,
+				// collection interface
+				'EventEspresso\core\domain\entities\route_match\RouteMatchSpecificationInterface',
+				// FQCNs for classes to add (all classes within each namespace will be loaded)
+				apply_filters(
+					'FHEE__EventEspresso_core_services_route_match_RouteMatchSpecificationManager__populateSpecificationCollection__collection_FQCNs',
+					array(
+						'EventEspresso\core\domain\entities\route_match\specifications\admin',
+						// 'EventEspresso\core\domain\entities\route_match\specifications\public',
+					)
+				),
+				// 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->specifications,
+			null,
+			$this->specifications_factory
+		);
+		return $loader->getCollection();
+	}
 
 
-    /**
-     * Given the FQCN for a RouteMatchSpecification, will return true if the current request matches
-     *
-     * @param string $routeMatchSpecificationFqcn fully qualified class name
-     * @return bool
-     * @throws InvalidClassException
-     * @since $VID:$
-     */
-    public function currentRequestMatches($routeMatchSpecificationFqcn)
-    {
-        /** @var RouteMatchSpecificationInterface $specification */
-        $specification = $this->specifications->get($routeMatchSpecificationFqcn);
-        if ( ! $specification instanceof $routeMatchSpecificationFqcn) {
-            throw new InvalidClassException($routeMatchSpecificationFqcn);
-        }
-        return $specification->routeMatches();
-    }
+	/**
+	 * Given the FQCN for a RouteMatchSpecification, will return true if the current request matches
+	 *
+	 * @param string $routeMatchSpecificationFqcn fully qualified class name
+	 * @return bool
+	 * @throws InvalidClassException
+	 * @since $VID:$
+	 */
+	public function currentRequestMatches($routeMatchSpecificationFqcn)
+	{
+		/** @var RouteMatchSpecificationInterface $specification */
+		$specification = $this->specifications->get($routeMatchSpecificationFqcn);
+		if ( ! $specification instanceof $routeMatchSpecificationFqcn) {
+			throw new InvalidClassException($routeMatchSpecificationFqcn);
+		}
+		return $specification->routeMatches();
+	}
 
 
-    /**
-     * Handy method for development that returns
-     * a list of existing RouteMatchSpecification classes
-     * matching the current request that can be used to identify it.
-     * If no matches are returned (or nothing acceptable)
-     * then create a new one that better matches your requirements.
-     *
-     * @return array
-     * @since $VID:$
-     */
-    public function findSpecificationsMatchingCurrentRequest()
-    {
-        $matches = array();
-        foreach ($this->specifications as $specification) {
-            /** @var RouteMatchSpecificationInterface $specification */
-            if ($specification->routeMatches()) {
-                $matches[] = get_class($specification );
-            }
-        }
-        return $matches;
-    }
+	/**
+	 * Handy method for development that returns
+	 * a list of existing RouteMatchSpecification classes
+	 * matching the current request that can be used to identify it.
+	 * If no matches are returned (or nothing acceptable)
+	 * then create a new one that better matches your requirements.
+	 *
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function findSpecificationsMatchingCurrentRequest()
+	{
+		$matches = array();
+		foreach ($this->specifications as $specification) {
+			/** @var RouteMatchSpecificationInterface $specification */
+			if ($specification->routeMatches()) {
+				$matches[] = get_class($specification );
+			}
+		}
+		return $matches;
+	}
 }

core/services/route_match/RouteMatchSpecificationFactory.php

Indentation +48 added lines, -48 removed lines

@@ -24,59 +24,59 @@
 class RouteMatchSpecificationFactory implements FactoryInterface
 {
 
-    /**
-     * @var RouteMatchSpecificationDependencyResolver $dependency_resolver
-     */
-    private $dependency_resolver;
+	/**
+	 * @var RouteMatchSpecificationDependencyResolver $dependency_resolver
+	 */
+	private $dependency_resolver;
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * RouteMatchSpecificationFactory constructor
-     *
-     * @param RouteMatchSpecificationDependencyResolver $dependency_resolver
-     * @param LoaderInterface                           $loader
-     */
-    public function __construct(RouteMatchSpecificationDependencyResolver $dependency_resolver, LoaderInterface $loader)
-    {
-        $this->dependency_resolver = $dependency_resolver;
-        $this->loader = $loader;
-    }
+	/**
+	 * RouteMatchSpecificationFactory constructor
+	 *
+	 * @param RouteMatchSpecificationDependencyResolver $dependency_resolver
+	 * @param LoaderInterface                           $loader
+	 */
+	public function __construct(RouteMatchSpecificationDependencyResolver $dependency_resolver, LoaderInterface $loader)
+	{
+		$this->dependency_resolver = $dependency_resolver;
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * @param $fqcn
-     * @return RouteMatchSpecification
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function createNewRouteMatchSpecification($fqcn)
-    {
-        $this->dependency_resolver->resolveDependenciesForSpecification($fqcn);
-        return $this->loader->getShared($fqcn);
-    }
+	/**
+	 * @param $fqcn
+	 * @return RouteMatchSpecification
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function createNewRouteMatchSpecification($fqcn)
+	{
+		$this->dependency_resolver->resolveDependenciesForSpecification($fqcn);
+		return $this->loader->getShared($fqcn);
+	}
 
 
-    /**
-     * @param $fqcn
-     * @return RouteMatchSpecification
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @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 InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @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/route_match/RouteMatchSpecificationDependencyResolver.php

Indentation +51 added lines, -51 removed lines

@@ -25,62 +25,62 @@
 class RouteMatchSpecificationDependencyResolver
 {
 
-    /**
-     * @var Mirror $mirror
-     */
-    private $mirror;
+	/**
+	 * @var Mirror $mirror
+	 */
+	private $mirror;
 
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
 
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    private $dependency_map;
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	private $dependency_map;
 
 
-    /**
-     * 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;
-    }
+	/**
+	 * 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;
+	}
 
 
-    /**
-     * @param string $FQCN Fully Qualified Class Name
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function resolveDependenciesForSpecification($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 (strpos($param_class, 'EventEspresso\core\domain\entities\route_match\specifications') !== false) {
-                $this->resolveDependenciesForSpecification($param_class);
-            }
-            $param_class = $param_class === 'EventEspresso\core\services\request\RequestInterface'
-                ? $this->class_cache->getFqnForAlias($param_class)
-                : $param_class;
+	/**
+	 * @param string $FQCN Fully Qualified Class Name
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function resolveDependenciesForSpecification($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 (strpos($param_class, 'EventEspresso\core\domain\entities\route_match\specifications') !== false) {
+				$this->resolveDependenciesForSpecification($param_class);
+			}
+			$param_class = $param_class === 'EventEspresso\core\services\request\RequestInterface'
+				? $this->class_cache->getFqnForAlias($param_class)
+				: $param_class;
 
-            $dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
-        }
-        $this->dependency_map->registerDependencies($FQCN, $dependencies);
-    }
+			$dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
+		}
+		$this->dependency_map->registerDependencies($FQCN, $dependencies);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
                 ? $this->class_cache->getFqnForAlias($param_class)
                 : $param_class;
 
-            $dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
+            $dependencies[$param_class] = EE_Dependency_Map::load_from_cache;
         }
         $this->dependency_map->registerDependencies($FQCN, $dependencies);
     }

core/services/loaders/ClassInterfaceCache.php

Indentation +157 added lines, -157 removed lines

@@ -16,161 +16,161 @@
 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)
-     */
-    public function addAlias($fqn, $alias, $for_class = '')
-    {
-        $fqn   = $this->getFqn($fqn);
-        $alias = $this->getFqn($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)
+	 */
+	public function addAlias($fqn, $alias, $for_class = '')
+	{
+		$fqn   = $this->getFqn($fqn);
+		$alias = $this->getFqn($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;
+	}
 }

core/services/assets/AssetManager.php

Indentation +148 added lines, -148 removed lines

@@ -21,152 +21,152 @@
 abstract class AssetManager implements AssetManagerInterface
 {
 
-    /**
-     * @var AssetCollection $assets
-     */
-    protected $assets;
-
-    /**
-     * @var DomainInterface
-     */
-    protected $domain;
-
-    /**
-     * @var Registry $registry
-     */
-    protected $registry;
-
-
-    /**
-     * AssetRegister constructor.
-     *
-     * @param DomainInterface $domain
-     * @param AssetCollection $assets
-     * @param Registry        $registry
-     */
-    public function __construct(DomainInterface $domain, AssetCollection $assets, Registry $registry)
-    {
-        $this->domain = $domain;
-        $this->assets = $assets;
-        $this->registry = $registry;
-        add_action('wp_enqueue_scripts', array($this, 'addManifestFile'), 0);
-        add_action('admin_enqueue_scripts', array($this, 'addManifestFile'), 0);
-        add_action('wp_enqueue_scripts', array($this, 'addAssets'), 2);
-        add_action('admin_enqueue_scripts', array($this, 'addAssets'), 2);
-    }
-
-
-    /**
-     * @since $VID:$
-     * @return string
-     */
-    public function assetNamespace()
-    {
-        return $this->domain->assetNamespace();
-    }
-
-
-    /**
-     * @return void
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addManifestFile()
-    {
-        // if a manifest file has already been added for this domain, then just return
-        if ($this->assets->has($this->domain->assetNamespace())) {
-            return;
-        }
-        $asset = new ManifestFile($this->domain);
-        $this->assets->add($asset, $this->domain->assetNamespace());
-    }
-
-
-    /**
-     * @return ManifestFile[]
-     * @since 4.9.62.p
-     */
-    public function getManifestFile()
-    {
-        return $this->assets->getManifestFiles();
-    }
-
-
-    /**
-     * @param string $handle
-     * @param string $source
-     * @param array  $dependencies
-     * @param bool   $load_in_footer
-     * @return JavascriptAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addJavascript(
-        $handle,
-        $source,
-        array $dependencies = array(),
-        $load_in_footer = true
-    ) {
-        $asset = new JavascriptAsset(
-            $handle,
-            $source,
-            $dependencies,
-            $load_in_footer,
-            $this->domain
-        );
-        $this->assets->add($asset, $handle);
-        return $asset;
-    }
-
-
-
-    /**
-     * @param string $handle
-     * @param string $source
-     * @param array  $dependencies
-     * @param string $media
-     * @return StylesheetAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addStylesheet(
-        $handle,
-        $source,
-        array $dependencies = array(),
-        $media = 'all'
-    ) {
-        $asset = new StylesheetAsset(
-            $handle,
-            $source,
-            $dependencies,
-            $this->domain,
-            $media
-        );
-        $this->assets->add($asset, $handle);
-        return $asset;
-    }
-
-
-    /**
-     * @param string $handle
-     * @return bool
-     * @since 4.9.62.p
-     */
-    public function enqueueAsset($handle)
-    {
-        if ($this->assets->has($handle)) {
-            $asset = $this->assets->get($handle);
-            if ($asset->isRegistered()) {
-                $asset->enqueueAsset();
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * @var AssetCollection $assets
+	 */
+	protected $assets;
+
+	/**
+	 * @var DomainInterface
+	 */
+	protected $domain;
+
+	/**
+	 * @var Registry $registry
+	 */
+	protected $registry;
+
+
+	/**
+	 * AssetRegister constructor.
+	 *
+	 * @param DomainInterface $domain
+	 * @param AssetCollection $assets
+	 * @param Registry        $registry
+	 */
+	public function __construct(DomainInterface $domain, AssetCollection $assets, Registry $registry)
+	{
+		$this->domain = $domain;
+		$this->assets = $assets;
+		$this->registry = $registry;
+		add_action('wp_enqueue_scripts', array($this, 'addManifestFile'), 0);
+		add_action('admin_enqueue_scripts', array($this, 'addManifestFile'), 0);
+		add_action('wp_enqueue_scripts', array($this, 'addAssets'), 2);
+		add_action('admin_enqueue_scripts', array($this, 'addAssets'), 2);
+	}
+
+
+	/**
+	 * @since $VID:$
+	 * @return string
+	 */
+	public function assetNamespace()
+	{
+		return $this->domain->assetNamespace();
+	}
+
+
+	/**
+	 * @return void
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addManifestFile()
+	{
+		// if a manifest file has already been added for this domain, then just return
+		if ($this->assets->has($this->domain->assetNamespace())) {
+			return;
+		}
+		$asset = new ManifestFile($this->domain);
+		$this->assets->add($asset, $this->domain->assetNamespace());
+	}
+
+
+	/**
+	 * @return ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	public function getManifestFile()
+	{
+		return $this->assets->getManifestFiles();
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @param string $source
+	 * @param array  $dependencies
+	 * @param bool   $load_in_footer
+	 * @return JavascriptAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addJavascript(
+		$handle,
+		$source,
+		array $dependencies = array(),
+		$load_in_footer = true
+	) {
+		$asset = new JavascriptAsset(
+			$handle,
+			$source,
+			$dependencies,
+			$load_in_footer,
+			$this->domain
+		);
+		$this->assets->add($asset, $handle);
+		return $asset;
+	}
+
+
+
+	/**
+	 * @param string $handle
+	 * @param string $source
+	 * @param array  $dependencies
+	 * @param string $media
+	 * @return StylesheetAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addStylesheet(
+		$handle,
+		$source,
+		array $dependencies = array(),
+		$media = 'all'
+	) {
+		$asset = new StylesheetAsset(
+			$handle,
+			$source,
+			$dependencies,
+			$this->domain,
+			$media
+		);
+		$this->assets->add($asset, $handle);
+		return $asset;
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @return bool
+	 * @since 4.9.62.p
+	 */
+	public function enqueueAsset($handle)
+	{
+		if ($this->assets->has($handle)) {
+			$asset = $this->assets->get($handle);
+			if ($asset->isRegistered()) {
+				$asset->enqueueAsset();
+				return true;
+			}
+		}
+		return false;
+	}
 }

core/services/assets/AssetManagerInterface.php

Indentation +62 added lines, -62 removed lines

@@ -19,78 +19,78 @@
  */
 interface AssetManagerInterface
 {
-    /**
-     * @since $VID:$
-     * @return string
-     */
-    public function assetNamespace();
+	/**
+	 * @since $VID:$
+	 * @return string
+	 */
+	public function assetNamespace();
 
-    /**
-     * @since 4.9.62.p
-     */
-    public function addAssets();
+	/**
+	 * @since 4.9.62.p
+	 */
+	public function addAssets();
 
 
-    /**
-     * @return ManifestFile
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addManifestFile();
+	/**
+	 * @return ManifestFile
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addManifestFile();
 
 
-    /**
-     * @return ManifestFile[]
-     * @since 4.9.62.p
-     */
-    public function getManifestFile();
+	/**
+	 * @return ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	public function getManifestFile();
 
 
-    /**
-     * @param string $handle
-     * @param string $source
-     * @param array  $dependencies
-     * @param bool   $load_in_footer
-     * @return JavascriptAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addJavascript(
-        $handle,
-        $source,
-        array $dependencies = array(),
-        $load_in_footer = true
-    );
+	/**
+	 * @param string $handle
+	 * @param string $source
+	 * @param array  $dependencies
+	 * @param bool   $load_in_footer
+	 * @return JavascriptAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addJavascript(
+		$handle,
+		$source,
+		array $dependencies = array(),
+		$load_in_footer = true
+	);
 
 
 
-    /**
-     * @param string $handle
-     * @param string $source
-     * @param array  $dependencies
-     * @param string $media
-     * @return StylesheetAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addStylesheet(
-        $handle,
-        $source,
-        array $dependencies = array(),
-        $media = 'all'
-    );
+	/**
+	 * @param string $handle
+	 * @param string $source
+	 * @param array  $dependencies
+	 * @param string $media
+	 * @return StylesheetAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addStylesheet(
+		$handle,
+		$source,
+		array $dependencies = array(),
+		$media = 'all'
+	);
 
 
-    /**
-     * @param string $handle
-     * @return bool
-     * @since 4.9.62.p
-     */
-    public function enqueueAsset($handle);
+	/**
+	 * @param string $handle
+	 * @return bool
+	 * @since 4.9.62.p
+	 */
+	public function enqueueAsset($handle);
 }