eventespresso / event-espresso-core

core/domain/entities/editor/EditorBlock.php

Indentation +242 added lines, -242 removed lines

@@ -23,246 +23,246 @@
 abstract class EditorBlock implements EditorBlockInterface
 {
 
-    const NS = 'event-espresso/';
-
-    /**
-     * @var DomainInterface $domain
-     */
-    protected $domain;
-
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
-
-
-    /**
-     * @var Registry
-     */
-    protected $assets_registry;
-
-    /**
-     * @var string $editor_block_type
-     */
-    private $editor_block_type;
-
-    /**
-     * @var WP_Block_Type $wp_block_type
-     */
-    private $wp_block_type;
-
-    /**
-     * @var array $supported_post_types
-     */
-    private $supported_post_types;
-
-    /**
-     * @var array $attributes
-     */
-    private $attributes;
-
-    /**
-     * If set to true, then the block will render its content client side
-     * If false, then the block will render its content server side using the renderBlock() method
-     *
-     * @var bool $dynamic
-     */
-    private $dynamic = false;
-
-
-    /**
-     * EditorBlockLoader constructor.
-     *
-     * @param DomainInterface $domain
-     * @param LoaderInterface $loader
-     * @param Registry        $assets_registry
-     */
-    public function __construct(
-        DomainInterface $domain,
-        LoaderInterface $loader,
-        Registry $assets_registry
-    ) {
-        $this->domain = $domain;
-        $this->loader = $loader;
-        $this->assets_registry = $assets_registry;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function editorBlockType()
-    {
-        return $this->editor_block_type;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function namespacedEditorBlockType()
-    {
-        return EditorBlock::NS . $this->editor_block_type;
-    }
-
-
-    /**
-     * @param string $editor_block_type
-     */
-    protected function setEditorBlockType($editor_block_type)
-    {
-        $this->editor_block_type = $editor_block_type;
-    }
-
-
-    /**
-     * @param WP_Block_Type $wp_block_type
-     */
-    protected function setWpBlockType($wp_block_type)
-    {
-        $this->wp_block_type = $wp_block_type;
-    }
-
-
-    /**
-     * @param array $supported_post_types
-     */
-    protected function setSupportedPostTypes(array $supported_post_types)
-    {
-        $this->supported_post_types = $supported_post_types;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function attributes()
-    {
-        return $this->attributes;
-    }
-
-
-    /**
-     * @param array $attributes
-     */
-    public function setAttributes(array $attributes)
-    {
-        $this->attributes = $attributes;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isDynamic()
-    {
-        return $this->dynamic;
-    }
-
-
-    /**
-     * @param bool $dynamic
-     */
-    public function setDynamic($dynamic = true)
-    {
-        $this->dynamic = filter_var($dynamic, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * 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()
-    {
-        $context ='core';
-        // todo add route detection (ie inject route) and change context based on route
-        $args          = array(
-            'attributes'      => $this->attributes(),
-            'editor_script'   => "ee-{$context}-blocks",
-            'editor_style'    => "ee-{$context}-blocks",
-            'script'          => "ee-{$context}-blocks",
-            'style'           => "ee-{$context}-blocks",
-        );
-        if (! $this->isDynamic()) {
-            $args['render_callback'] = $this->renderBlock();
-        }
-        $wp_block_type = register_block_type(
-            new WP_Block_Type(
-                $this->namespacedEditorBlockType(),
-                $args
-            )
-        );
-        $this->setWpBlockType($wp_block_type);
-        return $wp_block_type;
-    }
-
-
-    /**
-     * @return WP_Block_Type|false The registered block type on success, or false on failure.
-     */
-    public function unRegisterBlock()
-    {
-        return unregister_block_type($this->namespacedEditorBlockType());
-    }
-
-
-    /**
-     * 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 in_array($post_type, $this->supported_post_types, true);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getEditorContainer()
-    {
-        return array(
-            $this->namespacedEditorBlockType(),
-            array()
-        );
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function registerScripts()
-    {
-        // wp_register_script(
-        //     'core-blocks',
-        //     $this->domain->distributionAssetsUrl() . 'ee-core-blocks.dist.js',
-        //     array(
-        //         '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
-        //     ),
-        //     filemtime($this->domain->distributionAssetsPath() . 'ee-core-blocks.dist.js')
-        // );
-    }
-
-
-    /**
-     * @return void
-     */
-    public function registerStyles()
-    {
-        // wp_register_style(
-        //     'ee-block-styles',
-        //     $this->domain->distributionAssetsUrl() . 'style.css',
-        //     array(),
-        //     filemtime($this->domain->distributionAssetsPath() . 'style.css')
-        // );
-    }
+	const NS = 'event-espresso/';
+
+	/**
+	 * @var DomainInterface $domain
+	 */
+	protected $domain;
+
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
+
+
+	/**
+	 * @var Registry
+	 */
+	protected $assets_registry;
+
+	/**
+	 * @var string $editor_block_type
+	 */
+	private $editor_block_type;
+
+	/**
+	 * @var WP_Block_Type $wp_block_type
+	 */
+	private $wp_block_type;
+
+	/**
+	 * @var array $supported_post_types
+	 */
+	private $supported_post_types;
+
+	/**
+	 * @var array $attributes
+	 */
+	private $attributes;
+
+	/**
+	 * If set to true, then the block will render its content client side
+	 * If false, then the block will render its content server side using the renderBlock() method
+	 *
+	 * @var bool $dynamic
+	 */
+	private $dynamic = false;
+
+
+	/**
+	 * EditorBlockLoader constructor.
+	 *
+	 * @param DomainInterface $domain
+	 * @param LoaderInterface $loader
+	 * @param Registry        $assets_registry
+	 */
+	public function __construct(
+		DomainInterface $domain,
+		LoaderInterface $loader,
+		Registry $assets_registry
+	) {
+		$this->domain = $domain;
+		$this->loader = $loader;
+		$this->assets_registry = $assets_registry;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function editorBlockType()
+	{
+		return $this->editor_block_type;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function namespacedEditorBlockType()
+	{
+		return EditorBlock::NS . $this->editor_block_type;
+	}
+
+
+	/**
+	 * @param string $editor_block_type
+	 */
+	protected function setEditorBlockType($editor_block_type)
+	{
+		$this->editor_block_type = $editor_block_type;
+	}
+
+
+	/**
+	 * @param WP_Block_Type $wp_block_type
+	 */
+	protected function setWpBlockType($wp_block_type)
+	{
+		$this->wp_block_type = $wp_block_type;
+	}
+
+
+	/**
+	 * @param array $supported_post_types
+	 */
+	protected function setSupportedPostTypes(array $supported_post_types)
+	{
+		$this->supported_post_types = $supported_post_types;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function attributes()
+	{
+		return $this->attributes;
+	}
+
+
+	/**
+	 * @param array $attributes
+	 */
+	public function setAttributes(array $attributes)
+	{
+		$this->attributes = $attributes;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isDynamic()
+	{
+		return $this->dynamic;
+	}
+
+
+	/**
+	 * @param bool $dynamic
+	 */
+	public function setDynamic($dynamic = true)
+	{
+		$this->dynamic = filter_var($dynamic, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * 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()
+	{
+		$context ='core';
+		// todo add route detection (ie inject route) and change context based on route
+		$args          = array(
+			'attributes'      => $this->attributes(),
+			'editor_script'   => "ee-{$context}-blocks",
+			'editor_style'    => "ee-{$context}-blocks",
+			'script'          => "ee-{$context}-blocks",
+			'style'           => "ee-{$context}-blocks",
+		);
+		if (! $this->isDynamic()) {
+			$args['render_callback'] = $this->renderBlock();
+		}
+		$wp_block_type = register_block_type(
+			new WP_Block_Type(
+				$this->namespacedEditorBlockType(),
+				$args
+			)
+		);
+		$this->setWpBlockType($wp_block_type);
+		return $wp_block_type;
+	}
+
+
+	/**
+	 * @return WP_Block_Type|false The registered block type on success, or false on failure.
+	 */
+	public function unRegisterBlock()
+	{
+		return unregister_block_type($this->namespacedEditorBlockType());
+	}
+
+
+	/**
+	 * 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 in_array($post_type, $this->supported_post_types, true);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getEditorContainer()
+	{
+		return array(
+			$this->namespacedEditorBlockType(),
+			array()
+		);
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function registerScripts()
+	{
+		// wp_register_script(
+		//     'core-blocks',
+		//     $this->domain->distributionAssetsUrl() . 'ee-core-blocks.dist.js',
+		//     array(
+		//         '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
+		//     ),
+		//     filemtime($this->domain->distributionAssetsPath() . 'ee-core-blocks.dist.js')
+		// );
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function registerStyles()
+	{
+		// wp_register_style(
+		//     'ee-block-styles',
+		//     $this->domain->distributionAssetsUrl() . 'style.css',
+		//     array(),
+		//     filemtime($this->domain->distributionAssetsPath() . 'style.css')
+		// );
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -102,7 +102,7 @@ 
      */
     public function namespacedEditorBlockType()
     {
-        return EditorBlock::NS . $this->editor_block_type;
+        return EditorBlock::NS.$this->editor_block_type;
     }
 
 
@@ -177,16 +177,16 @@ 
      */
     public function registerBlock()
     {
-        $context ='core';
+        $context = 'core';
         // todo add route detection (ie inject route) and change context based on route
-        $args          = array(
+        $args = array(
             'attributes'      => $this->attributes(),
             'editor_script'   => "ee-{$context}-blocks",
             'editor_style'    => "ee-{$context}-blocks",
             'script'          => "ee-{$context}-blocks",
             'style'           => "ee-{$context}-blocks",
         );
-        if (! $this->isDynamic()) {
+        if ( ! $this->isDynamic()) {
             $args['render_callback'] = $this->renderBlock();
         }
         $wp_block_type = register_block_type(

core/services/editor/EditorBlockManager.php

Indentation +90 added lines, -90 removed lines

@@ -20,94 +20,94 @@
 abstract class EditorBlockManager
 {
 
-    /**
-     * @var CollectionInterface|EditorBlockInterface[] $blocks
-     */
-    protected $blocks;
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var DomainInterface $domain
-     */
-    protected $domain;
-
-    /**
-     * the post type that the current request applies to
-     *
-     * @var string $request_post_type
-     */
-    protected $request_post_type;
-
-    /**
-     * value of the 'page' $_GET param
-     *
-     * @var string $page
-     */
-    protected $page;
-
-    /**
-     * value of the 'action' $_GET param
-     *
-     * @var string $action
-     */
-    protected $action;
-
-
-    /**
-     * @var Registry
-     */
-    protected $assets_registry;
-
-    /**
-     * EditorBlockManager constructor.
-     *
-     * @param EditorBlockCollection $blocks
-     * @param RequestInterface      $request
-     * @param DomainInterface       $domain
-     * @param Registry              $assets_registry
-     */
-    public function __construct(
-        EditorBlockCollection $blocks,
-        RequestInterface $request,
-        DomainInterface $domain,
-        Registry $assets_registry
-    ) {
-        $this->blocks  = $blocks;
-        $this->request = $request;
-        $this->domain  = $domain;
-        $this->assets_registry = $assets_registry;
-        $this->request_post_type = $this->request->getRequestParam('post_type', '');
-        $this->page = $this->request->getRequestParam('page', '');
-        $this->action = $this->request->getRequestParam('action', '');
-        add_action($this->init_hook(), array($this, 'initialize'));
-    }
-
-
-    /**
-     *  Returns the name of a hookpoint to be used to call initialize()
-     *
-     * @return string
-     */
-    abstract public function initHook();
-
-
-    /**
-     * Perform any early setup required for block editors to functions
-     *
-     * @return void
-     */
-    abstract public function initialize();
-
-
-    /**
-     * @return string
-     */
-    public function currentRequestPostType()
-    {
-        return $this->request_post_type;
-    }
+	/**
+	 * @var CollectionInterface|EditorBlockInterface[] $blocks
+	 */
+	protected $blocks;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var DomainInterface $domain
+	 */
+	protected $domain;
+
+	/**
+	 * the post type that the current request applies to
+	 *
+	 * @var string $request_post_type
+	 */
+	protected $request_post_type;
+
+	/**
+	 * value of the 'page' $_GET param
+	 *
+	 * @var string $page
+	 */
+	protected $page;
+
+	/**
+	 * value of the 'action' $_GET param
+	 *
+	 * @var string $action
+	 */
+	protected $action;
+
+
+	/**
+	 * @var Registry
+	 */
+	protected $assets_registry;
+
+	/**
+	 * EditorBlockManager constructor.
+	 *
+	 * @param EditorBlockCollection $blocks
+	 * @param RequestInterface      $request
+	 * @param DomainInterface       $domain
+	 * @param Registry              $assets_registry
+	 */
+	public function __construct(
+		EditorBlockCollection $blocks,
+		RequestInterface $request,
+		DomainInterface $domain,
+		Registry $assets_registry
+	) {
+		$this->blocks  = $blocks;
+		$this->request = $request;
+		$this->domain  = $domain;
+		$this->assets_registry = $assets_registry;
+		$this->request_post_type = $this->request->getRequestParam('post_type', '');
+		$this->page = $this->request->getRequestParam('page', '');
+		$this->action = $this->request->getRequestParam('action', '');
+		add_action($this->init_hook(), array($this, 'initialize'));
+	}
+
+
+	/**
+	 *  Returns the name of a hookpoint to be used to call initialize()
+	 *
+	 * @return string
+	 */
+	abstract public function initHook();
+
+
+	/**
+	 * Perform any early setup required for block editors to functions
+	 *
+	 * @return void
+	 */
+	abstract public function initialize();
+
+
+	/**
+	 * @return string
+	 */
+	public function currentRequestPostType()
+	{
+		return $this->request_post_type;
+	}
 }

core/services/editor/EditorBlockRegistrationManager.php

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

core/services/collections/CollectionLoader.php

Indentation +249 added lines, -249 removed lines

@@ -27,276 +27,276 @@
 class CollectionLoader
 {
 
-    /**
-     * possible return value when adding entities to a collection.
-     * denotes that the entity was NOT ADDED to the collection
-     */
-    const ENTITY_NOT_ADDED = 'entity-not-added-to-collection';
+	/**
+	 * possible return value when adding entities to a collection.
+	 * denotes that the entity was NOT ADDED to the collection
+	 */
+	const ENTITY_NOT_ADDED = 'entity-not-added-to-collection';
 
-    /**
-     * possible return value when adding entities to a collection.
-     * denotes that the entity was SUCCESSFULLY ADDED to the collection
-     */
-    const ENTITY_ADDED = 'entity-added-to-collection';
+	/**
+	 * possible return value when adding entities to a collection.
+	 * denotes that the entity was SUCCESSFULLY ADDED to the collection
+	 */
+	const ENTITY_ADDED = 'entity-added-to-collection';
 
-    /**
-     * possible return value when adding entities to a collection.
-     * denotes that the entity was ALREADY ADDED to the collection,
-     * and therefore could not be added again.
-     */
-    const ENTITY_EXISTS = 'entity-already-in-collection';
+	/**
+	 * possible return value when adding entities to a collection.
+	 * denotes that the entity was ALREADY ADDED to the collection,
+	 * and therefore could not be added again.
+	 */
+	const ENTITY_EXISTS = 'entity-already-in-collection';
 
 
-    /**
-     * @var CollectionDetailsInterface $collection_details
-     */
-    protected $collection_details;
+	/**
+	 * @var CollectionDetailsInterface $collection_details
+	 */
+	protected $collection_details;
 
-    /**
-     * @var CollectionInterface $collection
-     */
-    protected $collection;
+	/**
+	 * @var CollectionInterface $collection
+	 */
+	protected $collection;
 
-    /**
-     * @var FileLocator $file_locator
-     */
-    protected $file_locator;
+	/**
+	 * @var FileLocator $file_locator
+	 */
+	protected $file_locator;
 
 
-    /**
-     * CollectionLoader constructor.
-     *
-     * @param CollectionDetailsInterface $collection_details
-     * @param CollectionInterface        $collection
-     * @param LocatorInterface           $file_locator
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     * @throws InvalidInterfaceException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     */
-    public function __construct(
-        CollectionDetailsInterface $collection_details,
-        CollectionInterface $collection = null,
-        LocatorInterface $file_locator = null
-    ) {
-        $this->collection_details = $collection_details;
-        if (! $collection instanceof CollectionInterface) {
-            $collection = new Collection($this->collection_details->getCollectionInterface());
-        }
-        $this->collection = $collection;
-        $this->file_locator = $file_locator;
-        $this->loadAllFromFilepaths();
-        $this->loadFromFQCNs();
-    }
+	/**
+	 * CollectionLoader constructor.
+	 *
+	 * @param CollectionDetailsInterface $collection_details
+	 * @param CollectionInterface        $collection
+	 * @param LocatorInterface           $file_locator
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 */
+	public function __construct(
+		CollectionDetailsInterface $collection_details,
+		CollectionInterface $collection = null,
+		LocatorInterface $file_locator = null
+	) {
+		$this->collection_details = $collection_details;
+		if (! $collection instanceof CollectionInterface) {
+			$collection = new Collection($this->collection_details->getCollectionInterface());
+		}
+		$this->collection = $collection;
+		$this->file_locator = $file_locator;
+		$this->loadAllFromFilepaths();
+		$this->loadFromFQCNs();
+	}
 
 
-    /**
-     * @return CollectionInterface
-     */
-    public function getCollection()
-    {
-        return $this->collection;
-    }
+	/**
+	 * @return CollectionInterface
+	 */
+	public function getCollection()
+	{
+		return $this->collection;
+	}
 
 
-    /**
-     * @throws InvalidClassException
-     * @throws InvalidFilePathException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    protected function loadAllFromFilepaths()
-    {
-        if (! $this->file_locator instanceof FileLocator) {
-            $this->file_locator = new FileLocator();
-        }
-        $this->file_locator->setFileMask($this->collection_details->getFileMask());
-        // find all of the files that match the file mask in the specified folder
-        $this->file_locator->locate($this->collection_details->getCollectionPaths());
-        // filter the results
-        $filepaths = (array) apply_filters(
-            'FHEE__CollectionLoader__loadAllFromFilepath__filepaths',
-            $this->file_locator->getFilePaths(),
-            $this->collection_details->collectionName(),
-            $this->collection_details
-        );
-        if (empty($filepaths)) {
-            return;
-        }
-        foreach ($filepaths as $filepath) {
-            $this->loadClassFromFilepath($filepath);
-        }
-    }
+	/**
+	 * @throws InvalidClassException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	protected function loadAllFromFilepaths()
+	{
+		if (! $this->file_locator instanceof FileLocator) {
+			$this->file_locator = new FileLocator();
+		}
+		$this->file_locator->setFileMask($this->collection_details->getFileMask());
+		// find all of the files that match the file mask in the specified folder
+		$this->file_locator->locate($this->collection_details->getCollectionPaths());
+		// filter the results
+		$filepaths = (array) apply_filters(
+			'FHEE__CollectionLoader__loadAllFromFilepath__filepaths',
+			$this->file_locator->getFilePaths(),
+			$this->collection_details->collectionName(),
+			$this->collection_details
+		);
+		if (empty($filepaths)) {
+			return;
+		}
+		foreach ($filepaths as $filepath) {
+			$this->loadClassFromFilepath($filepath);
+		}
+	}
 
 
-    /**
-     * @param  string $filepath
-     * @return string
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     * @throws InvalidClassException
-     */
-    protected function loadClassFromFilepath($filepath)
-    {
-        if (! is_string($filepath)) {
-            throw new InvalidDataTypeException('$filepath', $filepath, 'string');
-        }
-        if (! is_readable($filepath)) {
-            throw new InvalidFilePathException($filepath);
-        }
-        require_once $filepath;
-        // extract filename from path
-        $file_name = basename($filepath);
-        // now remove any file extensions
-        $class_name = EEH_File::get_classname_from_filepath_with_standard_filename($file_name);
-        if (! class_exists($class_name)) {
-            throw new InvalidClassException($class_name);
-        }
-        return $this->addEntityToCollection(new $class_name(), $file_name);
-    }
+	/**
+	 * @param  string $filepath
+	 * @return string
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidClassException
+	 */
+	protected function loadClassFromFilepath($filepath)
+	{
+		if (! is_string($filepath)) {
+			throw new InvalidDataTypeException('$filepath', $filepath, 'string');
+		}
+		if (! is_readable($filepath)) {
+			throw new InvalidFilePathException($filepath);
+		}
+		require_once $filepath;
+		// extract filename from path
+		$file_name = basename($filepath);
+		// now remove any file extensions
+		$class_name = EEH_File::get_classname_from_filepath_with_standard_filename($file_name);
+		if (! class_exists($class_name)) {
+			throw new InvalidClassException($class_name);
+		}
+		return $this->addEntityToCollection(new $class_name(), $file_name);
+	}
 
 
-    /**
-     * @param        $entity
-     * @param  mixed $identifier
-     * @return string
-     * @throws InvalidEntityException
-     */
-    protected function addEntityToCollection($entity, $identifier)
-    {
-        do_action(
-            'FHEE__CollectionLoader__addEntityToCollection__entity',
-            $entity,
-            $this->collection_details->collectionName(),
-            $this->collection_details
-        );
-        $identifier = $this->setIdentifier($entity, $identifier);
-        if ($this->collection->has($identifier)) {
-            do_action(
-                'FHEE__CollectionLoader__addEntityToCollection__entity_already_added',
-                $this,
-                $this->collection_details->collectionName(),
-                $this->collection_details
-            );
-            return CollectionLoader::ENTITY_EXISTS;
-        }
-        if ($this->collection->add($entity, $identifier)) {
-            do_action(
-                'FHEE__CollectionLoader__addEntityToCollection__entity_added',
-                $this,
-                $this->collection_details->collectionName(),
-                $this->collection_details
-            );
-            return CollectionLoader::ENTITY_ADDED;
-        }
-        do_action(
-            'FHEE__CollectionLoader__addEntityToCollection__entity_not_added',
-            $this,
-            $this->collection_details->collectionName(),
-            $this->collection_details
-        );
-        return CollectionLoader::ENTITY_NOT_ADDED;
-    }
+	/**
+	 * @param        $entity
+	 * @param  mixed $identifier
+	 * @return string
+	 * @throws InvalidEntityException
+	 */
+	protected function addEntityToCollection($entity, $identifier)
+	{
+		do_action(
+			'FHEE__CollectionLoader__addEntityToCollection__entity',
+			$entity,
+			$this->collection_details->collectionName(),
+			$this->collection_details
+		);
+		$identifier = $this->setIdentifier($entity, $identifier);
+		if ($this->collection->has($identifier)) {
+			do_action(
+				'FHEE__CollectionLoader__addEntityToCollection__entity_already_added',
+				$this,
+				$this->collection_details->collectionName(),
+				$this->collection_details
+			);
+			return CollectionLoader::ENTITY_EXISTS;
+		}
+		if ($this->collection->add($entity, $identifier)) {
+			do_action(
+				'FHEE__CollectionLoader__addEntityToCollection__entity_added',
+				$this,
+				$this->collection_details->collectionName(),
+				$this->collection_details
+			);
+			return CollectionLoader::ENTITY_ADDED;
+		}
+		do_action(
+			'FHEE__CollectionLoader__addEntityToCollection__entity_not_added',
+			$this,
+			$this->collection_details->collectionName(),
+			$this->collection_details
+		);
+		return CollectionLoader::ENTITY_NOT_ADDED;
+	}
 
 
-    /**
-     * @param        $entity
-     * @param  mixed $identifier
-     * @return string
-     * @throws InvalidEntityException
-     */
-    protected function setIdentifier($entity, $identifier)
-    {
-        switch ($this->collection_details->identifierType()) {
-            // every unique object gets added to the collection, but not duplicates of the exact same object
-            case CollectionDetails::ID_OBJECT_HASH:
-                $identifier = spl_object_hash($entity);
-                break;
-            // only one entity per class can be added to collection, like a singleton
-            case CollectionDetails::ID_CLASS_NAME:
-                $identifier = get_class($entity);
-                break;
-            // objects added to the collection based on entity callback, so the entity itself decides
-            case CollectionDetails::ID_CALLBACK_METHOD:
-                $identifier_callback = $this->collection_details->identifierCallback();
-                if (! method_exists($entity, $identifier_callback)) {
-                    throw new InvalidEntityException(
-                        $entity,
-                        $this->collection_details->getCollectionInterface(),
-                        sprintf(
-                            __(
-                                'The current collection is configured to use a method named "%1$s" when setting or retrieving objects. The supplied entity is an instance
+	/**
+	 * @param        $entity
+	 * @param  mixed $identifier
+	 * @return string
+	 * @throws InvalidEntityException
+	 */
+	protected function setIdentifier($entity, $identifier)
+	{
+		switch ($this->collection_details->identifierType()) {
+			// every unique object gets added to the collection, but not duplicates of the exact same object
+			case CollectionDetails::ID_OBJECT_HASH:
+				$identifier = spl_object_hash($entity);
+				break;
+			// only one entity per class can be added to collection, like a singleton
+			case CollectionDetails::ID_CLASS_NAME:
+				$identifier = get_class($entity);
+				break;
+			// objects added to the collection based on entity callback, so the entity itself decides
+			case CollectionDetails::ID_CALLBACK_METHOD:
+				$identifier_callback = $this->collection_details->identifierCallback();
+				if (! method_exists($entity, $identifier_callback)) {
+					throw new InvalidEntityException(
+						$entity,
+						$this->collection_details->getCollectionInterface(),
+						sprintf(
+							__(
+								'The current collection is configured to use a method named "%1$s" when setting or retrieving objects. The supplied entity is an instance
                                 of "%2$s", but does not contain this method.',
-                                'event_espresso'
-                            ),
-                            $identifier_callback,
-                            get_class($entity)
-                        )
-                    );
-                }
-                $identifier = $entity->{$identifier_callback}();
-                break;
-        }
-        return apply_filters(
-            'FHEE__CollectionLoader__addEntityToCollection__identifier',
-            $identifier,
-            $this->collection_details->collectionName(),
-            $this->collection_details
-        );
-    }
+								'event_espresso'
+							),
+							$identifier_callback,
+							get_class($entity)
+						)
+					);
+				}
+				$identifier = $entity->{$identifier_callback}();
+				break;
+		}
+		return apply_filters(
+			'FHEE__CollectionLoader__addEntityToCollection__identifier',
+			$identifier,
+			$this->collection_details->collectionName(),
+			$this->collection_details
+		);
+	}
 
 
-    /**
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws EE_Error
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     */
-    protected function loadFromFQCNs()
-    {
-        $FQCNs = $this->collection_details->getCollectionFQCNs();
-        $FQCNs = (array) apply_filters(
-            'FHEE__CollectionLoader__loadAllFromFQCNs__FQCNs',
-            $FQCNs,
-            $this->collection_details->collectionName(),
-            $this->collection_details
-        );
-        foreach ($FQCNs as $FQCN) {
-            $this->loadClassFromFQCN($FQCN);
-        }
-    }
+	/**
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws EE_Error
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 */
+	protected function loadFromFQCNs()
+	{
+		$FQCNs = $this->collection_details->getCollectionFQCNs();
+		$FQCNs = (array) apply_filters(
+			'FHEE__CollectionLoader__loadAllFromFQCNs__FQCNs',
+			$FQCNs,
+			$this->collection_details->collectionName(),
+			$this->collection_details
+		);
+		foreach ($FQCNs as $FQCN) {
+			$this->loadClassFromFQCN($FQCN);
+		}
+	}
 
 
-    /**
-     * @param  string $FQCN Fully Qualified Class Name
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadClassFromFQCN($FQCN)
-    {
-        if (! is_string($FQCN)) {
-            throw new InvalidDataTypeException('$FQCN', $FQCN, 'string');
-        }
-        if (! class_exists($FQCN)) {
-            throw new InvalidClassException($FQCN);
-        }
-        return $this->addEntityToCollection(
-            EE_Registry::instance()->create($FQCN),
-            $FQCN
-        );
-    }
+	/**
+	 * @param  string $FQCN Fully Qualified Class Name
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadClassFromFQCN($FQCN)
+	{
+		if (! is_string($FQCN)) {
+			throw new InvalidDataTypeException('$FQCN', $FQCN, 'string');
+		}
+		if (! class_exists($FQCN)) {
+			throw new InvalidClassException($FQCN);
+		}
+		return $this->addEntityToCollection(
+			EE_Registry::instance()->create($FQCN),
+			$FQCN
+		);
+	}
 }