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.

3 files changed, 60 insertions, 69 deletions

diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index b60991844f..c901ebacec 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -9,8 +9,6 @@ Class constant declarations
 
   class C
   {
-      const c0 = UNDEFINED;
-
       const c1 = 1, c2 = 1.5;
       const c3 =  + 1, c4 =  + 1.5;
       const c5 = -1, c6 = -1.5;
@@ -32,7 +30,6 @@ Class constant declarations
   }
 
   echo "\nAttempt to access various kinds of class constants:\n";
-  var_dump(C::c0);
   var_dump(C::c1);
   var_dump(C::c2);
   var_dump(C::c3);
@@ -61,16 +58,13 @@ Class constant declarations
 Notice: Undefined variable: undef in %s on line 5
 
 Attempt to access various kinds of class constants:
-
-Warning: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' (this will throw an Error in a future version of PHP) in %s on line %d
-string(9) "UNDEFINED"
 int(1)
 float(1.5)
 int(1)
 float(1.5)
 int(-1)
 float(-1.5)
-int(15)
+int(13)
 string(%d) "%s"
 string(1) "C"
 string(1) "C"
@@ -85,7 +79,7 @@ string(6) "hello2"
 
 Expecting fatal error:
 
-Fatal error: Uncaught Error: Undefined class constant 'c19' in %s:53
+Fatal error: Uncaught Error: Undefined class constant 'c19' in %s:%d
 Stack trace:
 #0 {main}
-  thrown in %s on line 53
+  thrown in %s on line %d
diff --git a/tests/classes/constants_scope_001.phpt b/tests/classes/constants_scope_001.phpt
index 7adf3f8681..e9635d8d23 100644
--- a/tests/classes/constants_scope_001.phpt
+++ b/tests/classes/constants_scope_001.phpt
@@ -9,7 +9,6 @@ class ErrorCodes {
 	const INFO = "Informational message\n";
 
 	static function print_fatal_error_codes() {
-		echo "FATAL = " . FATAL . "\n";
 		echo "self::FATAL = " . self::FATAL;
     }
 }
@@ -27,9 +26,7 @@ ErrorCodes::print_fatal_error_codes();
 ErrorCodesDerived::print_fatal_error_codes();
 
 ?>
---EXPECTF--
-Warning: Use of undefined constant FATAL - assumed 'FATAL' (this will throw an Error in a future version of PHP) in %sconstants_scope_001.php on line %d
-FATAL = FATAL
+--EXPECT--
 self::FATAL = Fatal error
 self::FATAL = Worst error
 parent::FATAL = Fatal error
diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
index 1f66dfce4c..db9c5be060 100644
--- a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
+++ b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
@@ -14,7 +14,7 @@ foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
 	  echo "--- testing: '$strVal' << '$otherVal' ---\n";
       try {
-        var_dump(strVal<<$otherVal);
+        var_dump($strVal<<$otherVal);
       } catch (Throwable $e) {
         echo "Exception: " . $e->getMessage() . "\n";
       }
@@ -53,17 +53,17 @@ int(0)
 --- testing: '0' << 'a5.9' ---
 int(0)
 --- testing: '65' << '0' ---
-int(0)
+int(65)
 --- testing: '65' << '65' ---
 int(0)
 --- testing: '65' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '65' << '1.2' ---
-int(0)
+int(130)
 --- testing: '65' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '65' << 'abc' ---
-int(0)
+int(65)
 --- testing: '65' << '123abc' ---
 int(0)
 --- testing: '65' << '123e5' ---
@@ -77,21 +77,21 @@ int(0)
 --- testing: '65' << '123abc ' ---
 int(0)
 --- testing: '65' << '3.4a' ---
-int(0)
+int(520)
 --- testing: '65' << 'a5.9' ---
-int(0)
+int(65)
 --- testing: '-44' << '0' ---
-int(0)
+int(-44)
 --- testing: '-44' << '65' ---
 int(0)
 --- testing: '-44' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '-44' << '1.2' ---
