Merge branch '3.1'

* 3.1:
  Tweak merge
  update tests to use the new error assertion helper
  [ci] Upgrade to symfony/phpunit-bridge >=3.2@dev
  update tests to use the new error assertion helper

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Author: nicolas-grekas

Tests/ContainerBuilderTest.php

@@ -14,6 +14,7 @@
 require_once __DIR__.'/Fixtures/includes/classes.php';
 require_once __DIR__.'/Fixtures/includes/ProjectExtension.php';
 
+use Symfony\Bridge\PhpUnit\ErrorAssert;
 use Symfony\Component\Config\Resource\ResourceInterface;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -58,31 +59,15 @@ public function testDefinitions()
 
     public function testCreateDeprecatedService()
     {
-        $deprecations = array();
-        set_error_handler(function ($type, $msg) use (&$deprecations) {
-            if (E_USER_DEPRECATED !== $type) {
-                restore_error_handler();
+        ErrorAssert::assertDeprecationsAreTriggered('The "deprecated_foo" service is deprecated. You should stop using it, as it will soon be removed.', function () {
+            $definition = new Definition('stdClass');
+            $definition->setDeprecated(true);
 
-                return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
-            }
-
-            $deprecations[] = $msg;
+            $builder = new ContainerBuilder();
+            $builder->setDefinition('deprecated_foo', $definition);
+            $builder->compile();
+            $builder->get('deprecated_foo');
         });
-
-        $definition = new Definition('stdClass');
-        $definition->setDeprecated(true);
-
-        $builder = new ContainerBuilder();
-        $builder->setDefinition('deprecated_foo', $definition);
-
-        $builder->compile();
-
-        $builder->get('deprecated_foo');
-
-        restore_error_handler();
-
-        $this->assertCount(1, $deprecations);
-        $this->assertContains('The "deprecated_foo" service is deprecated. You should stop using it, as it will soon be removed.', $deprecations[0]);
     }
 
     public function testRegister()

Tests/Loader/XmlFileLoaderTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
+use Symfony\Bridge\PhpUnit\ErrorAssert;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
@@ -546,29 +547,19 @@ public function testAutowire()
      */
     public function testAliasDefinitionContainsUnsupportedElements()
     {
-        $container = new ContainerBuilder();
-        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $deprecations = array(
+            'Using the attribute "class" is deprecated for alias definition "bar"',
+            'Using the element "tag" is deprecated for alias definition "bar"',
+            'Using the element "factory" is deprecated for alias definition "bar"',
+        );
 
-        $deprecations = array();
-        set_error_handler(function ($type, $msg) use (&$deprecations) {
-            if (E_USER_DEPRECATED !== $type) {
-                restore_error_handler();
+        ErrorAssert::assertDeprecationsAreTriggered($deprecations, function () {
+            $container = new ContainerBuilder();
+            $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
 
-                return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
-            }
+            $loader->load('legacy_invalid_alias_definition.xml');
 
-            $deprecations[] = $msg;
+            $this->assertTrue($container->has('bar'));
         });
-
-        $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]);
     }
 }