DX: check deprecations exactly (#7742)

Co-authored-by: Kuba Werłos <9282069+kubawerlos@users.noreply.github.com>
PHP-CS-Fixer · Jan 20, 2024 · 48a62f0 · 48a62f0
1 parent 0e2de60
commit 48a62f0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/tests/AutoReview/DescribeCommandTest.php b/tests/AutoReview/DescribeCommandTest.php
@@ -38,6 +38,7 @@ public function testDescribeCommand(FixerFactory $factory, string $fixerName): v
     {
         // @TODO 4.0 Remove this expectation
         $this->expectDeprecation('Rule set "@PER" is deprecated. Use "@PER-CS" instead.');
+        $this->expectDeprecation('Rule set "@PER:risky" is deprecated. Use "@PER-CS:risky" instead.');
 
         $command = new DescribeCommand($factory);
 

diff --git a/tests/Console/Command/DescribeCommandTest.php b/tests/Console/Command/DescribeCommandTest.php
@@ -55,6 +55,7 @@ public function testExecuteOutput(string $expected, bool $expectedIsRegEx, bool
     {
         // @TODO 4.0 Remove this expectation
         $this->expectDeprecation('Rule set "@PER" is deprecated. Use "@PER-CS" instead.');
+        $this->expectDeprecation('Rule set "@PER:risky" is deprecated. Use "@PER-CS:risky" instead.');
 
         $actual = $this->execute(null !== $fixer ? $fixer->getName() : 'Foo/bar', $decorated, $fixer)->getDisplay(true);
 

diff --git a/tests/Console/ConfigurationResolverTest.php b/tests/Console/ConfigurationResolverTest.php
@@ -1222,6 +1222,7 @@ public function testDeprecatedRuleSetConfigured(string $ruleSet, array $successo
                 ? 'No replacement available'
                 : sprintf('Use %s instead', Utils::naturalLanguageJoin($successors))
         ));
+
         $config = new Config();
         $config->setRules([$ruleSet => true]);
         $config->setRiskyAllowed(true);

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -35,12 +35,16 @@ abstract class TestCase extends BaseTestCase
     protected function tearDown(): void
     {
         if (null !== $this->previouslyDefinedErrorHandler) {
-            foreach ($this->expectedDeprecations as $expectedDeprecation) {
-                self::assertContains($expectedDeprecation, $this->actualDeprecations);
-            }
+            $this->actualDeprecations = array_unique($this->actualDeprecations);
+            sort($this->actualDeprecations);
+            $this->expectedDeprecations = array_unique($this->expectedDeprecations);
+            sort($this->expectedDeprecations);
+            self::assertSame($this->expectedDeprecations, $this->actualDeprecations);
 
             restore_error_handler();
         }
+
+        parent::tearDown();
     }
 
     final public function testNotDefiningConstructor(): void
@@ -54,6 +58,8 @@ final public function testNotDefiningConstructor(): void
     }
 
     /**
+     * Mark test to expect given deprecation. Order or repetition count of expected vs actual deprecation usage can vary, but result sets must be identical.
+     *
      * @TODO change access to protected and pass the parameter when PHPUnit 9 support is dropped
      */
     public function expectDeprecation(/* string $message */): void