Merge branch '2.x' into 3.x

Author: GuilhemN

.github/workflows/continuous-integration.yml

@@ -1,7 +1,7 @@
 # from doctrine/instantiator:
 # https://github.com/doctrine/instantiator/blob/97aa11bb71ad6259a8c5a1161b4de2d6cdcc5501/.github/workflows/continuous-integration.yml
 
-name: "Continuous Integration"
+name: "CI"
 
 on:
   pull_request:
@@ -37,6 +37,7 @@ jobs:
             coverage: yes
           - php-version: 8.0
             composer-flags: "--ignore-platform-reqs"
+            symfony-deprecations: "max[self]=0"
 
     steps:
       - name: "Checkout"
@@ -68,7 +69,9 @@ jobs:
       - name: "Install dependencies with composer"
         env:
           SYMFONY_REQUIRE: "${{ matrix.symfony-require }}"
-        run: "composer update --no-interaction --no-progress ${{ matrix.composer-flags }}"
+        run: |
+          composer global require --no-progress --no-scripts --no-plugins symfony/flex
+          composer update --no-interaction --no-progress ${{ matrix.composer-flags }}
 
       - name: "Run PHPUnit"
         if: "${{ matrix.coverage != '' }}"
@@ -78,5 +81,7 @@ jobs:
           php ocular.phar code-coverage:upload --format=php-clover coverage.clover
 
       - name: "Run PHPUnit"
+        env:
+          SYMFONY_DEPRECATIONS_HELPER: "${{ matrix.symfony-deprecations }}"
         if: "${{ matrix.coverage == '' }}"
         run: "./phpunit"

.phpunit.result.cache

@@ -20,7 +20,9 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * @author Ener-Getick <[email protected]>
+ * @author Guilhem Niot <[email protected]>
+ *
+ * @final since 2.8
  */
 final class FormatNegotiator extends BaseNegotiator
 {
@@ -39,7 +41,7 @@ public function add(RequestMatcherInterface $requestMatcher, array $options = []
         $this->map[] = [$requestMatcher, $options];
     }
 
-    public function getBest($header, array $priorities = []): ?AcceptHeader
+    public function getBest($header, array $priorities = [], $strict = false)
     {
         $request = $this->getRequest();
         $header = $header ?: $request->headers->get('Accept');

.travis.yml

@@ -37,8 +37,8 @@ public function testDecodeWithRemovingFalseData()
         $decoder = new JsonToFormDecoder();
         $decoded = $decoder->decode(json_encode($data));
 
-        $this->assertInternalType('array', $decoded);
-        $this->assertInternalType('array', $decoded['arrayKey']);
+        $this->assertIsArray($decoded);
+        $this->assertIsArray($decoded['arrayKey']);
         $this->assertNull($decoded['arrayKey']['falseKey']);
         $this->assertEquals('foo', $decoded['arrayKey']['stringKey']);
         $this->assertNull($decoded['falseKey']);

Negotiation/FormatNegotiator.php

@@ -22,12 +22,11 @@
  */
 class ConfigurationCheckPassTest extends TestCase
 {
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage You need to enable the parameter converter listeners in SensioFrameworkExtraBundle when using the FOSRestBundle RequestBodyParamConverter
-     */
     public function testShouldThrowRuntimeExceptionWhenBodyConverterIsEnabledButParamConvertersAreNotEnabled()
     {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('You need to enable the parameter converter listeners in SensioFrameworkExtraBundle when using the FOSRestBundle RequestBodyParamConverter');
+
         $container = new ContainerBuilder();
 
         $container->register('fos_rest.converter.request_body');
@@ -36,12 +35,11 @@ public function testShouldThrowRuntimeExceptionWhenBodyConverterIsEnabledButPara
         $compiler->process($container);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage SensioFrameworkExtraBundle view annotations
-     */
     public function testExceptionWhenViewAnnotationsAreNotEnabled()
     {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('SensioFrameworkExtraBundle view annotations');
+
         $container = new ContainerBuilder();
 
         $container->register('fos_rest.view_response_listener');

Tests/Decoder/JsonToFormDecoderTest.php

@@ -28,7 +28,7 @@ class SerializerConfigurationPassTest extends TestCase
      */
     private $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->container = new ContainerBuilder();
     }
@@ -44,11 +44,10 @@ public function testShouldDoNothingIfSerializerIsFound()
         $this->assertSame(get_class($serializer), $this->container->getDefinition('fos_rest.serializer')->getClass());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testShouldThrowInvalidArgumentExceptionWhenNoSerializerIsFound()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $compiler = new SerializerConfigurationPass();
         $compiler->process($this->container);
     }

Tests/DependencyInjection/Compiler/ConfigurationCheckPassTest.php

@@ -219,7 +219,7 @@ public function incorrectExceptionCodeProvider()
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->configuration = new Configuration(false);

Tests/DependencyInjection/Compiler/SerializerConfigurationPassTest.php

@@ -24,7 +24,7 @@
 
 class SerializerErrorRendererTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!interface_exists(ErrorRendererInterface::class)) {
             $this->markTestSkipped();

Tests/DependencyInjection/ConfigurationTest.php

@@ -159,7 +159,7 @@ public function getDataForDefaultVarsCopy()
         ];
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->router = $this->getMockBuilder(RouterInterface::class)->getMock();
         $this->serializer = $this->getMockBuilder(Serializer::class)->getMock();