Fix type checking bug in Decorator::typeAllowsScope() causes primitive type hints to fail scope validation (#153)

* Fix type checking bug in `Decorator::typeAllowsScope()` causes primitive type hints to fail scope validation

* Fix code styling

* Add test

* Fix code styling

* fix `float/double`

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

---------

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Co-authored-by: crynobone <172966+crynobone@users.noreply.github.com>
Co-authored-by: Tim MacDonald <hello@timacdonald.me>
Co-authored-by: timacdonald <24803032+timacdonald@users.noreply.github.com>

Author: crynobone

src/Drivers/Decorator.php

@@ -248,20 +248,22 @@ protected function typeAllowsScope($type, $scope, $function)
         }
 
         if ($type instanceof ReflectionNamedType) {
-            if ($type->getName() === 'mixed') {
+            $typeName = $type->getName();
+
+            if ($typeName === 'mixed') {
                 return true;
             }
 
             return match (gettype($scope)) {
-                'boolean',
-                'integer',
-                'double',
+                'boolean' => in_array($typeName, ['boolean', 'bool']),
+                'integer' => in_array($typeName, ['integer', 'int']),
+                'double' => in_array($typeName, ['double', 'float']),
                 'string',
                 'array',
                 'resource',
-                'resource (closed)' => gettype($scope) === $type->getName(),
+                'resource (closed)' => gettype($scope) === $typeName,
                 'NULL' => $this->canHandleNullScope($function),
-                'object' => $scope instanceof ($type->getName()),
+                'object' => $scope instanceof ($typeName),
                 'unknown type' => false,
             };
         }

tests/Feature/ArrayDriverTest.php

@@ -1213,6 +1213,61 @@ public function test_can_retrieve_scalar_values_without_in_memory_cache(): void
             $this->assertEquals($expectedValue, $retrieved);
         }
     }
+
+    public function test_it_handles_integer_scopes_correctly()
+    {
+        Feature::define(IntScopeFeature::class);
+
+        $this->assertSame([
+            IntScopeFeature::class => true,
+        ], Feature::for(1)->all());
+
+        $this->assertSame([
+            IntScopeFeature::class => false,
+        ], Feature::for(10)->all());
+    }
+
+    public function test_it_can_handles_double_scopes_correctly()
+    {
+        Feature::define(DoubleScopeFeature::class);
+
+        $this->assertSame([
+            DoubleScopeFeature::class => true,
+        ], Feature::for(1.1)->all());
+
+        $this->assertSame([
+            DoubleScopeFeature::class => true,
+        ], Feature::for(1.10)->all());
+
+        $this->assertSame([
+            DoubleScopeFeature::class => false,
+        ], Feature::for(1.11)->all());
+
+        $this->assertSame([
+            DoubleScopeFeature::class => false,
+        ], Feature::for(10.00)->all());
+    }
+
+    public function test_it_can_handles_float_scopes_correctly()
+    {
+        Feature::define(FloatScopeFeature::class);
+
+        $this->assertSame([
+            FloatScopeFeature::class => true,
+        ], Feature::for(1.1)->all());
+
+        $this->assertSame([
+            FloatScopeFeature::class => true,
+        ], Feature::for(1.10)->all());
+
+        $this->assertSame([
+            FloatScopeFeature::class => false,
+        ], Feature::for(1.11)->all());
+
+        $this->assertSame([
+            FloatScopeFeature::class => false,
+        ], Feature::for(10.00)->all());
+    }
 }
 
 class MyFeature
@@ -1298,3 +1353,27 @@ class FeatureDependency
 {
     //
 }
+
+class IntScopeFeature
+{
+    public function resolve(int $scope): bool
+    {
+        return in_array($scope, [1, 2, 3], true);
+    }
+}
+
+class DoubleScopeFeature
+{
+    public function resolve(float $scope): bool
+    {
+        return in_array($scope, [1.10, 2.20, 3.30], true);
+    }
+}
+
+class FloatScopeFeature
+{
+    public function resolve(float $scope): bool
+    {
+        return in_array($scope, [1.1, 2.2, 3.3], true);
+    }
+}