Merge pull request #9 from Crell/phpstan

Type pedantry fixes.

Author: Crell

phpstan.neon

@@ -6,15 +6,21 @@ parameters:
     excludePaths:
         - tests/Envs/*
     ignoreErrors:
-#        -
-#            message: '#type has no value type specified in iterable type array#'
-#            path: tests/
-#        -
-#            message: '#type has no value type specified in iterable type iterable#'
-#            path: tests/
+        -
+            message: '#type has no value type specified in iterable type array#'
+            path: tests/
+            reportUnmatched: false
+        -
+            message: '#type has no value type specified in iterable type iterable#'
+            path: tests/
+            reportUnmatched: false
         # PHPStan is overly aggressive on readonly properties.
-        - '#Class (.*) has an uninitialized readonly property (.*). Assign it in the constructor.#'
-        - '#Readonly property (.*) is assigned outside of the constructor.#'
+        -
+            identifier: property.uninitializedReadonly
+            reportUnmatched: false
+        -
+            identifier:  property.readOnlyAssignNotInConstructor
+            reportUnmatched: false
         # This is wrong, getName() is a working method on ReflectionType. But the stubs are wrong, or something.
         -
             message: "#^Call to an undefined method ReflectionType\\:\\:getName\\(\\)\\.$#"

src/EnvMapper.php

@@ -20,7 +20,7 @@ class EnvMapper
      * @param bool $requireValues
      *   If true, any unmatched properties will result in an exception.  If false, unmatched properties
      *   will be ignored, which in most cases means they will be uninitialized.
-     * @param array<string, mixed>|null $source
+     * @param array<string, string|int|float>|null $source
      *   The array to map from.  If not specified, $_ENV will be used. Note that because the
      *   primary use case is environment variables, the input array MUST have keys that are UPPER_CASE
      *   strings.
@@ -39,7 +39,9 @@ public function map(string $class, bool $requireValues = false, ?array $source =
             $propName = $rProp->getName();
             $envName = $this->normalizeName($propName);
             if (isset($source[$envName])) {
-                $toSet[$propName] = $this->typeNormalize($source[$envName], $rProp);
+                /** @var string|int|float $val */
+                $val = $source[$envName];
+                $toSet[$propName] = $this->typeNormalize($val, $rProp);
             } elseif (PropValue::None !== $default = $this->getDefaultValue($rProp)) {
                 $toSet[$propName] = $default;
             } elseif ($requireValues) {
@@ -71,12 +73,12 @@ public function map(string $class, bool $requireValues = false, ?array $source =
      * push them into well-typed numeric fields we need to cast them
      * appropriately.
      *
-     * @param string $val
+     * @param string|int|float $val
      *   The value to normalize.
      * @return int|float|string|bool
      *   The passed value, but now with the correct type.
      */
-    private function typeNormalize(string $val, \ReflectionProperty $rProp): int|float|string|bool|\BackedEnum
+    private function typeNormalize(string|int|float $val, \ReflectionProperty $rProp): int|float|string|bool|\BackedEnum
     {
         $rType = $rProp->getType();
         if ($rType instanceof \ReflectionNamedType) {
@@ -90,18 +92,18 @@ private function typeNormalize(string $val, \ReflectionProperty $rProp): int|flo
                 assert($backingType instanceof \ReflectionNamedType);
                 $isIntBacked = $backingType->getName() === 'int';
 
-                return $name::from($isIntBacked ? (int) $val : $val);
+                return $name::from($isIntBacked ? (int) $val : (string) $val);
             }
 
             return match ($name) {
                 'string' => $val,
                 'float' => is_numeric($val)
                     ? (float) $val
                     : throw TypeMismatch::create($rProp->getDeclaringClass()->getName(), $rProp->getName(), $val),
-                'int' => (is_numeric($val) && floor((float) $val) === (float) $val)
+                'int' => (is_numeric($val) && is_int($val + 0))
                     ? (int) $val
                     : throw TypeMismatch::create($rProp->getDeclaringClass()->getName(), $rProp->getName(), $val),
-                'bool' => in_array(strtolower($val), [1, '1', 'true', 'yes', 'on'], false),
+                'bool' => in_array(strtolower((string) $val), [1, '1', 'true', 'yes', 'on'], false),
                 default => throw TypeMismatch::create($rProp->getDeclaringClass()->getName(), $rProp->getName(), $val),
             };
         }

tests/EnvMapperTest.php

@@ -36,11 +36,11 @@ public function mapping_different_types_with_defaults_parses_correctly(): void
         /** @var SampleEnvironment $env */
         $env = $mapper->map(SampleEnvironment::class, source: $this->source);
 
-        self::assertNotNull($env->phpVersion);
-        self::assertNotNull($env->xdebug_mode);
-        self::assertNotNull($env->PATH);
-        self::assertNotNull($env->hostname);
-        self::assertNotNull($env->shlvl);
+        self::assertEquals($this->source['PHP_VERSION'], $env->phpVersion);
+        self::assertEquals($this->source['XDEBUG_MODE'], $env->xdebug_mode);
+        self::assertEquals($this->source['PATH'], $env->PATH);
+        self::assertEquals($this->source['HOSTNAME'], $env->hostname);
+        self::assertEquals($this->source['SHLVL'], $env->shlvl);
         self::assertSame('01234', $env->zipCode);
         self::assertSame(true, $env->bool);
         self::assertEquals(StringBackedEnum::Foo, $env->stringBackedEnum);