8000 Merge branch '4.4' into 5.4 · symfony/symfony@38b0c19 · GitHub
[go: up one dir, main page]

Skip to content

Commit 38b0c19

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: ensure docblock compatibility with PhpStan's docblock parser
2 parents b0e1f66 + 0eebba6 commit 38b0c19

File tree

1 file changed

+1
-1
lines changed
  • src/Symfony/Component/PropertyInfo/Tests/Fixtures

1 file changed

+1
-1
lines changed

src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class Dummy extends ParentDummy
8484
public $h;
8585

8686
/**
87-
* @var ?string|int
87+
* @var string|int|null
8888
*/
8989
public $i;
9090

0 commit comments

Comments
 (0)
0