From aad39879f2d2e89de105c4f87d334ee129b4321c Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 31 Jan 2019 12:25:51 +0100
Subject: Remove bareword fallback for constants

Access to undefined constants will now always result in an Error
exception being thrown.

This required quite a few test changes, because there were many
buggy tests that unintentionally used bareword fallback in combination
with error suppression.
---
 ext/reflection/tests/bug74673.phpt | 6 +-----
 ext/reflection/tests/bug76536.phpt | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'ext/reflection/tests')

diff --git a/ext/reflection/tests/bug74673.phpt b/ext/reflection/tests/bug74673.phpt
index 8e4e8e3a18..07db9a169a 100644
--- a/ext/reflection/tests/bug74673.phpt
+++ b/ext/reflection/tests/bug74673.phpt
@@ -3,10 +3,6 @@ Bug #74673 (Segfault when cast Reflection object to string with undefined consta
 --FILE--
 <?php
 
-set_error_handler(function() {
-    throw new Exception();
-});
-
 class A
 {
 	public function method($test = PHP_SELF + 1)
@@ -19,4 +15,4 @@ $class = new ReflectionClass('A');
 echo $class;
 ?>
 --EXPECTF--
-Fatal error: Method ReflectionClass::__toString() must not throw an exception, caught Exception:  in %sbug74673.php on line %d
+Fatal error: Method ReflectionClass::__toString() must not throw an exception, caught Error: Undefined constant 'PHP_SELF' in %s on line %d
diff --git a/ext/reflection/tests/bug76536.phpt b/ext/reflection/tests/bug76536.phpt
index 9f3b3fdb31..aa32781e16 100644
--- a/ext/reflection/tests/bug76536.phpt
+++ b/ext/reflection/tests/bug76536.phpt
@@ -2,7 +2,7 @@
 Bug #76536 (PHP crashes with core dump when throwing exception in error handler)
 --FILE--
 <?php
-class SomeConstants {const SOME_CONSTANT = SOME_NONSENSE;}
+class SomeConstants {const SOME_CONSTANT = "foo" % 5; }
 
 function handleError() {throw new ErrorException();}
 
-- 
cgit v1.2.1