Remove E_STRICT constant/error level

mvorisek · mvorisek · commit 283cdfb1c89f · 2023-12-30T14:19:46.000+01:00
diff --git a/Zend/tests/ErrorException_getSeverity.phpt b/Zend/tests/ErrorException_getSeverity.phpt
@@ -192,18 +192,6 @@ try {
     var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
 }
 
-try {
-    throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT);
-} catch(ErrorException $e) {
-    echo EXCEPTION_SEVERITY_ERROR_MSG . $e->getSeverity();
-    var_dump($e->getSeverity() === E_STRICT);
-    var_dump($e->getMessage() === EXCEPTION_PARAM_MSG);
-    var_dump($e->getCode() === 0);
-    var_dump($e->getPrevious() === NULL);
-    var_dump($e->getFile() === __FILE__);
-    var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-}
-
 try {
     throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_RECOVERABLE_ERROR);
 } catch(ErrorException $e) {
@@ -384,18 +372,6 @@ try {
     var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
 }
 
-try {
-    throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT, __FILE__);
-} catch(ErrorException $e) {
-    echo EXCEPTION_SEVERITY_ERROR_MSG . $e->getSeverity();
-    var_dump($e->getSeverity() === E_STRICT);
-    var_dump($e->getMessage() === EXCEPTION_PARAM_MSG);
-    var_dump($e->getCode() === 0);
-    var_dump($e->getPrevious() === NULL);
-    var_dump($e->getFile() === __FILE__);
-    var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-}
-
 try {
     throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_RECOVERABLE_ERROR, __FILE__);
 } catch(ErrorException $e) {
@@ -576,18 +552,6 @@ try {
     var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
 }
 
-try {
-    throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT, __FILE__, __LINE__);
-} catch(ErrorException $e) {
-    echo EXCEPTION_SEVERITY_ERROR_MSG . $e->getSeverity();
-    var_dump($e->getSeverity() === E_STRICT);
-    var_dump($e->getMessage() === EXCEPTION_PARAM_MSG);
-    var_dump($e->getCode() === 0);
-    var_dump($e->getPrevious() === NULL);
-    var_dump($e->getFile() === __FILE__);
-    var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-}
-
 try {
     throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_RECOVERABLE_ERROR, __FILE__, __LINE__);
 } catch(ErrorException $e) {
@@ -813,22 +777,6 @@ try {
     }
 }
 
