Refactoring and example config

Author: SongoQ

AssetsBundle/Resources/config/config.yml

@@ -0,0 +1,35 @@
+# Example
+#
+#docplanner_assets:
+#    style:
+#        assets:
+#            common: { src: "/to/some/file.css" }
+#            fries:  { src: "/to/some/other/file.css", inline: true }
+#        groups:
+#            default:
+#                assets:
+#                    - common
+#                    - fries
+#                default: true
+#            homepage:
+#                assets:
+#                    - common
+#                    - fries
+#                    - homepage
+#                routes: [ "homepage", "homepage_with_fireworks" ]
+#    script:
+#        assets:
+#            common: { src: "/to/some/file.js" }
+#            fries:  { src: "/to/some/other/file.js", inline: true }
+#        groups:
+#            default:
+#                assets:
+#                    - common
+#                    - fries
+#                default: true
+#            homepage:
+#                assets:
+#                    - common
+#                    - fries
+#                    - homepage
+#                routes: [ "homepage", "homepage_with_fireworks" ]

AssetsBundle/Service/AssetsLoader.php

@@ -19,51 +19,46 @@ public function __construct(AssetsPicker $assetsPicker)
 	}
 
 	/**
-	 * @param null $type
+	 * @param bool|false $isInline
 	 *
 	 * @return string
 	 */
-	public function renderScript($type = 'src')
+	public function renderScript($isInline = false)
 	{
 		$assets = $this->asstsPicker->pickScriptAssets();
-		$mask  = $type == 'inline' ? '<script>%s</script>' : '<script src="%s?%s"></script>';
+		$mask   = $type == 'inline' ? '<script>%s</script>' : '<script src="%s?%s"></script>';
 
-		return $this->render($mask, $assets, $type);
+		return $this->render($mask, $assets, $isInline);
 	}
 
 	/**
-	 * @param null $type
+	 * @param bool|false $isInline
 	 *
 	 * @return string
 	 */
-	public function renderStyle($type = 'src')
+	public function renderStyle($isInline = false)
 	{
 		$assets = $this->asstsPicker->pickStyleAssets();
-		$mask  = $type == 'inline' ? '<style>%s</style>' : '<link rel="stylesheet" type="text/css" href="%s?%s">';
+		$mask   = $type == 'inline' ? '<style>%s</style>' : '<link rel="stylesheet" type="text/css" href="%s?%s">';
 
-		return $this->render($mask, $assets, $type);
+		return $this->render($mask, $assets, $isInline);
 	}
 
 	/**
-	 * @param         $mask
+	 * @param String  $mask
 	 * @param Asset[] $assets
-	 * @param         $type
+	 * @param boolean $isInline
 	 *
 	 * @return string
 	 */
-	private function render($mask, $assets, $type)
+	private function render($mask, $assets, $isInline)
 	{
 		$ret = '';
 
-		if ($type == 'src')
+		if (!$isInline)
 		{
 			foreach ($assets as $asset)
 			{
-				if (!file_exists($asset->getSrc()))
-				{
-					throw new \LogicException(sprintf('File %s not found', $asset->getSrc()));
-				}
-
 				if ($asset->getSrc())
 				{
 					$ret .= sprintf($mask, $asset->getSrc(), crc32(file_get_contents($asset->getSrc())));
@@ -74,11 +69,6 @@ private function render($mask, $assets, $type)
 		{
 			foreach ($assets as $asset)
 			{
-				if (!file_exists($asset->getInline()))
-				{
-					throw new \LogicException(sprintf('File %s not found', $asset->getInline()));
-				}
-
 				if ($asset->getInline())
 				{
 					$ret .= file_get_contents($asset->getInline());
@@ -94,6 +84,3 @@ private function render($mask, $assets, $type)
 		return $ret;
 	}
 }
-
-
-

AssetsBundle/Twig/AssetsExtension.php

@@ -33,19 +33,19 @@ public function getFunctions()
 	 *
 	 * @return string
 	 */
-	public function assetsScript($type = 'src')
+	public function assetsScript($type = null)
 	{
-		return $this->assetsLoader->renderScript($type);
+		return $this->assetsLoader->renderScript($type == 'inline' ? true : false);
 	}
 
 	/**
 	 * @param null $type
 	 *
 	 * @return string
 	 */
-	public function assetsStyle($type = 'src')
+	public function assetsStyle($type = null)
 	{
-		return $this->assetsLoader->renderStyle($type);
+		return $this->assetsLoader->renderStyle($type == 'inline' ? true : false);
 	}
 
 	/**