Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 23c16c6

Browse filesBrowse files
nikophilnikophil
committed
[VarExporter] fix proxy helper when a method returns null
1 parent 202199b commit 23c16c6
Copy full SHA for 23c16c6

File tree

6 files changed

+59
-4
lines changed
Filter options

6 files changed

+59
-4
lines changed

‎src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, arra
231231
if (isset($a[$prefix.'returnType'])) {
232232
$v = $a[$prefix.'returnType'];
233233
$v = $v instanceof \ReflectionNamedType ? $v->getName() : (string) $v;
234-
$a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType'] instanceof \ReflectionNamedType && $a[$prefix.'returnType']->allowsNull() && 'mixed' !== $v ? '?'.$v : $v, [class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', '']);
234+
$a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType'] instanceof \ReflectionNamedType && $a[$prefix.'returnType']->allowsNull() && !\in_array($v, ['mixed', 'null'], true) ? '?'.$v : $v, [class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', '']);
235235
}
236236
if (isset($a[$prefix.'class'])) {
237237
$a[$prefix.'class'] = new ClassStub($a[$prefix.'class']);
@@ -413,7 +413,7 @@ public static function getSignature(array $a)
413413
if (!$type instanceof \ReflectionNamedType) {
414414
$signature .= $type.' ';
415415
} else {
416-
if ($param->allowsNull() && 'mixed' !== $type->getName()) {
416+
if ($param->allowsNull() && !\in_array($type->getName(), ['mixed', 'null'], true)) {
417417
$signature .= '?';
418418
}
419419
$signature .= substr(strrchr('\\'.$type->getName(), '\\'), 1).' ';

‎src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
+22-1Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo;
1919
use Symfony\Component\VarDumper\Tests\Fixtures\LotsOfAttributes;
2020
use Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass;
21+
use Symfony\Component\VarDumper\Tests\Fixtures\Php82NullStandaloneReturnType;
2122
use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionIntersectionTypeFixture;
2223
use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionNamedTypeFixture;
2324
use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionUnionTypeFixture;
@@ -95,7 +96,7 @@ public function testClosureCaster()
9596
$b: & 123
9697
}
9798
file: "%sReflectionCasterTest.php"
98-
line: "88 to 88"
99+
line: "%s"
99100
}
100101
EOTXT
101102
, $var
@@ -406,6 +407,26 @@ class: "Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest"
406407
);
407408
}
408409

410+
/**
411+
* @requires PHP 8.2
412+
*/
413+
public function testNullReturnType()
414+
{
415+
$className = Php82NullStandaloneReturnType::class;
416+
417+
$this->assertDumpMatchesFormat(
418+
<<<EOTXT
419+
{$className}::foo(null \$bar): null {
420+
returnType: "null"
421+
this: {$className} { …}
422+
file: "%s"
423+
line: "%s"
424+
}
425+
EOTXT
426+
, (new Php82NullStandaloneReturnType())->foo(...)
427+
);
428+
}
429+
409430
public function testUnionReturnType()
410431
{
411432
$f = function (): int|float {};

‎src/Symfony/Component/VarDumper/Tests/Fixtures/Php82NullStandaloneReturnType.php

Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace Symfony\Component\VarDumper\Tests\Fixtures;
4+
5+
class Php82NullStandaloneReturnType
6+
{
7+
public function foo(null $bar): null
8+
{
9+
return null;
10+
}
11+
}

‎src/Symfony/Component/VarExporter/ProxyHelper.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarExporter/ProxyHelper.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public static function exportType(\ReflectionFunctionAbstract|\ReflectionPropert
311311
return '';
312312
}
313313
if (null === $glue) {
314-
return (!$noBuiltin && $type->allowsNull() && 'mixed' !== $name ? '?' : '').$types[0];
314+
return (!$noBuiltin && $type->allowsNull() && !\in_array($name, ['mixed', 'null'], true) ? '?' : '').$types[0];
315315
}
316316
sort($types);
317317

‎src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/Php82NullStandaloneReturnType.php

Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy;
4+
5+
class Php82NullStandaloneReturnType
6+
{
7+
public function foo(): null
8+
{
9+
return null;
10+
}
11+
}

‎src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\VarExporter\Exception\LogicException;
1616
use Symfony\Component\VarExporter\ProxyHelper;
17+
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\Php82NullStandaloneReturnType;
1718
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\StringMagicGetClass;
1819

1920
class ProxyHelperTest extends TestCase
@@ -188,6 +189,17 @@ public function testCannotGenerateGhostForStringMagicGet()
188189
$this->expectException(LogicException::class);
189190
ProxyHelper::generateLazyGhost(new \ReflectionClass(StringMagicGetClass::class));
190191
}
192+
193+
/**
194+
* @requires PHP 8.2
195+
*/
196+
public function testNullStandaloneReturnType()
197+
{
198+
self::assertStringContainsString(
199+
'public function foo(): null',
200+
ProxyHelper::generateLazyProxy(new \ReflectionClass(Php82NullStandaloneReturnType::class))
201+
);
202+
}
191203
}
192204

193205
abstract class TestForProxyHelper

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.