[4.0] WebAsset: split WebAssetRegistry to Registry and Manager

libraries/src/Application/AdministratorApplication.php

@@ -99,7 +99,7 @@ public function dispatch($component = null)
 				$this->set('themeParams', $template->params);
 
 				// Add Asset registry files
-				$document->getWebAssetManager()
+				$document->getWebAssetManager()->getRegistry()
 					->addRegistryFile('media/' . $component . '/joomla.asset.json')
 					->addRegistryFile('administrator/templates/' . $template->template . '/joomla.asset.json');
 

libraries/src/Application/SiteApplication.php

@@ -184,7 +184,7 @@ public function dispatch($component = null)
 				$this->set('themeParams', $template->params);
 
 				// Add Asset registry files
-				$document->getWebAssetManager()
+				$document->getWebAssetManager()->getRegistry()
 					->addRegistryFile('media/' . $component . '/joomla.asset.json')
 					->addRegistryFile('templates/' . $template->template . '/joomla.asset.json');
 

libraries/src/Document/Document.php

@@ -13,7 +13,7 @@
 use Joomla\Application\AbstractWebApplication;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory as CmsFactory;
-use Joomla\CMS\WebAsset\WebAssetRegistry;
+use Joomla\CMS\WebAsset\WebAssetManager;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
 
 /**
@@ -249,7 +249,7 @@ class Document
 	/**
 	 * Web Asset instance
 	 *
-	 * @var    WebAssetRegistry
+	 * @var    WebAssetManager
 	 * @since  4.0.0
 	 */
 	protected $webAssetManager = null;
@@ -321,13 +321,16 @@ public function __construct($options = array())
 			$this->setPreloadManager(new PreloadManager);
 		}
 
-		if (array_key_exists('webAsset', $options))
+		if (array_key_exists('webAssetManager', $options))
 		{
-			$this->setWebAssetManager($options['webAsset']);
+			$this->setWebAssetManager($options['webAssetManager']);
 		}
 		else
 		{
-			$this->setWebAssetManager(\Joomla\CMS\Factory::getContainer()->get('webasset'));
+			$webAssetManager = new WebAssetManager(\Joomla\CMS\Factory::getContainer()->get('webassetregistry'));
+			$webAssetManager->setDispatcher(CmsFactory::getApplication()->getDispatcher());
+
+			$this->setWebAssetManager($webAssetManager);
 		}
 	}
 
@@ -831,13 +834,13 @@ public function getPreloadManager(): PreloadManagerInterface
 	/**
 	 * Set WebAsset manager
 	 *
-	 * @param   WebAssetRegistry  $webAsset  The WebAsset instance
+	 * @param   WebAssetManager  $webAsset  The WebAsset instance
 	 *
 	 * @return  Document
 	 *
 	 * @since   4.0.0
 	 */
-	public function setWebAssetManager(WebAssetRegistry $webAsset): self
+	public function setWebAssetManager(WebAssetManager $webAsset): self
 	{
 		$this->webAssetManager = $webAsset;
 
@@ -847,11 +850,11 @@ public function setWebAssetManager(WebAssetRegistry $webAsset): self
 	/**
 	 * Return WebAsset manager
 	 *
-	 * @return  WebAssetRegistry
+	 * @return  WebAssetManager
 	 *
 	 * @since   4.0.0
 	 */
-	public function getWebAssetManager(): WebAssetRegistry
+	public function getWebAssetManager(): WebAssetManager
 	{
 		return $this->webAssetManager;
 	}

libraries/src/Event/WebAsset/AbstractEvent.php

@@ -12,7 +12,6 @@
 
 use BadMethodCallException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
-use Joomla\CMS\WebAsset\WebAssetRegistry;
 
 /**
  * Event class for WebAsset events
@@ -40,25 +39,4 @@ public function __construct($name, array $arguments = array())
 
 		parent::__construct($name, $arguments);
 	}
-
-	/**
-	 * Setter for the subject argument
-	 *
-	 * @param   WebAssetRegistry  $value  The value to set
-	 *
-	 * @return  WebAssetRegistry
-	 *
-	 * @throws  BadMethodCallException  if the argument is not of the expected type
-	 *
-	 * @since   4.0.0
-	 */
-	protected function setSubject($value)
-	{
-		if (!$value || !($value instanceof WebAssetRegistry))
-		{
-			throw new BadMethodCallException("Argument 'subject' of event {$this->name} is not of the expected type");
-		}
-
-		return $value;
-	}
 }

