Updated Laravel data support

Author: iamrgroot

composer.json

@@ -39,7 +39,7 @@
         ]
     },
     "require": {
-        "spatie/laravel-data": "^2",
+        "spatie/laravel-data": "^2.2",
         "laravel/framework": "^8|^9|^10",
         "phpdocumentor/reflection-docblock": "^5.3",
         "spatie/invade": "^1.0"

composer.lock

@@ -44,9 +44,10 @@ public static function fromClass(string $class, ReflectionMethod|ReflectionFunct
     public function transform(
         bool $transformValues = true,
         WrapExecutionType $wrapExecutionType = WrapExecutionType::Disabled,
+        bool $mapPropertyNames = true,
     ): array {
         return collect($this->types)->mapWithKeys(
-            fn (string $content_type) => [$content_type => parent::transform($transformValues, $wrapExecutionType)]
+            fn (string $content_type) => [$content_type => parent::transform($transformValues, $wrapExecutionType, $mapPropertyNames)]
         )->toArray();
     }
 

src/Data/Content.php

@@ -79,8 +79,11 @@ public static function fromRoutes(array $routes, Command $command): self
     /**
      * @return array<string,mixed>
      */
-    public function transform(bool $transformValues = true, WrapExecutionType $wrapExecutionType = WrapExecutionType::Disabled): array
-    {
+    public function transform(
+        bool $transformValues = true,
+        WrapExecutionType $wrapExecutionType = WrapExecutionType::Disabled,
+        bool $mapPropertyNames = true,
+    ): array {
         // Double call to make sure all schemas are resolved
         $this->resolveSchemas();
 
@@ -97,7 +100,7 @@ public function transform(bool $transformValues = true, WrapExecutionType $wrapE
         ];
 
         return array_merge(
-            parent::transform($transformValues, $wrapExecutionType),
+            parent::transform($transformValues, $wrapExecutionType, $mapPropertyNames),
             $paths,
             [
                 'components' => [

src/Data/OpenApi.php

@@ -79,9 +79,10 @@ public static function fromRoute(Route $route): self
     public function transform(
         bool $transformValues = true,
         WrapExecutionType $wrapExecutionType = WrapExecutionType::Disabled,
+        bool $mapPropertyNames = true,
     ): array {
         return array_filter(
-            parent::transform($transformValues, $wrapExecutionType),
+            parent::transform($transformValues, $wrapExecutionType, $mapPropertyNames),
             fn (mixed $value) => null !== $value,
         );
     }

src/Data/Operation.php

@@ -134,6 +134,7 @@ public static function fromDataClass(string $class): self
     public function transform(
         bool $transformValues = true,
         WrapExecutionType $wrapExecutionType = WrapExecutionType::Disabled,
+        bool $mapPropertyNames = true,
     ): array {
         $array = array_filter(
             parent::transform($transformValues, $wrapExecutionType),
@@ -152,7 +153,7 @@ public function transform(
 
         if (null !== $this->properties) {
             $array['properties'] = collect($this->properties->all())
-                ->mapWithKeys(fn (Property $property) => [$property->getName() => $property->type->transform($transformValues, $wrapExecutionType)])
+                ->mapWithKeys(fn (Property $property) => [$property->getName() => $property->type->transform($transformValues, $wrapExecutionType, $mapPropertyNames)])
                 ->toArray();
         }
 

src/Data/Schema.php

@@ -69,6 +69,7 @@ public static function getPermissions(Route $route): array
     public function transform(
         bool $transformValues = true,
         WrapExecutionType $wrapExecutionType = WrapExecutionType::Disabled,
+        bool $mapPropertyNames = true,
     ): array {
         return [$this->scheme => $this->permissions];
     }