eventespresso / event-espresso-core

core/services/route_match/RouteMatchSpecificationManager.php

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 routeMatchesCurrentRequest($routeMatchSpecificationFqcn)
-    {
-        /** @var RouteMatchSpecificationInterface $specification */
-        $specification = $this->specifications->get($routeMatchSpecificationFqcn);
-        if (! $specification instanceof $routeMatchSpecificationFqcn) {
-            throw new InvalidClassException($routeMatchSpecificationFqcn);
-        }
-        return $specification->isMatchingRoute();
-    }
+	/**
+	 * 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 routeMatchesCurrentRequest($routeMatchSpecificationFqcn)
+	{
+		/** @var RouteMatchSpecificationInterface $specification */
+		$specification = $this->specifications->get($routeMatchSpecificationFqcn);
+		if (! $specification instanceof $routeMatchSpecificationFqcn) {
+			throw new InvalidClassException($routeMatchSpecificationFqcn);
+		}
+		return $specification->isMatchingRoute();
+	}
 
 
-    /**
-     * 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 findRouteMatchSpecificationsMatchingCurrentRequest()
-    {
-        $matches = array();
-        foreach ($this->specifications as $specification) {
-            /** @var RouteMatchSpecificationInterface $specification */
-            if ($specification->isMatchingRoute()) {
-                $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 findRouteMatchSpecificationsMatchingCurrentRequest()
+	{
+		$matches = array();
+		foreach ($this->specifications as $specification) {
+			/** @var RouteMatchSpecificationInterface $specification */
+			if ($specification->isMatchingRoute()) {
+				$matches[] = get_class($specification);
+			}
+		}
+		return $matches;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
     {
         /** @var RouteMatchSpecificationInterface $specification */
         $specification = $this->specifications->get($routeMatchSpecificationFqcn);
-        if (! $specification instanceof $routeMatchSpecificationFqcn) {
+        if ( ! $specification instanceof $routeMatchSpecificationFqcn) {
             throw new InvalidClassException($routeMatchSpecificationFqcn);
         }
         return $specification->isMatchingRoute();

core/services/editor/BlockRegistrationManager.php

Indentation +203 added lines, -203 removed lines

@@ -32,207 +32,207 @@
 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/domain/entities/route_match/specifications/admin/WordPressPostsEditorEdit.php

Indentation +12 added lines, -12 removed lines

@@ -14,16 +14,16 @@
  */
 class WordPressPostsEditorEdit extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since $VID:$
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return strpos($this->request->requestUri(), 'wp-admin/post.php') !== false
-            && $this->request->getRequestParam('post_type', 'post') === 'post'
-            && $this->request->getRequestParam('action') === 'edit';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since $VID:$
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return strpos($this->request->requestUri(), 'wp-admin/post.php') !== false
+			&& $this->request->getRequestParam('post_type', 'post') === 'post'
+			&& $this->request->getRequestParam('action') === 'edit';
+	}
 }

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

Indentation +11 added lines, -11 removed lines

@@ -14,15 +14,15 @@
  */
 class WordPressPostsEditorAddNew extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since $VID:$
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return strpos($this->request->requestUri(), 'wp-admin/post-new.php') !== false
-            && $this->request->getRequestParam('post_type', 'post') === 'post';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since $VID:$
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return strpos($this->request->requestUri(), 'wp-admin/post-new.php') !== false
+			&& $this->request->getRequestParam('post_type', 'post') === 'post';
+	}
 }

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

Indentation +11 added lines, -11 removed lines

@@ -14,15 +14,15 @@
  */
 class WordPressPostsListTable extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since $VID:$
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return strpos($this->request->requestUri(), 'wp-admin/edit.php') !== false
-            && $this->request->getRequestParam('post_type', 'post') === 'post';
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since $VID:$
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return strpos($this->request->requestUri(), 'wp-admin/edit.php') !== false
+			&& $this->request->getRequestParam('post_type', 'post') === 'post';
+	}
 }

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

Indentation +18 added lines, -18 removed lines

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

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

Indentation +18 added lines, -18 removed lines

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

core/services/route_match/RouteMatchSpecificationDependencyResolver.php

Indentation +16 added lines, -16 removed lines

@@ -22,20 +22,20 @@
 class RouteMatchSpecificationDependencyResolver extends DependencyResolver
 {
 
-    /**
-     * Used to configure and/or setup any aliases or namespace roots required by the DependencyResolver
-     *
-     * @since $VID:$
-     * @throws InvalidAliasException
-     */
-    public function initialize()
-    {
-        $this->addAlias(
-            new ClassAlias(
-                'EventEspresso\core\services\request\RequestInterface',
-                'EventEspresso\core\services\request\Request'
-            )
-        );
-        $this->addNamespaceRoot('EventEspresso\core\domain\entities\route_match\specifications');
-    }
+	/**
+	 * Used to configure and/or setup any aliases or namespace roots required by the DependencyResolver
+	 *
+	 * @since $VID:$
+	 * @throws InvalidAliasException
+	 */
+	public function initialize()
+	{
+		$this->addAlias(
+			new ClassAlias(
+				'EventEspresso\core\services\request\RequestInterface',
+				'EventEspresso\core\services\request\Request'
+			)
+		);
+		$this->addNamespaceRoot('EventEspresso\core\domain\entities\route_match\specifications');
+	}
 }

core/services/dependencies/DependencyResolver.php

Indentation +151 added lines, -151 removed lines

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

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