Address review comments

Girgias · Girgias · commit ee1b290cceeb · 2022-03-24T00:27:17.000Z
diff --git a/Zend/tests/type_declarations/standalone_null.phpt b/Zend/tests/type_declarations/standalone_null.phpt
@@ -10,7 +10,5 @@ function test(null $v): null {
 var_dump(test(null));
 
 ?>
-===DONE===
 --EXPECT--
 NULL
-===DONE===
diff --git a/Zend/tests/type_declarations/typed_properties_110.phpt b/Zend/tests/type_declarations/typed_properties_110.phpt
@@ -7,7 +7,14 @@ class Foo {
 }
 
 $foo = new Foo();
+$foo->value = null;
+
+try {
+    $foo->value = 1;
+} catch (\TypeError $e) {
+    echo $e->getMessage();
+}
+
 ?>
-===DONE===
 --EXPECT--
-===DONE===
+Cannot assign int to property Foo::$value of type null
diff --git a/Zend/tests/type_declarations/typed_properties_111.phpt b/Zend/tests/type_declarations/typed_properties_111.phpt
@@ -7,7 +7,14 @@ class Foo {
 }
 
 $foo = new Foo();
+$foo->value = false;
+
+try {
+    $foo->value = true;
+} catch (\TypeError $e) {
+    echo $e->getMessage();
+}
+
 ?>
-===DONE===
 --EXPECT--
-===DONE===
+Cannot assign bool to property Foo::$value of type false
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -6188,11 +6188,11 @@ static bool zend_type_contains_traversable(zend_type type) {
 static zend_type zend_compile_typename(
 		zend_ast *ast, bool force_allow_null) /* {{{ */
 {
-	bool is_marked_nullable = false;
+	bool is_marked_nullable = ast->attr & ZEND_TYPE_NULLABLE;
 	zend_ast_attr orig_ast_attr = ast->attr;
 	zend_type type = ZEND_TYPE_INIT_NONE(0);
-	if (ast->attr & ZEND_TYPE_NULLABLE) {
-		is_marked_nullable = true;
+
+	if (is_marked_nullable) {
 		ast->attr &= ~ZEND_TYPE_NULLABLE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -6188,11 +6188,11 @@ static bool zend_type_contains_traversable(zend_type type) {`
`6188`	`6188`	`static zend_type zend_compile_typename(`
`6189`	`6189`	`zend_ast ast, bool force_allow_null) / {{{ */`
`6190`	`6190`	`{`
`6191`		`- bool is_marked_nullable = false;`
	`6191`	`+ bool is_marked_nullable = ast->attr & ZEND_TYPE_NULLABLE;`
`6192`	`6192`	`zend_ast_attr orig_ast_attr = ast->attr;`
`6193`	`6193`	`zend_type type = ZEND_TYPE_INIT_NONE(0);`
`6194`		`- if (ast->attr & ZEND_TYPE_NULLABLE) {`
`6195`		`- is_marked_nullable = true;`
	`6194`	`+`
	`6195`	`+ if (is_marked_nullable) {`
`6196`	`6196`	`ast->attr &= ~ZEND_TYPE_NULLABLE;`
`6197`	`6197`	`}`
`6198`	`6198`