Code cleanup (#956)

kubawerlos · Jan 27, 2024 · 7b8f147 · 7b8f147
1 parent e17ffa5
commit 7b8f147
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/.dev-tools/composer.json b/.dev-tools/composer.json
@@ -10,7 +10,7 @@
         "mi-schi/phpmd-extension": "^4.3",
         "phpmd/phpmd": "^2.15",
         "phpstan/extension-installer": "^1.3.1",
-        "phpstan/phpstan": "^1.10.56",
+        "phpstan/phpstan": "^1.10.57",
         "phpstan/phpstan-phpunit": "^1.3.15",
         "phpstan/phpstan-strict-rules": "^1.5.2",
         "squizlabs/php_codesniffer": "^3.8.1",

diff --git a/.dev-tools/composer.lock b/.dev-tools/composer.lock
diff --git a/tests/Fixer/AbstractFixerTestCase.php b/tests/Fixer/AbstractFixerTestCase.php
@@ -100,15 +100,17 @@ final public function testCodeSampleEndsWithNewLine(): void
      */
     final public function testCodeSampleIsChangedDuringFixing(): void
     {
-        $codeSample = self::getFixer()->getDefinition()->getCodeSamples()[0];
-        if (self::getFixer() instanceof ConfigurableFixerInterface) {
-            self::getFixer()->configure($codeSample->getConfiguration() ?? []);
+        $fixer = self::getFixer();
+
+        $codeSample = $fixer->getDefinition()->getCodeSamples()[0];
+        if ($fixer instanceof ConfigurableFixerInterface) {
+            $fixer->configure($codeSample->getConfiguration() ?? []);
         }
 
         Tokens::clearCache();
         $tokens = Tokens::fromCode($codeSample->getCode());
 
-        self::getFixer()->fix($this->createSplFileInfoDouble(), $tokens);
+        $fixer->fix($this->createSplFileInfoDouble(), $tokens);
 
         self::assertNotSame($codeSample->getCode(), $tokens->generateCode());
     }

diff --git a/tests/Fixer/PhpdocArrayStyleFixerTest.php b/tests/Fixer/PhpdocArrayStyleFixerTest.php
@@ -61,7 +61,6 @@ public static function provideFixCases(): iterable
         yield [
             '<?php /** @var array<bool>|array<float>|array<int>|array<string> */',
             '<?php /** @var array<bool>|float[]|array<int>|string[] */',
-            ['style' => 'generic'],
         ];
 
         yield [
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,7 +61,6 @@ public static function provideFixCases(): iterable @@
             yield [
                 '<?php /** @var array<bool>|array<float>|array<int>|array<string> */',
                 '<?php /** @var array<bool>|float[]|array<int>|string[] */',
-                ['style' => 'generic'],
             ];
             yield [
@@ Expand Down @@