eventespresso / event-espresso-core

core/exceptions/InvalidEntityException.php

Indentation +26 added lines, -26 removed lines

@@ -16,30 +16,30 @@
 class InvalidEntityException extends InvalidArgumentException
 {
 
-    /**
-     * InvalidEntityException constructor.
-     *
-     * @param mixed     $actual   the actual object (or thing) we got
-     * @param string    $expected classname of the entity we wanted
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
-     */
-    public function __construct($actual, $expected, $message = '', $code = 0, Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = sprintf(
-                __(
-                    'The supplied entity is an instance of "%1$s", but an instance of "%2$s" was expected. Object: %3$s',
-                    'event_espresso'
-                ),
-                is_object($actual)
-                    ? get_class($actual)
-                    : gettype($actual),
-                $expected,
-                var_export($actual, true)
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * InvalidEntityException constructor.
+	 *
+	 * @param mixed     $actual   the actual object (or thing) we got
+	 * @param string    $expected classname of the entity we wanted
+	 * @param string    $message
+	 * @param int       $code
+	 * @param Exception $previous
+	 */
+	public function __construct($actual, $expected, $message = '', $code = 0, Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = sprintf(
+				__(
+					'The supplied entity is an instance of "%1$s", but an instance of "%2$s" was expected. Object: %3$s',
+					'event_espresso'
+				),
+				is_object($actual)
+					? get_class($actual)
+					: gettype($actual),
+				$expected,
+				var_export($actual, true)
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }

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

espresso.php

Indentation +79 added lines, -79 removed lines

@@ -38,103 +38,103 @@
  * @since       4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.62.rc.032');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.62.rc.032');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }