Merge 4.x into 5.x

.github/workflows/test.yaml

@@ -39,6 +39,7 @@ jobs:
                     - '7.4'
                     - '8.0'
                     - '8.1'
+                    - '8.2'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
@@ -68,6 +69,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.1.*
                       variant: symfony/symfony:"6.1.*"
+                    - php-version: '8.1'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 6.2.*
+                      variant: symfony/symfony:"6.2.*"
 
         steps:
             - name: Checkout

composer.json

@@ -83,7 +83,7 @@
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.17",
         "psalm/plugin-symfony": "^3.0",
-        "rector/rector": "^0.14",
+        "rector/rector": "^0.15",
         "sonata-project/admin-bundle": "^4.9",
         "sonata-project/block-bundle": "^4.11",
         "sonata-project/classification-bundle": "^4.0",

phpstan.neon.dist

@@ -1,5 +1,10 @@
+# DO NOT EDIT THIS FILE!
+#
+# It's auto-generated by sonata-project/dev-kit package.
+
 includes:
     - phpstan-baseline.neon
+    - vendor/phpstan/phpstan/conf/bleedingEdge.neon
 
 parameters:
     level: 8
@@ -8,6 +13,8 @@ parameters:
     paths:
         - src
         - tests
+    scanFiles:
+        - vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
     treatPhpDocTypesAsCertain: false
     checkGenericClassInNonGenericObjectType: true
     checkInternalClassCaseSensitivity: true

psalm.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="2" findUnusedPsalmSuppress="true" resolveFromConfigFile="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" errorBaseline="psalm-baseline.xml">
+<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="2" findUnusedPsalmSuppress="true" resolveFromConfigFile="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
     <projectFiles>
         <directory name="src"/>
         <directory name="tests"/>
@@ -15,5 +15,11 @@
         <!-- Psalm equivalent of PHPStan config `treatPhpDocTypesAsCertain: false` -->
         <DocblockTypeContradiction errorLevel="suppress"/>
         <RedundantConditionGivenDocblockType errorLevel="suppress"/>
+        <UndefinedInterfaceMethod>
+            <errorLevel type="suppress">
+                <!-- https://github.com/psalm/psalm-plugin-symfony/issues/287 -->
+                <referencedMethod name="Symfony\Component\Console\Helper\HelperInterface::ask"/>
+            </errorLevel>
+        </UndefinedInterfaceMethod>
     </issueHandlers>
 </psalm>

src/Command/RefreshMetadataCommand.php

@@ -18,7 +18,6 @@
 use Sonata\MediaBundle\Provider\Pool;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -135,7 +134,7 @@ private function getProvider(InputInterface $input, OutputInterface $output): Me
         $providerName = $input->getArgument('providerName');
 
         if (null === $providerName) {
-            $providerName = $this->getQuestionHelper()->ask(
+            $providerName = $this->getHelper('question')->ask(
                 $input,
                 $output,
                 new ChoiceQuestion('Please select the provider', array_keys($this->mediaPool->getProviders()))
@@ -150,7 +149,7 @@ private function getContext(InputInterface $input, OutputInterface $output): str
         $context = $input->getArgument('context');
 
         if (null === $context) {
-            $context = $this->getQuestionHelper()->ask(
+            $context = $this->getHelper('question')->ask(
                 $input,
                 $output,
                 new ChoiceQuestion('Please select the context', array_keys($this->mediaPool->getContexts()))
@@ -159,9 +158,4 @@ private function getContext(InputInterface $input, OutputInterface $output): str
 
         return $context;
     }
-
-    private function getQuestionHelper(): QuestionHelper
-    {
-        return $this->getHelper('question');
-    }
 }

src/Command/RemoveThumbsCommand.php

@@ -19,7 +19,6 @@
 use Sonata\MediaBundle\Provider\Pool;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -144,7 +143,7 @@ private function getProvider(InputInterface $input, OutputInterface $output): Me
         $providerName = $input->getArgument('providerName');
 
         if (null === $providerName) {
-            $providerName = $this->getQuestionHelper()->ask(
+            $providerName = $this->getHelper('question')->ask(
                 $input,
                 $output,
                 new ChoiceQuestion('Please select the provider', array_keys($this->mediaPool->getProviders()))
@@ -159,7 +158,7 @@ private function getContext(InputInterface $input, OutputInterface $output): str
         $context = $input->getArgument('context');
 
         if (null === $context) {
-            $context = $this->getQuestionHelper()->ask(
+            $context = $this->getHelper('question')->ask(
                 $input,
                 $output,
                 new ChoiceQuestion('Please select the context', array_keys($this->mediaPool->getContexts()))
@@ -177,7 +176,7 @@ private function getFormat(InputInterface $input, OutputInterface $output, Media
             $formats = array_keys($provider->getFormats());
             $formats[] = '<ALL THUMBNAILS>';
 
-            $format = $this->getQuestionHelper()->ask(
+            $format = $this->getHelper('question')->ask(
                 $input,
                 $output,
                 new ChoiceQuestion('Please select the format', $formats)
@@ -229,9 +228,4 @@ private function log(OutputInterface $output, string $message): void
             $output->writeln($message);
         }
     }
-
-    private function getQuestionHelper(): QuestionHelper
-    {
-        return $this->getHelper('question');
-    }
 }

src/Messenger/GenerateThumbnailsHandler.php

@@ -21,6 +21,8 @@
 
 /**
  * @author Jordi Sala Morales <jordism91@gmail.com>
+ *
+ * @psalm-suppress DeprecatedInterface
  */
 final class GenerateThumbnailsHandler implements MessageHandlerInterface
 {

src/Provider/BaseVideoProvider.php

@@ -182,7 +182,7 @@ protected function getMetadata(MediaInterface $media, string $url)
         } catch (\RuntimeException $exception) {
             throw new \RuntimeException(
                 sprintf('Unable to retrieve the video information for: %s', $url),
-                $exception->getCode(),
+                (int) $exception->getCode(),
                 $exception
             );
         }

tests/Messenger/GenerateThumbnailsHandlerTest.php

@@ -32,12 +32,12 @@ final class GenerateThumbnailsHandlerTest extends TestCase
     /**
      * @var MockObject&GenerableThumbnailInterface
      */
-    private $thumbnail;
+    private GenerableThumbnailInterface $thumbnail;
 
     /**
      * @var MockObject&MediaManagerInterface
      */
-    private $mediaManager;
+    private MediaManagerInterface $mediaManager;
 
     private Pool $pool;
 

tests/Thumbnail/MessengerThumbnailTest.php

@@ -32,7 +32,7 @@ final class MessengerThumbnailTest extends TestCase
     /**
      * @var MockObject&MessageBusInterface
      */
-    private $bus;
+    private MessageBusInterface $bus;
 
     private MessengerThumbnail $thumbnail;
 

tests/Twig/MediaRuntimeTest.php

@@ -30,17 +30,17 @@ class MediaRuntimeTest extends TestCase
     /**
      * @var MockObject&MediaManagerInterface
      */
-    private $mediaManager;
+    private MediaManagerInterface $mediaManager;
 
     /**
      * @var MockObject&Environment
      */
-    private $twig;
+    private Environment $twig;
 
     /**
      * @var MockObject&MediaProviderInterface
      */
-    private $provider;
+    private MediaProviderInterface $provider;
 
     private MediaRuntime $mediaRuntime;