Prevent early-binding

Author: nikic

Zend/tests/array_unpack/classes.phpt

@@ -9,21 +9,21 @@ class C {
     public static $bar = [...self::ARR];
 }
 
-class D {
-    public const A = [...self::B];
-    public const B = [...self::A];
+try {
+    class D {
+        public const A = [...self::B];
+        public const B = [...self::A];
+    }
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
 }
 
 var_dump(C::FOO);
 var_dump(C::$bar);
 
-try {
-    var_dump(D::A);
-} catch (Error $ex) {
-    echo "Exception: " . $ex->getMessage() . "\n";
-}
 ?>
 --EXPECT--
+Cannot declare self-referencing constant self::B
 array(5) {
   [0]=>
   int(0)
@@ -44,4 +44,3 @@ array(3) {
   [2]=>
   int(3)
 }
-Exception: Cannot declare self-referencing constant self::B

Zend/tests/bug41633_2.phpt

@@ -11,4 +11,4 @@ echo Foo::A."\n";
 Fatal error: Uncaught Error: Undefined constant self::B in %s:%d
 Stack trace:
 #0 {main}
-  thrown in %sbug41633_2.php on line 5
+  thrown in %sbug41633_2.php on line 2

Zend/tests/bug69832.phpt

@@ -3,20 +3,19 @@ Bug #69832 (Assertion failed in zend_compile_const_expr_magic_const)
 --FILE--
 <?php
 
+if (true) {
+class Bar {
+    const A = 1;
+}
+}
+
 class Test {
     public $foo = [Bar::A, __CLASS__][__CLASS__ != ""];
     public $bar = Bar::A && __CLASS__;
     public $baz = Bar::A ?: __CLASS__;
     public $buzz = Bar::A ? __CLASS__ : 0;
 }
 
-eval(<<<'PHP'
-class Bar {
-    const A = 1;
-}
-PHP
-);
-
 $t = new Test;
 var_dump($t->foo);
 var_dump($t->bar);

Zend/tests/bug78868.phpt

@@ -2,6 +2,15 @@
 Bug #78868: Calling __autoload() with incorrect EG(fake_scope) value
 --FILE--
 <?php
+
+function main_autoload($class_name) {
+    $c = new C;
+    $c->foo();
+    //doesn't affect the error
+    eval("class B {const foo = 1;}");
+}
+spl_autoload_register('main_autoload');
+
 class C {
     private $private = 1;
 
@@ -14,15 +23,6 @@ class A {
     static $foo = B::foo; //not resolved on include()
 }
 
-function main_autoload($class_name) {
-    $c = new C;
-    $c->foo();
-    //doesn't affect the error
-    eval("class B {const foo = 1;}");
-}
-
-spl_autoload_register('main_autoload');
-
 $classA = new ReflectionClass("A");
 $props = $classA->getProperties();
 $props[0]->setValue(2); //causes constant resolving, which runs autoload, all with EG(fake_scope) == "A"

Zend/tests/constexpr/objects.phpt

@@ -27,19 +27,19 @@ var_dump(test());
 
 ?>
 --EXPECT--
-object(Foo)#2 (1) {
+object(Foo)#1 (1) {
   ["prop"]=>
   int(0)
 }
-object(Foo)#3 (1) {
+object(Foo)#2 (1) {
   ["prop"]=>
   int(1)
 }
 object(Foo)#5 (1) {
   ["prop"]=>
   int(2)
 }
-object(Foo)#1 (1) {
+object(Foo)#3 (1) {
   ["prop"]=>
   int(3)
 }

Zend/tests/invalid_parent_const_ref_leak.phpt

@@ -3,12 +3,10 @@ Leak when using an invalid parent:: reference in a constant definition
 --FILE--
 <?php
 
-class A {
-    const B = parent::C;
-}
-
 try {
-    A::B;
+    class A {
+        const B = parent::C;
+    }
 } catch (Error $e) {
     echo $e->getMessage(), "\n";
 }

Zend/tests/type_declarations/typed_properties_021.phpt

@@ -2,12 +2,10 @@
 Test typed properties delay type check on constant
 --FILE--
 <?php
-class Foo {
-    public int $bar = BAR::BAZ;
-}
-
 try {
-    $foo = new Foo();
+    class Foo {
+        public int $bar = BAR::BAZ;
+    }
 } catch (Error $e) {
     echo $e->getMessage(), "\n";
 }

Zend/tests/type_declarations/typed_properties_058.phpt

@@ -10,8 +10,12 @@ class A {
     public int $foo = FOO;
 }
 
-class B {
-    public string $foo = FOO;
+try {
+    class B {
+        public string $foo = FOO;
+    }
+} catch (TypeError $e) {
+    echo $e->getMessage() . "\n";
 }
 
 $o = new A();
@@ -27,6 +31,7 @@ for ($i = 0; $i < 2; $i++) {
 }
 ?>
 --EXPECT--
+Cannot assign int to property B::$foo of type string
 int(5)
 Cannot assign int to property B::$foo of type string
 Cannot assign int to property B::$foo of type string

Zend/zend_compile.c

@@ -7563,7 +7563,7 @@ void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel) /* {{{
 	}
 
 	/* We currently don't early-bind classes that implement interfaces or use traits */
-	if (!ce->num_interfaces && !ce->num_traits
+	if (!ce->num_interfaces && !ce->num_traits && (ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)
 	 && !(CG(compiler_options) & ZEND_COMPILE_WITHOUT_EXECUTION)) {
 		if (toplevel) {
 			if (extends_ast) {

ext/reflection/tests/ReflectionClassConstant_toString_error.phpt

@@ -3,8 +3,12 @@ Exception thrown while converting ReflectionClassConstant to string
 --FILE--
 <?php
 
-class B {
-    const X = self::UNKNOWN;
+try {
+    class B {
+        const X = self::UNKNOWN;
+    }
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
 }
 
 try {
@@ -16,3 +20,4 @@ try {
 ?>
 --EXPECT--
 Undefined constant self::UNKNOWN
+Undefined constant self::UNKNOWN