refactor: whenHas check for model & other resource type

Author: Ark4ne

src/Descriptors/Values/Value.php

@@ -3,13 +3,12 @@
 namespace Ark4ne\JsonApi\Descriptors\Values;
 
 use Ark4ne\JsonApi\Descriptors\Describer;
-use Ark4ne\JsonApi\Support\Arr;
 use Ark4ne\JsonApi\Support\Config;
 use Ark4ne\JsonApi\Support\Fields;
+use Ark4ne\JsonApi\Support\Values;
 use Closure;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
-use Illuminate\Support\Arr as IlluminateArr;
 
 /**
  * @template T
@@ -81,23 +80,15 @@ public function whenHas(string $field = null): static
  Request $request,
  mixed $model,
  string $attribute
- ): bool => match (true) {
- $model instanceof Model => array_key_exists($field ?? $attribute, $model->getAttributes()),
- IlluminateArr::accessible($model) => array_key_exists($field ?? $attribute, $model),
- default => property_exists($model, $field ?? $attribute)
- });
+ ): bool => Values::hasAttribute($model, $field ?? $attribute));
  }
 
  public function resolveFor(Request $request, mixed $model, string $field): mixed
  {
  if ($this->attribute instanceof Closure) {
  $value = ($this->attribute)($model, $field);
- } elseif ($model instanceof Model) {
- $value = $model->getAttribute($this->attribute ?? $field);
- } elseif (IlluminateArr::accessible($model)) {
- $value = $model[$this->attribute ?? $field] ?? null;
  } else {
- $value = $model->{$this->attribute ?? $field} ?? null;
+ $value = Values::getAttribute($model, $this->attribute ?? $field);
  }
 
  return $value === null && $this->nullable

src/Resources/Concerns/ConditionallyLoadsAttributes.php

@@ -8,6 +8,7 @@
 use Ark4ne\JsonApi\Support\Fields;
 use Ark4ne\JsonApi\Support\Includes;
 use Ark4ne\JsonApi\Support\Supported;
+use Ark4ne\JsonApi\Support\Values;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\MergeValue;
 use Illuminate\Http\Resources\MissingValue;
@@ -72,8 +73,8 @@ protected function applyWhen(bool $condition, iterable $data): MergeValue
  }
 
  /**
- * @polyfill JsonResource::whenHas
- * @see https://github.com/laravel/framework/pull/45376/files
+ * @override JsonResource::whenHas
+ * Support none Model resource
  *
  * Retrieve an attribute if it exists on the resource.
  *
@@ -84,22 +85,17 @@ protected function applyWhen(bool $condition, iterable $data): MergeValue
  */
  public function whenHas($attribute, $value = null, $default = null)
  {
- if (Supported::$whenHas) {
- // @phpstan-ignore-next-line
- return parent::whenHas($attribute, $value, $default);
- }
-
  if (func_num_args() < 3) {
  $default = new MissingValue;
  }
 
- if (!array_key_exists($attribute, $this->resource->getAttributes())) {
+ if (!Values::hasAttribute($this->resource, $attribute)) {
  return value($default);
  }
 
  return func_num_args() === 1
- ? $this->resource->{$attribute}
- : value($value, $this->resource->{$attribute});
+ ? Values::getAttribute($this->resource, $attribute)
+ : value($value, Values::getAttribute($this->resource, $attribute));
  }
 
  /**

src/Support/Values.php

@@ -2,6 +2,7 @@
 
 namespace Ark4ne\JsonApi\Support;
 
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\MergeValue;
 use Illuminate\Http\Resources\PotentiallyMissing;
@@ -85,4 +86,31 @@ public static function isMissing(mixed $resource): bool
  $resource->resource instanceof PotentiallyMissing &&
  $resource->resource->isMissing());
  }
+
+ /**
+ * @param array<array-key, mixed>|object $object
+ * @param string $attribute
+ * @return bool
+ */
+ public static function hasAttribute(array|object $object, string $attribute): bool
+ {
+ if ($object instanceof Model) {
+ return array_key_exists($attribute, $object->getAttributes());
+ }
+ if (Arr::accessible($object)) {
+ return Arr::exists($object, $attribute);
+ }
+ return property_exists($object, $attribute);
+ }
+
+ public static function getAttribute(array|object $object, string $attribute): mixed
+ {
+ if ($object instanceof Model) {
+ return $object->getAttribute($attribute);
+ }
+ if (Arr::accessible($object)) {
+ return $object[$attribute] ?? null;
+ }
+ return $object->$attribute ?? null;
+ }
 }