Merge pull request #417 from Roave/dependabot/composer/doctrine/codin…

…g-standard-10.0.0 chore(deps-dev): bump doctrine/coding-standard from 9.0.2 to 10.0.0
Roave · Aug 29, 2022 · 34a06cf · 34a06cf
2 parents a96cb6b + c81138a
commit 34a06cf
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 74 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "vimeo/psalm": "^4.26.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9.0.2",
+        "doctrine/coding-standard": "^10.0.0",
         "phpunit/phpunit": "^9.5.23"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Roave/InfectionStaticAnalysis/Bootstrapper.php b/src/Roave/InfectionStaticAnalysis/Bootstrapper.php
@@ -14,7 +14,7 @@ final class Bootstrapper
 {
     public static function bootstrap(
         Container $container,
-        RunStaticAnalysisAgainstMutant $runStaticAnalysis
+        RunStaticAnalysisAgainstMutant $runStaticAnalysis,
     ): Container {
         $reflectionOffsetSet = (new ReflectionMethod(Container::class, 'offsetSet'));
 

diff --git a/src/Roave/InfectionStaticAnalysis/CliUtility.php b/src/Roave/InfectionStaticAnalysis/CliUtility.php
@@ -11,9 +11,7 @@
 use function strpos;
 use function substr;
 
-/**
- * @internal
- */
+/** @internal */
 final class CliUtility
 {
     private function __construct()
@@ -68,10 +66,8 @@ public static function extractArgument(array $arguments, string $argument): arra
         return [$arguments, $value];
     }
 
-    /**
-     * @return non-empty-string|null
-     */
-    private static function removeSurroundingQuites(?string $argument): ?string
+    /** @return non-empty-string|null */
+    private static function removeSurroundingQuites(string|null $argument): string|null
     {
         if ($argument === null || $argument === '') {
             return null;

diff --git a/src/Roave/InfectionStaticAnalysis/Psalm/RunStaticAnalysisAgainstMutant.php b/src/Roave/InfectionStaticAnalysis/Psalm/RunStaticAnalysisAgainstMutant.php
@@ -43,7 +43,7 @@ public function isMutantStillValidAccordingToStaticAnalysis(Mutant $mutant): boo
             $path,
             $projectAnalyzer->getCodebase()
                 ->file_reference_provider
-                ->getExistingIssues()
+                ->getExistingIssues(),
         );
     }
 }
diff --git a/src/Roave/InfectionStaticAnalysis/RunStaticAnalysisAgainstEscapedMutant.php b/src/Roave/InfectionStaticAnalysis/RunStaticAnalysisAgainstEscapedMutant.php
@@ -22,18 +22,13 @@
  */
 class RunStaticAnalysisAgainstEscapedMutant extends MutantExecutionResultFactory
 {
-    private MutantExecutionResultFactory $next;
-    private RunStaticAnalysisAgainstMutant $runStaticAnalysis;
     private ReflectionProperty $reflectionOriginalStartFileLocation;
     private ReflectionProperty $reflectionOriginalEndFilePosition;
 
     public function __construct(
-        MutantExecutionResultFactory $next,
-        RunStaticAnalysisAgainstMutant $runStaticAnalysis
+        private MutantExecutionResultFactory $next,
+        private RunStaticAnalysisAgainstMutant $runStaticAnalysis,
     ) {
-        $this->next              = $next;
-        $this->runStaticAnalysis = $runStaticAnalysis;
-
         $this->reflectionOriginalStartFileLocation = new ReflectionProperty(MutantExecutionResult::class, 'originalStartFilePosition');
         $this->reflectionOriginalEndFilePosition   = new ReflectionProperty(MutantExecutionResult::class, 'originalEndFilePosition');
 
@@ -73,7 +68,7 @@ public function createFromProcess(MutantProcess $mutantProcess): MutantExecution
             $originalEndFilePosition,
             later(static fn () => yield $result->getOriginalCode()),
             later(static fn () => yield $result->getMutatedCode()),
-            $result->getTests()
+            $result->getTests(),
         );
     }
 }
diff --git a/test/unit/Roave/InfectionStaticAnalysisTest/BootstrapperTest.php b/test/unit/Roave/InfectionStaticAnalysisTest/BootstrapperTest.php
@@ -22,15 +22,15 @@ public function testWillNotTestAnything(): void
         $runStaticAnalysis = $this->createMock(RunStaticAnalysisAgainstMutant::class);
         Bootstrapper::bootstrap(
             Container::create(),
-            $runStaticAnalysis
+            $runStaticAnalysis,
         );
 
         self::assertInstanceOf(
             RunStaticAnalysisAgainstEscapedMutant::class,
             Bootstrapper::bootstrap(
                 Container::create(),
-                $runStaticAnalysis
-            )->getMutantExecutionResultFactory()
+                $runStaticAnalysis,
+            )->getMutantExecutionResultFactory(),
         );
     }
 }
diff --git a/test/unit/Roave/InfectionStaticAnalysisTest/CliUtilityTest.php b/test/unit/Roave/InfectionStaticAnalysisTest/CliUtilityTest.php
@@ -10,9 +10,7 @@
 
 use function sprintf;
 
