Adjust tests, fix node conversion, still leaking and not resolving names.

Author: beberlei

Zend/tests/attributes_001.phpt

@@ -22,7 +22,7 @@ class Bar {
 	const C = 2;
 	<<TestProp>>
 	public $x = 3;
-	
+
 }
 $r = new ReflectionClass("Bar");
 var_dump($r->getAttributes());
@@ -38,7 +38,7 @@ $r = new ReflectionFunction("f1");
 var_dump($r->getAttributes());
 
 // Attributes with AST
-<<a1,a2(1+"a"),a3(1+"b",2+"c"),a4(["a"=>1,"b"=>2])>>
+<<a1,a2(1+1),a3(1+3,2+2),a4(["a"=>1,"b"=>2])>>
 function f2() {}
 $r = new ReflectionFunction("f2");
 var_dump($r->getAttributes());
@@ -97,102 +97,21 @@ array(4) {
   ["a2"]=>
   array(1) {
     [0]=>
-    object(ast\Node)#4 (4) {
-      ["kind"]=>
-      int(520)
-      ["flags"]=>
-      int(1)
-      ["lineno"]=>
-      NULL
-      ["children"]=>
-      array(2) {
-        [0]=>
-        int(1)
-        [1]=>
-        string(1) "a"
-      }
-    }
+    int(2)
   }
   ["a3"]=>
-  array(2) {
+  array(1) {
     [0]=>
-    object(ast\Node)#5 (4) {
-      ["kind"]=>
-      int(520)
-      ["flags"]=>
-      int(1)
-      ["lineno"]=>
-      NULL
-      ["children"]=>
-      array(2) {
-        [0]=>
-        int(1)
-        [1]=>
-        string(1) "b"
-      }
-    }
-    [1]=>
-    object(ast\Node)#6 (4) {
-      ["kind"]=>
-      int(520)
-      ["flags"]=>
-      int(1)
-      ["lineno"]=>
-      NULL
-      ["children"]=>
-      array(2) {
-        [0]=>
-        int(2)
-        [1]=>
-        string(1) "c"
-      }
-    }
+    int(4)
   }
   ["a4"]=>
   array(1) {
     [0]=>
-    object(ast\Node)#7 (4) {
-      ["kind"]=>
-      int(130)
-      ["flags"]=>
-      int(0)
-      ["lineno"]=>
-      NULL
-      ["children"]=>
-      array(2) {
-        [0]=>
-        object(ast\Node)#8 (4) {
-          ["kind"]=>
-          int(525)
-          ["flags"]=>
-          int(0)
-          ["lineno"]=>
-          NULL
-          ["children"]=>
-          array(2) {
-            [0]=>
-            int(1)
-            [1]=>
-            string(1) "a"
-          }
-        }
-        [1]=>
-        object(ast\Node)#9 (4) {
-          ["kind"]=>
-          int(525)
-          ["flags"]=>
-          int(0)
-          ["lineno"]=>
-          NULL
-          ["children"]=>
-          array(2) {
-            [0]=>
-            int(2)
-            [1]=>
-            string(1) "b"
-          }
-        }
-      }
+    array(2) {
+      ["a"]=>
+      int(1)
+      ["b"]=>
+      int(2)
     }
   }
 }

Zend/tests/attributes_002.phpt

@@ -14,9 +14,9 @@ namespace Doctrine\ORM {
 	function GetClassAttributes($class_name) {
 		$reflClass = new \ReflectionClass($class_name);
 		$attrs = $reflClass->getAttributes();
-		foreach ($attrs as $name => &$values) {
+		foreach ($attrs as $name => $values) {
 			$name = "Doctrine\\" . $name;
-			$values = new $name($values);
+			$attrs[$name] = new $name($values);
 		}
 		return $attrs;
 	}

Zend/tests/attributes_003.phpt

@@ -8,12 +8,25 @@ namespace Doctrine\ORM\Mapping {
     }
 }
 
-namespace {
+namespace Foo {
     use Doctrine\ORM\Mapping\Entity;
 
-    <<Entity(["foo"])>>
+    <<Entity(["foo" => "bar"])>>
     function foo() {
     }
-    var_dump((new ReflectionFunction('foo'))->getAttributes());
+}
+
+namespace {
+    var_dump((new ReflectionFunction('Foo\foo'))->getAttributes());
 }
 --EXPECTF--
+array(1) {
+  ["Doctrine\ORM\Mapping\Entity"]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      ["foo"]=>
+      string(3) "bar"
+    }
+  }
+}

Zend/zend_ast.c

@@ -2135,6 +2135,7 @@ ZEND_API void zend_ast_convert_to_object(zval *p, zend_ast *ast, zend_class_entr
 		if (UNEXPECTED(zend_ast_evaluate(&tmp, ast, ce) != SUCCESS)) {
 			return;
 		}
+
 		ZVAL_COPY_VALUE(p, &tmp);
 	}
 }

Zend/zend_compile.c

@@ -9286,12 +9286,12 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
 void zend_add_attribute(zend_ast *name, zend_ast *value) /* {{{ */
 {
 	zval *val, tmp;
-	//zend_string *key = zend_ast_get_str(name);
+	zend_string *key;
 
 	znode class_node;
 
 	zend_compile_class_ref(&class_node, name, ZEND_FETCH_CLASS_EXCEPTION);
-	zend_string *key = Z_STR(class_node.u.constant);
+	key = Z_STR(class_node.u.constant);
 
 	if (!CG(attributes)) {
 		ALLOC_HASHTABLE(CG(attributes));
@@ -9316,16 +9316,13 @@ void zend_add_attribute(zend_ast *name, zend_ast *value) /* {{{ */
 				zend_hash_next_index_insert_new(Z_ARRVAL_P(val), zv);
 			}
 		} else {
-			ZVAL_AST(&tmp, zend_ast_copy(value));
-			zend_ast_destroy(value);
+			zend_const_expr_to_zval(&tmp, value);
 			array_init(val);
 			zend_hash_next_index_insert_new(Z_ARRVAL_P(val), &tmp);
 		}
 	} else {
 		array_init(val);
 	}
-
-	zend_string_release(key);
 }
 /* }}} */