Fix handling of ?array and ?callable

Wrap these in AST_NULLABLE_TYPE as well.

Author: nikic

ast.c

@@ -381,6 +381,9 @@ static void ast_fill_children_ht(HashTable *ht, zend_ast *ast, zend_long version
 				ast_create_virtual_node_ex(
 					&child_zv, AST_NULLABLE_TYPE, 0, zend_ast_get_lineno(child), version, 1, &tmp);
 			}
+		} else if (child && child->kind == ZEND_AST_TYPE && (child->attr & ZEND_TYPE_NULLABLE)) {
+			child->attr &= ~ZEND_TYPE_NULLABLE;
+			ast_create_virtual_node(&child_zv, AST_NULLABLE_TYPE, child, version);
 		} else if (ast->kind == ZEND_AST_CLOSURE_USES) {
 			ast_create_virtual_node(&child_zv, AST_CLOSURE_VAR, child, version);
 		} else if (ast_is_var_name(child, ast, i)) {

tests/nullable_types.phpt

@@ -13,6 +13,8 @@ function test(?Foo $foo) : ?Bar {
 }
 function test(?int $foo) : ?int {
 }
+function test(?array $foo) : ?array {
+}
 PHP;
 
 echo ast_dump(ast\parse_code($code, $version=40));
@@ -54,3 +56,19 @@ AST_STMT_LIST
         returnType: AST_NULLABLE_TYPE
             type: AST_TYPE
                 flags: TYPE_LONG (4)
+    2: AST_FUNC_DECL
+        flags: 0
+        name: test
+        params: AST_PARAM_LIST
+            0: AST_PARAM
+                flags: 0
+                type: AST_NULLABLE_TYPE
+                    type: AST_TYPE
+                        flags: TYPE_ARRAY (7)
+                name: "foo"
+                default: null
+        uses: null
+        stmts: AST_STMT_LIST
+        returnType: AST_NULLABLE_TYPE
+            type: AST_TYPE
+                flags: TYPE_ARRAY (7)