From c554faaf349a87f8f9ebec7b3a1398d9e5e315d0 Mon Sep 17 00:00:00 2001
From: Laurent VOULLEMIER <laurent.voullemier@gmail.com>
Date: Thu, 19 Mar 2020 13:51:14 +0100
Subject: [PATCH] Use expectException method instead of deprecated annotation

---
 components/phpunit_bridge.rst | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
index 343ff8d7259..bf8e511ce32 100644
--- a/components/phpunit_bridge.rst
+++ b/components/phpunit_bridge.rst
@@ -215,21 +215,30 @@ Write Assertions about Deprecations
 
 When adding deprecations to your code, you might like writing tests that verify
 that they are triggered as required. To do so, the bridge provides the
-``@expectedDeprecation`` annotation that you can use on your test methods.
+:method:`Symfony\\Bridge\\PhpUnit\\ExpectDeprecationTrait::expectDeprecation` method that you can use on your test methods.
 It requires you to pass the expected message, given in the same format as for
 the `PHPUnit's assertStringMatchesFormat()`_ method. If you expect more than one
-deprecation message for a given test method, you can use the annotation several
+deprecation message for a given test method, you can use the method several
 times (order matters)::
 
-    /**
-     * @group legacy
-     * @expectedDeprecation This "%s" method is deprecated.
-     * @expectedDeprecation The second argument of the "%s" method is deprecated.
-     */
-    public function testDeprecatedCode()
+    use PHPUnit\Framework\TestCase;
+    use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+
+    class MyTest extends TestCase
     {
-        @trigger_error('This "Foo" method is deprecated.', E_USER_DEPRECATED);
-        @trigger_error('The second argument of the "Bar" method is deprecated.', E_USER_DEPRECATED);
+        use ExpectDeprecationTrait;
+
+        /**
+         * @group legacy
+         */
+        public function testDeprecatedCode()
+        {
+            $this->expectDeprecation("This "%s" method is deprecated.");
+            $this->expectDeprecation("The second argument of the "%s" method is deprecated.");
+
+            @trigger_error('This "Foo" method is deprecated.', E_USER_DEPRECATED);
+            @trigger_error('The second argument of the "Bar" method is deprecated.', E_USER_DEPRECATED);
+        }
     }
 
 Time-sensitive Tests