Merge branch '5.4' into 6.0

javiereguiluz · javiereguiluz · commit 37539a4ac8e2 · 2022-06-09T17:54:34.000+02:00
* 5.4:
  [PhpUnitBridge] Mention the SetUpTearDownTrait deprecation
diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
@@ -484,6 +484,10 @@ call to the ``doSetUp()``, ``doTearDown()``, ``doSetUpBeforeClass()`` and
         }
     }
 
+.. deprecated:: 5.3
+
+    The ``SetUpTearDownTrait`` was deprecated in Symfony 5.3.
+
 Using Namespaced PHPUnit Classes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

Original file line number	Diff line number	Diff line change
@@ -484,6 +484,10 @@ call to the ``doSetUp()``, ``doTearDown()``, ``doSetUpBeforeClass()`` and
`484`	`484`	`}`
`485`	`485`	`}`
`486`	`486`
	`487`	`+.. deprecated:: 5.3`
	`488`	`+`
	`489`	+ The ``SetUpTearDownTrait`` was deprecated in Symfony 5.3.
	`490`	`+`
`487`	`491`	`Using Namespaced PHPUnit Classes`
`488`	`492`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
`489`	`493`