Skip to content

Commit 106ee53

Browse files
GirgiasGirgias
committed
Remove usage/mentions of E_STRICT in tests.
1 parent 9c7e93a commit 106ee53

28 files changed

+33
-110
lines changed

‎Zend/tests/ErrorException_getSeverity.phpt

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,6 @@ try {
192192
var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
193193
}
194194

195-
try {
196-
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT);
197-
} catch(ErrorException $e) {
198-
echo EXCEPTION_SEVERITY_ERROR_MSG . $e->getSeverity();
199-
var_dump($e->getSeverity() === E_STRICT);
200-
var_dump($e->getMessage() === EXCEPTION_PARAM_MSG);
201-
var_dump($e->getCode() === 0);
202-
var_dump($e->getPrevious() === NULL);
203-
var_dump($e->getFile() === __FILE__);
204-
var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
205-
}
206-
207195
try {
208196
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_RECOVERABLE_ERROR);
209197
} catch(ErrorException $e) {
@@ -384,18 +372,6 @@ try {
384372
var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
385373
}
386374

387-
try {
388-
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT, __FILE__);
389-
} catch(ErrorException $e) {
390-
echo EXCEPTION_SEVERITY_ERROR_MSG . $e->getSeverity();
391-
var_dump($e->getSeverity() === E_STRICT);
392-
var_dump($e->getMessage() === EXCEPTION_PARAM_MSG);
393-
var_dump($e->getCode() === 0);
394-
var_dump($e->getPrevious() === NULL);
395-
var_dump($e->getFile() === __FILE__);
396-
var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
397-
}
398-
399375
try {
400376
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_RECOVERABLE_ERROR, __FILE__);
401377
} catch(ErrorException $e) {
@@ -576,18 +552,6 @@ try {
576552
var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
577553
}
578554

579-
try {
580-
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT, __FILE__, __LINE__);
581-
} catch(ErrorException $e) {
582-
echo EXCEPTION_SEVERITY_ERROR_MSG . $e->getSeverity();
583-
var_dump($e->getSeverity() === E_STRICT);
584-
var_dump($e->getMessage() === EXCEPTION_PARAM_MSG);
585-
var_dump($e->getCode() === 0);
586-
var_dump($e->getPrevious() === NULL);
587-
var_dump($e->getFile() === __FILE__);
588-
var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
589-
}
590-
591555
try {
592556
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_RECOVERABLE_ERROR, __FILE__, __LINE__);
593557
} catch(ErrorException $e) {
@@ -813,22 +777,6 @@ try {
813777
}
814778
}
815779

