From 1a3bdb4a2cad168c2091d62b50f673cc7155fef4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 3 Feb 2018 18:17:12 +0100 Subject: [PATCH] Remove some references to E_STRICT in tests run-tests.php enforces error_reporting=E_ALL (including E_STRICT), setting this explicitly in not necessary. Conversely, after the removal of some E_STRICT errors, explicitly excluding it is no longer necessary in some places. --- Zend/tests/bug27669.phpt | 3 +-- Zend/tests/bug40809.phpt | 1 - Zend/tests/bug43450.phpt | 1 - Zend/tests/bug45805.phpt | 2 +- Zend/tests/bug60536_002.phpt | 1 - Zend/tests/bug60536_003.phpt | 1 - Zend/tests/bug60536_004.phpt | 1 - Zend/tests/bug60536_005.phpt | 1 - Zend/tests/bug67436/bug67436_nohandler.phpt | 4 ---- Zend/tests/bug69388.phpt | 1 - Zend/tests/bug69388_2.phpt | 1 - Zend/tests/bug72101.phpt | 2 +- Zend/tests/bug74408.phpt | 4 ---- Zend/tests/clone_004.phpt | 2 -- Zend/tests/traits/property001.phpt | 5 +---- Zend/tests/traits/property002.phpt | 3 +-- Zend/tests/traits/property003.phpt | 3 +-- Zend/tests/traits/property004.phpt | 3 +-- Zend/tests/traits/property005.phpt | 3 +-- Zend/tests/traits/property006.phpt | 3 +-- Zend/tests/traits/property007.phpt | 3 +-- Zend/tests/traits/property008.phpt | 3 +-- Zend/tests/traits/property009.phpt | 3 +-- ext/date/tests/date_sunrise_and_sunset_basic.phpt | 3 --- ext/date/tests/mktime_basic1.phpt | 1 - ext/date/tests/mktime_error.phpt | 1 - ext/date/tests/timezone_name_from_abbr_error.phpt | 4 +--- ext/standard/tests/class_object/is_a_error_001.phpt | 4 +--- ext/standard/tests/class_object/is_a_variation_001.phpt | 2 -- ext/standard/tests/class_object/is_a_variation_002.phpt | 2 -- ext/standard/tests/class_object/is_a_variation_003.phpt | 2 -- ext/standard/tests/file/bug37158.phpt | 1 - ext/standard/tests/general_functions/is_callable_basic1.phpt | 3 --- ext/standard/tests/general_functions/is_callable_basic2.phpt | 3 --- ext/standard/tests/general_functions/is_callable_error.phpt | 5 +---- .../tests/general_functions/is_callable_variation1.phpt | 3 --- .../tests/general_functions/is_callable_variation2.phpt | 5 +---- ext/standard/tests/serialize/serialization_objects_013.phpt | 2 -- ext/standard/tests/serialize/serialization_objects_014.phpt | 4 +--- ext/standard/tests/serialize/serialization_objects_015.phpt | 2 -- tests/lang/engine_assignExecutionOrder_008.phpt | 1 - tests/lang/foreachLoop.016.phpt | 1 - tests/lang/passByReference_012.phpt | 2 -- tests/lang/returnByReference.006.phpt | 2 -- tests/lang/returnByReference.007.phpt | 2 -- tests/lang/returnByReference.008.phpt | 2 -- 46 files changed, 17 insertions(+), 94 deletions(-) diff --git a/Zend/tests/bug27669.phpt b/Zend/tests/bug27669.phpt index 43591a9386..97b15590e2 100644 --- a/Zend/tests/bug27669.phpt +++ b/Zend/tests/bug27669.phpt @@ -2,8 +2,6 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dynamically) --FILE-- ===DONE=== --EXPECTF-- +Deprecated: Non-static method A::hello() should not be called statically in %s on line %d Hello World ===DONE=== diff --git a/Zend/tests/bug40809.phpt b/Zend/tests/bug40809.phpt index 9ff4e6f1b6..f0ba1d9753 100644 --- a/Zend/tests/bug40809.phpt +++ b/Zend/tests/bug40809.phpt @@ -2,7 +2,6 @@ Bug #40809 (Poor performance of ".=") --FILE-- test(); --EXPECTF-- bool(true) bool(true) -hello World! \ No newline at end of file +hello World! diff --git a/Zend/tests/traits/property003.phpt b/Zend/tests/traits/property003.phpt index b4f0105d20..09686277db 100644 --- a/Zend/tests/traits/property003.phpt +++ b/Zend/tests/traits/property003.phpt @@ -2,7 +2,6 @@ Conflicting properties with different visibility modifiers should result in a fatal error, since this indicates that the code is incompatible. --FILE-- hello = "foo"; --EXPECTF-- PRE-CLASS-GUARD -Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d \ No newline at end of file +Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/property004.phpt b/Zend/tests/traits/property004.phpt index 393b492b7f..a2a8d41301 100644 --- a/Zend/tests/traits/property004.phpt +++ b/Zend/tests/traits/property004.phpt @@ -2,7 +2,6 @@ Conflicting properties with different initial values are considered incompatible. --FILE-- int(0) -} \ No newline at end of file +} diff --git a/Zend/tests/traits/property009.phpt b/Zend/tests/traits/property009.phpt index 590a5e9b7d..fdd2351023 100644 --- a/Zend/tests/traits/property009.phpt +++ b/Zend/tests/traits/property009.phpt @@ -2,7 +2,6 @@ Handling of public fields with traits needs to have same semantics as with normal inheritance, however, we do add strict warnings since it is easier to run into something unexpeted with changing traits. --FILE-- int(0) -} \ No newline at end of file +} diff --git a/ext/date/tests/date_sunrise_and_sunset_basic.phpt b/ext/date/tests/date_sunrise_and_sunset_basic.phpt index f89b63fd93..f7eb30a3ab 100644 --- a/ext/date/tests/date_sunrise_and_sunset_basic.phpt +++ b/ext/date/tests/date_sunrise_and_sunset_basic.phpt @@ -14,9 +14,6 @@ offset: +1 GMT echo "Basic test for date_sunrise() and date_sunset()\n"; -// suppress date() function strict msgs -error_reporting(E_ALL & ~E_STRICT); - echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n"; echo date("D M d Y") . ', sunset time : ' . date_sunset(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n"; diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt index da1f3d63bf..ad95f138fc 100644 --- a/ext/date/tests/mktime_basic1.phpt +++ b/ext/date/tests/mktime_basic1.phpt @@ -7,7 +7,6 @@ Test mktime() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: */ -error_reporting(E_ALL | E_STRICT); //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt index 9e3e872cb5..c08eefe9d7 100644 --- a/ext/date/tests/mktime_error.phpt +++ b/ext/date/tests/mktime_error.phpt @@ -7,7 +7,6 @@ Test mktime() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: */ -error_reporting(E_ALL | E_STRICT); //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/timezone_name_from_abbr_error.phpt b/ext/date/tests/timezone_name_from_abbr_error.phpt index 640caaec54..866cef5996 100644 --- a/ext/date/tests/timezone_name_from_abbr_error.phpt +++ b/ext/date/tests/timezone_name_from_abbr_error.phpt @@ -8,8 +8,6 @@ Test timezone_name_from_abbr() function : error conditions * Alias to functions: */ -error_reporting(E_ALL | E_STRICT); - //Set the default time zone date_default_timezone_set("Europe/London"); @@ -39,4 +37,4 @@ bool(false) Warning: timezone_name_from_abbr() expects at most 3 parameters, 4 given in %s on line %d bool(false) -===DONE=== \ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt index 6518a03c0f..57cedaf81a 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -1,7 +1,5 @@ --TEST-- Test is_a() function : error conditions - wrong number of args ---INI-- -error_reporting=E_ALL | E_STRICT | E_DEPRECATED --FILE-- ---INI-- -precision=14 -error_reporting = E_ALL & ~E_NOTICE | E_STRICT --FILE-- &string(14) "obj->c.changed" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt index 2265caba93..b47920e879 100644 --- a/ext/standard/tests/serialize/serialization_objects_015.phpt +++ b/ext/standard/tests/serialize/serialization_objects_015.phpt @@ -1,7 +1,5 @@ --TEST-- Object serialization / unserialization: properties reference containing object ---INI-- -error_reporting = E_ALL & ~E_STRICT --FILE--