Fix issues reported by PHPStan running on PHP 8.5

Author: lkrms

src/Toolkit/Cli/CliCommand.php

@@ -783,7 +783,7 @@ final protected function applyOptionValues(
                 $name = $option->Name;
             }
             $_value = $option->applyValue($value, $normalise, $expand);
-            $_values[$name] = $_value;
+            $_values[(string) $name] = $_value;
             $this->OptionValues[$option->Key] = $_value;
             if ($asArguments) {
                 // If the option has an optional value and no value was given,
@@ -825,7 +825,7 @@ final protected function normaliseOptionValues(
             if (!$schema) {
                 $name = $option->Name;
             }
-            $_values[$name] = $option->normaliseValue($value, $expand);
+            $_values[(string) $name] = $option->normaliseValue($value, $expand);
         }
 
         return $_values ?? [];
@@ -901,7 +901,7 @@ final protected function getOptionValues(
             } else {
                 $value = $this->OptionValues[$option->Key] ?? null;
             }
-            $values[$name] = $value;
+            $values[(string) $name] = $value;
         }
 
         /** @var array<array<string|int|bool|float>|string|int|bool|float|null> */
@@ -926,7 +926,7 @@ final protected function getDefaultOptionValues(bool $schema = false): array
                 continue;
             }
             $name = $schema ? $key : $option->Name;
-            $values[$name] = $option->OriginalDefaultValue;
+            $values[(string) $name] = $option->OriginalDefaultValue;
         }
 
         /** @var array<array<string|int|bool|float>|string|int|bool|float|null> */
@@ -1122,7 +1122,7 @@ function (string $key, $value) use (&$argValues, &$saved, &$option) {
                 continue;
             }
 
-            $option = $this->OptionsByName[$name] ?? null;
+            $option = $this->OptionsByName[(string) $name] ?? null;
             if (!$option || $option->IsPositional) {
                 $this->optionError(sprintf("unknown option '%s'", $name));
                 continue;

src/Toolkit/Core/Concern/ImmutableTrait.php

@@ -71,7 +71,9 @@ private function propertyIsInitialized(string $property): bool
         }
 
         $property = new ReflectionProperty($this, $property);
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
         return $property->isInitialized($this);
     }
 }

src/Toolkit/Core/Reflection/ClassReflection.php

@@ -612,7 +612,7 @@ public function getPropertyRelationships(): array
                     ? $normaliser($property, false)
                     : $property;
                 // @phpstan-ignore argument.type (PHPStan regression)
-                $relationships[$name] = new PropertyRelationship($property, $type, $target);
+                $relationships[(string) $name] = new PropertyRelationship($property, $type, $target);
             }
             $relationships = array_intersect_key($relationships, $declared);
             if (count($relationships) !== 2) {

src/Toolkit/Sli/Command/Generate/AbstractGenerateCommand.php

@@ -545,7 +545,7 @@ protected function getPHPDocTypeAlias(
             return strpos($t, '\\') !== false
                 ? $this->getTypeAlias($t)
                 : $this->getTypeAlias(
-                    $this->InputFileUseMaps[$filename][Str::lower($t)]
+                    $this->InputFileUseMaps[(string) $filename][Str::lower($t)]
                         ?? $this->applyNamespace($t, $namespace),
                     $filename,
                 );

src/Toolkit/Utility/Internal/Copier.php

@@ -163,7 +163,9 @@ private function doCopy($var)
                 continue;
             }
 
-            $property->setAccessible(true);
+            if (PHP_VERSION_ID < 80100) {
+                $property->setAccessible(true);
+            }
 
             if (!$property->isInitialized($clone)) {
                 continue;

src/Toolkit/Utility/Internal/Exporter.php

@@ -180,8 +180,7 @@ function ($matches) use (&$utf8Escapes) {
                                 ? (($dec = octdec($matches['octal'])) === 27
                                     ? '\e'
                                     : sprintf('\x%02x', $dec))
-                                // @phpstan-ignore offsetAccess.notFound
-                                : sprintf('\x%02x', ['a' => 7, 'b' => 8][$matches['cslash']]))),
+                                : sprintf('\x%02x', ['a' => 7, 'b' => 8][(string) $matches['cslash']]))),
                     $double,
                     -1,
                     $count,

src/Toolkit/Utility/Test.php

@@ -29,7 +29,7 @@ public static function isBoolean($value): bool
      * Check if a value is an integer or integer string
      *
      * @param mixed $value
-     * @phpstan-assert-if-true int|non-empty-string $value
+     * @phpstan-assert-if-true int|numeric-string $value
      */
     public static function isInteger($value): bool
     {
@@ -45,7 +45,7 @@ public static function isInteger($value): bool
      * Returns `false` if `$value` is an integer string.
      *
      * @param mixed $value
-     * @phpstan-assert-if-true float|non-empty-string $value
+     * @phpstan-assert-if-true float|numeric-string $value
      */
     public static function isFloat($value): bool
     {
@@ -61,7 +61,7 @@ public static function isFloat($value): bool
      * an array key
      *
      * @param mixed $value
-     * @phpstan-assert-if-true int|float|bool|non-empty-string $value
+     * @phpstan-assert-if-true int|float|bool|numeric-string $value
      */
     public static function isNumericKey($value): bool
     {

tests/fixtures/Toolkit/Cli/Command/TestOptions.php

@@ -260,7 +260,7 @@ private function getCallbacks(): array
                     /** @var string */
                     $name = $option->Name;
                     if ($this->optionHasArgument($name)) {
-                        $hasArg[$option->Name] = true;
+                        $hasArg[$name] = true;
                     }
                 }
                 return $this->removeHidden($hasArg ?? []);

tests/phpstan-conditional.php

@@ -33,6 +33,12 @@
 ];
 
 $ignoreErrors = [
+    ...(\PHP_VERSION_ID < 80500 ? [] : [
+        [
+            'message' => '#^Call to deprecated method setAccessible\(\) of class ReflectionProperty\.$#',
+            'identifier' => 'method.deprecated',
+        ],
+    ]),
     ...(\PHP_VERSION_ID < 80400 ? [] : [
         [
             'identifier' => 'unset.possiblyHookedProperty',