-try {
-    throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT, __FILE__, __LINE__, NULL);
-} catch(Exception $exceptionErr) {
-    try {
-        throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT, __FILE__, __LINE__, $exceptionErr->getPrevious());
-    } catch(ErrorException $e) {
-        echo EXCEPTION_SEVERITY_ERROR_MSG . $e->getSeverity();
-        var_dump($e->getSeverity() === E_STRICT);
-        var_dump($e->getMessage() === EXCEPTION_PARAM_MSG);
-        var_dump($e->getCode() === 0);
-        var_dump($e->getPrevious() === NULL);
-        var_dump($e->getFile() === __FILE__);
-        var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }
-}
-
 try {
     throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_RECOVERABLE_ERROR, __FILE__, __LINE__, NULL);
 } catch(Exception $exceptionErr) {
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -1554,7 +1554,6 @@ static ZEND_COLD void get_filename_lineno(int type, zend_string **filename, uint
 		case E_COMPILE_WARNING:
 		case E_ERROR:
 		case E_NOTICE:
-		case E_STRICT:
 		case E_DEPRECATED:
 		case E_WARNING:
 		case E_USER_ERROR:
diff --git a/Zend/zend_constants.stub.php b/Zend/zend_constants.stub.php
@@ -68,12 +68,6 @@
  */
 const E_USER_NOTICE = UNKNOWN;
 
-/**
- * @var int
- * @cvalue E_STRICT
- */
-const E_STRICT = UNKNOWN;
-
 /**
  * @var int
  * @cvalue E_RECOVERABLE_ERROR
diff --git a/Zend/zend_constants_arginfo.h b/Zend/zend_constants_arginfo.h
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
@@ -31,15 +31,14 @@
 #define E_USER_ERROR		(1<<8L)
 #define E_USER_WARNING		(1<<9L)
 #define E_USER_NOTICE		(1<<10L)
-#define E_STRICT			(1<<11L)
 #define E_RECOVERABLE_ERROR	(1<<12L)
 #define E_DEPRECATED		(1<<13L)
 #define E_USER_DEPRECATED	(1<<14L)
 
 /* Indicates that this usually fatal error should not result in a bailout */
 #define E_DONT_BAIL			(1<<15L)
 
-#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED | E_STRICT)
+#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED)
 #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
 
 /* Fatal errors that are ignored by the silence operator */
diff --git a/main/main.c b/main/main.c
@@ -1321,10 +1321,6 @@ static ZEND_COLD void php_error_cb(int orig_type, zend_string *error_filename, c
 				error_type_str = "Notice";
 				syslog_type_int = LOG_NOTICE;
 				break;
-			case E_STRICT:
-				error_type_str = "Strict Standards";
-				syslog_type_int = LOG_INFO;
-				break;
 			case E_DEPRECATED:
 			case E_USER_DEPRECATED:
 				error_type_str = "Deprecated";
diff --git a/php.ini-development b/php.ini-development
@@ -107,7 +107,7 @@
 ; error_reporting
 ;   Default Value: E_ALL
 ;   Development Value: E_ALL
-;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+;   Production Value: E_ALL & ~E_DEPRECATED
 
 ; log_errors
 ;   Default Value: Off
@@ -452,7 +452,7 @@ memory_limit = 128M
 ; operators. The error level constants are below here for convenience as well as
 ; some common settings and their meanings.
 ; By default, PHP is set to take action on all errors, notices and warnings EXCEPT
-; those related to E_NOTICE and E_STRICT, which together cover best practices and
+; those related to E_NOTICE, which together cover best practices and
 ; recommended coding standards in PHP. For performance reasons, this is the
 ; recommend error reporting setting. Your production server shouldn't be wasting
 ; resources complaining about best practices and coding standards. That's what
@@ -472,9 +472,6 @@ memory_limit = 128M
 ;                     intentional (e.g., using an uninitialized variable and
 ;                     relying on the fact it is automatically initialized to an
 ;                     empty string)
-; E_STRICT          - run-time notices, enable to have PHP suggest changes
-;                     to your code which will ensure the best interoperability
-;                     and forward compatibility of your code
 ; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
 ; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
 ;                     initial startup
@@ -490,11 +487,10 @@ memory_limit = 128M
 ; Common Values:
 ;   E_ALL (Show all errors, warnings and notices including coding standards.)
 ;   E_ALL & ~E_NOTICE  (Show all errors, except for notices)
-;   E_ALL & ~E_NOTICE & ~E_STRICT  (Show all errors, except for notices and coding standards warnings.)
 ;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
 ; Default Value: E_ALL
 ; Development Value: E_ALL
-; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+; Production Value: E_ALL & ~E_DEPRECATED
 ; https://php.net/error-reporting
 error_reporting = E_ALL
 
diff --git a/php.ini-production b/php.ini-production
@@ -107,7 +107,7 @@
 ; error_reporting
 ;   Default Value: E_ALL
 ;   Development Value: E_ALL
-;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+;   Production Value: E_ALL & ~E_DEPRECATED
 
 ; log_errors
 ;   Default Value: Off
@@ -454,7 +454,7 @@ memory_limit = 128M
 ; operators. The error level constants are below here for convenience as well as
 ; some common settings and their meanings.
 ; By default, PHP is set to take action on all errors, notices and warnings EXCEPT
-; those related to E_NOTICE and E_STRICT, which together cover best practices and
+; those related to E_NOTICE, which together cover best practices and
 ; recommended coding standards in PHP. For performance reasons, this is the
 ; recommend error reporting setting. Your production server shouldn't be wasting
 ; resources complaining about best practices and coding standards. That's what
@@ -474,9 +474,6 @@ memory_limit = 128M
 ;                     intentional (e.g., using an uninitialized variable and
 ;                     relying on the fact it is automatically initialized to an
 ;                     empty string)
-; E_STRICT          - run-time notices, enable to have PHP suggest changes
-;                     to your code which will ensure the best interoperability
-;                     and forward compatibility of your code
 ; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
 ; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
 ;                     initial startup
@@ -492,13 +489,12 @@ memory_limit = 128M
 ; Common Values:
 ;   E_ALL (Show all errors, warnings and notices including coding standards.)
 ;   E_ALL & ~E_NOTICE  (Show all errors, except for notices)
-;   E_ALL & ~E_NOTICE & ~E_STRICT  (Show all errors, except for notices and coding standards warnings.)
 ;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
 ; Default Value: E_ALL
 ; Development Value: E_ALL
-; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+; Production Value: E_ALL & ~E_DEPRECATED
 ; https://php.net/error-reporting
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+error_reporting = E_ALL & ~E_DEPRECATED
 
 ; This directive controls whether or not and where PHP will output errors,
 ; notices and warnings too. Error output is very useful during development, but
diff --git a/run-tests.php b/run-tests.php
@@ -1606,7 +1606,6 @@ function run_all_tests_parallel(array $test_files, array $env, ?string $redir_te
                                 'E_USER_ERROR',
                                 'E_USER_WARNING',
                                 'E_USER_NOTICE',
-                                'E_STRICT', // TODO Cleanup when removed from Zend Engine.
                                 'E_RECOVERABLE_ERROR',
                                 'E_DEPRECATED',
                                 'E_USER_DEPRECATED'
