Merge branch '3.1'

* 3.1:
  [2.8][PhpUnitBridge] Drop ErrorAssert in favor of @expectedDeprecation
  [3.1][PhpUnitBridge] Drop ErrorAssert in favor of @expectedDeprecation

Author: nicolas-grekas

Tests/ContainerBuilderTest.php

@@ -14,7 +14,6 @@
 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\Compiler\PassConfig;
@@ -60,19 +59,18 @@ public function testDefinitions()
     }
 
     /**
-     * @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
+     * @group legacy
+     * @expectedDeprecation The "deprecated_foo" service is deprecated. You should stop using it, as it will soon be removed.
      */
     public function testCreateDeprecatedService()
     {
-        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);
+        $definition = new Definition('stdClass');
+        $definition->setDeprecated(true);
 
-            $builder = new ContainerBuilder();
-            $builder->setDefinition('deprecated_foo', $definition);
-            $builder->compile();
-            $builder->get('deprecated_foo');
-        });
+        $builder = new ContainerBuilder();
+        $builder->setDefinition('deprecated_foo', $definition);
+        $builder->compile();
+        $builder->get('deprecated_foo');
     }
 
     public function testRegister()

Tests/Loader/XmlFileLoaderTest.php

@@ -11,7 +11,6 @@
 
 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\Reference;
@@ -558,23 +557,17 @@ public function testAutowire()
 
     /**
      * @group legacy
-     * @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
+     * @expectedDeprecation Using the attribute "class" is deprecated for the service "bar" which is defined as an alias %s.
+     * @expectedDeprecation Using the element "tag" is deprecated for the service "bar" which is defined as an alias %s.
+     * @expectedDeprecation Using the element "factory" is deprecated for the service "bar" which is defined as an alias %s.
      */
     public function testAliasDefinitionContainsUnsupportedElements()
     {
-        $deprecations = array(
-            'Using the attribute "class" is deprecated for the service "bar" which is defined as an alias',
-            'Using the element "tag" is deprecated for the service "bar" which is defined as an alias',
-            'Using the element "factory" is deprecated for the service "bar" which is defined as an alias',
-        );
-
-        ErrorAssert::assertDeprecationsAreTriggered($deprecations, function () {
-            $container = new ContainerBuilder();
-            $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
 
-            $loader->load('legacy_invalid_alias_definition.xml');
+        $loader->load('legacy_invalid_alias_definition.xml');
 
-            $this->assertTrue($container->has('bar'));
-        });
+        $this->assertTrue($container->has('bar'));
     }
 }