Compatibility with Symfony4 (thanks to Arkounay, see #110 & #111)

Resources/config/services.yml

@@ -12,6 +12,7 @@ services:
           - '%gregwar_image.cache_dir_mode%'
           - '%image.handler.class%'
           - '@service_container'
+          - '@assets.packages'
           - '@file_locator'
           - '%gregwar_image.throw_exception%'
           - '%gregwar_image.fallback_image%'

Services/ImageHandling.php

@@ -5,6 +5,7 @@
 use Gregwar\ImageBundle\ImageHandler;
 use Symfony\Component\Config\FileLocatorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Asset\Packages;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
@@ -30,6 +31,11 @@ class ImageHandling
      */
     private $container;
 
+    /**
+     * @var Packages
+     */
+    private $assetsPackages;
+
     /**
      * @var string
      */
@@ -54,7 +60,7 @@ class ImageHandling
      * @param bool                                 $throwException
      * @param string                               $fallbackImage
      */
-    public function __construct($cacheDirectory, $cacheDirMode, $handlerClass, ContainerInterface $container, $fileLocator, $throwException, $fallbackImage)
+    public function __construct($cacheDirectory, $cacheDirMode, $handlerClass, ContainerInterface $container, Packages $assetsPackages, $fileLocator, $throwException, $fallbackImage)
     {
         if (!$fileLocator instanceof FileLocatorInterface && $fileLocator instanceof KernelInterface) {
             throw new \InvalidArgumentException(
@@ -76,6 +82,7 @@ public function __construct($cacheDirectory, $cacheDirMode, $handlerClass, Conta
         $this->cacheDirMode = intval($cacheDirMode);
         $this->handlerClass = $handlerClass;
         $this->container = $container;
+        $this->assetsPackages = $assetsPackages;
         $this->fileLocator = $fileLocator;
         $this->throwException = $throwException;
         $this->fallbackImage = $fallbackImage;
@@ -150,7 +157,7 @@ private function createInstance($file, $w = null, $h = null)
             });
         } else {
             $image->setFileCallback(function ($file) use ($container) {
-                return $container->get('assets.packages')->getUrl($file);
+                return $this->assetsPackages->getUrl($file);
             });
         }
 

composer.json

@@ -15,17 +15,21 @@
     "require": {
         "php": ">=5.3.3",
         "ext-gd": "*",
-        "symfony/framework-bundle": "^2.3 || ^3.0",
+        "symfony/framework-bundle": "^2.3 || ^3.0 || ^4.0",
         "twig/twig": "^1.12 || ^2.0",
         "gregwar/image": "2.*"
     },
     "require-dev": {
         "sllh/php-cs-fixer-styleci-bridge": "~1.1"
     },
     "autoload": {
-        "psr-0": {
-            "Gregwar\\ImageBundle": ""
+        "psr-4": {
+            "Gregwar\\ImageBundle\\": ""
         }
     },
-    "target-dir": "Gregwar/ImageBundle"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.x-dev"
+        }
+    }
 }