Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/plugin/sfPearEnvironment.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
* file that was distributed with this source code.
*/

// Remove E_STRICT from error_reporting
error_reporting(error_reporting() & ~E_STRICT);
date_default_timezone_set('UTC');

require_once 'PEAR.php';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ prod:

dev:
.settings:
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
error_reporting: <?php echo E_ALL."\n" ?>
web_debug: true
cache: false
no_script_name: false
etag: false

test:
.settings:
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
cache: false
web_debug: false
no_script_name: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ prod:

dev:
.settings:
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
error_reporting: <?php echo E_ALL."\n" ?>
web_debug: true
cache: false
no_script_name: false
etag: false

test:
.settings:
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
cache: false
web_debug: false
no_script_name: false
Expand Down
4 changes: 2 additions & 2 deletions lib/task/generator/skeleton/app/app/config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ prod:

dev:
.settings:
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
error_reporting: <?php echo E_ALL."\n" ?>
web_debug: true
cache: false
no_script_name: false
etag: false

test:
.settings:
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
cache: false
web_debug: false
no_script_name: false
Expand Down
6 changes: 0 additions & 6 deletions lib/test/sfTestFunctionalBase.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -429,12 +429,6 @@ public static function handlePhpError($errno, $errstr, $errfile, $errline)
throw new RuntimeException($msg);
break;

case E_STRICT:
$msg = sprintf($msg, 'strict');

throw new RuntimeException($msg);
break;

case E_RECOVERABLE_ERROR:
$msg = sprintf($msg, 'catchable');

Expand Down
6 changes: 2 additions & 4 deletions test/functional/fixtures/apps/cache/config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@ prod:

dev:
.settings:
# E_ALL | E_STRICT = 4095
error_reporting: 4095
error_reporting: 30719
web_debug: true
cache: true
no_script_name: false
etag: true

test:
.settings:
# E_ALL | E_STRICT = 4095
error_reporting: 4095
error_reporting: 30719
web_debug: false
cache: true
no_script_name: false
Expand Down
4 changes: 2 additions & 2 deletions test/functional/fixtures/apps/frontend/config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ prod:

dev:
.settings:
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
error_reporting: <?php echo E_ALL."\n" ?>
web_debug: true
cache: false
no_script_name: false
etag: false

test:
.settings:
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
cache: false
web_debug: false
no_script_name: false
Expand Down
4 changes: 2 additions & 2 deletions test/functional/fixtures/apps/i18n/config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ prod:

dev:
.settings:
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
error_reporting: <?php echo E_ALL."\n" ?>
web_debug: true
cache: false
no_script_name: false
etag: false

test:
.settings:
error_reporting: <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
error_reporting: <?php echo (E_ALL ^ E_NOTICE)."\n" ?>
cache: false
web_debug: false
no_script_name: false
Expand Down
2 changes: 0 additions & 2 deletions test/unit/plugin/sfPearEnvironmentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
* file that was distributed with this source code.
*/

error_reporting(error_reporting() & ~E_STRICT);

require_once __DIR__.'/../../bootstrap/unit.php';

$t = new lime_test(3);
Expand Down
2 changes: 0 additions & 2 deletions test/unit/plugin/sfPearRestPluginTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
* file that was distributed with this source code.
*/

error_reporting(error_reporting() & ~E_STRICT);

require_once __DIR__.'/../../bootstrap/unit.php';

$t = new lime_test(5);
Expand Down
2 changes: 0 additions & 2 deletions test/unit/plugin/sfPluginManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
* file that was distributed with this source code.
*/

error_reporting(error_reporting() & ~E_STRICT);

require_once __DIR__.'/../../bootstrap/unit.php';

$t = new lime_test(40);
Expand Down