--force

Author: WyattCast44

.vscode/settings.json

@@ -15,7 +15,10 @@
         ".gitignore": true,
         "composer.lock": true,
         "phpstan-baseline.neon": true,
-        "phpstan.neon.dist": true
+        "phpstan.neon.dist": true,
+        "CHANGELOG.md": true,
+        "LICENSE.md": true,
+        "phpunit.xml.dist": true
     },
     "hide-files.files": [
         ".vscode",
@@ -25,6 +28,9 @@
         ".gitignore",
         "composer.lock",
         "phpstan-baseline.neon",
-        "phpstan.neon.dist"
+        "phpstan.neon.dist",
+        "CHANGELOG.md",
+        "LICENSE.md",
+        "phpunit.xml.dist"
     ]
 }

src/Concerns/InteractsWithTheRequest.php

@@ -6,28 +6,16 @@
 
 trait InteractsWithTheRequest
 {
-    public function setRequest(Request $request): static
-    {
-        $this->request = $request;
-
-        return $this;
-    }
-
-    public function request(): Request
+    public function get(string $key, mixed $default = null): mixed
     {
-        return $this->request;
+        return $this->request->get($key, $default);
     }
 
     public function has(string|array $key): bool
     {
         return $this->request->has($key);
     }
 
-    public function hasAny(string|array $keys): bool
-    {
-        return $this->request->hasAny($keys);
-    }
-
     public function hasAll(array $keys): bool
     {
         foreach ($keys as $key) {
@@ -39,9 +27,28 @@ public function hasAll(array $keys): bool
         return true;
     }
 
-    public function get(string $key, mixed $default = null): mixed
+    public function hasAny(string|array $keys): bool
     {
-        return $this->request->get($key, $default);
+        return $this->request->hasAny($keys);
+    }
+
+    public function replace(string|array $key, mixed $value): static
+    {
+        $this->set($key, $value, replace: true);
+
+        return $this;
+    }
+
+    public function request(): Request
+    {
+        return $this->request;
+    }
+
+    public function setRequest(Request $request): static
+    {
+        $this->request = $request;
+
+        return $this;
     }
 
     public function set(string|array $key, mixed $value = null, bool $replace = false): static
@@ -89,11 +96,4 @@ public function setIfMissing(string|array $key, mixed $value): static
 
         return $this;
     }
-
-    public function replace(string|array $key, mixed $value): static
-    {
-        $this->set($key, $value, replace: true);
-
-        return $this;
-    }
 }

src/Concerns/SupportsPublicPropetyMappingFeatures.php

@@ -41,18 +41,18 @@ public function attemptToMapValidatedDataToPublicProperties(): static
 
             $propertyName = $inspector->getPropertyName($property);
 
-            if(!array_key_exists($propertyName, $validated)) {
+            if (! array_key_exists($propertyName, $validated)) {
                 continue;
             }
 
             $value = $validated[$propertyName];
-            
+
             if (! $inspector->propertyHasTypehints($property)) {
                 $inspector->setPropertyValue($property, $value);
-                
+
                 continue;
             }
-            
+
             $valueType = $this->getNormalizedType($value);
             $propertyTypes = $inspector->getPropertyTypeHints($property);
 
@@ -62,10 +62,10 @@ public function attemptToMapValidatedDataToPublicProperties(): static
                     $inspector->setPropertyValue($property, $value);
                 }
             } else {
-                if($valueType === $propertyTypes[0]) {
+                if ($valueType === $propertyTypes[0]) {
                     $inspector->setPropertyValue($property, $value);
                 }
-            }                
+            }
 
         }
 
@@ -76,11 +76,11 @@ protected function getNormalizedType($value): string
     {
         $type = gettype($value);
 
-        if($type === 'object') {
+        if ($type === 'object') {
             $type = get_class($value);
         }
 
-        if($type === 'integer') {
+        if ($type === 'integer') {
             $type = 'int';
         }
 

src/Inspector.php

@@ -73,7 +73,6 @@ public function getPropertyTypeHints(ReflectionProperty $property): array
             $types[] = $type->getName();
         }
 
-
         return array_values(array_unique($types));
     }
 

tests/FormActionPublicPropertyMappingFeaturesTest.php

@@ -106,4 +106,4 @@ public function validated(string|array|int $key = null, mixed $default = null):
 
     expect(isset($action->model))->toBeTrue();
     expect($action->model)->toBeInstanceOf(TestModel::class);
-});
+});