Add exception to file not exists

Author: SongoQ

AssetsBundle/DependencyInjection/DocplannerAssetsExtension.php

@@ -26,9 +26,4 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }
-
-	public function getAlias()
-	{
-		return 'docplanner_assets';
-	}
 }

AssetsBundle/Service/AssetsLoader.php

@@ -11,9 +11,9 @@ class AssetsLoader
 	 */
 	public function renderScript($type = 'file')
 	{
-		$files = 'file.js';
+		$files = ['platform/js/rwd-common.js'];
 
-		$mask = $type == 'file' ? '<script>%s</script>' : '<script src="%s?%s"></script>';
+		$mask = $type == 'inline' ? '<script>%s</script>' : '<script src="%s?%s"></script>';
 
 		return $this->render($mask, $files, $type);
 	}
@@ -25,9 +25,9 @@ public function renderScript($type = 'file')
 	 */
 	public function renderStyle($type = 'file')
 	{
-		$files = 'file.js';
+		$files = ['platform/css/rwd-common.css'];
 
-		$mask = $type == 'file' ? '<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, $files, $type);
 	}
@@ -47,13 +47,23 @@ private function render($mask, $files, $type)
 		{
 			foreach ($files as $file)
 			{
+				if (!file_exists($file))
+				{
+					throw new \LogicException(sprintf('File %s not found', $file));
+				}
+
 				$ret .= sprintf($mask, $file, crc32(file_get_contents($file)));
 			}
 		}
 		else
 		{
 			foreach ($files as $file)
 			{
+				if (!file_exists($file))
+				{
+					throw new \LogicException(sprintf('File %s not found', $file));
+				}
+
 				$source = file_get_contents($file);
 				$ret .= $source;
 			}

AssetsBundle/Twig/AssetsExtension.php

@@ -23,8 +23,8 @@ public function __construct(AssetsLoader $assetsLoader)
 	public function getFunctions()
 	{
 		return [
-			new \Twig_SimpleFunction('assets_script', [$this, 'assetsScript']),
-			new \Twig_SimpleFunction('assets_style',  [$this, 'assetsStyle']),
+			new \Twig_SimpleFunction('assets_script', [$this, 'assetsScript'], ['is_safe' => ['html']]),
+			new \Twig_SimpleFunction('assets_style',  [$this, 'assetsStyle'], ['is_safe' => ['html']]),
 		];
 	}
 
@@ -33,20 +33,19 @@ public function getFunctions()
 	 *
 	 * @return string
 	 */
-	protected function assetsScript($type = null)
+	public function assetsScript($type = 'file')
 	{
-		return '';
-//		return $this->assetsLoader->renderScript($type);
+		return $this->assetsLoader->renderScript($type);
 	}
 
 	/**
 	 * @param null $type
 	 *
 	 * @return string
 	 */
-	protected function assetsStyle($type = null)
+	public function assetsStyle($type = 'file')
 	{
-		return $this->assetsLoader->renderScript($type);
+		return $this->assetsLoader->renderStyle($type);
 	}
 
 	/**