Merge pull request #1516 from liip/cs

fix cs with updated php-cs-fixer
liip · May 23, 2023 · 58b067f · 58b067f
2 parents 1a1d299 + 418e7a5
commit 58b067f
Show file tree

Hide file tree

Showing 73 changed files with 29 additions and 410 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -21,7 +21,7 @@ jobs:
           coverage: none
 
       - name: Update project dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Add vips
         run: composer require rokka/imagine-vips

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -60,7 +60,7 @@ jobs:
             stability: 'dev'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure coverage driver
         id: coverage
@@ -94,12 +94,12 @@ jobs:
         run: composer remove --dev --no-update symfony/messenger
 
       - name: Update project dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
         with:
           dependency-versions: ${{ matrix.dependencies }}
 
       - name: Cache PHPUnit
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: vendor/bin/.phpunit
           key: ${{ runner.os }}-phpunit-${{ matrix.php }}

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -89,4 +89,5 @@
         'semicolon_after_instruction' => true,
         'strict_comparison' => true,
         'strict_param' => true,
+        'get_class_to_class_keyword' => false, // not compatible with PHP 7
     ]);
diff --git a/Async/CacheResolved.php b/Async/CacheResolved.php
@@ -51,9 +51,6 @@ public function getUris(): array
         return $this->uris;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function jsonSerialize(): array
     {
         return ['path' => $this->path, 'uris' => $this->uris];

diff --git a/Async/ResolveCache.php b/Async/ResolveCache.php
@@ -62,9 +62,6 @@ public function isForce(): bool
         return $this->force;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function jsonSerialize(): array
     {
         return ['path' => $this->path, 'filters' => $this->filters, 'force' => $this->force];

diff --git a/Binary/Loader/AbstractDoctrineLoader.php b/Binary/Loader/AbstractDoctrineLoader.php
@@ -37,9 +37,6 @@ public function __construct($manager, $class = null)
         $this->class = $class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function find($path)
     {
         $image = $this->manager->find($this->class, $this->mapPathToId($path));

diff --git a/Binary/Loader/ChainLoader.php b/Binary/Loader/ChainLoader.php
@@ -30,9 +30,6 @@ public function __construct(array $loaders)
         });
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function find($path)
     {
         $exceptions = [];

diff --git a/Binary/Loader/FileSystemLoader.php b/Binary/Loader/FileSystemLoader.php
@@ -66,9 +66,6 @@ public function __construct(
         $this->locator = $locator;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function find($path)
     {
         $path = $this->locator->locate($path);

diff --git a/Binary/Loader/FlysystemLoader.php b/Binary/Loader/FlysystemLoader.php
@@ -46,9 +46,6 @@ public function __construct(
         $this->filesystem = $filesystem;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function find($path)
     {
         if (false === $this->filesystem->has($path)) {

diff --git a/Binary/Loader/FlysystemV2Loader.php b/Binary/Loader/FlysystemV2Loader.php
@@ -37,9 +37,6 @@ public function __construct(
         $this->filesystem = $filesystem;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function find($path)
     {
         try {

diff --git a/Binary/Loader/LoaderInterface.php b/Binary/Loader/LoaderInterface.php
@@ -20,8 +20,6 @@ interface LoaderInterface
      *
      * The path may be a file path on a filesystem, or any unique identifier among the storage engine implemented by this Loader.
      *
-     * @param mixed $path
-     *
      * @return BinaryInterface|string An image binary content
      */
     public function find($path);

diff --git a/Binary/Loader/StreamLoader.php b/Binary/Loader/StreamLoader.php
@@ -46,9 +46,6 @@ public function __construct($wrapperPrefix, $context = null)
         $this->context = empty($context) ? null : $context;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function find($path)
     {
         $name = $this->wrapperPrefix.$path;

diff --git a/Binary/Locator/FileSystemInsecureLocator.php b/Binary/Locator/FileSystemInsecureLocator.php
@@ -15,9 +15,9 @@ class FileSystemInsecureLocator extends FileSystemLocator
 {
     protected function generateAbsolutePath(string $root, string $path): ?string
     {
-        if (false === mb_strpos($path, '..'.DIRECTORY_SEPARATOR) &&
-            false === mb_strpos($path, DIRECTORY_SEPARATOR.'..') &&
-            false !== file_exists($absolute = $root.DIRECTORY_SEPARATOR.$path)
+        if (false === mb_strpos($path, '..'.DIRECTORY_SEPARATOR)
+            && false === mb_strpos($path, DIRECTORY_SEPARATOR.'..')
+            && false !== file_exists($absolute = $root.DIRECTORY_SEPARATOR.$path)
         ) {
             return $absolute;
         }

diff --git a/Binary/SimpleMimeTypeGuesser.php b/Binary/SimpleMimeTypeGuesser.php
@@ -38,9 +38,6 @@ public function __construct($mimeTypeGuesser)
         $this->mimeTypeGuesser = $mimeTypeGuesser;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function guess($binary)
     {
         if (false === $tmpFile = tempnam(sys_get_temp_dir(), 'liip-imagine-bundle')) {

diff --git a/Controller/ImagineController.php b/Controller/ImagineController.php
@@ -52,7 +52,7 @@ public function __construct(
         FilterService $filterService,
         DataManager $dataManager,
         SignerInterface $signer,
-        ?ControllerConfig $controllerConfig = null
+        ControllerConfig $controllerConfig = null
     ) {
         $this->filterService = $filterService;
         $this->dataManager = $dataManager;
@@ -156,7 +156,7 @@ private function getFiltersBc(Request $request): array
         return $runtimeConfig;
     }
 
-    private function createRedirectResponse(\Closure $url, string $path, string $filter, ?string $hash = null): RedirectResponse
+    private function createRedirectResponse(\Closure $url, string $path, string $filter, string $hash = null): RedirectResponse
     {
         try {
             return new RedirectResponse($url(), $this->controllerConfig->getRedirectResponseCode());

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -69,10 +69,10 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->beforeNormalization()
                 ->ifTrue(function ($v) {
                     return
-                        empty($v['loaders']) ||
-                        empty($v['loaders']['default']) ||
-                        empty($v['resolvers']) ||
-                        empty($v['resolvers']['default']);
+                        empty($v['loaders'])
+                        || empty($v['loaders']['default'])
+                        || empty($v['resolvers'])
+                        || empty($v['resolvers']['default']);
                 })
                 ->then(function ($v) {
                     if (empty($v['loaders'])) {

diff --git a/DependencyInjection/Factory/Loader/ChainLoaderFactory.php b/DependencyInjection/Factory/Loader/ChainLoaderFactory.php
@@ -17,9 +17,6 @@
 
 class ChainLoaderFactory extends AbstractLoaderFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function create(ContainerBuilder $container, $loaderName, array $config): string
     {
         $definition = $this->getChildLoaderDefinition();
@@ -28,17 +25,11 @@ public function create(ContainerBuilder $container, $loaderName, array $config):
         return $this->setTaggedLoaderDefinition($loaderName, $definition, $container);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName(): string
     {
         return 'chain';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addConfiguration(ArrayNodeDefinition $builder): void
     {
         $builder

diff --git a/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php b/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php
@@ -19,9 +19,6 @@
 
 class FileSystemLoaderFactory extends AbstractLoaderFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function create(ContainerBuilder $container, $loaderName, array $config)
     {
         $locatorDefinition = new ChildDefinition(sprintf('liip_imagine.binary.locator.%s', $config['locator']));
@@ -41,17 +38,11 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
         return $this->setTaggedLoaderDefinition($loaderName, $definition, $container);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName()
     {
         return 'filesystem';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder

diff --git a/DependencyInjection/Factory/Loader/FlysystemLoaderFactory.php b/DependencyInjection/Factory/Loader/FlysystemLoaderFactory.php
@@ -18,9 +18,6 @@
 
 class FlysystemLoaderFactory extends AbstractLoaderFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function create(ContainerBuilder $container, $loaderName, array $config)
     {
         $definition = $this->getChildLoaderDefinition($this->getChildLoaderName());
@@ -35,17 +32,11 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
         return $this->setTaggedLoaderDefinition($loaderName, $definition, $container);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName()
     {
         return 'flysystem';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder

diff --git a/DependencyInjection/Factory/Loader/StreamLoaderFactory.php b/DependencyInjection/Factory/Loader/StreamLoaderFactory.php
@@ -16,9 +16,6 @@
 
 class StreamLoaderFactory extends AbstractLoaderFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function create(ContainerBuilder $container, $loaderName, array $config)
     {
         $definition = $this->getChildLoaderDefinition();
@@ -28,17 +25,11 @@ public function create(ContainerBuilder $container, $loaderName, array $config)
         return $this->setTaggedLoaderDefinition($loaderName, $definition, $container);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName()
     {
         return 'stream';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder

diff --git a/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php b/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php
@@ -18,9 +18,6 @@
 
 class AwsS3ResolverFactory extends AbstractResolverFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function create(ContainerBuilder $container, $resolverName, array $config)
     {
         $awsS3ClientId = 'liip_imagine.cache.resolver.'.$resolverName.'.client';
@@ -74,17 +71,11 @@ public function create(ContainerBuilder $container, $resolverName, array $config
         return $resolverId;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName()
     {
         return 'aws_s3';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder

diff --git a/DependencyInjection/Factory/Resolver/FlysystemResolverFactory.php b/DependencyInjection/Factory/Resolver/FlysystemResolverFactory.php
@@ -18,9 +18,6 @@
 
 class FlysystemResolverFactory extends AbstractResolverFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function create(ContainerBuilder $container, $resolverName, array $config)
     {
         $resolverDefinition = $this->getChildResolverDefinition($this->getChildResolverName());
@@ -38,17 +35,11 @@ public function create(ContainerBuilder $container, $resolverName, array $config
         return $resolverId;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName()
     {
         return 'flysystem';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder

diff --git a/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php b/DependencyInjection/Factory/Resolver/WebPathResolverFactory.php
@@ -17,9 +17,6 @@
 
 class WebPathResolverFactory extends AbstractResolverFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function create(ContainerBuilder $container, $resolverName, array $config)
     {
         $resolverDefinition = $this->getChildResolverDefinition();
@@ -35,17 +32,11 @@ public function create(ContainerBuilder $container, $resolverName, array $config
         return $resolverId;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getName()
     {
         return 'web_path';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,9 +30,6 @@ public function __construct(array $loaders) @@
             });
         }
-        /**
-         * {@inheritdoc}
-         */
         public function find($path)
         {
             $exceptions = [];
@@ Expand Down @@