816-
try {
817-
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT, __FILE__, __LINE__, NULL);
818-
} catch(Exception $exceptionErr) {
819-
try {
820-
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_STRICT, __FILE__, __LINE__, $exceptionErr->getPrevious());
821-
} catch(ErrorException $e) {
822-
echo EXCEPTION_SEVERITY_ERROR_MSG . $e->getSeverity();
823-
var_dump($e->getSeverity() === E_STRICT);
824-
var_dump($e->getMessage() === EXCEPTION_PARAM_MSG);
825-
var_dump($e->getCode() === 0);
826-
var_dump($e->getPrevious() === NULL);
827-
var_dump($e->getFile() === __FILE__);
828-
var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
829-
}
830-
}
831-
832780
try {
833781
throw new ErrorException(EXCEPTION_PARAM_MSG, EXCEPTION_CODE_ERROR, E_RECOVERABLE_ERROR, __FILE__, __LINE__, NULL);
834782
} catch(Exception $exceptionErr) {
@@ -953,12 +901,6 @@ bool(true)
953901
bool(true)
954902
bool(true)
955903
bool(true)
956-
This exception severity is: 2048bool(true)
957-
bool(true)
958-
bool(true)
959-
bool(true)
960-
bool(true)
961-
bool(true)
962904
This exception severity is: 4096bool(true)
963905
bool(true)
964906
bool(true)
@@ -1049,12 +991,6 @@ bool(true)
1049991
bool(true)
1050992
bool(true)
1051993
bool(true)
1052-
This exception severity is: 2048bool(true)
1053-
bool(true)
1054-
bool(true)
1055-
bool(true)
1056-
bool(true)
1057-
bool(true)
1058994
This exception severity is: 4096bool(true)
1059995
bool(true)
1060996
bool(true)
@@ -1145,12 +1081,6 @@ bool(true)
11451081
bool(true)
11461082
bool(true)
11471083
bool(true)
1148-
This exception severity is: 2048bool(true)
1149-
bool(true)
1150-
bool(true)
1151-
bool(true)
1152-
bool(true)
1153-
bool(true)
11541084
This exception severity is: 4096bool(true)
11551085
bool(true)
11561086
bool(true)
@@ -1241,12 +1171,6 @@ bool(true)
12411171
bool(true)
12421172
bool(true)
12431173
bool(true)
1244-
This exception severity is: 2048bool(true)
1245-
bool(true)
1246-
bool(true)
1247-
bool(true)
1248-
bool(true)
1249-
bool(true)
12501174
This exception severity is: 4096bool(true)
12511175
bool(true)
12521176
bool(true)

‎Zend/tests/bug33771.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
33
--FILE--
44
<?php
55

6-
error_reporting(E_ALL | E_STRICT);
6+
error_reporting(E_ALL | E_NOTICE);
77

88
var_dump(error_reporting());
99

@@ -14,7 +14,7 @@ function make_exception()
1414

1515
function make_exception_and_change_err_reporting()
1616
{
17-
error_reporting(E_ALL & ~E_STRICT);
17+
error_reporting(E_ALL & ~E_NOTICE);
1818
throw new Exception();
1919
}
2020

@@ -36,5 +36,5 @@ echo "Done\n";
3636
--EXPECT--
3737
int(32767)
3838
int(32767)
39-
int(30719)
39+
int(32759)
4040
Done

‎Zend/tests/bug52160.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #52160 (Invalid E_STRICT redefined constructor error)
2+
Bug #52160 (Invalid E_DEPRECATED redefined constructor error)
33
--FILE--
44
<?php
55

‎Zend/tests/bug62956.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #62956: "incompatible" signatures for private methods should not cause E_STRICT
2+
Bug #62956: "incompatible" signatures for private methods should not cause E_WARNING
33
--FILE--
44
<?php
55
class Base

‎Zend/tests/bug64988.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #64988 (Class loading order affects E_STRICT warning)
2+
Bug #64988 (Class loading order affects E_WARNING warning)
33
--FILE--
44
<?php
55
abstract class Base1 {

‎Zend/tests/bug67436/bug67436_nohandler.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
bug67436: E_STRICT instead of custom error handler
2+
bug67436: E_WARNING instead of custom error handler
33
--FILE--
44
<?php
55

‎Zend/tests/error_reporting02.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function foo($arg) {
99
}
1010

1111
function bar() {
12-
error_reporting(E_ALL|E_STRICT);
12+
error_reporting(E_ALL|E_DEPRECATED);
1313
throw new Exception("test");
1414
}
1515

‎Zend/tests/error_reporting03.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function bar() {
1616

1717
function foo1() {
1818
echo $undef1;
19-
error_reporting(E_ALL|E_STRICT);
19+
error_reporting(E_ALL|E_DEPRECATED);
2020
echo $undef2;
2121
}
2222

‎Zend/tests/error_reporting04.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error_reporting(E_ALL);
77

88
function foo() {
99
echo $undef;
10-
error_reporting(E_ALL|E_STRICT);
10+
error_reporting(E_ALL|E_DEPRECATED);
1111
}
1212

1313

‎Zend/tests/error_reporting08.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function foo2($arg) {
1212
}
1313

1414
function foo3() {
15-
error_reporting(E_ALL|E_STRICT);
15+
error_reporting(E_ALL|E_DEPRECATED);
1616
echo $undef3;
1717
throw new Exception("test");
1818
}

0 commit comments

Comments
 (0)