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

…g-standard-10.0.0

Bump doctrine/coding-standard from 9.0.0 to 10.0.0

composer.json

@@ -23,7 +23,7 @@
         }
     ],
     "require-dev": {
-        "doctrine/coding-standard": "^9.0.0",
+        "doctrine/coding-standard": "^10.0.0",
         "php-standard-library/psalm-plugin": "^1.1.5",
         "phpunit/phpunit": "^9.5.23",
         "psalm/plugin-phpunit": "^0.17.0",

src/Change.php

@@ -20,9 +20,9 @@ private function __construct(
         private string $modificationType,
         public string $description,
         private bool $isBcBreak,
-        public ?string $file = null,
-        public ?int $line = null,
-        public ?int $column = null
+        public string|null $file = null,
+        public int|null $line = null,
+        public int|null $column = null,
     ) {
     }
 
@@ -73,9 +73,9 @@ public function isSkipped(): bool
 
     /** @internal */
     public function withFilePositionsIfNotAlreadySet(
-        ?string $file,
+        string|null $file,
         int $line,
-        ?int $column
+        int|null $column,
     ): self {
         $instance = clone $this;
 
@@ -86,7 +86,7 @@ public function withFilePositionsIfNotAlreadySet(
         return $instance;
     }
 
-    public function onFile(?string $file): self
+    public function onFile(string|null $file): self
     {
         $instance = clone $this;
 
@@ -104,7 +104,7 @@ public function onLine(int $line): self
         return $instance;
     }
 
-    public function onColumn(?int $column): self
+    public function onColumn(int|null $column): self
     {
         $instance = clone $this;
 
@@ -119,7 +119,7 @@ public function __toString(): string
             '%s%s: %s',
             $this->isBcBreak ? '[BC] ' : '     ',
             Str\uppercase($this->modificationType),
-            $this->description
+            $this->description,
         );
     }
 }

src/Changes.php

@@ -12,21 +12,15 @@
 
 use function array_values;
 
-/**
- * @implements IteratorAggregate<int, Change>
- */
+/** @implements IteratorAggregate<int, Change> */
 final class Changes implements IteratorAggregate, Countable
 {
-    /** @var list<Change> */
-    private array $bufferedChanges;
-
     /** @var iterable<int, Change>|null */
-    private ?iterable $unBufferedChanges = null;
+    private iterable|null $unBufferedChanges = null;
 
     /** @param list<Change> $bufferedChanges */
-    private function __construct(array $bufferedChanges)
+    private function __construct(private array $bufferedChanges)
     {
-        $this->bufferedChanges = $bufferedChanges;
     }
 
     public static function empty(): self

src/Command/AssertBackwardsCompatible.php

@@ -33,24 +33,20 @@
 
 final class AssertBackwardsCompatible extends Command
 {
-    /**
-     * @throws LogicException
-     */
+    /** @throws LogicException */
     public function __construct(
         private PerformCheckoutOfRevision $git,
         private ComposerInstallationReflectorFactory $makeComposerInstallationReflector,
         private ParseRevision $parseRevision,
         private GetVersionCollection $getVersions,
         private PickVersionFromVersionCollection $pickFromVersion,
         private LocateDependencies $locateDependencies,
-        private CompareApi $compareApi
+        private CompareApi $compareApi,
     ) {
         parent::__construct();
     }
 
-    /**
-     * @throws InvalidArgumentException
-     */
+    /** @throws InvalidArgumentException */
     protected function configure(): void
     {
         $this
@@ -60,27 +56,27 @@ protected function configure(): void
                 'from',
                 null,
                 InputOption::VALUE_OPTIONAL,
-                'Git reference for the base version of the library, which is considered "stable"'
+                'Git reference for the base version of the library, which is considered "stable"',
             )
             ->addOption(
                 'to',
                 null,
                 InputOption::VALUE_REQUIRED,
                 'Git reference for the new version of the library, which is verified against "from" for BC breaks',
-                'HEAD'
+                'HEAD',
             )
             ->addOption(
                 'format',
                 null,
                 InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 'Currently supports "console", "markdown" or "github-actions"',
-                ['console']
+                ['console'],
             )
             ->addOption(
                 'install-development-dependencies',
                 null,
                 InputOption::VALUE_NONE,
-                'Whether to also install "require-dev" dependencies too'
+                'Whether to also install "require-dev" dependencies too',
             )
             ->addUsage(
                 <<<'USAGE'
@@ -104,13 +100,11 @@ protected function configure(): void
 
 If you want to produce `STDOUT` output, then please use the
 `--format` flag.
-USAGE
+USAGE,
             );
     }
 
-    /**
-     * @throws InvalidArgumentException
-     */
+    /** @throws InvalidArgumentException */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
         $output = Type\object(ConsoleOutputInterface::class)->assert($output);
@@ -132,7 +126,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
         $stdErr->writeln(Str\format(
             'Comparing from %s to %s...',
             Type\string()->coerce($fromRevision),
-            Type\string()->coerce($toRevision)
+            Type\string()->coerce($toRevision),
         ));
 
         $fromPath = $this->git->checkout($sourceRepo, $fromRevision);
@@ -142,16 +136,16 @@ public function execute(InputInterface $input, OutputInterface $output): int
             $changes = ($this->compareApi)(
                 ($this->makeComposerInstallationReflector)(
                     $fromPath->__toString(),
-                    new AggregateSourceLocator() // no dependencies
+                    new AggregateSourceLocator(), // no dependencies
                 ),
                 ($this->makeComposerInstallationReflector)(
                     $fromPath->__toString(),
-                    ($this->locateDependencies)($fromPath->__toString(), $includeDevelopmentDependencies)
+                    ($this->locateDependencies)($fromPath->__toString(), $includeDevelopmentDependencies),
                 ),
                 ($this->makeComposerInstallationReflector)(
                     $toPath->__toString(),
-                    ($this->locateDependencies)($toPath->__toString(), $includeDevelopmentDependencies)
-                )
+                    ($this->locateDependencies)($toPath->__toString(), $includeDevelopmentDependencies),
+                ),
             );
 
             $formatters = [
@@ -190,9 +184,7 @@ private function printOutcomeAndExit(Changes $changes, OutputInterface $stdErr):
         return $hasBcBreaks ? 3 : 0;
     }
 
-    /**
-     * @throws InvalidArgumentException
-     */
+    /** @throws InvalidArgumentException */
     private function parseRevisionFromInput(InputInterface $input, CheckedOutRepository $repository): Revision
     {
         $from = Type\string()->coerce($input->getOption('from'));
@@ -202,7 +194,7 @@ private function parseRevisionFromInput(InputInterface $input, CheckedOutReposit
 
     private function determineFromRevisionFromRepository(
         CheckedOutRepository $repository,
-        OutputInterface $output
+        OutputInterface $output,
     ): Revision {
         $versions = $this->getVersions->fromRepository($repository);
 
@@ -214,7 +206,7 @@ private function determineFromRevisionFromRepository(
 
         return $this->parseRevision->fromStringForRepository(
             $versionString,
-            $repository
+            $repository,
         );
     }
 }

src/CompareApi.php

@@ -18,6 +18,6 @@ interface CompareApi
     public function __invoke(
         Reflector $definedSymbols,
         Reflector $pastSourcesWithDependencies,
-        Reflector $newSourcesWithDependencies
+        Reflector $newSourcesWithDependencies,
     ): Changes;
 }