minor symfony#18296 [3.1] fix testing deprecation messages (xabbuh)

This PR was merged into the 3.1-dev branch.

Discussion
----------

[3.1] fix testing deprecation messages

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

* always restore the previous error handler
* throw `LogicExcetion` when unexpected error type is triggered

Commits
-------

0df544f fix testing deprecation messages

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php

@@ -91,7 +91,9 @@ public function testAbsolutePathsAreDeprecated($name, $logicalName, $path, $ref)
         $deprecations = array();
         set_error_handler(function ($type, $msg) use (&$deprecations) {
             if (E_USER_DEPRECATED !== $type) {
-                throw new \LogicException(sprintf('Unexpected error: "%s".', $msg));
+                restore_error_handler();
+
+                return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
             }
 
             $deprecations[] = $msg;

src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php

@@ -519,20 +519,24 @@ public function testAliasDefinitionContainsUnsupportedElements()
 
         $deprecations = array();
         set_error_handler(function ($type, $msg) use (&$deprecations) {
-            if (E_USER_DEPRECATED === $type) {
-                $deprecations[] = $msg;
+            if (E_USER_DEPRECATED !== $type) {
+                restore_error_handler();
+
+                return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
             }
+
+            $deprecations[] = $msg;
         });
 
         $loader->load('legacy_invalid_alias_definition.xml');
 
+        restore_error_handler();
+
         $this->assertTrue($container->has('bar'));
 
         $this->assertCount(3, $deprecations);
         $this->assertContains('Using the attribute "class" is deprecated for alias definition "bar"', $deprecations[0]);
         $this->assertContains('Using the element "tag" is deprecated for alias definition "bar"', $deprecations[1]);
         $this->assertContains('Using the element "factory" is deprecated for alias definition "bar"', $deprecations[2]);
-
-        restore_error_handler();
     }
 }

src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php

@@ -32,9 +32,13 @@ public function testRenderFallbackWithObjectAttributesIsDeprecated()
     {
         $deprecations = array();
         set_error_handler(function ($type, $message) use (&$deprecations) {
-            if (E_USER_DEPRECATED === $type) {
-                $deprecations[] = $message;
+            if (E_USER_DEPRECATED !== $type) {
+                restore_error_handler();
+
+                return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
             }
+
+            $deprecations[] = $message;
         });
 
         $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
@@ -45,10 +49,10 @@ public function testRenderFallbackWithObjectAttributesIsDeprecated()
 
         $strategy->render($reference, $request);
 
+        restore_error_handler();
+
         $this->assertCount(1, $deprecations);
         $this->assertContains('Passing objects as part of URI attributes to the ESI and SSI rendering strategies is deprecated', $deprecations[0]);
-
-        restore_error_handler();
     }
 
     public function testRender()

src/Symfony/Component/Yaml/Tests/InlineTest.php

@@ -260,9 +260,13 @@ public function testParseUnquotedScalarStartingWithPercentCharacter()
     {
         $deprecations = array();
         set_error_handler(function ($type, $msg) use (&$deprecations) {
-            if (E_USER_DEPRECATED === $type) {
-                $deprecations[] = $msg;
+            if (E_USER_DEPRECATED !== $type) {
+                restore_error_handler();
+
+                return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
             }
+
+            $deprecations[] = $msg;
         });
 
         Inline::parse('{ foo: %foo }');