-int(0)
+int(-88)
 --- testing: '-44' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '-44' << 'abc' ---
-int(0)
+int(-44)
 --- testing: '-44' << '123abc' ---
 int(0)
 --- testing: '-44' << '123e5' ---
@@ -105,21 +105,21 @@ int(0)
 --- testing: '-44' << '123abc ' ---
 int(0)
 --- testing: '-44' << '3.4a' ---
-int(0)
+int(-352)
 --- testing: '-44' << 'a5.9' ---
-int(0)
+int(-44)
 --- testing: '1.2' << '0' ---
-int(0)
+int(1)
 --- testing: '1.2' << '65' ---
 int(0)
 --- testing: '1.2' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '1.2' << '1.2' ---
-int(0)
+int(2)
 --- testing: '1.2' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '1.2' << 'abc' ---
-int(0)
+int(1)
 --- testing: '1.2' << '123abc' ---
 int(0)
 --- testing: '1.2' << '123e5' ---
@@ -133,21 +133,21 @@ int(0)
 --- testing: '1.2' << '123abc ' ---
 int(0)
 --- testing: '1.2' << '3.4a' ---
-int(0)
+int(8)
 --- testing: '1.2' << 'a5.9' ---
-int(0)
+int(1)
 --- testing: '-7.7' << '0' ---
-int(0)
+int(-7)
 --- testing: '-7.7' << '65' ---
 int(0)
 --- testing: '-7.7' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '-7.7' << '1.2' ---
-int(0)
+int(-14)
 --- testing: '-7.7' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '-7.7' << 'abc' ---
-int(0)
+int(-7)
 --- testing: '-7.7' << '123abc' ---
 int(0)
 --- testing: '-7.7' << '123e5' ---
@@ -161,9 +161,9 @@ int(0)
 --- testing: '-7.7' << '123abc ' ---
 int(0)
 --- testing: '-7.7' << '3.4a' ---
-int(0)
+int(-56)
 --- testing: '-7.7' << 'a5.9' ---
-int(0)
+int(-7)
 --- testing: 'abc' << '0' ---
 int(0)
 --- testing: 'abc' << '65' ---
@@ -193,17 +193,17 @@ int(0)
 --- testing: 'abc' << 'a5.9' ---
 int(0)
 --- testing: '123abc' << '0' ---
-int(0)
+int(123)
 --- testing: '123abc' << '65' ---
 int(0)
 --- testing: '123abc' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '123abc' << '1.2' ---
-int(0)
+int(246)
 --- testing: '123abc' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '123abc' << 'abc' ---
-int(0)
+int(123)
 --- testing: '123abc' << '123abc' ---
 int(0)
 --- testing: '123abc' << '123e5' ---
@@ -217,21 +217,21 @@ int(0)
 --- testing: '123abc' << '123abc ' ---
 int(0)
 --- testing: '123abc' << '3.4a' ---
-int(0)
+int(984)
 --- testing: '123abc' << 'a5.9' ---
-int(0)
+int(123)
 --- testing: '123e5' << '0' ---
-int(0)
+int(12300000)
 --- testing: '123e5' << '65' ---
 int(0)
 --- testing: '123e5' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '123e5' << '1.2' ---
-int(0)
+int(24600000)
 --- testing: '123e5' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '123e5' << 'abc' ---
-int(0)
+int(12300000)
 --- testing: '123e5' << '123abc' ---
 int(0)
 --- testing: '123e5' << '123e5' ---
@@ -245,21 +245,21 @@ int(0)
 --- testing: '123e5' << '123abc ' ---
 int(0)
 --- testing: '123e5' << '3.4a' ---
-int(0)
+int(98400000)
 --- testing: '123e5' << 'a5.9' ---
-int(0)
+int(12300000)
 --- testing: '123e5xyz' << '0' ---
-int(0)
+int(12300000)
 --- testing: '123e5xyz' << '65' ---
 int(0)
 --- testing: '123e5xyz' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '123e5xyz' << '1.2' ---
-int(0)
+int(24600000)
 --- testing: '123e5xyz' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '123e5xyz' << 'abc' ---
-int(0)
+int(12300000)
 --- testing: '123e5xyz' << '123abc' ---
 int(0)
 --- testing: '123e5xyz' << '123e5' ---
@@ -273,21 +273,21 @@ int(0)
 --- testing: '123e5xyz' << '123abc ' ---
 int(0)
 --- testing: '123e5xyz' << '3.4a' ---
-int(0)
+int(98400000)
 --- testing: '123e5xyz' << 'a5.9' ---
-int(0)
+int(12300000)
 --- testing: ' 123abc' << '0' ---
-int(0)
+int(123)
 --- testing: ' 123abc' << '65' ---
 int(0)
 --- testing: ' 123abc' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: ' 123abc' << '1.2' ---
-int(0)
+int(246)
 --- testing: ' 123abc' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: ' 123abc' << 'abc' ---
-int(0)
+int(123)
 --- testing: ' 123abc' << '123abc' ---
 int(0)
 --- testing: ' 123abc' << '123e5' ---
@@ -301,21 +301,21 @@ int(0)
 --- testing: ' 123abc' << '123abc ' ---
 int(0)
 --- testing: ' 123abc' << '3.4a' ---
-int(0)
+int(984)
 --- testing: ' 123abc' << 'a5.9' ---
-int(0)
+int(123)
 --- testing: '123 abc' << '0' ---
-int(0)
+int(123)
 --- testing: '123 abc' << '65' ---
 int(0)
 --- testing: '123 abc' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '123 abc' << '1.2' ---
-int(0)
+int(246)
 --- testing: '123 abc' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '123 abc' << 'abc' ---
-int(0)
+int(123)
 --- testing: '123 abc' << '123abc' ---
 int(0)
 --- testing: '123 abc' << '123e5' ---
@@ -329,21 +329,21 @@ int(0)
 --- testing: '123 abc' << '123abc ' ---
 int(0)
 --- testing: '123 abc' << '3.4a' ---
-int(0)
+int(984)
 --- testing: '123 abc' << 'a5.9' ---
-int(0)
+int(123)
 --- testing: '123abc ' << '0' ---
-int(0)
+int(123)
 --- testing: '123abc ' << '65' ---
 int(0)
 --- testing: '123abc ' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '123abc ' << '1.2' ---
-int(0)
+int(246)
 --- testing: '123abc ' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '123abc ' << 'abc' ---
-int(0)
+int(123)
 --- testing: '123abc ' << '123abc' ---
 int(0)
 --- testing: '123abc ' << '123e5' ---
@@ -357,21 +357,21 @@ int(0)
 --- testing: '123abc ' << '123abc ' ---
 int(0)
 --- testing: '123abc ' << '3.4a' ---
-int(0)
+int(984)
 --- testing: '123abc ' << 'a5.9' ---
-int(0)
+int(123)
 --- testing: '3.4a' << '0' ---
-int(0)
+int(3)
 --- testing: '3.4a' << '65' ---
 int(0)
 --- testing: '3.4a' << '-44' ---
 Exception: Bit shift by negative number
 --- testing: '3.4a' << '1.2' ---
-int(0)
+int(6)
 --- testing: '3.4a' << '-7.7' ---
 Exception: Bit shift by negative number
 --- testing: '3.4a' << 'abc' ---
-int(0)
+int(3)
 --- testing: '3.4a' << '123abc' ---
 int(0)
 --- testing: '3.4a' << '123e5' ---
@@ -385,9 +385,9 @@ int(0)
 --- testing: '3.4a' << '123abc ' ---
 int(0)
 --- testing: '3.4a' << '3.4a' ---
-int(0)
+int(24)
 --- testing: '3.4a' << 'a5.9' ---
-int(0)
+int(3)
 --- testing: 'a5.9' << '0' ---
 int(0)
 --- testing: 'a5.9' << '65' ---