eventespresso / event-espresso-core

core/domain/entities/editor/EditorBlockCollection.php

Indentation +47 added lines, -47 removed lines

@@ -20,55 +20,55 @@
 class EditorBlockCollection extends Collection
 {
 
-    /**
-     * Collection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('EventEspresso\core\domain\entities\editor\EditorBlockInterface');
-    }
+	/**
+	 * Collection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('EventEspresso\core\domain\entities\editor\EditorBlockInterface');
+	}
 
 
-    /**
-     * unRegisterBlock
-     * finds block in the Collection based on the identifier that was set using addObject()
-     * and calls unRegisterBlock() on it. Returns block if successful and false if block was not found.
-     * PLZ NOTE: the pointer is reset to the beginning of the collection afterwards
-     *
-     * @param mixed $identifier
-     * @return boolean
-     */
-    public function unRegisterBlock($identifier)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($identifier === $this->getInfo()) {
-                $object = $this->current();
-                $this->rewind();
-                return $object->unRegisterBlock();
-            }
-            $this->next();
-        }
-        return false;
-    }
+	/**
+	 * unRegisterBlock
+	 * finds block in the Collection based on the identifier that was set using addObject()
+	 * and calls unRegisterBlock() on it. Returns block if successful and false if block was not found.
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection afterwards
+	 *
+	 * @param mixed $identifier
+	 * @return boolean
+	 */
+	public function unRegisterBlock($identifier)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($identifier === $this->getInfo()) {
+				$object = $this->current();
+				$this->rewind();
+				return $object->unRegisterBlock();
+			}
+			$this->next();
+		}
+		return false;
+	}
 
 
-    /**
-     * unRegisterAllBlocks
-     * calls unRegisterBlock() on all blocks in Collection.
-     * PLZ NOTE: the pointer is reset to the beginning of the collection afterwards
-     *
-     * @return void
-     */
-    public function unRegisterAllBlocks()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $this->current()->unRegisterBlock();
-            $this->next();
-        }
-        $this->rewind();
-    }
+	/**
+	 * unRegisterAllBlocks
+	 * calls unRegisterBlock() on all blocks in Collection.
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection afterwards
+	 *
+	 * @return void
+	 */
+	public function unRegisterAllBlocks()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$this->current()->unRegisterBlock();
+			$this->next();
+		}
+		$this->rewind();
+	}
 }

core/domain/entities/editor/EditorBlockInterface.php

Indentation +68 added lines, -68 removed lines

@@ -25,72 +25,72 @@
 interface EditorBlockInterface
 {
 
-    /**
-     * Perform any early setup required by the block
-     * including setting the block type and supported post types
-     *
-     * @return void
-     */
-    public function initialize();
-
-
-    /**
-     * @return string
-     */
-    public function editorBlockType();
-
-
-    /**
-     * Registers the Editor Block with WP core;
-     * Returns the registered block type on success, or false on failure.
-     *
-     * @return WP_Block_Type|false
-     */
-    public function registerBlock();
-
-
-    /**
-     * Un-registers the Editor Block with WP core;
-     * Returns the registered block type on success, or false on failure.
-     *
-     * @return WP_Block_Type|false
-     */
-    public function unRegisterBlock();
-
-
-    /**
-     * returns true if the block type applies for the supplied post type
-     * and should be added to that post type's editor
-     *
-     * @param string $post_type
-     * @return boolean
-     */
-    public function appliesToPostType($post_type);
-
-
-    /**
-     * @return array
-     */
-    public function getEditorContainer();
-
-
-    /**
-     * @return  void
-     */
-    public function registerScripts();
-
-
-    /**
-     * @return void
-     */
-    public function registerStyles();
-
-
-    /**
-     * returns the rendered HTML for the block
-     *
-     * @param array $attributes
-     * @return string
-     */
-    public function renderBlock(array $attributes = array());
+	/**
+	 * Perform any early setup required by the block
+	 * including setting the block type and supported post types
+	 *
+	 * @return void
+	 */
+	public function initialize();
+
+
+	/**
+	 * @return string
+	 */
+	public function editorBlockType();
+
+
+	/**
+	 * Registers the Editor Block with WP core;
+	 * Returns the registered block type on success, or false on failure.
+	 *
+	 * @return WP_Block_Type|false
+	 */
+	public function registerBlock();
+
+
+	/**
+	 * Un-registers the Editor Block with WP core;
+	 * Returns the registered block type on success, or false on failure.
+	 *
+	 * @return WP_Block_Type|false
+	 */
+	public function unRegisterBlock();
+
+
+	/**
+	 * returns true if the block type applies for the supplied post type
+	 * and should be added to that post type's editor
+	 *
+	 * @param string $post_type
+	 * @return boolean
+	 */
+	public function appliesToPostType($post_type);
+
+
+	/**
+	 * @return array
+	 */
+	public function getEditorContainer();
+
+
+	/**
+	 * @return  void
+	 */
+	public function registerScripts();
+
+
+	/**
+	 * @return void
+	 */
+	public function registerStyles();
+
+
+	/**
+	 * returns the rendered HTML for the block
+	 *
+	 * @param array $attributes
+	 * @return string
+	 */
+	public function renderBlock(array $attributes = array());
 }

core/domain/services/admin/PluginUpsells.php

Spacing +3 added lines, -3 removed lines

@@ -83,12 +83,12 @@
                     <div class="notice inline notice-alt">
                         <div class="ee-upsell-container">
                             <div class="ee-upsell-inner-container">
