minor #13271 [2.6] fix deprecation silencing... (nicolas-grekas)

fabpot · fabpot · commit 966ac2d06641 · 2015-01-05T18:58:26.000+01:00
This PR was merged into the 2.6 branch. Discussion ---------- [2.6] fix deprecation silencing... | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - My bad... Commits ------- 57fddbf [2.6] fix deprecation silencing...
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
@@ -28,7 +28,7 @@ public function setUp()
 
     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
@@ -39,7 +39,7 @@ public function testHandleClassNotFound($error, $translatedMessage)
      */
     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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function setUp()`
`28`	`28`
`29`	`29`	`public function testLegacyGetSecurity()`
`30`	`30`	`{`
`31`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`31`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`32`	`32`
`33`	`33`	`$securityContext = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface');`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function testHandleClassNotFound($error, $translatedMessage)`
`39`	`39`	`*/`
`40`	`40`	`public function testLegacyHandleClassNotFound($error, $translatedMessage, $autoloader)`
`41`	`41`	`{`
`42`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`42`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`43`	`43`
`44`	`44`	`// Unregister all autoloaders to ensure the custom provided`
`45`	`45`	`// autoloader is the only one to be used during the test run.`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class LegacyContainerBuilderTest extends \PHPUnit_Framework_TestCase`
`18`	`18`	`{`
`19`	`19`	`public function setUp()`
`20`	`20`	`{`
`21`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`21`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class LegacyPdoSessionHandlerTest extends \PHPUnit_Framework_TestCase`
`19`	`19`
`20`	`20`	`protected function setUp()`
`21`	`21`	`{`
`22`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`22`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`23`	`23`
`24`	`24`	`if (!class_exists('PDO') \|\| !in_array('sqlite', \PDO::getAvailableDrivers())) {`
`25`	`25`	`$this->markTestSkipped('This test requires SQLite support in your environment');`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class LegacyOptionsTest extends \PHPUnit_Framework_TestCase`
`23`	`23`
`24`	`24`	`protected function setUp()`
`25`	`25`	`{`
`26`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`26`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`27`	`27`
`28`	`28`	`$this->options = new OptionsResolver();`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class LegacySecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase`
`21`	`21`	`*/`
`22`	`22`	`public function testConstantSync()`
`23`	`23`	`{`
`24`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`24`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`25`	`25`
`26`	`26`	`$this->assertSame(Security::ACCESS_DENIED_ERROR, SecurityContextInterface::ACCESS_DENIED_ERROR);`
`27`	`27`	`$this->assertSame(Security::AUTHENTICATION_ERROR, SecurityContextInterface::AUTHENTICATION_ERROR);`