Inspection of "Refactor editor to block editor dependency (fixes..." - eventespresso/event-espresso-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#1151)

by Darren

created 2019-04-26 17:46 UTC

Status

Indentation +306 added lines, -306 removed lines patch added patch discarded remove patch

@@ -22,311 +22,311 @@
 block discarded – undo
 abstract class BlockAssetManager extends AssetManager implements BlockAssetManagerInterface
 {
 
-    /**
-     * @var string $editor_script_handle
-     */
-    private $editor_script_handle;
-
-    /**
-     * @var string $editor_style_handle
-     */
-    private $editor_style_handle;
-
-    /**
-     * @var string $script_handle
-     */
-    private $script_handle;
-
-    /**
-     * @var string $style_handle
-     */
-    private $style_handle;
-
-
-    /**
-     * @return string
-     */
-    public function getEditorScriptHandle()
-    {
-        return $this->editor_script_handle;
-    }
-
-
-    /**
-     * @param string $editor_script_handle
-     */
-    public function setEditorScriptHandle($editor_script_handle)
-    {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
-        }
-        $this->editor_script_handle = $editor_script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getEditorStyleHandle()
-    {
-        return $this->editor_style_handle;
-    }
-
-
-    /**
-     * @param string $editor_style_handle
-     */
-    public function setEditorStyleHandle($editor_style_handle)
-    {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
-        }
-        $this->editor_style_handle = $editor_style_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getScriptHandle()
-    {
-        return $this->script_handle;
-    }
-
-
-    /**
-     * @param string $script_handle
-     */
-    public function setScriptHandle($script_handle)
-    {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
-        }
-        $this->script_handle = $script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getStyleHandle()
-    {
-        return $this->style_handle;
-    }
-
-
-    /**
-     * @param string $style_handle
-     */
-    public function setStyleHandle($style_handle)
-    {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
-        }
-        $this->style_handle = $style_handle;
-    }
-
-    /**
-     * @since 4.9.71.p
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addAssets()
-    {
-        $this->addEditorScript($this->getEditorScriptHandle());
-        $this->addEditorStyle($this->getEditorStyleHandle());
-        $this->addScript($this->getScriptHandle());
-        $this->addStyle($this->getStyleHandle());
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since 4.9.71.p
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorScript($handle, array $dependencies = array())
-    {
-        if($this->assets->hasJavascriptAsset($handle)){
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return parent::addJavascript(
-            $handle,
-            $this->registry->getJsUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $this->addDefaultBlockScriptDependencies($dependencies)
-        )
-        ->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since 4.9.71.p
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $this->addDefaultBlockStyleDependencies($dependencies)
-        );
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since 4.9.71.p
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addScript($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasJavascriptAsset($handle)) {
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return parent::addJavascript(
-            $handle,
-            $this->registry->getJsUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies + array( CoreAssetManager::JS_HANDLE_COMPONENTS )
-        )
-        ->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since 4.9.71.p
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies + array( CoreAssetManager::CSS_HANDLE_COMPONENTS )
-        );
-    }
-
-
-    /**
-     * @param array $dependencies
-     * @return array
-     */
-    protected function addDefaultBlockScriptDependencies(array $dependencies)
-    {
-        $dependencies += 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
-                'wp-block-editor', // block editor components
-                CoreAssetManager::JS_HANDLE_EDITOR_HOCS,
-                $this->getScriptHandle(),
-            );
-        return $dependencies;
-    }
-
-
-    /**
-     * @param array $dependencies
-     * @return array
-     */
-    protected function addDefaultBlockStyleDependencies(array $dependencies)
-    {
-        $dependencies += array(
-            $this->getStyleHandle()
-        );
-        return $dependencies;
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getEditorScript()
-    {
-        return $this->assets->getJavascriptAsset($this->editor_script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getEditorStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->editor_style_handle);
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getScript()
-    {
-        return $this->assets->getJavascriptAsset($this->script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->style_handle);
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function enqueueAssets()
-    {
-        $assets = array(
-            $this->getEditorScript(),
-            $this->getEditorStyle(),
-            $this->getScript(),
-            $this->getStyle(),
-        );
-        foreach ($assets as $asset) {
-            if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
-                $asset->enqueueAsset();
-            }
-        }
-    }
+	/**
+	 * @var string $editor_script_handle
+	 */
+	private $editor_script_handle;
+
+	/**
+	 * @var string $editor_style_handle
+	 */
+	private $editor_style_handle;
+
+	/**
+	 * @var string $script_handle
+	 */
+	private $script_handle;
+
+	/**
+	 * @var string $style_handle
+	 */
+	private $style_handle;
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorScriptHandle()
+	{
+		return $this->editor_script_handle;
+	}
+
+
+	/**
+	 * @param string $editor_script_handle
+	 */
+	public function setEditorScriptHandle($editor_script_handle)
+	{
+		if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+		}
+		$this->editor_script_handle = $editor_script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorStyleHandle()
+	{
+		return $this->editor_style_handle;
+	}
+
+
+	/**
+	 * @param string $editor_style_handle
+	 */
+	public function setEditorStyleHandle($editor_style_handle)
+	{
+		if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+		}
+		$this->editor_style_handle = $editor_style_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getScriptHandle()
+	{
+		return $this->script_handle;
+	}
+
+
+	/**
+	 * @param string $script_handle
+	 */
+	public function setScriptHandle($script_handle)
+	{
+		if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+		}
+		$this->script_handle = $script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getStyleHandle()
+	{
+		return $this->style_handle;
+	}
+
+
+	/**
+	 * @param string $style_handle
+	 */
+	public function setStyleHandle($style_handle)
+	{
+		if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+		}
+		$this->style_handle = $style_handle;
+	}
+
+	/**
+	 * @since 4.9.71.p
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addAssets()
+	{
+		$this->addEditorScript($this->getEditorScriptHandle());
+		$this->addEditorStyle($this->getEditorStyleHandle());
+		$this->addScript($this->getScriptHandle());
+		$this->addStyle($this->getStyleHandle());
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since 4.9.71.p
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorScript($handle, array $dependencies = array())
+	{
+		if($this->assets->hasJavascriptAsset($handle)){
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return parent::addJavascript(
+			$handle,
+			$this->registry->getJsUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$this->addDefaultBlockScriptDependencies($dependencies)
+		)
+		->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since 4.9.71.p
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$this->addDefaultBlockStyleDependencies($dependencies)
+		);
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since 4.9.71.p
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addScript($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasJavascriptAsset($handle)) {
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return parent::addJavascript(
+			$handle,
+			$this->registry->getJsUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies + array( CoreAssetManager::JS_HANDLE_COMPONENTS )
+		)
+		->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since 4.9.71.p
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies + array( CoreAssetManager::CSS_HANDLE_COMPONENTS )
+		);
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 * @return array
+	 */
+	protected function addDefaultBlockScriptDependencies(array $dependencies)
+	{
+		$dependencies += 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
+				'wp-block-editor', // block editor components
+				CoreAssetManager::JS_HANDLE_EDITOR_HOCS,
+				$this->getScriptHandle(),
+			);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 * @return array
+	 */
+	protected function addDefaultBlockStyleDependencies(array $dependencies)
+	{
+		$dependencies += array(
+			$this->getStyleHandle()
+		);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getEditorScript()
+	{
+		return $this->assets->getJavascriptAsset($this->editor_script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getEditorStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->editor_style_handle);
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getScript()
+	{
+		return $this->assets->getJavascriptAsset($this->script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->style_handle);
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function enqueueAssets()
+	{
+		$assets = array(
+			$this->getEditorScript(),
+			$this->getEditorStyle(),
+			$this->getScript(),
+			$this->getStyle(),
+		);
+		foreach ($assets as $asset) {
+			if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
+				$asset->enqueueAsset();
+			}
+		}
+	}
 
 }

Please login to merge, or discard this patch.

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -57,8 +57,8 @@  discard block
 block discarded – undo
      */
     public function setEditorScriptHandle($editor_script_handle)
     {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+        if (strpos($editor_script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $editor_script_handle = BlockInterface::NAME_SPACE.'-'.$editor_script_handle;
         }
         $this->editor_script_handle = $editor_script_handle;
     }
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
      */
     public function setEditorStyleHandle($editor_style_handle)
     {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $editor_style_handle = BlockInterface::NAME_SPACE.'-'.$editor_style_handle;
         }
         $this->editor_style_handle = $editor_style_handle;
     }
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
      */
     public function setScriptHandle($script_handle)
     {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+        if (strpos($script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $script_handle = BlockInterface::NAME_SPACE.'-'.$script_handle;
         }
         $this->script_handle = $script_handle;
     }
@@ -120,8 +120,8 @@  discard block
 block discarded – undo
      */
     public function setStyleHandle($style_handle)
     {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+        if (strpos($style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $style_handle = BlockInterface::NAME_SPACE.'-'.$style_handle;
         }
         $this->style_handle = $style_handle;
     }
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
      */
     public function addEditorScript($handle, array $dependencies = array())
     {
-        if($this->assets->hasJavascriptAsset($handle)){
+        if ($this->assets->hasJavascriptAsset($handle)) {
             return $this->assets->getJavascriptAsset($handle);
         }
         return parent::addJavascript(
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
                 $this->domain->assetNamespace(),
                 $handle
             ),
-            $dependencies + array( CoreAssetManager::JS_HANDLE_COMPONENTS )
+            $dependencies + array(CoreAssetManager::JS_HANDLE_COMPONENTS)
         )
         ->setRequiresTranslation();
     }
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
                 $this->domain->assetNamespace(),
                 $handle
             ),
-            $dependencies + array( CoreAssetManager::CSS_HANDLE_COMPONENTS )
+            $dependencies + array(CoreAssetManager::CSS_HANDLE_COMPONENTS)
         );
     }
 
@@ -250,9 +250,9 @@  discard block
 block discarded – undo
     protected function addDefaultBlockScriptDependencies(array $dependencies)
     {
         $dependencies += array(
-                '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
                 'wp-block-editor', // block editor components
                 CoreAssetManager::JS_HANDLE_EDITOR_HOCS,

Please login to merge, or discard this patch.

		@@ -57,8 +57,8 @@ discard block
		block discarded – undo
57	57	*/
58	58	public function setEditorScriptHandle($editor_script_handle)
59	59	{
60		- if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
61		- $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
	60	+ if (strpos($editor_script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
	61	+ $editor_script_handle = BlockInterface::NAME_SPACE.'-'.$editor_script_handle;
62	62	}
63	63	$this->editor_script_handle = $editor_script_handle;
64	64	}
		@@ -78,8 +78,8 @@ discard block
		block discarded – undo
78	78	*/
79	79	public function setEditorStyleHandle($editor_style_handle)
80	80	{
81		- if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
82		- $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
	81	+ if (strpos($editor_style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
	82	+ $editor_style_handle = BlockInterface::NAME_SPACE.'-'.$editor_style_handle;
83	83	}
84	84	$this->editor_style_handle = $editor_style_handle;
85	85	}
		@@ -99,8 +99,8 @@ discard block
		block discarded – undo
99	99	*/
100	100	public function setScriptHandle($script_handle)
101	101	{
102		- if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
103		- $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
	102	+ if (strpos($script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
	103	+ $script_handle = BlockInterface::NAME_SPACE.'-'.$script_handle;
104	104	}
105	105	$this->script_handle = $script_handle;
106	106	}
		@@ -120,8 +120,8 @@ discard block
		block discarded – undo
120	120	*/
121	121	public function setStyleHandle($style_handle)
122	122	{
123		- if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
124		- $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
	123	+ if (strpos($style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
	124	+ $style_handle = BlockInterface::NAME_SPACE.'-'.$style_handle;
125	125	}
126	126	$this->style_handle = $style_handle;
127	127	}
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	*/
153	153	public function addEditorScript($handle, array $dependencies = array())
154	154	{
155		- if($this->assets->hasJavascriptAsset($handle)){
	155	+ if ($this->assets->hasJavascriptAsset($handle)) {
156	156	return $this->assets->getJavascriptAsset($handle);
157	157	}
158	158	return parent::addJavascript(
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	$this->domain->assetNamespace(),
213	213	$handle
214	214	),
215		- $dependencies + array( CoreAssetManager::JS_HANDLE_COMPONENTS )
	215	+ $dependencies + array(CoreAssetManager::JS_HANDLE_COMPONENTS)
216	216	)
217	217	->setRequiresTranslation();
218	218	}
		@@ -238,7 +238,7 @@ discard block
		block discarded – undo
238	238	$this->domain->assetNamespace(),
239	239	$handle
240	240	),
241		- $dependencies + array( CoreAssetManager::CSS_HANDLE_COMPONENTS )
	241	+ $dependencies + array(CoreAssetManager::CSS_HANDLE_COMPONENTS)
242	242	);
243	243	}
244	244
		@@ -250,9 +250,9 @@ discard block
		block discarded – undo
250	250	protected function addDefaultBlockScriptDependencies(array $dependencies)
251	251	{
252	252	$dependencies += array(
253		- 'wp-blocks', // Provides useful functions and components for extending the editor
254		- 'wp-i18n', // Provides localization functions
255		- 'wp-element', // Provides React.Component
	253	+ 'wp-blocks', // Provides useful functions and components for extending the editor
	254	+ 'wp-i18n', // Provides localization functions
	255	+ 'wp-element', // Provides React.Component
256	256	'wp-components', // Provides many prebuilt components and controls
257	257	'wp-block-editor', // block editor components
258	258	CoreAssetManager::JS_HANDLE_EDITOR_HOCS,

		@@ -22,311 +22,311 @@
		block discarded – undo
22	22	abstract class BlockAssetManager extends AssetManager implements BlockAssetManagerInterface
23	23	{
24	24
25		- /**
26		- * @var string $editor_script_handle
27		- */
28		- private $editor_script_handle;
29		-
30		- /**
31		- * @var string $editor_style_handle
32		- */
33		- private $editor_style_handle;
34		-
35		- /**
36		- * @var string $script_handle
37		- */
38		- private $script_handle;
39		-
40		- /**
41		- * @var string $style_handle
42		- */
43		- private $style_handle;
44		-
45		-
46		- /**
47		- * @return string
48		- */
49		- public function getEditorScriptHandle()
50		- {
51		- return $this->editor_script_handle;
52		- }
53		-
54		-
55		- /**
56		- * @param string $editor_script_handle
57		- */
58		- public function setEditorScriptHandle($editor_script_handle)
59		- {
60		- if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
61		- $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
62		- }
63		- $this->editor_script_handle = $editor_script_handle;
64		- }
65		-
66		-
67		- /**
68		- * @return string
69		- */
70		- public function getEditorStyleHandle()
71		- {
72		- return $this->editor_style_handle;
73		- }
74		-
75		-
76		- /**
77		- * @param string $editor_style_handle
78		- */
79		- public function setEditorStyleHandle($editor_style_handle)
80		- {
81		- if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
82		- $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
83		- }
84		- $this->editor_style_handle = $editor_style_handle;
85		- }
86		-
87		-
88		- /**
89		- * @return string
90		- */
91		- public function getScriptHandle()
92		- {
93		- return $this->script_handle;
94		- }
95		-
96		-
97		- /**
98		- * @param string $script_handle
99		- */
100		- public function setScriptHandle($script_handle)
101		- {
102		- if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
103		- $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
104		- }
105		- $this->script_handle = $script_handle;
106		- }
107		-
108		-
109		- /**
110		- * @return string
111		- */
112		- public function getStyleHandle()
113		- {
114		- return $this->style_handle;
115		- }
116		-
117		-
118		- /**
119		- * @param string $style_handle
120		- */
121		- public function setStyleHandle($style_handle)
122		- {
123		- if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
124		- $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
125		- }
126		- $this->style_handle = $style_handle;
127		- }
128		-
129		- /**
130		- * @since 4.9.71.p
131		- * @throws InvalidDataTypeException
132		- * @throws InvalidEntityException
133		- * @throws DuplicateCollectionIdentifierException
134		- */
135		- public function addAssets()
136		- {
137		- $this->addEditorScript($this->getEditorScriptHandle());
138		- $this->addEditorStyle($this->getEditorStyleHandle());
139		- $this->addScript($this->getScriptHandle());
140		- $this->addStyle($this->getStyleHandle());
141		- }
142		-
143		-
144		- /**
145		- * @param $handle
146		- * @param array $dependencies
147		- * @since 4.9.71.p
148		- * @return JavascriptAsset
149		- * @throws InvalidDataTypeException
150		- * @throws InvalidEntityException
151		- * @throws DuplicateCollectionIdentifierException
152		- */
153		- public function addEditorScript($handle, array $dependencies = array())
154		- {
155		- if($this->assets->hasJavascriptAsset($handle)){
156		- return $this->assets->getJavascriptAsset($handle);
157		- }
158		- return parent::addJavascript(
159		- $handle,
160		- $this->registry->getJsUrl(
161		- $this->domain->assetNamespace(),
162		- $handle
163		- ),
164		- $this->addDefaultBlockScriptDependencies($dependencies)
165		- )
166		- ->setRequiresTranslation();
167		- }
168		-
169		-
170		- /**
171		- * @param $handle
172		- * @param array $dependencies
173		- * @since 4.9.71.p
174		- * @return StylesheetAsset
175		- * @throws InvalidDataTypeException
176		- * @throws InvalidEntityException
177		- * @throws DuplicateCollectionIdentifierException
178		- */
179		- public function addEditorStyle($handle, array $dependencies = array())
180		- {
181		- if ($this->assets->hasStylesheetAsset($handle)) {
182		- return $this->assets->getStylesheetAsset($handle);
183		- }
184		- return parent::addStylesheet(
185		- $handle,
186		- $this->registry->getCssUrl(
187		- $this->domain->assetNamespace(),
188		- $handle
189		- ),
190		- $this->addDefaultBlockStyleDependencies($dependencies)
191		- );
192		- }
193		-
194		-
195		- /**
196		- * @param $handle
197		- * @param array $dependencies
198		- * @since 4.9.71.p
199		- * @return JavascriptAsset
200		- * @throws InvalidDataTypeException
201		- * @throws InvalidEntityException
202		- * @throws DuplicateCollectionIdentifierException
203		- */
204		- public function addScript($handle, array $dependencies = array())
205		- {
206		- if ($this->assets->hasJavascriptAsset($handle)) {
207		- return $this->assets->getJavascriptAsset($handle);
208		- }
209		- return parent::addJavascript(
210		- $handle,
211		- $this->registry->getJsUrl(
212		- $this->domain->assetNamespace(),
213		- $handle
214		- ),
215		- $dependencies + array( CoreAssetManager::JS_HANDLE_COMPONENTS )
216		- )
217		- ->setRequiresTranslation();
218		- }
219		-
220		-
221		- /**
222		- * @param $handle
223		- * @param array $dependencies
224		- * @since 4.9.71.p
225		- * @return StylesheetAsset
226		- * @throws InvalidDataTypeException
227		- * @throws InvalidEntityException
228		- * @throws DuplicateCollectionIdentifierException
229		- */
230		- public function addStyle($handle, array $dependencies = array())
231		- {
232		- if ($this->assets->hasStylesheetAsset($handle)) {
233		- return $this->assets->getStylesheetAsset($handle);
234		- }
235		- return parent::addStylesheet(
236		- $handle,
237		- $this->registry->getCssUrl(
238		- $this->domain->assetNamespace(),
239		- $handle
240		- ),
241		- $dependencies + array( CoreAssetManager::CSS_HANDLE_COMPONENTS )
242		- );
243		- }
244		-
245		-
246		- /**
247		- * @param array $dependencies
248		- * @return array
249		- */
250		- protected function addDefaultBlockScriptDependencies(array $dependencies)
251		- {
252		- $dependencies += array(
253		- 'wp-blocks', // Provides useful functions and components for extending the editor
254		- 'wp-i18n', // Provides localization functions
255		- 'wp-element', // Provides React.Component
256		- 'wp-components', // Provides many prebuilt components and controls
257		- 'wp-block-editor', // block editor components
258		- CoreAssetManager::JS_HANDLE_EDITOR_HOCS,
259		- $this->getScriptHandle(),
260		- );
261		- return $dependencies;
262		- }
263		-
264		-
265		- /**
266		- * @param array $dependencies
267		- * @return array
268		- */
269		- protected function addDefaultBlockStyleDependencies(array $dependencies)
270		- {
271		- $dependencies += array(
272		- $this->getStyleHandle()
273		- );
274		- return $dependencies;
275		- }
276		-
277		-
278		- /**
279		- * @return JavascriptAsset\|null
280		- */
281		- public function getEditorScript()
282		- {
283		- return $this->assets->getJavascriptAsset($this->editor_script_handle);
284		- }
285		-
286		-
287		- /**
288		- * @return StylesheetAsset\|null
289		- */
290		- public function getEditorStyle()
291		- {
292		- return $this->assets->getStylesheetAsset($this->editor_style_handle);
293		- }
294		-
295		-
296		- /**
297		- * @return JavascriptAsset\|null
298		- */
299		- public function getScript()
300		- {
301		- return $this->assets->getJavascriptAsset($this->script_handle);
302		- }
303		-
304		-
305		- /**
306		- * @return StylesheetAsset\|null
307		- */
308		- public function getStyle()
309		- {
310		- return $this->assets->getStylesheetAsset($this->style_handle);
311		- }
312		-
313		-
314		- /**
315		- * @return void
316		- */
317		- public function enqueueAssets()
318		- {
319		- $assets = array(
320		- $this->getEditorScript(),
321		- $this->getEditorStyle(),
322		- $this->getScript(),
323		- $this->getStyle(),
324		- );
325		- foreach ($assets as $asset) {
326		- if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
327		- $asset->enqueueAsset();
328		- }
329		- }
330		- }
	25	+ /**
	26	+ * @var string $editor_script_handle
	27	+ */
	28	+ private $editor_script_handle;
	29	+
	30	+ /**
	31	+ * @var string $editor_style_handle
	32	+ */
	33	+ private $editor_style_handle;
	34	+
	35	+ /**
	36	+ * @var string $script_handle
	37	+ */
	38	+ private $script_handle;
	39	+
	40	+ /**
	41	+ * @var string $style_handle
	42	+ */
	43	+ private $style_handle;
	44	+
	45	+
	46	+ /**
	47	+ * @return string
	48	+ */
	49	+ public function getEditorScriptHandle()
	50	+ {
	51	+ return $this->editor_script_handle;
	52	+ }
	53	+
	54	+
	55	+ /**
	56	+ * @param string $editor_script_handle
	57	+ */
	58	+ public function setEditorScriptHandle($editor_script_handle)
	59	+ {
	60	+ if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
	61	+ $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
	62	+ }
	63	+ $this->editor_script_handle = $editor_script_handle;
	64	+ }
	65	+
	66	+
	67	+ /**
	68	+ * @return string
	69	+ */
	70	+ public function getEditorStyleHandle()
	71	+ {
	72	+ return $this->editor_style_handle;
	73	+ }
	74	+
	75	+
	76	+ /**
	77	+ * @param string $editor_style_handle
	78	+ */
	79	+ public function setEditorStyleHandle($editor_style_handle)
	80	+ {
	81	+ if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
	82	+ $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
	83	+ }
	84	+ $this->editor_style_handle = $editor_style_handle;
	85	+ }
	86	+
	87	+
	88	+ /**
	89	+ * @return string
	90	+ */
	91	+ public function getScriptHandle()
	92	+ {
	93	+ return $this->script_handle;
	94	+ }
	95	+
	96	+
	97	+ /**
	98	+ * @param string $script_handle
	99	+ */
	100	+ public function setScriptHandle($script_handle)
	101	+ {
	102	+ if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
	103	+ $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
	104	+ }
	105	+ $this->script_handle = $script_handle;
	106	+ }
	107	+
	108	+
	109	+ /**
	110	+ * @return string
	111	+ */
	112	+ public function getStyleHandle()
	113	+ {
	114	+ return $this->style_handle;
	115	+ }
	116	+
	117	+
	118	+ /**
	119	+ * @param string $style_handle
	120	+ */
	121	+ public function setStyleHandle($style_handle)
	122	+ {
	123	+ if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
	124	+ $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
	125	+ }
	126	+ $this->style_handle = $style_handle;
	127	+ }
	128	+
	129	+ /**
	130	+ * @since 4.9.71.p
	131	+ * @throws InvalidDataTypeException
	132	+ * @throws InvalidEntityException
	133	+ * @throws DuplicateCollectionIdentifierException
	134	+ */
	135	+ public function addAssets()
	136	+ {
	137	+ $this->addEditorScript($this->getEditorScriptHandle());
	138	+ $this->addEditorStyle($this->getEditorStyleHandle());
	139	+ $this->addScript($this->getScriptHandle());
	140	+ $this->addStyle($this->getStyleHandle());
	141	+ }
	142	+
	143	+
	144	+ /**
	145	+ * @param $handle
	146	+ * @param array $dependencies
	147	+ * @since 4.9.71.p
	148	+ * @return JavascriptAsset
	149	+ * @throws InvalidDataTypeException
	150	+ * @throws InvalidEntityException
	151	+ * @throws DuplicateCollectionIdentifierException
	152	+ */
	153	+ public function addEditorScript($handle, array $dependencies = array())
	154	+ {
	155	+ if($this->assets->hasJavascriptAsset($handle)){
	156	+ return $this->assets->getJavascriptAsset($handle);
	157	+ }
	158	+ return parent::addJavascript(
	159	+ $handle,
	160	+ $this->registry->getJsUrl(
	161	+ $this->domain->assetNamespace(),
	162	+ $handle
	163	+ ),
	164	+ $this->addDefaultBlockScriptDependencies($dependencies)
	165	+ )
	166	+ ->setRequiresTranslation();
	167	+ }
	168	+
	169	+
	170	+ /**
	171	+ * @param $handle
	172	+ * @param array $dependencies
	173	+ * @since 4.9.71.p
	174	+ * @return StylesheetAsset
	175	+ * @throws InvalidDataTypeException
	176	+ * @throws InvalidEntityException
	177	+ * @throws DuplicateCollectionIdentifierException
	178	+ */
	179	+ public function addEditorStyle($handle, array $dependencies = array())
	180	+ {
	181	+ if ($this->assets->hasStylesheetAsset($handle)) {
	182	+ return $this->assets->getStylesheetAsset($handle);
	183	+ }
	184	+ return parent::addStylesheet(
	185	+ $handle,
	186	+ $this->registry->getCssUrl(
	187	+ $this->domain->assetNamespace(),
	188	+ $handle
	189	+ ),
	190	+ $this->addDefaultBlockStyleDependencies($dependencies)
	191	+ );
	192	+ }
	193	+
	194	+
	195	+ /**
	196	+ * @param $handle
	197	+ * @param array $dependencies
	198	+ * @since 4.9.71.p
	199	+ * @return JavascriptAsset
	200	+ * @throws InvalidDataTypeException
	201	+ * @throws InvalidEntityException
	202	+ * @throws DuplicateCollectionIdentifierException
	203	+ */
	204	+ public function addScript($handle, array $dependencies = array())
	205	+ {
	206	+ if ($this->assets->hasJavascriptAsset($handle)) {
	207	+ return $this->assets->getJavascriptAsset($handle);
	208	+ }
	209	+ return parent::addJavascript(
	210	+ $handle,
	211	+ $this->registry->getJsUrl(
	212	+ $this->domain->assetNamespace(),
	213	+ $handle
	214	+ ),
	215	+ $dependencies + array( CoreAssetManager::JS_HANDLE_COMPONENTS )
	216	+ )
	217	+ ->setRequiresTranslation();
	218	+ }
	219	+
	220	+
	221	+ /**
	222	+ * @param $handle
	223	+ * @param array $dependencies
	224	+ * @since 4.9.71.p
	225	+ * @return StylesheetAsset
	226	+ * @throws InvalidDataTypeException
	227	+ * @throws InvalidEntityException
	228	+ * @throws DuplicateCollectionIdentifierException
	229	+ */
	230	+ public function addStyle($handle, array $dependencies = array())
	231	+ {
	232	+ if ($this->assets->hasStylesheetAsset($handle)) {
	233	+ return $this->assets->getStylesheetAsset($handle);
	234	+ }
	235	+ return parent::addStylesheet(
	236	+ $handle,
	237	+ $this->registry->getCssUrl(
	238	+ $this->domain->assetNamespace(),
	239	+ $handle
	240	+ ),
	241	+ $dependencies + array( CoreAssetManager::CSS_HANDLE_COMPONENTS )
	242	+ );
	243	+ }
	244	+
	245	+
	246	+ /**
	247	+ * @param array $dependencies
	248	+ * @return array
	249	+ */
	250	+ protected function addDefaultBlockScriptDependencies(array $dependencies)
	251	+ {
	252	+ $dependencies += array(
	253	+ 'wp-blocks', // Provides useful functions and components for extending the editor
	254	+ 'wp-i18n', // Provides localization functions
	255	+ 'wp-element', // Provides React.Component
	256	+ 'wp-components', // Provides many prebuilt components and controls
	257	+ 'wp-block-editor', // block editor components
	258	+ CoreAssetManager::JS_HANDLE_EDITOR_HOCS,
	259	+ $this->getScriptHandle(),
	260	+ );
	261	+ return $dependencies;
	262	+ }
	263	+
	264	+
	265	+ /**
	266	+ * @param array $dependencies
	267	+ * @return array
	268	+ */
	269	+ protected function addDefaultBlockStyleDependencies(array $dependencies)
	270	+ {
	271	+ $dependencies += array(
	272	+ $this->getStyleHandle()
	273	+ );
	274	+ return $dependencies;
	275	+ }
	276	+
	277	+
	278	+ /**
	279	+ * @return JavascriptAsset\|null
	280	+ */
	281	+ public function getEditorScript()
	282	+ {
	283	+ return $this->assets->getJavascriptAsset($this->editor_script_handle);
	284	+ }
	285	+
	286	+
	287	+ /**
	288	+ * @return StylesheetAsset\|null
	289	+ */
	290	+ public function getEditorStyle()
	291	+ {
	292	+ return $this->assets->getStylesheetAsset($this->editor_style_handle);
	293	+ }
	294	+
	295	+
	296	+ /**
	297	+ * @return JavascriptAsset\|null
	298	+ */
	299	+ public function getScript()
	300	+ {
	301	+ return $this->assets->getJavascriptAsset($this->script_handle);
	302	+ }
	303	+
	304	+
	305	+ /**
	306	+ * @return StylesheetAsset\|null
	307	+ */
	308	+ public function getStyle()
	309	+ {
	310	+ return $this->assets->getStylesheetAsset($this->style_handle);
	311	+ }
	312	+
	313	+
	314	+ /**
	315	+ * @return void
	316	+ */
	317	+ public function enqueueAssets()
	318	+ {
	319	+ $assets = array(
	320	+ $this->getEditorScript(),
	321	+ $this->getEditorStyle(),
	322	+ $this->getScript(),
	323	+ $this->getStyle(),
	324	+ );
	325	+ foreach ($assets as $asset) {
	326	+ if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
	327	+ $asset->enqueueAsset();
	328	+ }
	329	+ }
	330	+ }
331	331
332	332	}

eventespresso / event-espresso-core

Pull Request — master (#1151)

Status

Category

Indentation +306 added lines, -306 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch