Promote warning to exception in constant() function

Author: kocsismate

Zend/tests/018.phpt

@@ -3,19 +3,27 @@ constant() tests
 --FILE--
 <?php
 
-var_dump(constant(""));
 
 define("TEST_CONST", 1);
-var_dump(constant("TEST_CONST"));
+try {
+    var_dump(constant(""));
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    constant('::');
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 define("TEST_CONST2", "test");
 var_dump(constant("TEST_CONST2"));
 
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: constant(): Couldn't find constant  in %s on line %d
-NULL
-int(1)
+Couldn't find constant 
+Couldn't find constant ::
 string(4) "test"
 Done

Zend/tests/bug51791.phpt

@@ -6,9 +6,12 @@ Bug #51791 (constant() failed to check undefined constant and php interpreter st
 class A  {
     const B = 1;
 }
-var_dump(constant('A::B1'));
 
+try {
+    constant('A::B1');
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 ?>
---EXPECTF--
-Warning: constant(): Couldn't find constant A::B1 in %s on line %d
-NULL
+--EXPECT--
+Couldn't find constant A::B1

ext/standard/basic_functions.c

@@ -2040,7 +2040,7 @@ PHP_FUNCTION(constant)
 		}
 	} else {
 		if (!EG(exception)) {
-			php_error_docref(NULL, E_WARNING, "Couldn't find constant %s", ZSTR_VAL(const_name));
+			zend_value_error("Couldn't find constant %s", ZSTR_VAL(const_name));
 		}
 		RETURN_NULL();
 	}

ext/standard/tests/general_functions/bug72920.phpt

@@ -6,7 +6,10 @@ class Foo {
 	private const C1 = "a";
 }
 
-var_dump(constant('Foo::C1'));
---EXPECTF--
-Warning: constant(): Couldn't find constant Foo::C1 in %s on line %d
-NULL
+try {
+    constant('Foo::C1');
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+--EXPECT--
+Couldn't find constant Foo::C1

tests/classes/constants_visibility_002.phpt

@@ -14,11 +14,14 @@ class A {
 
 A::staticConstDump();
 (new A())->constDump();
-constant('A::protectedConst');
+try {
+    constant('A::protectedConst');
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 ?>
---EXPECTF--
+--EXPECT--
 string(14) "protectedConst"
 string(14) "protectedConst"
-
-Warning: constant(): Couldn't find constant A::protectedConst in %s on line %d
+Couldn't find constant A::protectedConst

tests/classes/constants_visibility_003.phpt

@@ -14,11 +14,13 @@ class A {
 
 A::staticConstDump();
 (new A())->constDump();
-constant('A::privateConst');
-
+try {
+    constant('A::privateConst');
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 ?>
---EXPECTF--
+--EXPECT--
 string(12) "privateConst"
 string(12) "privateConst"
-
-Warning: constant(): Couldn't find constant A::privateConst in %s on line %d
+Couldn't find constant A::privateConst

tests/lang/bug44827.phpt

@@ -7,10 +7,12 @@ Testfest Munich 2009
 --FILE--
 <?php
 define('::', true);
-var_dump(constant('::'));
+try {
+    constant('::');
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 ?>
 --EXPECTF--
 Warning: Class constants cannot be defined or redefined in %s on line %d
-
-Warning: constant(): Couldn't find constant :: in %s on line %d
-NULL
+Couldn't find constant ::