Add throw_on_error declare

Girgias · Girgias · commit 27442e8fb2db · 2021-02-28T14:54:15.000Z
This declare promotes warnings automatically to Exceptions
diff --git a/Zend/tests/throw_on_error/declare_off_must_not_promote_warning.phpt b/Zend/tests/throw_on_error/declare_off_must_not_promote_warning.phpt
@@ -0,0 +1,10 @@
+--TEST--
+If throw_on_error declare statement is explicitly turned off do not promote warning
+--FILE--
+<?php
+declare(throw_on_error=0);
+
+echo $undef;
+
+--EXPECTF--
+Warning: Undefined variable $undef in %s on line %d
diff --git a/Zend/tests/throw_on_error/declare_on_must_promote_warning.phpt b/Zend/tests/throw_on_error/declare_on_must_promote_warning.phpt
@@ -0,0 +1,30 @@
+--TEST--
+throw_on_error declare statement promote warning
+--FILE--
+<?php
+declare(throw_on_error=1);
+
+try {
+    echo $undef;
+} catch (\Exception $e) {
+    var_dump($e);
+}
+
+--EXPECTF--
+object(Exception)#1 (7) {
+  ["message":protected]=>
+  string(25) "Undefined variable $undef"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(2)
+  ["file":protected]=>
+  string(%d) "%s"
+  ["line":protected]=>
+  int(5)
+  ["trace":"Exception":private]=>
+  array(0) {
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}
diff --git a/Zend/tests/throw_on_error/declare_statement_isolated.phpt b/Zend/tests/throw_on_error/declare_statement_isolated.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Test throw_on_error declare statement is isolated to file
+--FILE--
+<?php
+include 'fixture/no_declare.inc';
+
+try {
+    include 'fixture/declare_on.inc';
+} catch (\Exception $e) {
+    echo "Warning caught\n";
+}
+include 'fixture/declare_off.inc';
+?>
+DONE
+--EXPECTF--
+Warning: Undefined variable $undef in %sno_declare.inc on line 2
+Warning caught
+
+Warning: Undefined variable $undef in %sdeclare_off.inc on line 4
+DONE
diff --git a/Zend/tests/throw_on_error/exception_or_warning-docref_001.phpt b/Zend/tests/throw_on_error/exception_or_warning-docref_001.phpt
@@ -0,0 +1,20 @@
+--TEST--
+php_exception_or_warning_docref test when declare enabled
+--SKIPIF--
+<?php
+if (!class_exists('_ZendTestClass')) die('skip zend_test extension required');
+?>
+--FILE--
+<?php
+declare(throw_on_error=1);
+
+try {
+    zend_throw_on_error_declare_exception_or_warning();
+} catch (\Exception $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+
+echo "OK";
+--EXPECT--
+Context dependent
+OK
diff --git a/Zend/tests/throw_on_error/exception_or_warning-docref_002.phpt b/Zend/tests/throw_on_error/exception_or_warning-docref_002.phpt
@@ -0,0 +1,16 @@
+--TEST--
+php_exception_or_warning_docref test when declare explicitly disable
+--SKIPIF--
+<?php
+if (!class_exists('_ZendTestClass')) die('skip zend_test extension required');
+?>
+--FILE--
+<?php
+declare(throw_on_error=0);
+
+zend_throw_on_error_declare_exception_or_warning();
+
+echo "OK";
+--EXPECTF--
+Warning: zend_throw_on_error_declare_exception_or_warning(): Context dependent in %s on line %d
+OK
diff --git a/Zend/tests/throw_on_error/exception_or_warning-docref_003.phpt b/Zend/tests/throw_on_error/exception_or_warning-docref_003.phpt
@@ -0,0 +1,15 @@
+--TEST--
+php_exception_or_warning_docref test when declare implicitly disable
+--SKIPIF--
+<?php
+if (!class_exists('_ZendTestClass')) die('skip zend_test extension required');
+?>
+--FILE--
+<?php
+
+zend_throw_on_error_declare_exception_or_warning();
+
+echo "OK";
+--EXPECTF--
+Warning: zend_throw_on_error_declare_exception_or_warning(): Context dependent in %s on line %d
+OK
diff --git a/Zend/tests/throw_on_error/fixture/declare_off.inc b/Zend/tests/throw_on_error/fixture/declare_off.inc
@@ -0,0 +1,4 @@
+<?php
+declare(throw_on_error=0);
+
+echo $undef;
diff --git a/Zend/tests/throw_on_error/fixture/declare_on.inc b/Zend/tests/throw_on_error/fixture/declare_on.inc
@@ -0,0 +1,4 @@
+<?php
+declare(throw_on_error=1);
+
+echo $undef;
diff --git a/Zend/tests/throw_on_error/fixture/no_declare.inc b/Zend/tests/throw_on_error/fixture/no_declare.inc
@@ -0,0 +1,2 @@
+<?php
+echo $undef;
diff --git a/Zend/tests/throw_on_error/ignore_error_reporting.phpt b/Zend/tests/throw_on_error/ignore_error_reporting.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Promoted warning by throw_on_error must ignore error_reporting setting
+--FILE--
+<?php
+declare(throw_on_error=1);
+ini_set("error_reporting", 0);
+try {
+    echo $undef;
+} catch(Exception $e) {
+    var_dump($e);
+}
+
+--EXPECTF--
+object(Exception)#1 (7) {
+  ["message":protected]=>
+  string(25) "Undefined variable $undef"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(2)
+  ["file":protected]=>
+  string(%d) "%s"
+  ["line":protected]=>
+  int(5)
+  ["trace":"Exception":private]=>
+  array(0) {
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}
diff --git a/Zend/tests/throw_on_error/ignore_suppress_operator.phpt b/Zend/tests/throw_on_error/ignore_suppress_operator.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Promoted warning by throw_on_error must ignore @ operator
+--FILE--
+<?php
+declare(throw_on_error=1);
+
+try {
+    echo @$undef;
+} catch (\Exception $e) {
+    var_dump($e);
+}
+
+--EXPECTF--
+object(Exception)#1 (7) {
+  ["message":protected]=>
+  string(25) "Undefined variable $undef"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(2)
+  ["file":protected]=>
+  string(%d) "%s"
+  ["line":protected]=>
+  int(5)
+  ["trace":"Exception":private]=>
+  array(0) {
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}
diff --git a/Zend/tests/throw_on_error/no_declare_must_not_promote_warning.phpt b/Zend/tests/throw_on_error/no_declare_must_not_promote_warning.phpt
@@ -0,0 +1,17 @@
+--TEST--
+If throw_on_error declare statement is missing do not promote warning
+--FILE--
+<?php
+
+echo $undef;
+
+function foo() {
+    echo $undef;
+}
+
+foo();
+
+--EXPECTF--
+Warning: Undefined variable $undef in %s on line %d
+
+Warning: Undefined variable $undef in %s on line %d
diff --git a/Zend/tests/throw_on_error/play_nice_with_strict_types_after.phpt b/Zend/tests/throw_on_error/play_nice_with_strict_types_after.phpt
@@ -0,0 +1,10 @@
+--TEST--
+throw_on_error declare statement with strict_types declare after
+--FILE--
+<?php
+declare(throw_on_error=1);
+declare(strict_types=1);
+
+echo "OK";
+--EXPECT--
+OK
diff --git a/Zend/tests/throw_on_error/play_nice_with_strict_types_before.phpt b/Zend/tests/throw_on_error/play_nice_with_strict_types_before.phpt
@@ -0,0 +1,10 @@
+--TEST--
+throw_on_error declare statement with strict_types declare before
+--FILE--
+<?php
+declare(strict_types=1);
+declare(throw_on_error=1);
+
+echo "OK";
+--EXPECT--
+OK
diff --git a/Zend/tests/throw_on_error/promote_warning_in_internal_function.phpt b/Zend/tests/throw_on_error/promote_warning_in_internal_function.phpt
@@ -0,0 +1,44 @@
+--TEST--
+throw_on_error declare statement must promote warning emit in internal function
+--FILE--
+<?php
+declare(throw_on_error=1);
+
+try {
+    file_get_contents('not_found.txt');
+} catch (\Exception $e) {
+    var_dump($e);
+}
+
+--EXPECTF--
+object(Exception)#1 (7) {
+  ["message":protected]=>
+  string(82) "file_get_contents(not_found.txt): Failed to open stream: No such file or directory"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(2)
+  ["file":protected]=>
+  string(%d) "%s"
+  ["line":protected]=>
+  int(5)
+  ["trace":"Exception":private]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["file"]=>
+      string(%d) "%s"
+      ["line"]=>
+      int(5)
+      ["function"]=>
+      string(17) "file_get_contents"
+      ["args"]=>
+      array(1) {
+        [0]=>
+        string(13) "not_found.txt"
+      }
+    }
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}
diff --git a/Zend/tests/throw_on_error/promote_warning_in_user_function.phpt b/Zend/tests/throw_on_error/promote_warning_in_user_function.phpt
@@ -0,0 +1,46 @@
+--TEST--
+throw_on_error declare statement must promote warning emit in user defined function
+--FILE--
+<?php
+declare(throw_on_error=1);
+
+function foo() {
+    echo $undef;
+}
+
+try {
+    foo();
+} catch (\Exception $e) {
+    var_dump($e);
+}
+
+--EXPECTF--
+object(Exception)#1 (7) {
+  ["message":protected]=>
+  string(25) "Undefined variable $undef"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(2)
+  ["file":protected]=>
+  string(%d) "%s"
+  ["line":protected]=>
+  int(5)
+  ["trace":"Exception":private]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["file"]=>
+      string(%d) "%s"
+      ["line"]=>
+      int(9)
+      ["function"]=>
+      string(3) "foo"
+      ["args"]=>
+      array(0) {
+      }
+    }
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}
diff --git a/Zend/tests/throw_on_error/statement_must_be_the_first_one.phpt b/Zend/tests/throw_on_error/statement_must_be_the_first_one.phpt
@@ -0,0 +1,10 @@
+--TEST--
+throw_on_error declare statement must be before anything else
+--FILE--
+<?php
+echo "Before";
+
+declare(throw_on_error=1);
+
+--EXPECTF--
+Fatal error: throw_on_error declaration must be the very first statement in the script in %s on line 4
diff --git a/Zend/tests/throw_on_error/throw_on_error_declare_statement.phpt b/Zend/tests/throw_on_error/throw_on_error_declare_statement.phpt
@@ -0,0 +1,9 @@
+--TEST--
+throw_on_error declare statement
+--FILE--
+<?php
+declare(throw_on_error=1);
+
+echo "OK";
+--EXPECT--
+OK
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -1307,6 +1307,23 @@ static ZEND_COLD void zend_error_impl(
 		return;
 	}
 
+	/* Promote E_WARNING to exception when throw_on_error declare is enabled */
+	if (orig_type == E_WARNING && EG(current_execute_data)) {
+		zend_execute_data *ex = EG(current_execute_data);
+		/* Find first non internal execute_data */
+		while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) {
+			ex = ex->prev_execute_data;
+		}
+		if (ex->func == NULL) {
+			goto normal;
+		}
+		if ((ex->func->common.fn_flags & ZEND_ACC_THROW_WARNING) != 0) {
+			zend_throw_exception(NULL, ZSTR_VAL(message), E_WARNING);
+			return;
+		}
+	}
+	normal:
+
 	/* Report about uncaught exception in case of fatal errors */
 	if (EG(exception)) {
 		zend_execute_data *ex;
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
diff --git a/ext/zend_test/test.stub.php b/ext/zend_test/test.stub.php
diff --git a/ext/zend_test/test_arginfo.h b/ext/zend_test/test_arginfo.h
diff --git a/main/main.c b/main/main.c
diff --git a/main/php.h b/main/php.h

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<?php
 +declare(throw_on_error=0);
++
 +echo $undef;