[Refactor] Add more changes with all tests now passing

Author: lindyhopchris

composer.json

@@ -24,7 +24,7 @@
     "require": {
         "php": "^7.4|^8.0",
         "ext-json": "*",
-        "laravel-json-api/neomerx-json-api": "^5.0",
+        "laravel-json-api/neomerx-json-api": "dev-hotfix/5.0.1",
         "laravel/framework": "^8.76|^9.0",
         "nyholm/psr7": "^1.2",
         "ramsey/uuid": "^3.0|^4.0",

docs/basics/schemas.md

@@ -35,7 +35,7 @@ can locate a schema for each PHP class it encounters.
 ## Creating Schemas
 
 To generate a schema that extends, use the following command. The generated schema will extend
-`Neomerx\JsonApi\Schema\SchemaProvider`.
+`CloudCreativity\LaravelJsonApi\Schema\SchemaProvider`.
 
 ```bash
 php artisan make:json-api:schema <resource-type> [<api>]

docs/features/async.md

@@ -71,7 +71,7 @@ In the generated schema, you will need to add the `AsyncSchema` trait, for examp
 
 ```php
 use CloudCreativity\LaravelJsonApi\Queue\AsyncSchema;
-use Neomerx\JsonApi\Schema\SchemaProvider;
+use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
 
 class Schema extends SchemaProvider
 {

docs/fetching/inclusion.md

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-This package supports the [inclusion of related resources](http://jsonapi.org/format/1.0/#fetching-includes). 
+This package supports the [inclusion of related resources](http://jsonapi.org/format/1.0/#fetching-includes).
 This allows a client to specify resources related to the primary data that should be included in the response.
 The purpose is to allow the client to reduce the number of HTTP requests it needs to make to obtain all the data
 it requires.
@@ -20,13 +20,13 @@ For this feature to work, you will need to:
 default validators do not allow include paths.
 2. Add relationships to the resource [Schema](../basics/schemas.md) and ensure they return data.
 3. For Eloquent models, define the translation of any JSON API include paths to eager load paths
-on the resource [Adapter](../basics/adapters.md).  
+on the resource [Adapter](../basics/adapters.md).
 
 These are all described in this chapter.
 
 ## The Include Query Parameter
 
-Related resources are specified by the client using the `include` query parameter. This parameter 
+Related resources are specified by the client using the `include` query parameter. This parameter
 contains a comma separated list of relationship paths that should be included. The response will be a
 [compound document](http://jsonapi.org/format/#document-compound-documents) where the primary data of the
 request is in the JSON's `data` member, and the related resources are in the `included` member.
@@ -37,7 +37,7 @@ resources in the same request:
 ```http
 GET /api/posts?include=author,tags HTTP/1.1
 Accept: application/vnd.api+json
-``` 
+```
 
 If these include paths are valid, then the client will receive the following response:
 
@@ -79,7 +79,7 @@ Content-Type: application/vnd.api+json
                     "links": {
                         "self": "/api/posts/123/relationships/tags",
                         "related": "/api/posts/123/tags"
-                    }                
+                    }
                 }
             },
             "links": {
@@ -130,7 +130,7 @@ relationship, the client could request the following:
 ```http
 GET /api/posts?include=author.address,tags HTTP/1.1
 Accept: application/vnd.api+json
-``` 
+```
 
 For this request, both the author `users` resource and the user's `addresses` resource would be present in
 the `included` member of the JSON document.
@@ -201,7 +201,7 @@ class Validators extends AbstractValidators
         'author.address',
         'tags'
     ];
-    
+
     // ...
 }
 ```
@@ -235,7 +235,7 @@ the posts schema would have to return both the related author and the related ta
 ```php
 namespace App\JsonApi\Posts;
 
-use Neomerx\JsonApi\Schema\SchemaProvider;
+use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
 
 class Schema extends SchemaProvider
 {
@@ -278,7 +278,7 @@ method on the `users` schema.
 
 ## Eager Loading
 
-The Eloquent adapter automatically converts JSON API include paths to Eloquent model 
+The Eloquent adapter automatically converts JSON API include paths to Eloquent model
 [eager loading](https://laravel.com/docs/eloquent-relationships#eager-loading) paths.
 The JSON API path is converted to a camel-case path. For example, the JSON API path
 `author.current-address` is converted to the `author.currentAddress` Eloquent path.
@@ -299,7 +299,7 @@ class Adapter extends AbstractAdapter
         'author' => 'createdBy',
         'author.current-address' => 'createdBy.currentAddress',
     ];
-    
+
     // ...
 }
 ```
@@ -324,7 +324,7 @@ requested as primary data:
 ```php
 namespace App\JsonApi\Posts;
 
-use Neomerx\JsonApi\Schema\SchemaProvider;
+use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
 
 class Schema extends SchemaProvider
 {
@@ -344,7 +344,7 @@ This would mean that the following request receive a response with `users` and `
 ```http
 GET /api/posts HTTP/1.1
 Accept: application/vnd.api+json
-``` 
+```
 
 ### Default Path Eager Loading
 
@@ -359,7 +359,7 @@ use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter;
 class Adapter extends AbstractAdapter
 {
     protected $defaultWith = ['author', 'tags'];
-    
+
     // ...
 }
 ```

src/Api/Api.php

@@ -34,6 +34,7 @@
 use CloudCreativity\LaravelJsonApi\Resolver\NamespaceResolver;
 use GuzzleHttp\Client;
 use Neomerx\JsonApi\Contracts\Http\Headers\MediaTypeInterface;
+use Neomerx\JsonApi\Contracts\Schema\SchemaContainerInterface;
 
 /**
  * Class Api
@@ -321,7 +322,7 @@ public function encoder($options = 0, $depth = 512)
         }
 
         return $this->factory
-            ->createExtendedEncoder($this->getContainer())
+            ->createExtendedEncoder($this->getSchemaContainer())
             ->withEncoderOptions($options);
     }
 
@@ -358,7 +359,7 @@ public function client($clientHostOrOptions = [], array $options = [])
 
         $client = ($clientHostOrOptions instanceof Client) ? $clientHostOrOptions : new Client($options);
 
-        return $this->factory->createClient($client, $this->getContainer(), $this->encoder());
+        return $this->factory->createClient($client, $this->getSchemaContainer(), $this->encoder());
     }
 
     /**
@@ -399,4 +400,13 @@ public function register(AbstractProvider $provider)
         $this->resolver->attach($provider->getResolver());
     }
 
+    /**
+     * @return SchemaContainerInterface
+     */
+    private function getSchemaContainer(): SchemaContainerInterface
+    {
+        return $this->factory->createLaravelSchemaContainer(
+            $this->getContainer()
+        );
+    }
 }

src/Client/ClientSerializer.php

@@ -143,7 +143,7 @@ public function withFieldsets($resourceType, $fields)
      */
     public function serialize($record, $meta = null, array $links = [])
     {
-        $serializer = clone $this->serializer;
+        $serializer = $this->setupSerializer();
         $serializer->withMeta($meta)->withLinks($links);
         $serialized = $serializer->serializeData($record, $this->createEncodingParameters());
         $resourceLinks = null;
@@ -173,7 +173,7 @@ public function serialize($record, $meta = null, array $links = [])
      */
     public function serializeRelated($related, $meta = null, array $links = [])
     {
-        $serializer = clone $this->serializer;
+        $serializer = $this->setupSerializer();
         $serializer->withMeta($meta)->withLinks($links);
 
         return $serializer->serializeIdentifiers($related);
@@ -291,4 +291,16 @@ protected function createEncodingParameters()
             $this->fieldsets
         );
     }
+
+    /**
+     * @return SerializerInterface
+     */
+    private function setupSerializer(): SerializerInterface
+    {
+        $serializer = clone $this->serializer;
+        $serializer->withIncludedPaths($this->includePaths ?? []);
+        $serializer->withFieldSets($this->fieldsets ?? []);
+
+        return $serializer;
+    }
 }

src/Codec/Codec.php

@@ -20,8 +20,9 @@
 use CloudCreativity\LaravelJsonApi\Contracts\ContainerInterface;
 use CloudCreativity\LaravelJsonApi\Encoder\Encoder;
 use CloudCreativity\LaravelJsonApi\Factories\Factory;
+use CloudCreativity\LaravelJsonApi\Http\Headers\MediaTypeParser;
+use Illuminate\Support\Collection;
 use Neomerx\JsonApi\Contracts\Http\Headers\MediaTypeInterface;
-use Neomerx\JsonApi\Http\Headers\MediaType;
 
 /**
  * Class Codec
@@ -133,9 +134,9 @@ public function encodes(string ...$mediaTypes): bool
     {
         $encoding = $this->getEncodingMediaType();
 
-        return collect($mediaTypes)->contains(function ($mediaType, $index) use ($encoding) {
-            return $encoding->equalsTo(MediaType::parse($index, $mediaType));
-        });
+        return Collection::make($mediaTypes)->contains(
+            fn($mediaType) => $encoding->equalsTo(MediaTypeParser::getInstance()->parse($mediaType))
+        );
     }
 
     /**
@@ -182,9 +183,9 @@ public function decodes(string ...$mediaTypes): bool
             return false;
         }
 
-        return collect($mediaTypes)->contains(function ($mediaType, $index) use ($decoding) {
-            return $decoding->equalsTo(MediaType::parse($index, $mediaType));
-        });
+        return Collection::make($mediaTypes)->contains(
+            static fn($mediaType) => $decoding->equalsTo(MediaTypeParser::getInstance()->parse($mediaType))
+        );
     }
 
     /**

src/Exceptions/HandlesErrors.php

@@ -23,7 +23,8 @@
 use CloudCreativity\LaravelJsonApi\Utils\Helpers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Neomerx\JsonApi\Contracts\Document\ErrorInterface;
+use Illuminate\Support\Collection;
+use Neomerx\JsonApi\Contracts\Schema\ErrorInterface;
 use Neomerx\JsonApi\Exceptions\JsonApiException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Throwable;
@@ -81,9 +82,9 @@ public function renderJsonApi($request, Throwable $e)
      */
     protected function prepareJsonApiException(JsonApiException $ex)
     {
-        $error = collect($ex->getErrors())->map(function (ErrorInterface $err) {
-            return $err->getDetail() ?: $err->getTitle();
-        })->filter()->first();
+        $error = Collection::make($ex->getErrors())->map(
+            fn(ErrorInterface $err) => $err->getDetail() ?: $err->getTitle()
+        )->filter()->first();
 
         return new HttpException($ex->getHttpCode(), $error, $ex);
     }

src/Schema/SchemaFields.php

@@ -102,7 +102,8 @@ public function __construct(iterable $paths = null, iterable $fieldSets = null)
 
         if (null !== $fieldSets) {
             foreach ($fieldSets as $type => $fieldList) {
-                foreach (\explode(static::FIELD_SEPARATOR, $fieldList) as $field) {
+                $fieldList = \is_string($fieldList) ? \explode(static::FIELD_SEPARATOR, $fieldList) : $fieldList;
+                foreach ($fieldList as $field) {
                     $this->fastFields[$type][$field] = true;
                     $this->fastFieldLists[$type][$field] = $field;
                 }
@@ -147,4 +148,4 @@ public function getRequestedFields(string $type): ?array
     {
         return $this->fastFieldLists[$type] ?? null;
     }
-}
+}

stubs/abstract/schema.stub

@@ -2,7 +2,7 @@
 
 namespace DummyNamespace;
 
-use Neomerx\JsonApi\Schema\SchemaProvider;
+use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
 
 class DummyClass extends SchemaProvider
 {