minor #50828 [DoctrineBridge][HttpFoundation] Remove ExpectDeprecationTrait where it is not used (GromNaN)

nicolas-grekas · nicolas-grekas · commit 1eaefe300afc · 2023-06-30T10:07:30.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [DoctrineBridge][HttpFoundation] Remove `ExpectDeprecationTrait` where it is not used | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | n/a This unused code has been left since 6.0 by #43100 and #43550. The PR targets 6.4 because this is not a bug, but minor code cleanup. Commits ------- 9317cbd Remove ExpectDeprecationTrait where it is not used
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -19,7 +19,6 @@
 use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
 use Symfony\Component\Form\Exception\LogicException;
@@ -29,8 +28,6 @@
  */
 class DoctrineChoiceLoaderTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     /**
      * @var MockObject&ChoiceListFactoryInterface
      */
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\HttpFoundation\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\HttpFoundation\IpUtils;
 
 class IpUtilsTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     public function testSeparateCachesPerProtocol()
     {
         $ip = '192.168.52.1';

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,10 @@`
`12`	`12`	`namespace Symfony\Component\HttpFoundation\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;`
`16`	`15`	`use Symfony\Component\HttpFoundation\IpUtils;`
`17`	`16`
`18`	`17`	`class IpUtilsTest extends TestCase`
`19`	`18`	`{`
`20`		`- use ExpectDeprecationTrait;`
`21`		`-`
`22`	`19`	`public function testSeparateCachesPerProtocol()`
`23`	`20`	`{`
`24`	`21`	`$ip = '192.168.52.1';`