From b20cb86408ec48769f38a4d05b248570e8a356ec Mon Sep 17 00:00:00 2001 From: Paulo Magalhaes Date: Wed, 26 Nov 2025 21:31:29 +0000 Subject: [PATCH] drop use of E_STRICT --- lib/plugin/sfPearEnvironment.class.php | 2 -- .../functional/fixtures/apps/backend/config/settings.yml | 4 ++-- .../functional/fixtures/apps/frontend/config/settings.yml | 4 ++-- lib/task/generator/skeleton/app/app/config/settings.yml | 4 ++-- lib/test/sfTestFunctionalBase.class.php | 6 ------ test/functional/fixtures/apps/cache/config/settings.yml | 6 ++---- test/functional/fixtures/apps/frontend/config/settings.yml | 4 ++-- test/functional/fixtures/apps/i18n/config/settings.yml | 4 ++-- test/unit/plugin/sfPearEnvironmentTest.php | 2 -- test/unit/plugin/sfPearRestPluginTest.php | 2 -- test/unit/plugin/sfPluginManagerTest.php | 2 -- 11 files changed, 12 insertions(+), 28 deletions(-) diff --git a/lib/plugin/sfPearEnvironment.class.php b/lib/plugin/sfPearEnvironment.class.php index 49b73369c..08e99b8bb 100644 --- a/lib/plugin/sfPearEnvironment.class.php +++ b/lib/plugin/sfPearEnvironment.class.php @@ -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'; diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/settings.yml b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/settings.yml index 73fd9fc6b..88fac4494 100644 --- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/settings.yml +++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/settings.yml @@ -5,7 +5,7 @@ prod: dev: .settings: - error_reporting: + error_reporting: web_debug: true cache: false no_script_name: false @@ -13,7 +13,7 @@ dev: test: .settings: - error_reporting: + error_reporting: cache: false web_debug: false no_script_name: false diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/settings.yml b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/settings.yml index 73fd9fc6b..88fac4494 100644 --- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/settings.yml +++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/settings.yml @@ -5,7 +5,7 @@ prod: dev: .settings: - error_reporting: + error_reporting: web_debug: true cache: false no_script_name: false @@ -13,7 +13,7 @@ dev: test: .settings: - error_reporting: + error_reporting: cache: false web_debug: false no_script_name: false diff --git a/lib/task/generator/skeleton/app/app/config/settings.yml b/lib/task/generator/skeleton/app/app/config/settings.yml index ce74c7d6a..9f77546d0 100644 --- a/lib/task/generator/skeleton/app/app/config/settings.yml +++ b/lib/task/generator/skeleton/app/app/config/settings.yml @@ -8,7 +8,7 @@ prod: dev: .settings: - error_reporting: + error_reporting: web_debug: true cache: false no_script_name: false @@ -16,7 +16,7 @@ dev: test: .settings: - error_reporting: + error_reporting: cache: false web_debug: false no_script_name: false diff --git a/lib/test/sfTestFunctionalBase.class.php b/lib/test/sfTestFunctionalBase.class.php index d9feef311..2ce6b905f 100644 --- a/lib/test/sfTestFunctionalBase.class.php +++ b/lib/test/sfTestFunctionalBase.class.php @@ -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'); diff --git a/test/functional/fixtures/apps/cache/config/settings.yml b/test/functional/fixtures/apps/cache/config/settings.yml index bef752e08..b3491ae59 100644 --- a/test/functional/fixtures/apps/cache/config/settings.yml +++ b/test/functional/fixtures/apps/cache/config/settings.yml @@ -5,8 +5,7 @@ prod: dev: .settings: - # E_ALL | E_STRICT = 4095 - error_reporting: 4095 + error_reporting: 30719 web_debug: true cache: true no_script_name: false @@ -14,8 +13,7 @@ dev: test: .settings: - # E_ALL | E_STRICT = 4095 - error_reporting: 4095 + error_reporting: 30719 web_debug: false cache: true no_script_name: false diff --git a/test/functional/fixtures/apps/frontend/config/settings.yml b/test/functional/fixtures/apps/frontend/config/settings.yml index 97d21a71f..049535029 100644 --- a/test/functional/fixtures/apps/frontend/config/settings.yml +++ b/test/functional/fixtures/apps/frontend/config/settings.yml @@ -5,7 +5,7 @@ prod: dev: .settings: - error_reporting: + error_reporting: web_debug: true cache: false no_script_name: false @@ -13,7 +13,7 @@ dev: test: .settings: - error_reporting: + error_reporting: cache: false web_debug: false no_script_name: false diff --git a/test/functional/fixtures/apps/i18n/config/settings.yml b/test/functional/fixtures/apps/i18n/config/settings.yml index bffb419a9..4e6c0b96b 100644 --- a/test/functional/fixtures/apps/i18n/config/settings.yml +++ b/test/functional/fixtures/apps/i18n/config/settings.yml @@ -5,7 +5,7 @@ prod: dev: .settings: - error_reporting: + error_reporting: web_debug: true cache: false no_script_name: false @@ -13,7 +13,7 @@ dev: test: .settings: - error_reporting: + error_reporting: cache: false web_debug: false no_script_name: false diff --git a/test/unit/plugin/sfPearEnvironmentTest.php b/test/unit/plugin/sfPearEnvironmentTest.php index f21e4254e..26ee7a939 100644 --- a/test/unit/plugin/sfPearEnvironmentTest.php +++ b/test/unit/plugin/sfPearEnvironmentTest.php @@ -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); diff --git a/test/unit/plugin/sfPearRestPluginTest.php b/test/unit/plugin/sfPearRestPluginTest.php index 716199018..fafbf1f80 100644 --- a/test/unit/plugin/sfPearRestPluginTest.php +++ b/test/unit/plugin/sfPearRestPluginTest.php @@ -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); diff --git a/test/unit/plugin/sfPluginManagerTest.php b/test/unit/plugin/sfPluginManagerTest.php index c15901a18..1e982f169 100644 --- a/test/unit/plugin/sfPluginManagerTest.php +++ b/test/unit/plugin/sfPluginManagerTest.php @@ -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);