Bump PHPStan to level 4

.phpstan/baseline.neon

@@ -3,3 +3,13 @@ parameters:
         - message: '#^Access to undefined constant static\(Liip\\ImagineBundle\\Config\\Filter\\Type\\FilterAbstract\)::NAME\.$#'
           paths:
               - ../src/Config/Filter/Type/FilterAbstract.php
+
+        # BC Layer for Symfony < 5.1
+        - message: "#^Call to function is_array\\(\\) with string will always evaluate to false\\.$#"
+          count: 1
+          path: ../src/Controller/ImagineController.php
+
+        # BC Layer for Symfony < 5.1
+        - message: "#^Unreachable statement \\- code above always terminates\\.$#"
+          count: 1
+          path: ../src/Controller/ImagineController.php

composer.json

@@ -39,7 +39,8 @@
         "aws/aws-sdk-php": "^2.4",
         "doctrine/persistence": "^1.3|^2.0",
         "league/flysystem": "^1.0|^2.0",
-        "phpstan/phpstan": "^0.12.64",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
         "psr/cache": "^1.0|^2.0|^3.0",
         "psr/log": "^1.0",
         "symfony/browser-kit": "^4.4|^5.3|^6.0",

phpstan.neon.dist

@@ -1,10 +1,14 @@
 includes:
     - .phpstan/baseline.neon
+    - vendor/phpstan/phpstan-symfony/extension.neon
 parameters:
-    level: 1
+    level: 4
     paths:
         - src
+    treatPhpDocTypesAsCertain: false
     scanFiles:
         - .phpstan/stubs/AdapterInterface.stub
         - .phpstan/stubs/FilesystemInterface.stub
         - .phpstan/stubs/ReadInterface.stub
+    dynamicConstantNames:
+        - Symfony\Component\HttpKernel\Kernel::VERSION

src/DependencyInjection/Configuration.php

@@ -26,12 +26,12 @@ class Configuration implements ConfigurationInterface
     /**
      * @var ResolverFactoryInterface[]
      */
-    protected $resolversFactories;
+    protected array $resolversFactories;
 
     /**
      * @var LoaderFactoryInterface[]
      */
-    protected $loadersFactories;
+    protected array $loadersFactories;
 
     /**
      * @param ResolverFactoryInterface[] $resolversFactories
@@ -251,7 +251,11 @@ private function addConfigurationSections(array $factories, ArrayNodeDefinition
             $f->addConfiguration($definition->children()->arrayNode($f->getName()));
         }
 
-        $definition->end()
+        $nodeDefinition = $definition->end();
+
+        \assert($nodeDefinition instanceof ArrayNodeDefinition);
+
+        $nodeDefinition
             ->validate()
             ->ifTrue(function ($array) use ($type) {
                 foreach ($array as $name => $element) {

src/DependencyInjection/LiipImagineExtension.php

@@ -32,12 +32,12 @@ class LiipImagineExtension extends Extension implements PrependExtensionInterfac
     /**
      * @var ResolverFactoryInterface[]
      */
-    private $resolversFactories = [];
+    private array $resolversFactories = [];
 
     /**
      * @var LoaderFactoryInterface[]
      */
-    private $loadersFactories = [];
+    private array $loadersFactories = [];
 
     public function addResolverFactory(ResolverFactoryInterface $resolverFactory): void
     {

src/Events/CacheResolveEvent.php

@@ -58,8 +58,6 @@ public function getPath(): string
 
     /**
      * Sets filter name.
-     *
-     * @param $filter
      */
     public function setFilter(string $filter): void
     {

src/Imagine/Cache/Resolver/AbstractFilesystemResolver.php

@@ -28,7 +28,7 @@ abstract class AbstractFilesystemResolver implements ResolverInterface, CacheMan
 
     protected int $folderPermissions = 0777;
 
-    private Request $request;
+    private ?Request $request = null;
 
     /**
      * Constructs a filesystem based cache resolver.
@@ -112,7 +112,7 @@ public function remove(array $paths, array $filters): void
      */
     protected function getRequest(): Request
     {
-        if (false === $this->request) {
+        if (null === $this->request) {
             throw new \LogicException('The request was not injected, inject it before using resolver.');
         }
 

src/Imagine/Filter/Loader/BackgroundFilterLoader.php

@@ -89,7 +89,6 @@ public function load(ImageInterface $image, array $options = []): ImageInterface
                     break;
                 default:
                     throw new \InvalidArgumentException("Unexpected position '{$position}'");
-                    break;
             }
 
             $size = new Box($width, $height);

src/Imagine/Filter/Loader/ResampleFilterLoader.php

@@ -49,13 +49,9 @@ public function load(ImageInterface $image, array $options = []): ImageInterface
     }
 
     /**
-     * @param string $path
-     *
      * @throws \RuntimeException
-     *
-     * @return string
      */
-    private function getTemporaryFile($path)
+    private function getTemporaryFile(string $path): string
     {
         if (!is_dir($path) || false === $file = tempnam($path, 'liip-imagine-bundle')) {
             throw new \RuntimeException(sprintf('Unable to create temporary file in "%s" base path.', $path));
@@ -65,21 +61,16 @@ private function getTemporaryFile($path)
     }
 
     /**
-     * @param $file
-     *
      * @throws \RuntimeException
      */
-    private function delTemporaryFile($file)
+    private function delTemporaryFile(string $file): void
     {
         if (file_exists($file)) {
             unlink($file);
         }
     }
 
-    /**
-     * @return array
-     */
-    private function getImagineSaveOptions(array $options)
+    private function getImagineSaveOptions(array $options): array
     {
         $saveOptions = [
             'resolution-units' => $options['unit'],
@@ -94,10 +85,7 @@ private function getImagineSaveOptions(array $options)
         return $saveOptions;
     }
 
-    /**
-     * @return array
-     */
-    private function resolveOptions(array $options)
+    private function resolveOptions(array $options): array
     {
         $resolver = new OptionsResolver();
 

src/Imagine/Filter/Loader/WatermarkFilterLoader.php

@@ -110,7 +110,6 @@ public function load(ImageInterface $image, array $options = []): ImageInterface
                 break;
             default:
                 throw new \InvalidArgumentException("Unexpected position '{$options['position']}'");
-                break;
         }
 
         return $image->paste($watermark, new Point($x, $y));

src/Imagine/Filter/PostProcessor/PngquantPostProcessor.php

@@ -42,7 +42,7 @@ public function __construct(string $executablePath = '/usr/bin/pngquant', $quali
         $this->quality = $quality;
     }
 
-    /*
+    /**
      * @throws ProcessFailedException
      */
     public function process(BinaryInterface $binary, array $options = []): BinaryInterface