Make PHP 8 green on Travis

Author: nicolas-grekas

Tests/Controller/ArgumentResolverTest.php

@@ -216,10 +216,10 @@ public function testGetNullableArguments()
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
         $request->attributes->set('bar', new \stdClass());
-        $request->attributes->set('mandatory', 'mandatory');
+        $request->attributes->set('last', 'last');
         $controller = [new NullableController(), 'action'];
 
-        $this->assertEquals(['foo', new \stdClass(), 'value', 'mandatory'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', new \stdClass(), 'value', 'last'], self::$resolver->getArguments($request, $controller));
     }
 
     /**
@@ -228,10 +228,10 @@ public function testGetNullableArguments()
     public function testGetNullableArgumentsWithDefaults()
     {
         $request = Request::create('/');
-        $request->attributes->set('mandatory', 'mandatory');
+        $request->attributes->set('last', 'last');
         $controller = [new NullableController(), 'action'];
 
-        $this->assertEquals([null, null, 'value', 'mandatory'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([null, null, 'value', 'last'], self::$resolver->getArguments($request, $controller));
     }
 
     public function testGetSessionArguments()

Tests/Controller/ControllerResolverTest.php

@@ -15,7 +15,7 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ControllerResolver;
-use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\LegacyNullableController;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
 
 class ControllerResolverTest extends TestCase
@@ -243,6 +243,7 @@ public function testIfExceptionIsThrownWhenMissingAnArgument()
 
     /**
      * @requires PHP 7.1
+     * @requires PHP < 8
      * @group legacy
      */
     public function testGetNullableArguments()
@@ -253,12 +254,13 @@ public function testGetNullableArguments()
         $request->attributes->set('foo', 'foo');
         $request->attributes->set('bar', new \stdClass());
         $request->attributes->set('mandatory', 'mandatory');
-        $controller = [new NullableController(), 'action'];
+        $controller = [new LegacyNullableController(), 'action'];
         $this->assertEquals(['foo', new \stdClass(), 'value', 'mandatory'], $resolver->getArguments($request, $controller));
     }
 
     /**
      * @requires PHP 7.1
+     * @requires PHP < 8
      * @group legacy
      */
     public function testGetNullableArgumentsWithDefaults()
@@ -267,7 +269,7 @@ public function testGetNullableArgumentsWithDefaults()
 
         $request = Request::create('/');
         $request->attributes->set('mandatory', 'mandatory');
-        $controller = [new NullableController(), 'action'];
+        $controller = [new LegacyNullableController(), 'action'];
         $this->assertEquals([null, null, 'value', 'mandatory'], $resolver->getArguments($request, $controller));
     }
 

Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php

@@ -80,7 +80,7 @@ public function testSignature5()
 
         $this->assertEquals([
             new ArgumentMetadata('foo', 'array', false, true, null, true),
-            new ArgumentMetadata('bar', null, false, false, null),
+            new ArgumentMetadata('bar', null, false, true, null, true),
         ], $arguments);
     }
 
@@ -122,7 +122,7 @@ public function testNullableTypesSignature()
             new ArgumentMetadata('foo', 'string', false, false, null, true),
             new ArgumentMetadata('bar', \stdClass::class, false, false, null, true),
             new ArgumentMetadata('baz', 'string', false, true, 'value', true),
-            new ArgumentMetadata('mandatory', null, false, false, null, true),
+            new ArgumentMetadata('last', 'string', false, true, '', false),
         ], $arguments);
     }
 
@@ -142,7 +142,7 @@ private function signature4($foo = 'default', $bar = 500, $baz = [])
     {
     }
 
-    private function signature5(array $foo = null, $bar)
+    private function signature5(array $foo = null, $bar = null)
     {
     }
 }

Tests/Fixtures/Controller/LegacyNullableController.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
+
+class LegacyNullableController
+{
+    public function action(?string $foo, ?\stdClass $bar, ?string $baz = 'value', $mandatory)
+    {
+    }
+}

Tests/Fixtures/Controller/NullableController.php

@@ -13,7 +13,7 @@
 
 class NullableController
 {
-    public function action(?string $foo, ?\stdClass $bar, ?string $baz = 'value', $mandatory)
+    public function action(?string $foo, ?\stdClass $bar, ?string $baz = 'value', string $last = '')
     {
     }
 }