-                                <a href="' . $button_url . '">
-                                    ' . $button_text . '
+                                <a href="' . $button_url.'">
+                                    ' . $button_text.'
                                 </a>
                             </div>
                             <div class="ee-upsell-inner-container">
-                                <p>' . $upsell_text . '</p>
+                                <p>' . $upsell_text.'</p>
                             </div>
                             <div style="clear:both"></div>
                         </div>

Indentation +57 added lines, -57 removed lines

@@ -17,47 +17,47 @@ 
 class PluginUpsells
 {
 
-    /**
-     * @var DomainInterface
-     */
-    private $domain;
+	/**
+	 * @var DomainInterface
+	 */
+	private $domain;
 
 
-    /**
-     * PluginUpsells constructor.
-     *
-     * @param DomainInterface $domain
-     */
-    public function __construct(DomainInterface $domain)
-    {
-        $this->domain = $domain;
-    }
+	/**
+	 * PluginUpsells constructor.
+	 *
+	 * @param DomainInterface $domain
+	 */
+	public function __construct(DomainInterface $domain)
+	{
+		$this->domain = $domain;
+	}
 
 
-    /**
-     * Hook in various upsells for the decaf version of EE.
-     */
-    public function decafUpsells()
-    {
-        if ($this->domain instanceof CaffeinatedInterface && ! $this->domain->isCaffeinated()) {
-            add_action('after_plugin_row', array($this, 'doPremiumUpsell'), 10, 3);
-        }
-    }
+	/**
+	 * Hook in various upsells for the decaf version of EE.
+	 */
+	public function decafUpsells()
+	{
+		if ($this->domain instanceof CaffeinatedInterface && ! $this->domain->isCaffeinated()) {
+			add_action('after_plugin_row', array($this, 'doPremiumUpsell'), 10, 3);
+		}
+	}
 
 
-    /**
-     * Callback for `after_plugin_row` to add upsell info
-     *
-     * @param string $plugin_file
-     * @param array  $plugin_data
-     * @param string $status
-     * @throws DomainException
-     */
-    public function doPremiumUpsell($plugin_file, $plugin_data, $status)
-    {
-        if ($plugin_file === $this->domain->pluginBasename()) {
-            list($button_text, $button_url, $upsell_text) = $this->getAfterPluginRowDetails();
-            echo '<tr class="plugin-update-tr ee-upsell-plugin-list-table active">
+	/**
+	 * Callback for `after_plugin_row` to add upsell info
+	 *
+	 * @param string $plugin_file
+	 * @param array  $plugin_data
+	 * @param string $status
+	 * @throws DomainException
+	 */
+	public function doPremiumUpsell($plugin_file, $plugin_data, $status)
+	{
+		if ($plugin_file === $this->domain->pluginBasename()) {
+			list($button_text, $button_url, $upsell_text) = $this->getAfterPluginRowDetails();
+			echo '<tr class="plugin-update-tr ee-upsell-plugin-list-table active">
                 <td colspan="3" class="plugin-update colspanchange">
                     <div class="notice inline notice-alt">
                         <div class="ee-upsell-container">
@@ -74,27 +74,27 @@ 
                     </div>
                 </td>
               </tr>';
-        }
-    }
+		}
+	}
 
-    /**
-     * Provide the details used for the upsell container.
-     *
-     * @return array
-     */
-    protected function getAfterPluginRowDetails()
-    {
-        return array(
-            esc_html__('Upgrade for Support', 'event_espresso'),
-            'https://eventespresso.com/purchase/?slug=ee4-license-personal&utm_source=wp_admin_plugins_screen&utm_medium=link&utm_campaign=plugins_screen_upgrade_link" class="button button-primary',
-            sprintf(
-                esc_html__(
-                    'You\'re missing out on %1$sexpert support%2$s and %1$sone-click updates%2$s! Don\'t have an Event Espresso support license key? Support the project and buy one today!',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            ),
-        );
-    }
+	/**
+	 * Provide the details used for the upsell container.
+	 *
+	 * @return array
+	 */
+	protected function getAfterPluginRowDetails()
+	{
+		return array(
+			esc_html__('Upgrade for Support', 'event_espresso'),
+			'https://eventespresso.com/purchase/?slug=ee4-license-personal&utm_source=wp_admin_plugins_screen&utm_medium=link&utm_campaign=plugins_screen_upgrade_link" class="button button-primary',
+			sprintf(
+				esc_html__(
+					'You\'re missing out on %1$sexpert support%2$s and %1$sone-click updates%2$s! Don\'t have an Event Espresso support license key? Support the project and buy one today!',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			),
+		);
+	}
 }

core/domain/Domain.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@
      */
     private function setCaffeinated()
     {
-        $this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
-            && is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
+        $this->caffeinated = ( ! defined('EE_DECAF') || EE_DECAF !== true)
+            && is_readable($this->pluginPath().'caffeinated/brewing_regular.php');
     }
 }

Indentation +41 added lines, -41 removed lines

@@ -19,54 +19,54 @@
 class Domain extends DomainBase implements CaffeinatedInterface
 {
 
-    /**
-     * URL path component used to denote an API request
-     */
-    const API_NAMESPACE = 'ee/v';
+	/**
+	 * URL path component used to denote an API request
+	 */
+	const API_NAMESPACE = 'ee/v';
 
-    /**
-     * Slug used for the context where a registration status is changed from a manual trigger in the Registration Admin
-     * Page ui.
-     */
-    const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN
-        = 'manual_registration_status_change_from_registration_admin';
+	/**
+	 * Slug used for the context where a registration status is changed from a manual trigger in the Registration Admin
+	 * Page ui.
+	 */
+	const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN
+		= 'manual_registration_status_change_from_registration_admin';
 
-    const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN_NOTIFY
-        = 'manual_registration_status_change_from_registration_admin_and_notify';
+	const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN_NOTIFY
+		= 'manual_registration_status_change_from_registration_admin_and_notify';
 
 
-    /**
-     * Whether or not EE core is the full premium version.
-     * @since 4.9.59.p
-     * @var bool
-     */
-    private $caffeinated;
+	/**
+	 * Whether or not EE core is the full premium version.
+	 * @since 4.9.59.p
+	 * @var bool
+	 */
+	private $caffeinated;
 
 
-    public function __construct(FilePath $plugin_file, Version $version)
-    {
-        parent::__construct($plugin_file, $version);
-        $this->setCaffeinated();
-    }
+	public function __construct(FilePath $plugin_file, Version $version)
+	{
+		parent::__construct($plugin_file, $version);
+		$this->setCaffeinated();
+	}
 
-    /**
-     * Whether or not EE core is the full premium version.
-     * @since 4.9.59.p
-     * @return bool
-     */
-    public function isCaffeinated()
-    {
-        return $this->caffeinated;
-    }
+	/**
+	 * Whether or not EE core is the full premium version.
+	 * @since 4.9.59.p
+	 * @return bool
+	 */
+	public function isCaffeinated()
+	{
+		return $this->caffeinated;
+	}
 
 
-    /**
-     * Setter for $is_caffeinated property.
-     * @since 4.9.59.p
-     */
-    private function setCaffeinated()
-    {
-        $this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
-            && is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
-    }
+	/**
+	 * Setter for $is_caffeinated property.
+	 * @since 4.9.59.p
+	 */
+	private function setCaffeinated()
+	{
+		$this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
+			&& is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
+	}
 }

core/services/loaders/Loader.php

Doc Comments +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 
 
     /**
-     * @param FullyQualifiedName|string $fqcn
+     * @param string $fqcn
      * @param array                     $arguments
      * @return mixed
      */

Indentation +111 added lines, -111 removed lines

@@ -15,115 +15,115 @@
 class Loader implements LoaderInterface
 {
 
-    /**
-     * @var LoaderDecoratorInterface $new_loader
-     */
-    private $new_loader;
-
-    /**
-     * @var LoaderDecoratorInterface $shared_loader
-     */
-    private $shared_loader;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * Loader constructor.
-     *
-     * @param LoaderDecoratorInterface        $new_loader
-     * @param CachingLoaderDecoratorInterface $shared_loader
-     * @param ClassInterfaceCache             $class_cache
-     */
-    public function __construct(
-        LoaderDecoratorInterface $new_loader,
-        CachingLoaderDecoratorInterface $shared_loader,
-        ClassInterfaceCache $class_cache
-    ) {
-        $this->new_loader    = $new_loader;
-        $this->shared_loader = $shared_loader;
-        $this->class_cache   = $class_cache;
-    }
-
-
-    /**
-     * @return LoaderDecoratorInterface
-     */
-    public function getNewLoader()
-    {
-        return $this->new_loader;
-    }
-
-
-    /**
-     * @return CachingLoaderDecoratorInterface
-     */
-    public function getSharedLoader()
-    {
-        return $this->shared_loader;
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @param bool                      $shared
-     * @return mixed
-     */
-    public function load($fqcn, array $arguments = array(), $shared = true)
-    {
-        $fqcn = $this->class_cache->getFqn($fqcn);
-        if ($this->class_cache->hasInterface($fqcn, 'EventEspresso\core\interfaces\ReservedInstanceInterface')) {
-            $shared = true;
-        }
-        return $shared
-            ? $this->getSharedLoader()->load($fqcn, $arguments, $shared)
-            : $this->getNewLoader()->load($fqcn, $arguments, $shared);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getNew($fqcn, array $arguments = array())
-    {
-        return $this->load($fqcn, $arguments, false);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getShared($fqcn, array $arguments = array())
-    {
-        return $this->load($fqcn, $arguments);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param mixed                     $object
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function share($fqcn, $object)
-    {
-        $fqcn = $this->class_cache->getFqn($fqcn);
-        return $this->getSharedLoader()->share($fqcn, $object);
-    }
-
-
-    /**
-     * calls reset() on loaders if that method exists
-     */
-    public function reset()
-    {
-        $this->shared_loader->reset();
-    }
+	/**
+	 * @var LoaderDecoratorInterface $new_loader
+	 */
+	private $new_loader;
+
+	/**
+	 * @var LoaderDecoratorInterface $shared_loader
+	 */
+	private $shared_loader;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * Loader constructor.
+	 *
+	 * @param LoaderDecoratorInterface        $new_loader
+	 * @param CachingLoaderDecoratorInterface $shared_loader
+	 * @param ClassInterfaceCache             $class_cache
+	 */
+	public function __construct(
+		LoaderDecoratorInterface $new_loader,
+		CachingLoaderDecoratorInterface $shared_loader,
+		ClassInterfaceCache $class_cache
+	) {
+		$this->new_loader    = $new_loader;
+		$this->shared_loader = $shared_loader;
+		$this->class_cache   = $class_cache;
+	}
+
+
+	/**
+	 * @return LoaderDecoratorInterface
+	 */
+	public function getNewLoader()
+	{
+		return $this->new_loader;
+	}
+
+
+	/**
+	 * @return CachingLoaderDecoratorInterface
+	 */
+	public function getSharedLoader()
+	{
+		return $this->shared_loader;
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @param bool                      $shared
+	 * @return mixed
+	 */
+	public function load($fqcn, array $arguments = array(), $shared = true)
+	{
+		$fqcn = $this->class_cache->getFqn($fqcn);
+		if ($this->class_cache->hasInterface($fqcn, 'EventEspresso\core\interfaces\ReservedInstanceInterface')) {
+			$shared = true;
+		}
+		return $shared
+			? $this->getSharedLoader()->load($fqcn, $arguments, $shared)
+			: $this->getNewLoader()->load($fqcn, $arguments, $shared);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getNew($fqcn, array $arguments = array())
+	{
+		return $this->load($fqcn, $arguments, false);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getShared($fqcn, array $arguments = array())
+	{
+		return $this->load($fqcn, $arguments);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param mixed                     $object
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function share($fqcn, $object)
+	{
+		$fqcn = $this->class_cache->getFqn($fqcn);
+		return $this->getSharedLoader()->share($fqcn, $object);
+	}
+
+
+	/**
+	 * calls reset() on loaders if that method exists
+	 */
+	public function reset()
+	{
+		$this->shared_loader->reset();
+	}
 }

core/services/bootstrap/BootstrapDependencyInjectionContainer.php

Spacing +2 added lines, -2 removed lines

@@ -78,13 +78,13 @@
         // EE_Dependency_Map: info about how to load classes required by other classes
         espresso_load_required(
             'EE_Dependency_Map',
-            EE_CORE . 'EE_Dependency_Map.core.php'
+            EE_CORE.'EE_Dependency_Map.core.php'
         );
         $this->dependency_map = EE_Dependency_Map::instance($this->class_cache);
         // EE_Registry: central repository for classes (legacy)
         espresso_load_required(
             'EE_Registry',
-            EE_CORE . 'EE_Registry.core.php'
+            EE_CORE.'EE_Registry.core.php'
         );
         $this->registry = EE_Registry::instance(
             $this->dependency_map,

Indentation +119 added lines, -119 removed lines

@@ -25,123 +25,123 @@
 class BootstrapDependencyInjectionContainer
 {
 
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
-
-    /**
-     * @type LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @var EE_Registry $registry
-     */
-    protected $registry;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * @var Mirror
-     */
-    private $mirror;
-
-    /**
-     * @var ObjectIdentifier
-     */
-    private $object_identifier;
-
-
-    /**
-     * Can't use this just yet until we exorcise some more of our singleton usage from core
-     */
-    public function buildDependencyInjectionContainer()
-    {
-        // build DI container
-        // $OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
-        // $OpenCoffeeShop->addRecipes();
-        // $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
-    }
-
-
-    /**
-     * Setups  EE_Registry and EE_Dependency_Map
-     *
-     * @throws EE_Error
-     */
-    public function buildLegacyDependencyInjectionContainer()
-    {
-        $this->class_cache = new ClassInterfaceCache();
-        $this->object_identifier = new ObjectIdentifier($this->class_cache);
-        $this->mirror = new Mirror();
-        // EE_Dependency_Map: info about how to load classes required by other classes
-        espresso_load_required(
-            'EE_Dependency_Map',
-            EE_CORE . 'EE_Dependency_Map.core.php'
-        );
-        $this->dependency_map = EE_Dependency_Map::instance($this->class_cache);
-        // EE_Registry: central repository for classes (legacy)
-        espresso_load_required(
-            'EE_Registry',
-            EE_CORE . 'EE_Registry.core.php'
-        );
-        $this->registry = EE_Registry::instance(
-            $this->dependency_map,
-            $this->mirror,
-            $this->class_cache,
-            $this->object_identifier
-        );
-    }
-
-
-    /**
-     * Performs initial setup for the generic Loader
-     *
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function buildLoader()
-    {
-        $this->loader = LoaderFactory::getLoader(
-            $this->registry,
-            $this->class_cache,
-            $this->object_identifier
-        );
-        $this->loader->share('EventEspresso\core\services\loaders\ClassInterfaceCache', $this->class_cache);
-        $this->loader->share('EventEspresso\core\services\loaders\ObjectIdentifier', $this->object_identifier);
-        $this->loader->share('EventEspresso\core\services\container\Mirror', $this->mirror);
-        $this->dependency_map->setLoader($this->loader);
-    }
-
-
-    /**
-     * @return EE_Dependency_Map
-     */
-    public function getDependencyMap()
-    {
-        return $this->dependency_map;
-    }
-
-
-    /**
-     * @return EE_Registry
-     */
-    public function getRegistry()
-    {
-        return $this->registry;
-    }
-
-
-    /**
-     * @return LoaderInterface
-     */
-    public function getLoader()
-    {
-        return $this->loader;
-    }
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
+
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @var EE_Registry $registry
+	 */
+	protected $registry;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * @var Mirror
+	 */
+	private $mirror;
+
+	/**
+	 * @var ObjectIdentifier
+	 */
+	private $object_identifier;
+
+
+	/**
+	 * Can't use this just yet until we exorcise some more of our singleton usage from core
+	 */
+	public function buildDependencyInjectionContainer()
+	{
+		// build DI container
+		// $OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
+		// $OpenCoffeeShop->addRecipes();
+		// $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
+	}
+
+
+	/**
+	 * Setups  EE_Registry and EE_Dependency_Map
+	 *
+	 * @throws EE_Error
+	 */
+	public function buildLegacyDependencyInjectionContainer()
+	{
+		$this->class_cache = new ClassInterfaceCache();
+		$this->object_identifier = new ObjectIdentifier($this->class_cache);
+		$this->mirror = new Mirror();
+		// EE_Dependency_Map: info about how to load classes required by other classes
+		espresso_load_required(
+			'EE_Dependency_Map',
+			EE_CORE . 'EE_Dependency_Map.core.php'
+		);
+		$this->dependency_map = EE_Dependency_Map::instance($this->class_cache);
+		// EE_Registry: central repository for classes (legacy)
+		espresso_load_required(
+			'EE_Registry',
+			EE_CORE . 'EE_Registry.core.php'
+		);
+		$this->registry = EE_Registry::instance(
+			$this->dependency_map,
+			$this->mirror,
+			$this->class_cache,
+			$this->object_identifier
+		);
+	}
+
+
+	/**
+	 * Performs initial setup for the generic Loader
+	 *
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function buildLoader()
+	{
+		$this->loader = LoaderFactory::getLoader(
+			$this->registry,
+			$this->class_cache,
+			$this->object_identifier
+		);
+		$this->loader->share('EventEspresso\core\services\loaders\ClassInterfaceCache', $this->class_cache);
+		$this->loader->share('EventEspresso\core\services\loaders\ObjectIdentifier', $this->object_identifier);
+		$this->loader->share('EventEspresso\core\services\container\Mirror', $this->mirror);
+		$this->dependency_map->setLoader($this->loader);
+	}
+
+
+	/**
+	 * @return EE_Dependency_Map
+	 */
+	public function getDependencyMap()
+	{
+		return $this->dependency_map;
+	}
+
+
+	/**
+	 * @return EE_Registry
+	 */
+	public function getRegistry()
+	{
+		return $this->registry;
+	}
+
+
+	/**
+	 * @return LoaderInterface
+	 */
+	public function getLoader()
+	{
+		return $this->loader;
+	}
 }

core/services/container/Mirror.php

Indentation +222 added lines, -222 removed lines

@@ -25,226 +25,226 @@
 class Mirror
 {
 
-    /**
-     * @var ReflectionClass[] $classes
-     */
-    private $classes = array();
-
-    /**
-     * @var ReflectionMethod[] $constructors
-     */
-    private $constructors = array();
-
-    /**
-     * @var ReflectionParameter[][] $parameters
-     */
-    private $parameters = array();
-
-    /**
-     * @var ReflectionParameter[][] $parameters
-     */
-    private $parameter_classes = array();
-
-    /**
-     * @var ReflectionProperty[][] $properties
-     */
-    private $properties = array();
-
-    /**
-     * @var ReflectionMethod[][] $methods
-     */
-    private $methods = array();
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionClass
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     */
-    public function getReflectionClass($class_name)
-    {
-        if (! is_string($class_name)) {
-            throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
-        }
-        if (! isset($this->classes[ $class_name ])) {
-            $this->classes[ $class_name ] = new ReflectionClass($class_name);
-        }
-        return $this->classes[ $class_name ];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionMethod
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getConstructor($class_name)
-    {
-        if (! is_string($class_name)) {
-            throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
-        }
-        if (! isset($this->constructors[ $class_name ])) {
-            $reflection_class                  = $this->getReflectionClass($class_name);
-            $this->constructors[ $class_name ] = $reflection_class->getConstructor();
-        }
-        return $this->constructors[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionMethod
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getConstructorFromReflection(ReflectionClass $reflection_class)
-    {
-        return $this->getConstructor($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParameters($class_name)
-    {
-        if (! isset($this->parameters[ $class_name ])) {
-            $constructor                     = $this->getConstructor($class_name);
-            $this->parameters[ $class_name ] = $constructor->getParameters();
-        }
-        return $this->parameters[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParametersFromReflection(ReflectionClass $reflection_class)
-    {
-        return $this->getParameters($reflection_class->getName());
-    }
-
-
-    /**
-     * @param ReflectionMethod $constructor
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParametersFromReflectionConstructor(ReflectionMethod $constructor)
-    {
-        return $this->getParameters($constructor->getDeclaringClass());
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @param string              $class_name
-     * @param string              $index
-     * @return string|null
-     */
-    public function getParameterClassName(ReflectionParameter $param, $class_name, $index)
-    {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
-        }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = array();
-        }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = array();
-        }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
-            ? $param->getClass()->name
-            : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @param string              $class_name
-     * @param string              $index
-     * @return string|null
-     */
-    public function getParameterDefaultValue(ReflectionParameter $param, $class_name, $index)
-    {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
-        }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = array();
-        }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = array();
-        }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
-            ? $param->getDefaultValue()
-            : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionProperty[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getProperties($class_name)
-    {
-        if (! isset($this->properties[ $class_name ])) {
-            $reflection_class                = $this->getReflectionClass($class_name);
-            $this->properties[ $class_name ] = $reflection_class->getProperties();
-        }
-        return $this->properties[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionProperty[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getPropertiesFromReflection(ReflectionClass $reflection_class)
-    {
-        return $this->getProperties($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionMethod[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getMethods($class_name)
-    {
-        if (! isset($this->methods[ $class_name ])) {
-            $reflection_class             = $this->getReflectionClass($class_name);
-            $this->methods[ $class_name ] = $reflection_class->getMethods();
-        }
-        return $this->methods[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class )
-     * @return ReflectionMethod[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getMethodsFromReflection(ReflectionClass $reflection_class)
-    {
-        return $this->getMethods($reflection_class->getName());
-    }
+	/**
+	 * @var ReflectionClass[] $classes
+	 */
+	private $classes = array();
+
+	/**
+	 * @var ReflectionMethod[] $constructors
+	 */
+	private $constructors = array();
+
+	/**
+	 * @var ReflectionParameter[][] $parameters
+	 */
+	private $parameters = array();
+
+	/**
+	 * @var ReflectionParameter[][] $parameters
+	 */
+	private $parameter_classes = array();
+
+	/**
+	 * @var ReflectionProperty[][] $properties
+	 */
+	private $properties = array();
+
+	/**
+	 * @var ReflectionMethod[][] $methods
+	 */
+	private $methods = array();
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionClass
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 */
+	public function getReflectionClass($class_name)
+	{
+		if (! is_string($class_name)) {
+			throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
+		}
+		if (! isset($this->classes[ $class_name ])) {
+			$this->classes[ $class_name ] = new ReflectionClass($class_name);
+		}
+		return $this->classes[ $class_name ];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionMethod
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getConstructor($class_name)
+	{
+		if (! is_string($class_name)) {
+			throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
+		}
+		if (! isset($this->constructors[ $class_name ])) {
+			$reflection_class                  = $this->getReflectionClass($class_name);
+			$this->constructors[ $class_name ] = $reflection_class->getConstructor();
+		}
+		return $this->constructors[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionMethod
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getConstructorFromReflection(ReflectionClass $reflection_class)
+	{
+		return $this->getConstructor($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParameters($class_name)
+	{
+		if (! isset($this->parameters[ $class_name ])) {
+			$constructor                     = $this->getConstructor($class_name);
+			$this->parameters[ $class_name ] = $constructor->getParameters();
+		}
+		return $this->parameters[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParametersFromReflection(ReflectionClass $reflection_class)
+	{
+		return $this->getParameters($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param ReflectionMethod $constructor
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParametersFromReflectionConstructor(ReflectionMethod $constructor)
+	{
+		return $this->getParameters($constructor->getDeclaringClass());
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @param string              $class_name
+	 * @param string              $index
+	 * @return string|null
+	 */
+	public function getParameterClassName(ReflectionParameter $param, $class_name, $index)
+	{
+		if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
+			return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+		}
+		if (! isset($this->parameter_classes[ $class_name ])) {
+			$this->parameter_classes[ $class_name ] = array();
+		}
+		if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
+			$this->parameter_classes[ $class_name ][ $index ] = array();
+		}
+		$this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
+			? $param->getClass()->name
+			: null;
+		return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @param string              $class_name
+	 * @param string              $index
+	 * @return string|null
+	 */
+	public function getParameterDefaultValue(ReflectionParameter $param, $class_name, $index)
+	{
+		if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
+			return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+		}
+		if (! isset($this->parameter_classes[ $class_name ])) {
+			$this->parameter_classes[ $class_name ] = array();
+		}
+		if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
+			$this->parameter_classes[ $class_name ][ $index ] = array();
+		}
+		$this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
+			? $param->getDefaultValue()
+			: null;
+		return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionProperty[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getProperties($class_name)
+	{
+		if (! isset($this->properties[ $class_name ])) {
+			$reflection_class                = $this->getReflectionClass($class_name);
+			$this->properties[ $class_name ] = $reflection_class->getProperties();
+		}
+		return $this->properties[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionProperty[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getPropertiesFromReflection(ReflectionClass $reflection_class)
+	{
+		return $this->getProperties($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionMethod[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getMethods($class_name)
+	{
+		if (! isset($this->methods[ $class_name ])) {
+			$reflection_class             = $this->getReflectionClass($class_name);
+			$this->methods[ $class_name ] = $reflection_class->getMethods();
+		}
+		return $this->methods[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class )
+	 * @return ReflectionMethod[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getMethodsFromReflection(ReflectionClass $reflection_class)
+	{
+		return $this->getMethods($reflection_class->getName());
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -64,13 +64,13 @@ 
      */
     public function getReflectionClass($class_name)
     {
-        if (! is_string($class_name)) {
+        if ( ! is_string($class_name)) {
             throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
         }
-        if (! isset($this->classes[ $class_name ])) {
-            $this->classes[ $class_name ] = new ReflectionClass($class_name);
+        if ( ! isset($this->classes[$class_name])) {
+            $this->classes[$class_name] = new ReflectionClass($class_name);
         }
-        return $this->classes[ $class_name ];
+        return $this->classes[$class_name];
     }
 
 
@@ -82,14 +82,14 @@ 
      */
     public function getConstructor($class_name)
     {
-        if (! is_string($class_name)) {
+        if ( ! is_string($class_name)) {
             throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
         }
-        if (! isset($this->constructors[ $class_name ])) {
+        if ( ! isset($this->constructors[$class_name])) {
             $reflection_class                  = $this->getReflectionClass($class_name);
-            $this->constructors[ $class_name ] = $reflection_class->getConstructor();
+            $this->constructors[$class_name] = $reflection_class->getConstructor();
         }
-        return $this->constructors[ $class_name ];
+        return $this->constructors[$class_name];
     }
 
 
@@ -113,11 +113,11 @@ 
      */
     public function getParameters($class_name)
     {
-        if (! isset($this->parameters[ $class_name ])) {
+        if ( ! isset($this->parameters[$class_name])) {
             $constructor                     = $this->getConstructor($class_name);
-            $this->parameters[ $class_name ] = $constructor->getParameters();
+            $this->parameters[$class_name] = $constructor->getParameters();
         }
-        return $this->parameters[ $class_name ];
+        return $this->parameters[$class_name];
     }
 
 
@@ -153,19 +153,19 @@ 
      */
     public function getParameterClassName(ReflectionParameter $param, $class_name, $index)
     {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+        if (isset($this->parameter_classes[$class_name][$index]['param_class_name'])) {
+            return $this->parameter_classes[$class_name][$index]['param_class_name'];
         }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = array();
+        if ( ! isset($this->parameter_classes[$class_name])) {
+            $this->parameter_classes[$class_name] = array();
         }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = array();
+        if ( ! isset($this->parameter_classes[$class_name][$index])) {
+            $this->parameter_classes[$class_name][$index] = array();
         }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
+        $this->parameter_classes[$class_name][$index]['param_class_name'] = $param->getClass()
             ? $param->getClass()->name
             : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+        return $this->parameter_classes[$class_name][$index]['param_class_name'];
     }
 
 
@@ -177,19 +177,19 @@ 
      */
     public function getParameterDefaultValue(ReflectionParameter $param, $class_name, $index)
     {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+        if (isset($this->parameter_classes[$class_name][$index]['param_class_default'])) {
+            return $this->parameter_classes[$class_name][$index]['param_class_default'];
         }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = array();
+        if ( ! isset($this->parameter_classes[$class_name])) {
+            $this->parameter_classes[$class_name] = array();
         }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = array();
+        if ( ! isset($this->parameter_classes[$class_name][$index])) {
+            $this->parameter_classes[$class_name][$index] = array();
         }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
+        $this->parameter_classes[$class_name][$index]['param_class_default'] = $param->isDefaultValueAvailable()
             ? $param->getDefaultValue()
             : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+        return $this->parameter_classes[$class_name][$index]['param_class_default'];
     }
 
 
@@ -201,11 +201,11 @@ 
      */
     public function getProperties($class_name)
     {
-        if (! isset($this->properties[ $class_name ])) {
+        if ( ! isset($this->properties[$class_name])) {
             $reflection_class                = $this->getReflectionClass($class_name);
-            $this->properties[ $class_name ] = $reflection_class->getProperties();
+            $this->properties[$class_name] = $reflection_class->getProperties();
         }
-        return $this->properties[ $class_name ];
+        return $this->properties[$class_name];
     }
 
 
@@ -229,11 +229,11 @@ 
      */
     public function getMethods($class_name)
     {
-        if (! isset($this->methods[ $class_name ])) {
+        if ( ! isset($this->methods[$class_name])) {
             $reflection_class             = $this->getReflectionClass($class_name);
-            $this->methods[ $class_name ] = $reflection_class->getMethods();
+            $this->methods[$class_name] = $reflection_class->getMethods();
         }
-        return $this->methods[ $class_name ];
+        return $this->methods[$class_name];
     }
 
 

core/domain/DomainInterface.php

Indentation +40 added lines, -40 removed lines

@@ -16,61 +16,61 @@
 interface DomainInterface extends InterminableInterface
 {
 
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function pluginFile();
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function pluginFile();
 
 
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function pluginBasename();
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function pluginBasename();
 
 
-    /**
-     * @return string
-     */
-    public function pluginPath();
+	/**
+	 * @return string
+	 */
+	public function pluginPath();
 
 
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function pluginUrl();
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function pluginUrl();
 
 
-    /**
-     * @return string
-     * @throws DomainException
-     */
-    public function version();
+	/**
+	 * @return string
+	 * @throws DomainException
+	 */
+	public function version();
 
 
-    /**
-     * @return string
-     */
-    public function sourceAssetsPath();
+	/**
+	 * @return string
+	 */
+	public function sourceAssetsPath();
 
 
-    /**
-     * @return string
-     */
-    public function sourceAssetsUrl();
+	/**
+	 * @return string
+	 */
+	public function sourceAssetsUrl();
 
 
-    /**
-     * @return string
-     */
-    public function distributionAssetsPath();
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsPath();
 
 
-    /**
-     * @return string
-     */
-    public function distributionAssetsUrl();
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsUrl();
 
 }

core/services/editor/EditorBlockRegistrationManager.php

Spacing +4 added lines, -4 removed lines

@@ -143,7 +143,7 @@ 
             foreach ($this->blocks as $block) {
                 // 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');
                 }
                 add_action('enqueue_block_assets', array($block, 'registerStyles'));
@@ -178,9 +178,9 @@ 
             $this->assets_registry->getAssetUrl(Registry::ASSET_NAMESPACE, 'core-blocks', Registry::ASSET_TYPE_JS),
             array(
                 'eejs-core',
-                'wp-blocks',    // Provides useful functions and components for extending the editor
-                'wp-i18n',      // Provides localization functions
-                'wp-element',   // Provides React.Component
+                'wp-blocks', // Provides useful functions and components for extending the editor
+                'wp-i18n', // Provides localization functions
+                'wp-element', // Provides React.Component
                 'wp-components' // Provides many prebuilt components and controls
             ),
             null,

Indentation +149 added lines, -149 removed lines

@@ -34,153 +34,153 @@
 class EditorBlockRegistrationManager extends EditorBlockManager
 {
 
-    /**
-     *  Returns the name of a hookpoint to be used to call initialize()
-     *
-     * @return string
-     */
-    public function initHook()
-    {
-        return 'AHEE__EE_System__set_hooks_for_core';
-    }
-
-
-    /**
-     * Perform any early setup required for block editors to functions
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function initialize()
-    {
-        $this->loadEditorBlocks();
-        add_action('AHEE__EE_System__initialize', array($this, 'registerEditorBlocks'));
-    }
-
-
-    /**
-     * @return CollectionInterface|EditorBlockInterface[]
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidFilePathException
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     */
-    protected function populateEditorBlockCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-                // collection name
-                'shortcodes',
-                // collection interface
-                'EventEspresso\core\domain\entities\editor\EditorBlockInterface',
-                // FQCNs for classes to add (all classes within each namespace will be loaded)
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_editor_EditorBlockManager__populateEditorBlockCollection__collection_FQCNs',
-                    array()
-                    // array(
-                    //     'EventEspresso\core\domain\entities\editor\blocks\common',
-                    //     'EventEspresso\core\domain\entities\editor\blocks\editor',
-                    //     'EventEspresso\core\domain\entities\editor\blocks\shortcodes',
-                    //     '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 EditorBlockCollection and calls initialize() on all installed blocks
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function loadEditorBlocks()
-    {
-        try {
-            $this->populateEditorBlockCollection();
-            // cycle thru block loaders and initialize each loader
-            foreach ($this->blocks as $block) {
-                $block->initialize();
-            }
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * calls registerBlock() and load assets for all installed blocks
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function registerEditorBlocks()
-    {
-        try {
-            // register primary assets
-            add_action('enqueue_block_assets', array($this, 'registerStyles'));
-            add_action('enqueue_block_assets', array($this, 'registerScripts'));
-            // cycle thru block loader folders
-            foreach ($this->blocks as $block) {
-                // 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');
-                }
-                add_action('enqueue_block_assets', array($block, 'registerStyles'));
-                add_action('enqueue_block_assets', array($block, 'registerScripts'));
-                do_action(
-                    'FHEE__EventEspresso_core_services_editor_EditorBlockManager__registerEditorBlocks__block_type_registered',
-                    $block,
-                    $block_type
-                );
-            }
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    public function registerStyles()
-    {
-        // wp_register_style(
-        //     'ee-block-styles',
-        //     $this->domain->distributionAssetsUrl() . 'style.css',
-        //     array(),
-        //     filemtime($this->domain->distributionAssetsPath() . 'style.css')
-        // );
-    }
-
-
-    public function registerScripts()
-    {
-        wp_register_script(
-            'ee-core-blocks',
-            $this->assets_registry->getAssetUrl(Registry::ASSET_NAMESPACE, 'core-blocks', Registry::ASSET_TYPE_JS),
-            array(
-                'eejs-core',
-                'wp-blocks',    // Provides useful functions and components for extending the editor
-                'wp-i18n',      // Provides localization functions
-                'wp-element',   // Provides React.Component
-                'wp-components' // Provides many prebuilt components and controls
-            ),
-            null,
-            true
-        );
-    }
+	/**
+	 *  Returns the name of a hookpoint to be used to call initialize()
+	 *
+	 * @return string
+	 */
+	public function initHook()
+	{
+		return 'AHEE__EE_System__set_hooks_for_core';
+	}
+
+
+	/**
+	 * Perform any early setup required for block editors to functions
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function initialize()
+	{
+		$this->loadEditorBlocks();
+		add_action('AHEE__EE_System__initialize', array($this, 'registerEditorBlocks'));
+	}
+
+
+	/**
+	 * @return CollectionInterface|EditorBlockInterface[]
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function populateEditorBlockCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+				// collection name
+				'shortcodes',
+				// collection interface
+				'EventEspresso\core\domain\entities\editor\EditorBlockInterface',
+				// FQCNs for classes to add (all classes within each namespace will be loaded)
+				apply_filters(
+					'FHEE__EventEspresso_core_services_editor_EditorBlockManager__populateEditorBlockCollection__collection_FQCNs',
+					array()
+					// array(
+					//     'EventEspresso\core\domain\entities\editor\blocks\common',
+					//     'EventEspresso\core\domain\entities\editor\blocks\editor',
+					//     'EventEspresso\core\domain\entities\editor\blocks\shortcodes',
+					//     '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 EditorBlockCollection and calls initialize() on all installed blocks
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function loadEditorBlocks()
+	{
+		try {
+			$this->populateEditorBlockCollection();
+			// cycle thru block loaders and initialize each loader
+			foreach ($this->blocks as $block) {
+				$block->initialize();
+			}
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * calls registerBlock() and load assets for all installed blocks
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function registerEditorBlocks()
+	{
+		try {
+			// register primary assets
+			add_action('enqueue_block_assets', array($this, 'registerStyles'));
+			add_action('enqueue_block_assets', array($this, 'registerScripts'));
+			// cycle thru block loader folders
+			foreach ($this->blocks as $block) {
+				// 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');
+				}
+				add_action('enqueue_block_assets', array($block, 'registerStyles'));
+				add_action('enqueue_block_assets', array($block, 'registerScripts'));
+				do_action(
+					'FHEE__EventEspresso_core_services_editor_EditorBlockManager__registerEditorBlocks__block_type_registered',
+					$block,
+					$block_type
+				);
+			}
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	public function registerStyles()
+	{
+		// wp_register_style(
+		//     'ee-block-styles',
+		//     $this->domain->distributionAssetsUrl() . 'style.css',
+		//     array(),
+		//     filemtime($this->domain->distributionAssetsPath() . 'style.css')
+		// );
+	}
+
+
+	public function registerScripts()
+	{
+		wp_register_script(
+			'ee-core-blocks',
+			$this->assets_registry->getAssetUrl(Registry::ASSET_NAMESPACE, 'core-blocks', Registry::ASSET_TYPE_JS),
+			array(
+				'eejs-core',
+				'wp-blocks',    // Provides useful functions and components for extending the editor
+				'wp-i18n',      // Provides localization functions
+				'wp-element',   // Provides React.Component
+				'wp-components' // Provides many prebuilt components and controls
+			),
+			null,
+			true
+		);
+	}
 }