-/**
- * @covers \Roave\InfectionStaticAnalysis\CliUtility
- */
+/** @covers \Roave\InfectionStaticAnalysis\CliUtility */
 final class CliUtilityTest extends TestCase
 {
     /**
@@ -25,9 +23,9 @@ final class CliUtilityTest extends TestCase
      */
     public function testExtractArgument(
         array $expectedNewArguments,
-        ?string $expectedArgumentValue,
+        string|null $expectedArgumentValue,
         array $arguments,
-        string $argument
+        string $argument,
     ): void {
         $result = CliUtility::extractArgument($arguments, $argument);
 
@@ -135,17 +133,15 @@ public function provideExtractionData(): array
      */
     public function testExtractArgumentThrowsForMissingValue(
         array $arguments,
-        string $argument
+        string $argument,
     ): void {
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage(sprintf('Please provide a value for "%s" argument.', $argument));
 
         CliUtility::extractArgument($arguments, $argument);
     }
 
-    /**
-     * @return list<array{0: list<non-empty-string>, 1: non-empty-string}>
-     */
+    /** @return list<array{0: list<non-empty-string>, 1: non-empty-string}> */
     public function provideExtractionMissingValueData(): array
     {
         return [

diff --git a/test/unit/Roave/InfectionStaticAnalysisTest/Psalm/RunStaticAnalysisAgainstMutantTest.php b/test/unit/Roave/InfectionStaticAnalysisTest/Psalm/RunStaticAnalysisAgainstMutantTest.php
@@ -98,7 +98,7 @@ function hasMethod(object $input, string $method): bool {
 
         $mutationAttributes = array_combine(
             MutationAttributeKeys::ALL,
-            array_map('strlen', MutationAttributeKeys::ALL)
+            array_map('strlen', MutationAttributeKeys::ALL),
         );
 
         $this->mutantWithValidCode = new Mutant(
@@ -111,11 +111,11 @@ function hasMethod(object $input, string $method): bool {
                 '',
                 MutatedNode::wrap([]),
                 0,
-                []
+                [],
             ),
             now($validCode),
             now(''),
-            now('')
+            now(''),
         );
 
         $this->mutantWithInvalidCode = new Mutant(
@@ -128,11 +128,11 @@ function hasMethod(object $input, string $method): bool {
                 '',
                 MutatedNode::wrap([]),
                 0,
-                []
+                [],
             ),
             now($invalidCode),
             now(''),
-            now('')
+            now(''),
         );
 
         $this->mutantWithValidCodeReferencingProjectFiles = new Mutant(
@@ -145,11 +145,11 @@ function hasMethod(object $input, string $method): bool {
                 '',
                 MutatedNode::wrap([]),
                 0,
-                []
+                [],
             ),
             now($validCodeReferencingProjectFiles),
             now(''),
-            now('')
+            now(''),
         );
 
         $this->mutantWithValidCodeReferencingReflectionApi = new Mutant(
@@ -162,11 +162,11 @@ function hasMethod(object $input, string $method): bool {
                 '',
                 MutatedNode::wrap([]),
                 0,
-                []
+                [],
             ),
             now($validCodeReferencingProjectFiles),
             now(''),
-            now('')
+            now(''),
         );
 
         if (! defined('PSALM_VERSION')) {
@@ -182,15 +182,15 @@ function hasMethod(object $input, string $method): bool {
 
             $config = Config::getConfigForPath(
                 self::PSALM_WORKING_DIRECTORY,
-                self::PSALM_WORKING_DIRECTORY
+                self::PSALM_WORKING_DIRECTORY,
             );
 
             $config->setIncludeCollector(new IncludeCollector());
 
             return new ProjectAnalyzer(
                 $config,
                 new Providers(new FileProvider()),
-                new ReportOptions()
+                new ReportOptions(),
             );
         });
     }
@@ -209,7 +209,7 @@ public function testWillConsiderMutantValidIfNoErrorsAreDetectedByStaticAnalysis
     {
         $psalmConfig = Config::getConfigForPath(
             self::PSALM_WORKING_DIRECTORY,
-            self::PSALM_WORKING_DIRECTORY
+            self::PSALM_WORKING_DIRECTORY,
         );
 
         $psalmConfig->setIncludeCollector(new IncludeCollector());
@@ -221,7 +221,7 @@ public function testWillConsiderMutantInvalidIfErrorsAreDetectedByStaticAnalysis
     {
         $psalmConfig = Config::getConfigForPath(
             self::PSALM_WORKING_DIRECTORY,
-            self::PSALM_WORKING_DIRECTORY
+            self::PSALM_WORKING_DIRECTORY,
         );
 
         $psalmConfig->setIncludeCollector(new IncludeCollector());
@@ -233,7 +233,7 @@ public function testWillConsiderMutantReferencingProjectFilesAsValid(): void
     {
         $psalmConfig = Config::getConfigForPath(
             self::PSALM_WORKING_DIRECTORY,
-            self::PSALM_WORKING_DIRECTORY
+            self::PSALM_WORKING_DIRECTORY,
         );
 
         $psalmConfig->setIncludeCollector(new IncludeCollector());
@@ -245,7 +245,7 @@ public function testWillConsiderMutantReferencingReflectionApiAsValid(): void
     {
         $psalmConfig = Config::getConfigForPath(
             self::PSALM_WORKING_DIRECTORY,
-            self::PSALM_WORKING_DIRECTORY
+            self::PSALM_WORKING_DIRECTORY,
         );
 
         $psalmConfig->setIncludeCollector(new IncludeCollector());