Fixes for phpstan level 6

Author: steevanb

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-    level: 5
+    level: 6
     paths:
         - src/
     inferPrivatePropertyTypeFromConstructor: true

src/Benchmark/BenchmarkType.php

@@ -225,6 +225,7 @@ class BenchmarkType
         ]
     ];
 
+    /** @return string[] */
     public static function getAll(): array
     {
         return [
@@ -247,6 +248,7 @@ public static function getAll(): array
         ];
     }
 
+    /** @return array<array> */
     public static function getAllByComponentType(): array
     {
         $types = static::getAll();
@@ -276,6 +278,7 @@ public static function getAllByComponentType(): array
         ];
     }
 
+    /** @return string[] */
     public static function getByComponentType(string $componentType): array
     {
         return static::getAllByComponentType()[$componentType];
@@ -301,6 +304,7 @@ public static function getDefaultBenchmarkRelativeUrl(string $type = null): stri
         return static::getConfiguration($type, 'defaultBenchmarkRelativeUrl');
     }
 
+    /** @return string[] */
     public static function getResponseBodyFiles(string $type = null): array
     {
         return static::getConfiguration($type, 'responseBodyFiles');
@@ -311,6 +315,7 @@ public static function getResponseBodyFileMinSize(string $type = null): int
         return static::getConfiguration($type, 'responseBodyFileMinSize');
     }
 
+    /** @return string[] */
     public static function getSourceCodeUrlIds(string $type = null, string $componentType = null): array
     {
         $ids = static::getConfiguration($type, 'sourceCodeUrlIds');

src/BenchmarkConfiguration/BenchmarkConfigurationArray.php

@@ -8,7 +8,8 @@
 
 class BenchmarkConfigurationArray extends ObjectArray
 {
-    public function __construct(...$benchmarkConfigurations)
+    /** @param iterable<BenchmarkConfiguration> $benchmarkConfigurations */
+    public function __construct(iterable $benchmarkConfigurations = [])
     {
         parent::__construct($benchmarkConfigurations, BenchmarkConfiguration::class);
     }
@@ -18,6 +19,7 @@ public function current(): ?BenchmarkConfiguration
         return parent::current();
     }
 
+    /** @param mixed $offset */
     public function offsetGet($offset): BenchmarkConfiguration
     {
         return parent::offsetGet($offset);

src/BenchmarkConfiguration/BenchmarkConfigurationService.php

@@ -11,8 +11,10 @@ class BenchmarkConfigurationService
     public static function getAvailable(PhpVersion $phpVersion): BenchmarkConfigurationArray
     {
         $return = new BenchmarkConfigurationArray(
-            new BenchmarkConfiguration(false, false),
-            new BenchmarkConfiguration(true, false),
+            [
+                new BenchmarkConfiguration(false, false),
+                new BenchmarkConfiguration(true, false)
+            ]
         );
 
         if ($phpVersion->isPreloadAvailable() === true) {

src/Command/AbstractCommand.php

@@ -128,6 +128,7 @@ protected function outputError(string $error, string $title = 'ERROR'): self
         return $this;
     }
 
+    /** @param string[] $templateParameters */
     protected function renderTemplate(string $templatePath, array $templateParameters = []): string
     {
         static $twig;
@@ -138,6 +139,7 @@ protected function renderTemplate(string $templatePath, array $templateParameter
         return $twig->render($templatePath, $templateParameters);
     }
 
+    /** @param string[] $templateParameters */
     protected function renderBenchmarkTemplate(
         string $templatePath,
         array $templateParameters = [],
@@ -166,6 +168,7 @@ protected function renderBenchmarkTemplate(
         return $this->renderTemplate("benchmark/$templateTwigPath", $templateParameters);
     }
 
+    /** @param string[] $templateParameters */
     protected function writeFileFromTemplate(
         string $templatePath,
         array $templateParameters = [],
@@ -231,7 +234,10 @@ protected function removeFile(string $file, bool $rmPrefix = true): self
         return $this;
     }
 
-    /** @return $this */
+    /**
+     * @param string[] $commands
+     * @return $this
+     */
     protected function runProcess(
         array $commands,
         int $outputVerbosity = OutputInterface::VERBOSITY_NORMAL,
@@ -294,7 +300,10 @@ function (string $type, string $line) use ($outputVerbosity): void {
         return $this;
     }
 
-    /** @return $this */
+    /**
+     * @param array<mixed> $arguments
+     * @return $this
+     */
     protected function runCommand(
         string $name,
         array $arguments = [],
@@ -352,6 +361,7 @@ protected function askQuestion(string $question, string $default = null): ?strin
             );
     }
 
+    /** @param array<mixed> $choices */
     protected function askChoiceQuestion(string $question, array $choices): string
     {
         return $this

src/Command/Behavior/GetComposerConfigurationTrait.php

@@ -8,6 +8,7 @@
 
 trait GetComposerConfigurationTrait
 {
+    /** @return array<mixed> */
     protected function getComposerConfiguration(): array
     {
         $composerJsonFile = Path::getSourceCodePath() . '/composer.json';

src/Command/Behavior/OutputBlockTrait.php

@@ -8,7 +8,10 @@
 
 trait OutputBlockTrait
 {
-    /** @return $this */
+    /**
+     * @param string[] $lines
+     * @return $this
+     */
     protected function outputBlock(array $lines, string $backgroundColor, OutputInterface $output): self
     {
         foreach ($lines as $line) {

src/Command/Behavior/ValidateCircleCiOptionTrait.php

@@ -39,6 +39,10 @@ protected function getValidateCircleCiOption(InputInterface $input): bool
         return InputOptionService::getBoolValue($input, $this->getValidateCircleCiOptionName());
     }
 
+    /**
+     * @param string[] $parameters
+     * @return string[]
+     */
     protected function appendValidateCircleCiOption(InputInterface $input, array $parameters = []): array
     {
         return array_merge(

src/Command/Configure/Composer/ConfigureComposerJsonCommand.php

@@ -71,6 +71,7 @@ protected function doExecute(): int
         return 0;
     }
 
+    /** @param array<array> $data */
     private function defineName(array &$data): self
     {
         $name = static::getComposerName($this->getInput()->getOption('component-slug'));
@@ -79,13 +80,15 @@ private function defineName(array &$data): self
         return $this->outputSuccess("Name defined to $name.");
     }
 
+    /** @param array<array> $data */
     private function defineLicense(array &$data): self
     {
         $data = array_merge(['license' => static::LICENSE], $data);
 
         return $this->outputSuccess('License defined to ' . static::LICENSE . '.');
     }
 
+    /** @param array<array> $data */
     private function defineVersions(array &$data): self
     {
         if ($this->getInput()->getOption('no-dependency-version') === true) {

src/Command/Configure/ConfigurePhpBenchmarksCommand.php

@@ -121,7 +121,7 @@ private function getComponentSlug(): string
             return $componentSlug;
         }
 
-        $componentType = $this->askChoiceQuestion('Component type?', ComponentType::getAll());
+        $componentType = $this->askChoiceQuestion('Component type?', ComponentType::getAll()->toArray());
 
         return $this->askChoiceQuestion('Component?', Component::getByType($componentType));
     }
@@ -144,6 +144,7 @@ private function getBenchmarkType(string $componentSlug): string
         return $this->askChoiceQuestion('Benchmark type?', $benchmarkTypes);
     }
 
+    /** @return string[] */
     private function getCoreDependency(string $componentSlug): array
     {
         $composerPath = Path::getSourceCodePath() . '/composer.json';