]> granicus.if.org Git - php/commitdiff
Fixed tests for recent constant array changes
authorBob Weinand <bobwei9@hotmail.com>
Fri, 11 Apr 2014 18:13:24 +0000 (20:13 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Fri, 11 Apr 2014 18:13:24 +0000 (20:13 +0200)
Zend/zend_ast.c
tests/classes/constants_error_002.phpt

index d7fbba12158e1b82bb658fa17ce6fab9d6704392..583a52321bee0551af463ab7beddcf50ec4dffc9 100644 (file)
@@ -351,9 +351,11 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast)
                zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast*) * (ast->children - 1));
                int i;
                new->kind = ast->kind;
+               new->children = ast->children;
                for (i = 0; i < ast->children; i++) {
                        (&new->u.child)[i] = zend_ast_copy((&ast->u.child)[i]);
                }
+               return new;
        }
        return zend_ast_create_dynamic(ast->kind);
 }
index be27971b87af5cb61d5ba3b89515c263e07ccaee..610a42da9b00049f141fe96b0eab087ef84fdb88 100644 (file)
@@ -2,11 +2,11 @@
 Error case: class constant as an array
 --FILE--
 <?php
-  class myclass
-  {
-      const myConst = array();
-  }
+class myclass
+{
+       const myConst = array();
+}
 ?>
+===DONE===
 --EXPECTF--
-
-Fatal error: Arrays are not allowed in class constants in %s on line 4
+===DONE===