libraries/src/Event/WebAsset/WebAssetBeforeAttachEvent.php

@@ -12,6 +12,7 @@
 
 use BadMethodCallException;
 use Joomla\CMS\Document\Document;
+use Joomla\CMS\WebAsset\WebAssetManager;
 
 /**
  * Event class for WebAsset events
@@ -41,6 +42,27 @@ public function __construct($name, array $arguments = array())
 		parent::__construct($name, $arguments);
 	}
 
+	/**
+	 * Setter for the subject argument
+	 *
+	 * @param   WebAssetManager  $value  The value to set
+	 *
+	 * @return  WebAssetManager
+	 *
+	 * @throws  BadMethodCallException  if the argument is not of the expected type
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function setSubject($value)
+	{
+		if (!$value || !($value instanceof WebAssetManager))
+		{
+			throw new BadMethodCallException("Argument 'subject' of event {$this->name} is not of the expected type");
+		}
+
+		return $value;
+	}
+
 	/**
 	 * Return target Document
 	 *

libraries/src/Factory.php

@@ -559,7 +559,7 @@ protected static function createContainer(): Container
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\HTMLRegistry)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Session)
 			->registerServiceProvider(new \Joomla\CMS\Service\Provider\Toolbar)
-			->registerServiceProvider(new \Joomla\CMS\Service\Provider\WebAsset);
+			->registerServiceProvider(new \Joomla\CMS\Service\Provider\WebAssetRegistry);
 
 		return $container;
 	}

libraries/src/Service/Provider/WebAsset.php → libraries/src/Service/Provider/WebAssetRegistry.php

@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\WebAsset\WebAssetRegistry;
+use Joomla\CMS\WebAsset\WebAssetRegistry as Registry;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 
@@ -19,7 +19,7 @@
  *
  * @since  4.0.0
  */
-class WebAsset implements ServiceProviderInterface
+class WebAssetRegistry implements ServiceProviderInterface
 {
 	/**
 	 * Registers the service provider with a DI container.
@@ -32,15 +32,12 @@ class WebAsset implements ServiceProviderInterface
 	 */
 	public function register(Container $container)
 	{
-		$container->alias('webasset', WebAssetRegistry::class)
+		$container->alias('webassetregistry', Registry::class)
 			->share(
-				WebAssetRegistry::class,
+				Registry::class,
 				function (Container $container)
 				{
-					$registry = new WebAssetRegistry;
-
-					// Set up Dispatcher
-					$registry->setDispatcher($container->get('Joomla\Event\DispatcherInterface'));
+					$registry = new Registry;
 
 					// Add Core registry files
 					$registry->addRegistryFile('media/vendor/joomla.asset.json')

libraries/src/WebAsset/Exception/UnknownAssetException.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\WebAsset\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an Unknown Asset
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class UnknownAssetException extends \RuntimeException implements WebAssetExceptionInterface
+{
+	/**
+	 * UnknownAssetException constructor.
+	 *
+	 * @param   string      $assetName  The asset name.
+	 * @param   int         $code       The Exception code.
+	 * @param   \Throwable  $previous   The previous throwable used for the exception chaining.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function __construct(string $assetName, int $code = 0, \Throwable $previous = null)
+	{
+		$message = 'Unknown asset "' . $assetName . '"';
+
+		parent::__construct($message, $code, $previous);
+	}
+}

libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\WebAsset\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an Unsatisfied Dependency
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class UnsatisfiedDependencyException extends \RuntimeException implements WebAssetExceptionInterface
+{
+
+}

libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\WebAsset\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception interface defining a WebAsset error
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+interface WebAssetExceptionInterface
+{
+}