Merge pull request #294 from ergebnis/feature/synchronize

Enhancement: Synchronize with ergebnis/php-cs-fixer-config-template
ergebnis · Dec 11, 2020 · 48659c1 · 48659c1
2 parents 3bd6934 + 4741819
commit 48659c1
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/test/Unit/RuleSet/AbstractRuleSetTestCase.php b/test/Unit/RuleSet/AbstractRuleSetTestCase.php
@@ -63,7 +63,7 @@ final public function testRuleSetDoesNotConfigureRuleSets(): void
         ));
     }
 
-    final public function testRuleSetDoesDoNotConfigureRulesThatAreNotBuiltIn(): void
+    final public function testRuleSetDoesNotConfigureRulesThatAreNotBuiltIn(): void
     {
         $namesOfRulesThatAreConfiguredAndNotBuiltIn = \array_diff(
             self::namesOfRulesThatAreConfigured(),
@@ -80,7 +80,7 @@ final public function testRuleSetDoesDoNotConfigureRulesThatAreNotBuiltIn(): voi
     final public function testRuleSetDoesNotConfigureRulesThatAreDeprecated(): void
     {
         $namesOfRulesThatAreConfiguredAndDeprecated = \array_intersect(
-            self::namesOfRulesThatAreDeprecated(),
+            self::namesOfRulesThatAreBuiltInAndDeprecated(),
             self::namesOfRulesThatAreConfigured()
         );
 
@@ -94,7 +94,7 @@ final public function testRuleSetDoesNotConfigureRulesThatAreDeprecated(): void
     final public function testRuleSetConfiguresAllRulesThatAreNotDeprecated(): void
     {
         $namesOfRulesThatAreNotDeprecatedAndNotConfigured = \array_diff(
-            self::namesOfRulesThatAreNotDeprecated(),
+            self::namesOfRulesThatAreBuiltInAndNotDeprecated(),
             self::namesOfRulesThatAreConfigured()
         );
 
@@ -279,12 +279,12 @@ private static function namesOfRulesThatAreConfigured(): array
 
         $ruleSet = new RuleSet\RuleSet($rules);
 
-        /** @var array<string, Fixer\FixerInterface> $fixersThatAreConfigured */
-        $fixersThatAreConfigured = $ruleSet->getRules();
+        /** @var array<string, bool> $rulesThatAreConfigured */
+        $rulesThatAreConfigured = $ruleSet->getRules();
 
-        \ksort($fixersThatAreConfigured);
+        \ksort($rulesThatAreConfigured);
 
-        return \array_keys($fixersThatAreConfigured);
+        return \array_keys($rulesThatAreConfigured);
     }
 
     /**
@@ -298,7 +298,7 @@ private static function namesOfRulesThatAreBuiltIn(): array
     /**
      * @return array<int, string>
      */
-    private static function namesOfRulesThatAreDeprecated(): array
+    private static function namesOfRulesThatAreBuiltInAndDeprecated(): array
     {
         return \array_keys(\array_filter(self::fixersThatAreBuiltIn(), static function (Fixer\FixerInterface $fixer): bool {
             return $fixer instanceof Fixer\DeprecatedFixerInterface;
@@ -308,7 +308,7 @@ private static function namesOfRulesThatAreDeprecated(): array
     /**
      * @return array<int, string>
      */
-    private static function namesOfRulesThatAreNotDeprecated(): array
+    private static function namesOfRulesThatAreBuiltInAndNotDeprecated(): array
     {
         return \array_keys(\array_filter(self::fixersThatAreBuiltIn(), static function (Fixer\FixerInterface $fixer): bool {
             return !$fixer instanceof Fixer\DeprecatedFixerInterface;