More test coverage

Author: rubenvanassche

src/Attributes/MapName.php

@@ -3,11 +3,12 @@
 namespace Spatie\LaravelData\Attributes;
 
 use Attribute;
+use Spatie\LaravelData\Mappers\NameMapper;
 
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)]
 class MapName
 {
-    public function __construct(public string|int $input, public string|int|null $output = null)
+    public function __construct(public string|int|NameMapper $input, public string|int|NameMapper|null $output = null)
     {
         $this->output ??= $this->input;
     }

src/Concerns/BaseData.php

@@ -85,14 +85,6 @@ public static function prepareForPipeline(array $properties): array
         return $properties;
     }
 
-    public function getMorphClass(): string
-    {
-        /** @var class-string<BaseDataContract> $class */
-        $class = static::class;
-
-        return app(DataConfig::class)->morphMap->getDataClassAlias($class) ?? $class;
-    }
-
     public function __sleep(): array
     {
         $dataClass = app(DataConfig::class)->getDataClass(static::class);

src/Concerns/EnumerableMethods.php

@@ -13,6 +13,8 @@
 trait EnumerableMethods
 {
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @param callable(TValue, TKey): TValue $through
      *
      * @return static
@@ -27,6 +29,8 @@ public function through(callable $through): static
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @param callable(TValue, TKey): TValue $map
      *
      * @return static
@@ -37,6 +41,8 @@ public function map(callable $map): static
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @param callable(TValue): bool $filter
      *
      * @return static
@@ -51,6 +57,8 @@ public function filter(callable $filter): static
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @param callable(TValue): bool $filter
      *
      * @return static
@@ -65,6 +73,8 @@ public function reject(callable $filter): static
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @template            TFirstDefault
      *
      * @param null|         (callable(TValue,TKey): bool) $callback
@@ -78,6 +88,8 @@ public function first(callable|null $callback = null, $default = null)
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @template            TLastDefault
      *
      * @param null|         (callable(TValue,TKey): bool) $callback
@@ -91,6 +103,8 @@ public function last(callable|null $callback = null, $default = null)
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @param callable(TValue, TKey): mixed $callback
      *
      * @return static
@@ -103,6 +117,8 @@ public function each(callable $callback): static
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @return static<int, TValue>
      */
     public function values(): static
@@ -114,6 +130,9 @@ public function values(): static
         return $cloned;
     }
 
+    /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     */
     public function where(string $key, mixed $operator = null, mixed $value = null): static
     {
         $cloned = clone $this;
@@ -124,6 +143,8 @@ public function where(string $key, mixed $operator = null, mixed $value = null):
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @template TReduceInitial
      * @template TReduceReturnType
      *
@@ -138,6 +159,8 @@ public function reduce(callable $callback, mixed $initial = null)
     }
 
     /**
+     * @deprecated In v5, use a regular Laravel collection instead
+     *
      * @param  (callable(TValue, TKey): bool)|string|null  $key
      * @param mixed $operator
      * @param mixed $value
@@ -153,6 +176,8 @@ public function sole(callable|string|null $key = null, mixed $operator = null, m
     }
 
     /**
+     *
+     *
      * @param DataCollection $collection
      *
      * @return static

src/Contracts/BaseData.php

@@ -51,6 +51,4 @@ public static function normalizers(): array;
     public static function prepareForPipeline(array $properties): array;
 
     public static function pipeline(): DataPipeline;
-
-    public function getMorphClass(): string;
 }

src/Exceptions/DataMissingFeature.php

@@ -34,12 +34,7 @@ public function packageRegistered(): void
             fn () => $this->app->make(DataStructureCache::class)->getConfig() ?? DataConfig::createFromConfig(config('data'))
         );
 
-        /** @psalm-suppress UndefinedInterfaceMethod */
         $this->app->beforeResolving(BaseData::class, function ($class, $parameters, $app) {
-            if ($app->has($class)) {
-                return;
-            }
-
             $app->bind(
                 $class,
                 fn ($container) => $class::from($container['request'])

src/Exceptions/InvalidDataClassMapper.php

@@ -8,10 +8,6 @@ class CamelCaseMapper implements NameMapper
 {
     public function map(int|string $name): string|int
     {
-        if (! is_string($name)) {
-            return $name;
-        }
-
         return Str::camel($name);
     }
 }

src/LaravelDataServiceProvider.php

@@ -12,9 +12,4 @@ public function map(int|string $name): string|int
     {
         return $this->name;
     }
-
-    public function inverse(): NameMapper
-    {
-        return $this;
-    }
 }

src/Mappers/CamelCaseMapper.php

@@ -8,10 +8,6 @@ class SnakeCaseMapper implements NameMapper
 {
     public function map(int|string $name): string|int
     {
-        if (! is_string($name)) {
-            return $name;
-        }
-
         return Str::snake($name);
     }
 }