Skip to content

Commit d9857cb

Browse files
mentalstringthePanz
authored andcommitted
drop use of E_STRICT
1 parent 052023a commit d9857cb

File tree

11 files changed

+12
-28
lines changed

11 files changed

+12
-28
lines changed

lib/plugin/sfPearEnvironment.class.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
// Remove E_STRICT from error_reporting
12-
error_reporting(error_reporting() & ~E_STRICT);
1311
date_default_timezone_set('UTC');
1412

1513
require_once 'PEAR.php';

lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ prod:
55

66
dev:
77
.settings:
8-
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
8+
error_reporting: <?php echo E_ALL."\n" ?>
99
web_debug: true
1010
cache: false
1111
no_script_name: false
1212
etag: false
1313

1414
test:
1515
.settings:
16-
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
16+
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
1717
cache: false
1818
web_debug: false
1919
no_script_name: false

lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ prod:
55

66
dev:
77
.settings:
8-
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
8+
error_reporting: <?php echo E_ALL."\n" ?>
99
web_debug: true
1010
cache: false
1111
no_script_name: false
1212
etag: false
1313

1414
test:
1515
.settings:
16-
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
16+
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
1717
cache: false
1818
web_debug: false
1919
no_script_name: false

lib/task/generator/skeleton/app/app/config/settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ prod:
88

99
dev:
1010
.settings:
11-
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
11+
error_reporting: <?php echo E_ALL."\n" ?>
1212
web_debug: true
1313
cache: false
1414
no_script_name: false
1515
etag: false
1616

1717
test:
1818
.settings:
19-
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
19+
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
2020
cache: false
2121
web_debug: false
2222
no_script_name: false

lib/test/sfTestFunctionalBase.class.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,6 @@ public static function handlePhpError($errno, $errstr, $errfile, $errline)
429429
throw new RuntimeException($msg);
430430
break;
431431

432-
case E_STRICT:
433-
$msg = sprintf($msg, 'strict');
434-
435-
throw new RuntimeException($msg);
436-
break;
437-
438432
case E_RECOVERABLE_ERROR:
439433
$msg = sprintf($msg, 'catchable');
440434

test/functional/fixtures/apps/cache/config/settings.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ prod:
55

66
dev:
77
.settings:
8-
# E_ALL | E_STRICT = 4095
9-
error_reporting: 4095
8+
error_reporting: 30719
109
web_debug: true
1110
cache: true
1211
no_script_name: false
1312
etag: true
1413

1514
test:
1615
.settings:
17-
# E_ALL | E_STRICT = 4095
18-
error_reporting: 4095
16+
error_reporting: 30719
1917
web_debug: false
2018
cache: true
2119
no_script_name: false

test/functional/fixtures/apps/frontend/config/settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ prod:
55

66
dev:
77
.settings:
8-
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
8+
error_reporting: <?php echo E_ALL."\n" ?>
99
web_debug: true
1010
cache: false
1111
no_script_name: false
1212
etag: false
1313

1414
test:
1515
.settings:
16-
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
16+
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
1717
cache: false
1818
web_debug: false
1919
no_script_name: false

test/functional/fixtures/apps/i18n/config/settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ prod:
55

66
dev:
77
.settings:
8-
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
8+
error_reporting: <?php echo E_ALL."\n" ?>
99
web_debug: true
1010
cache: false
1111
no_script_name: false
1212
etag: false
1313

1414
test:
1515
.settings:
16-
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
16+
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
1717
cache: false
1818
web_debug: false
1919
no_script_name: false

test/unit/plugin/sfPearEnvironmentTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
error_reporting(error_reporting() & ~E_STRICT);
12-
1311
require_once __DIR__.'/../../bootstrap/unit.php';
1412

1513
$t = new lime_test(3);

test/unit/plugin/sfPearRestPluginTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
error_reporting(error_reporting() & ~E_STRICT);
12-
1311
require_once __DIR__.'/../../bootstrap/unit.php';
1412

1513
$t = new lime_test(5);

0 commit comments

Comments
 (0)