Merge branch '6.4' into 7.0

* 6.4:
  Make more nullable types explicit
  Add more explicit nullable types for default null values

Author: derrabus

Caster/ReflectionCaster.php

@@ -368,7 +368,7 @@ public static function getSignature(array $a): string
                     if (!$type instanceof \ReflectionNamedType) {
                         $signature .= $type.' ';
                     } else {
-                        if (!$param->isOptional() && $param->allowsNull() && 'mixed' !== $type->getName()) {
+                        if ($param->allowsNull() && 'mixed' !== $type->getName()) {
                             $signature .= '?';
                         }
                         $signature .= substr(strrchr('\\'.$type->getName(), '\\'), 1).' ';

Tests/Caster/StubCasterTest.php

@@ -155,7 +155,7 @@ public function testClassStub()
 
         $expectedDump = <<<'EODUMP'
 <foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp data-depth=1 class=sf-dump-expanded>
-  <span class=sf-dump-index>0</span> => "<a href="%sFooInterface.php:10" rel="noopener noreferrer"><span class=sf-dump-str title="39 characters">hello(?stdClass $a, stdClass $b = null)</span></a>"
+  <span class=sf-dump-index>0</span> => "<a href="%sFooInterface.php:10" rel="noopener noreferrer"><span class=sf-dump-str title="40 characters">hello(?stdClass $a, ?stdClass $b = null)</span></a>"
 </samp>]
 </bar>
 EODUMP;

Tests/Dumper/CliDumperTest.php

@@ -90,7 +90,7 @@ public function testGet()
     +foo: ""…3
     +"bar": "bar"
   }
-  "closure" => Closure(\$a, PDO &\$b = null) {#%d
+  "closure" => Closure(\$a, ?PDO &\$b = null) {#%d
     class: "Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest"
     this: Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest {#%d …}
     file: "%s%eTests%eFixtures%edumb-var.php"

Tests/Dumper/HtmlDumperTest.php

@@ -84,7 +84,7 @@ public function testGet()
     +<span class=sf-dump-public title="Public property">foo</span>: "<span class=sf-dump-str title="3 characters">foo</span>"
     +"<span class=sf-dump-public title="Runtime added dynamic property">bar</span>": "<span class=sf-dump-str title="3 characters">bar</span>"
   </samp>}
-  "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure(\$a, PDO &amp;\$b = null)</span> {<a class=sf-dump-ref>#%d</a><samp data-depth=2 class=sf-dump-compact>
+  "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure(\$a, ?PDO &amp;\$b = null)</span> {<a class=sf-dump-ref>#%d</a><samp data-depth=2 class=sf-dump-compact>
     <span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest
 55 characters"><span class="sf-dump-ellipsis sf-dump-ellipsis-class">Symfony\Component\VarDumper\Tests\Dumper</span><span class="sf-dump-ellipsis sf-dump-ellipsis-class">\</span>HtmlDumperTest</span>"
     <span class=sf-dump-meta>this</span>: <span class=sf-dump-note title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest

Tests/Dumper/functions/dump_data_collector_with_spl_array.phpt

@@ -14,10 +14,10 @@ use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\VarDumper;
 
-VarDumper::setHandler(function ($var, string $label = null) {
+VarDumper::setHandler(function ($var, ?string $label = null) {
     $dumper = new DumpDataCollector();
     $cloner = new VarCloner();
-    $handler = function ($var, string $label = null) use ($dumper, $cloner) {
+    $handler = function ($var, ?string $label = null) use ($dumper, $cloner) {
         $var = $cloner->cloneVar($var);
         if (null !== $label) {
             $var = $var->withContext(['label' => $label]);

Tests/Fixtures/FooInterface.php

@@ -7,5 +7,5 @@ interface FooInterface
     /**
      * Hello.
      */
-    public function foo(?\stdClass $a, \stdClass $b = null);
+    public function foo(?\stdClass $a, ?\stdClass $b = null);
 }

Tests/Fixtures/Twig.php

@@ -18,7 +18,7 @@ class __TwigTemplate_VarDumperFixture_u75a09 extends AbstractTwigTemplate
 {
     private $path;
 
-    public function __construct(Twig\Environment $env = null, $path = null)
+    public function __construct(?Twig\Environment $env = null, $path = null)
     {
         if (null !== $env) {
             parent::__construct($env);

Tests/Fixtures/dumb-var.php

@@ -31,7 +31,7 @@ class DumbFoo
     '[]' => [],
     'res' => $g,
     'obj' => $foo,
-    'closure' => function ($a, \PDO &$b = null) {},
+    'closure' => function ($a, ?\PDO &$b = null) {},
     'line' => __LINE__ - 1,
     'nobj' => [(object) []],
 ];