Merge pull request #2280 from xabbuh/bump-phpunit-version

bump PHPUnit version

Author: GuilhemN

.github/workflows/continuous-integration.yml

@@ -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"

.travis.yml

@@ -19,11 +19,9 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * @author Ener-Getick <[email protected]>
- *
- * @final since 2.8
+ * @internal
  */
-class FormatNegotiator extends BaseNegotiator
+class BaseFormatNegotiator extends BaseNegotiator
 {
     private $map = [];
     private $requestStack;
@@ -40,7 +38,10 @@ public function add(RequestMatcherInterface $requestMatcher, array $options = []
         $this->map[] = [$requestMatcher, $options];
     }
 
-    public function getBest($header, array $priorities = [])
+    /**
+     * @internal
+     */
+    protected function doGetBest($header, array $priorities = [])
     {
         $request = $this->getRequest();
         $header = $header ?: $request->headers->get('Accept');
@@ -153,3 +154,31 @@ private function getRequest(): Request
         return $request;
     }
 }
+
+if (method_exists(BaseNegotiator::class, 'getOrderedElements')) {
+    /**
+     * @author Guilhem Niot <[email protected]>
+     *
+     * @final since 2.8
+     */
+    class FormatNegotiator extends BaseFormatNegotiator
+    {
+        public function getBest($header, array $priorities = [], $strict = false)
+        {
+            return $this->doGetBest($header, $priorities);
+        }
+    }
+} else {
+    /**
+     * @author Guilhem Niot <[email protected]>
+     *
+     * @final since 2.8
+     */
+    class FormatNegotiator extends BaseFormatNegotiator
+    {
+        public function getBest($header, array $priorities = [])
+        {
+            return $this->doGetBest($header, $priorities);
+        }
+    }
+}

Negotiation/FormatNegotiator.php

@@ -23,6 +23,13 @@ public static function findClassInFile(string $file): ?string
         $class = false;
         $namespace = false;
         $tokens = token_get_all(file_get_contents($file));
+
+        if (defined('T_NAME_QUALIFIED')) {
+            $namespaceToken = T_NAME_QUALIFIED;
+        } else {
+            $namespaceToken = T_STRING;
+        }
+
         for ($i = 0, $count = count($tokens); $i < $count; ++$i) {
             $token = $tokens[$i];
 
@@ -34,12 +41,12 @@ public static function findClassInFile(string $file): ?string
                 return $namespace.'\\'.$token[1];
             }
 
-            if (true === $namespace && T_STRING === $token[0]) {
+            if (true === $namespace && $namespaceToken === $token[0]) {
                 $namespace = '';
                 do {
                     $namespace .= $token[1];
                     $token = $tokens[++$i];
-                } while ($i < $count && is_array($token) && in_array($token[0], [T_NS_SEPARATOR, T_STRING]));
+                } while ($i < $count && is_array($token) && in_array($token[0], [T_NS_SEPARATOR, $namespaceToken]));
             }
 
             if (T_CLASS === $token[0]) {

Routing/Loader/ClassUtils.php

@@ -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']);

Tests/Decoder/JsonToFormDecoderTest.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/DependencyInjection/Compiler/ConfigurationCheckPassTest.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/SerializerConfigurationPassTest.php

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

Tests/DependencyInjection/ConfigurationTest.php

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

Tests/ErrorRenderer/SerializerErrorRendererTest.php

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