Support for Symfony 4.x (#4)

* Support for Symfony 4.x

* Updated code

Author: patrykwozinski

AssetsBundle/DependencyInjection/DocplannerAssetsExtension.php

@@ -2,6 +2,8 @@
 
 namespace Docplanner\AssetsBundle\DependencyInjection;
 
+use RuntimeException;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -40,7 +42,7 @@ public function load(array $configs, ContainerBuilder $container)
 
 					if (false === file_exists($path))
 					{
-						throw new \RuntimeException(sprintf('File "%s" not found(asset "%s")!', $path, $assetName));
+						throw new RuntimeException(sprintf('File "%s" not found(asset "%s")!', $path, $assetName));
 					}
 
 					if ($config['use_revisions'])
@@ -78,7 +80,7 @@ public function load(array $configs, ContainerBuilder $container)
 
 		$container->setParameter('docplanner_assets.config', $config);
 
-		$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+		$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }
 
@@ -93,14 +95,14 @@ protected function loadManifestAssets($manifestFile)
 
 				if(!is_array($manifest))
 				{
-					throw new \RuntimeException(sprintf('Cannot parse manifest file `%s`', $manifestFile));
+					throw new RuntimeException(sprintf('Cannot parse manifest file `%s`', $manifestFile));
 				}
 
 				self::$parsedManifests[$manifestFile] = $manifest;
 			}
 			else
 			{
-				throw new \RuntimeException(sprintf('Manifest file `%s` not found', $manifestFile));
+				throw new RuntimeException(sprintf('Manifest file `%s` not found', $manifestFile));
 			}
 		}
 

AssetsBundle/Service/AssetsPicker.php

@@ -6,6 +6,7 @@
 
 namespace Docplanner\AssetsBundle\Service;
 
+use LogicException;
 use Docplanner\AssetsBundle\IO\Asset;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -40,7 +41,7 @@ public function __construct(RequestStack $requestStack, array $config)
 	public function pickAssets($type, $forceRoute = null)
 	{
 		if (false === array_key_exists($type, $this->config['types'])) {
-			throw new \LogicException(sprintf('Type "%s" is not defined!', $type));
+			throw new LogicException(sprintf('Type "%s" is not defined!', $type));
 		}
 
 		$route = $forceRoute ? $forceRoute : ($this->requestStack->getMasterRequest() ? $this->requestStack->getMasterRequest()->get('_route') : null);

AssetsBundle/Service/AssetsRepository.php

@@ -6,6 +6,7 @@
 
 namespace Docplanner\AssetsBundle\Service;
 
+use LogicException;
 use Docplanner\AssetsBundle\IO\Asset;
 
 class AssetsRepository
@@ -38,7 +39,7 @@ public function getAssetsList($type)
 
 		if (false === array_key_exists($type, $this->config['types']))
 		{
-			throw new \LogicException(sprintf('Type "%s" is not defined!', $type));
+			throw new LogicException(sprintf('Type "%s" is not defined!', $type));
 		}
 
 		$this->data[$type] = [];
@@ -62,7 +63,7 @@ public function getAsset($type, $assetName)
 
 		if (false === array_key_exists($assetName, $assets))
 		{
-			throw new \LogicException(sprintf('Asset "%s" not defined in type "%s"!', $assetName, $type));
+			throw new LogicException(sprintf('Asset "%s" not defined in type "%s"!', $assetName, $type));
 		}
 
 		return $assets[$assetName];

AssetsBundle/Twig/AssetsExtension.php

@@ -2,9 +2,11 @@
 
 namespace Docplanner\AssetsBundle\Twig;
 
+use Twig_Extension;
+use Twig_SimpleFunction;
 use Docplanner\AssetsBundle\Service\AssetsLoader;
 
-class AssetsExtension extends \Twig_Extension
+class AssetsExtension extends Twig_Extension
 {
 	/** @var AssetsLoader $assetsLoader */
 	private $assetsLoader;
@@ -23,7 +25,7 @@ public function __construct(AssetsLoader $assetsLoader)
 	public function getFunctions()
 	{
 		return [
-			new \Twig_SimpleFunction('assets_*', [$this->assetsLoader, 'assets'], ['is_safe' => ['html']]),
+			new Twig_SimpleFunction('assets_*', [$this->assetsLoader, 'assets'], ['is_safe' => ['html']]),
 		];
 	}
 

composer.json

@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=7.1",
-        "symfony/framework-bundle": "~2.3|~3.0",
+        "symfony/framework-bundle": "~2.3|~3.0|~4.0",
         "twig/twig": "1.*"
     },
     "autoload": {