From 57fddbf9b7a42aff37fd8c02457f3206c8210dc9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 5 Jan 2015 18:41:06 +0100 Subject: [PATCH] [2.6] fix deprecation silencing... --- .../FrameworkBundle/Tests/Templating/GlobalVariablesTest.php | 2 +- .../FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php | 2 +- .../DependencyInjection/Tests/LegacyContainerBuilderTest.php | 2 +- .../Session/Storage/Handler/LegacyPdoSessionHandlerTest.php | 2 +- .../Component/OptionsResolver/Tests/LegacyOptionsTest.php | 2 +- .../Security/Tests/Core/LegacySecurityContextInterfaceTest.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php index 3d1aa90414..ba2ea37668 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php @@ -28,7 +28,7 @@ class GlobalVariablesTest extends TestCase public function testLegacyGetSecurity() { - $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); + $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); $securityContext = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'); diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php index 5e47dfc757..1ae6fc4f64 100644 --- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php +++ b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php @@ -39,7 +39,7 @@ class ClassNotFoundFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase */ public function testLegacyHandleClassNotFound($error, $translatedMessage, $autoloader) { - $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); + $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); // Unregister all autoloaders to ensure the custom provided // autoloader is the only one to be used during the test run. diff --git a/src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php index 2f7b827d43..c837de4ef5 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php @@ -18,7 +18,7 @@ class LegacyContainerBuilderTest extends \PHPUnit_Framework_TestCase { public function setUp() { - $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); + $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); } /** diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php index cb072deff6..2924501382 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php @@ -19,7 +19,7 @@ class LegacyPdoSessionHandlerTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); + $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) { $this->markTestSkipped('This test requires SQLite support in your environment'); diff --git a/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php b/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php index 4353c0f49f..ccdb5bd963 100644 --- a/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php +++ b/src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php @@ -23,7 +23,7 @@ class LegacyOptionsTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); + $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); $this->options = new OptionsResolver(); } diff --git a/src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php b/src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php index 764a43d37a..8f684758f8 100644 --- a/src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php +++ b/src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php @@ -21,7 +21,7 @@ class LegacySecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase */ public function testConstantSync() { - $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); + $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); $this->assertSame(Security::ACCESS_DENIED_ERROR, SecurityContextInterface::ACCESS_DENIED_ERROR); $this->assertSame(Security::AUTHENTICATION_ERROR, SecurityContextInterface::AUTHENTICATION_ERROR);