Parameter & Property: isNullable() returns true when default value is…

… null (possible BC break)
nette · Jun 18, 2024 · bb548ce · bb548ce
1 parent c125c35
commit bb548ce
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/src/PhpGenerator/Parameter.php b/src/PhpGenerator/Parameter.php
@@ -66,7 +66,7 @@ public function setNullable(bool $state = true): static
 
 	public function isNullable(): bool
 	{
-		return $this->nullable;
+		return $this->nullable || ($this->hasDefaultValue && $this->defaultValue === null);
 	}
 
 

diff --git a/src/PhpGenerator/Property.php b/src/PhpGenerator/Property.php
@@ -83,7 +83,7 @@ public function setNullable(bool $state = true): static
 
 	public function isNullable(): bool
 	{
-		return $this->nullable;
+		return $this->nullable || ($this->initialized && $this->value === null);
 	}
 
 

diff --git a/tests/PhpGenerator/expected/ClassType.expect b/tests/PhpGenerator/expected/ClassType.expect
@@ -27,7 +27,7 @@ abstract class Example extends ParentClass implements IExample, IOne
 	public $order = RecursiveIteratorIterator::SELF_FIRST;
 	public readonly array $typed1;
 	public ?array $typed2 = null;
-	public array $typed3 = null;
+	public ?array $typed3 = null;
 	public static $sections = ['first' => true];
 
 

diff --git a/tests/PhpGenerator/expected/Extractor.bodies.expect b/tests/PhpGenerator/expected/Extractor.bodies.expect
@@ -48,7 +48,7 @@ abstract class Class7
 	}
 
 
-	function resolving($a = a\FOO, self $b = null, $c = self::FOO)
+	function resolving($a = a\FOO, ?self $b = null, $c = self::FOO)
 	{
 		// constants
 		echo FOO;

diff --git a/tests/PhpGenerator/expected/Extractor.bodies.resolving.expect b/tests/PhpGenerator/expected/Extractor.bodies.resolving.expect
@@ -43,7 +43,7 @@ abstract class Class7
 	}
 
 
-	function resolving($a = \Abc\a\FOO, self $b = null, $c = self::FOO)
+	function resolving($a = \Abc\a\FOO, ?self $b = null, $c = self::FOO)
 	{
 		// constants
 		echo FOO;

diff --git a/tests/PhpGenerator/expected/Extractor.bodies.unresolving.expect b/tests/PhpGenerator/expected/Extractor.bodies.unresolving.expect
@@ -43,7 +43,7 @@ abstract class Class7
 	}
 
 
-	function resolving($a = \Abc\a\FOO, self $b = null, $c = self::FOO)
+	function resolving($a = \Abc\a\FOO, ?self $b = null, $c = self::FOO)
 	{
 		// constants
 		echo FOO;

diff --git a/tests/PhpGenerator/expected/Extractor.classes.expect b/tests/PhpGenerator/expected/Extractor.classes.expect
@@ -72,7 +72,7 @@ class Class2 extends Class1 implements Interface2
 	}
 
 
-	private function func4(array $a = [], Class2 $b = null, $c = Unknown::ABC)
+	private function func4(array $a = [], ?Class2 $b = null, $c = Unknown::ABC)
 	{
 	}
 
@@ -94,7 +94,7 @@ class Class4
 
 class Class5
 {
-	public function func1(\A $a, ?\B $b, ?\C $c = null, \D $d = null, ?int $i = 1, ?array $arr = [])
+	public function func1(\A $a, ?\B $b, ?\C $c = null, ?\D $d = null, ?int $i = 1, ?array $arr = [])
 	{
 	}