bind to the container instead of using a static

timacdonald · Oct 16, 2023 · f112ff6 · f112ff6
1 parent 93dfac0
commit f112ff6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Concerns/Attributes.php b/src/Concerns/Attributes.php
@@ -7,21 +7,22 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\PotentiallyMissing;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\App;
 use TiMacDonald\JsonApi\Support\Fields;
 
 /**
  * @internal
  */
 trait Attributes
 {
-    private static bool $minimalAttributes = false;
+    private const MINIMAL_ATTRIBUTES_KEY = self::class.':$minimalAttributes';
 
     /**
      * @return void
      */
     public static function minimalAttributes($value = true)
     {
-        self::$minimalAttributes = $value;
+        App::instance(self::MINIMAL_ATTRIBUTES_KEY, $value);
     }
 
     /**
@@ -52,6 +53,13 @@ private function resolveAttributes(Request $request)
      */
     private function requestedFields(Request $request)
     {
-        return Fields::getInstance()->parse($request, $this->toType($request), self::$minimalAttributes);
+        return Fields::getInstance()->parse($request, $this->toType($request), self::resolveMinimalAttributes());
+    }
+
+    private static function resolveMinimalAttributes(): bool
+    {
+        return App::bound(self::MINIMAL_ATTRIBUTES_KEY)
+            ? (bool) App::make(self::MINIMAL_ATTRIBUTES_KEY)
+            : false;
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -29,7 +29,6 @@ protected function tearDown(): void
         parent::tearDown();
 
         JsonApiResource::resolveServerImplementationNormally();
-        JsonApiResource::minimalAttributes(false);
     }
 
     protected function assertValidJsonApi(TestResponse|string|array $data): void