[Feature] Update to cloudcreativity/laravel-json-api 0.5.x-dev

Author: lindyhopchris

app/Http/Controllers/Api/PeopleController.php

@@ -11,14 +11,19 @@ final class PeopleController extends EloquentController
 
     /**
      * PeopleController constructor.
-     * @param People\Request $request
      * @param People\Hydrator $hydrator
      */
-    public function __construct(
-        People\Request $request,
-        People\Hydrator $hydrator
-    ) {
-        parent::__construct(new Person(), $request, $hydrator);
+    public function __construct(People\Hydrator $hydrator)
+    {
+        parent::__construct(new Person(), $hydrator);
+    }
+
+    /**
+     * @return string
+     */
+    protected function getRequestHandler()
+    {
+        return People\Request::class;
     }
 
 }

app/Http/Controllers/Api/PostsController.php

@@ -11,15 +11,19 @@ class PostsController extends EloquentController
 
     /**
      * PostsController constructor.
-     * @param Posts\Request $request
      * @param Posts\Hydrator $hydrator
      * @param Posts\Search $search
      */
-    public function __construct(
-        Posts\Request $request,
-        Posts\Hydrator $hydrator,
-        Posts\Search $search
-    ) {
-        parent::__construct(new Post(), $request, $hydrator, $search);
+    public function __construct(Posts\Hydrator $hydrator, Posts\Search $search)
+    {
+        parent::__construct(new Post(), $hydrator, $search);
+    }
+
+    /**
+     * @return string
+     */
+    protected function getRequestHandler()
+    {
+        return Posts\Request::class;
     }
 }

app/JsonApi/Comments/Schema.php

@@ -11,18 +11,21 @@ class Schema extends EloquentSchema
 
     const RESOURCE_TYPE = 'comments';
 
-    /**
-     * @var string
-     */
-    protected $resourceType = self::RESOURCE_TYPE;
-
     /**
      * @var array
      */
     protected $attributes = [
         'content'
     ];
 
+    /**
+     * @return string
+     */
+    public function getResourceType()
+    {
+        return self::RESOURCE_TYPE;
+    }
+
     /**
      * @param object $resource
      * @param bool $isPrimary

app/JsonApi/People/Hydrator.php

@@ -4,7 +4,7 @@
 
 use App\Person;
 use CloudCreativity\JsonApi\Contracts\Object\StandardObjectInterface;
-use CloudCreativity\LaravelJsonApi\Hydrator\AbstractHydrator;
+use CloudCreativity\JsonApi\Hydrator\AbstractHydrator;
 
 class Hydrator extends AbstractHydrator
 {

app/JsonApi/People/Request.php

@@ -2,21 +2,24 @@
 
 namespace App\JsonApi\People;
 
-use CloudCreativity\LaravelJsonApi\Http\Requests\AbstractRequest;
+use CloudCreativity\LaravelJsonApi\Http\Requests\AbstractRequestHandler;
 
-class Request extends AbstractRequest
+class Request extends AbstractRequestHandler
 {
 
-    /**
-     * @var string
-     */
-    protected $resourceType = Schema::RESOURCE_TYPE;
-
     /**
      * @var array
      */
     protected $allowedFilteringParameters = [
         'id',
     ];
 
+    /**
+     * @return string
+     */
+    public function getResourceType()
+    {
+        return Schema::RESOURCE_TYPE;
+    }
+
 }

app/JsonApi/People/Schema.php

@@ -11,11 +11,6 @@ class Schema extends EloquentSchema
 
     const RESOURCE_TYPE = 'people';
 
-    /**
-     * @var string
-     */
-    protected $resourceType = self::RESOURCE_TYPE;
-
     /**
      * @var array
      */
@@ -24,6 +19,14 @@ class Schema extends EloquentSchema
         'surname',
     ];
 
+    /**
+     * @return string
+     */
+    public function getResourceType()
+    {
+        return self::RESOURCE_TYPE;
+    }
+
     /**
      * @param object $resource
      * @param bool $isPrimary

app/JsonApi/Posts/Hydrator.php

@@ -7,7 +7,7 @@
 use CloudCreativity\JsonApi\Contracts\Object\RelationshipInterface;
 use CloudCreativity\JsonApi\Contracts\Object\StandardObjectInterface;
 use CloudCreativity\JsonApi\Exceptions\HydratorException;
-use CloudCreativity\LaravelJsonApi\Hydrator\AbstractHydrator;
+use CloudCreativity\JsonApi\Hydrator\AbstractHydrator;
 
 class Hydrator extends AbstractHydrator
 {

app/JsonApi/Posts/Request.php

@@ -2,16 +2,11 @@
 
 namespace App\JsonApi\Posts;
 
-use CloudCreativity\LaravelJsonApi\Http\Requests\AbstractRequest;
+use CloudCreativity\LaravelJsonApi\Http\Requests\AbstractRequestHandler;
 
-class Request extends AbstractRequest
+class Request extends AbstractRequestHandler
 {
 
-    /**
-     * @var string
-     */
-    protected $resourceType = Schema::RESOURCE_TYPE;
-
     /**
      * @var array
      */
@@ -51,7 +46,15 @@ class Request extends AbstractRequest
      */
     public function __construct(Validators $validator)
     {
-        parent::__construct($validator);
+        parent::__construct(null, $validator);
+    }
+
+    /**
+     * @return string
+     */
+    public function getResourceType()
+    {
+        return Schema::RESOURCE_TYPE;
     }
 
 }

app/JsonApi/Posts/Schema.php

@@ -11,11 +11,6 @@ class Schema extends EloquentSchema
 
     const RESOURCE_TYPE = 'posts';
 
-    /**
-     * @var string
-     */
-    protected $resourceType = self::RESOURCE_TYPE;
-
     /**
      * @var array
      */
@@ -25,6 +20,14 @@ class Schema extends EloquentSchema
         'content',
     ];
 
+    /**
+     * @return string
+     */
+    public function getResourceType()
+    {
+        return self::RESOURCE_TYPE;
+    }
+
     /**
      * @param object $resource
      * @param bool $isPrimary

app/JsonApi/Posts/Validators.php

@@ -5,25 +5,17 @@
 use App\Post;
 use CloudCreativity\JsonApi\Contracts\Validators\RelationshipsValidatorInterface;
 use CloudCreativity\LaravelJsonApi\Validators\AbstractValidatorProvider;
-use Illuminate\Contracts\Validation\Validator;
 
 class Validators extends AbstractValidatorProvider
 {
 
     /**
-     * @var string
+     * @inheritdoc
      */
-    protected $resourceType = Schema::RESOURCE_TYPE;
-
-    /**
-     * Get the rules to validate the attributes.
-     *
-     * @param Post|null $record
-     *      the record being updated, or null if one is being created.
-     * @return array
-     */
-    protected function attributeRules($record = null)
+    protected function attributeRules($resourceType, $record = null)
     {
+        /** @var Post $record */
+
         // The JSON API spec says the client does not have to send all attributes for an update request, so
         // if the record already exists we need to include a 'sometimes' before required.
         $required = $record ? 'sometimes|required' : 'required';
@@ -41,22 +33,17 @@ protected function attributeRules($record = null)
     }
 
     /**
-     * Define the rules to validate relationships.
-     *
-     * @param RelationshipsValidatorInterface $relationships
-     * @param Post|null $record
+     * @inheritdoc
      */
-    protected function relationshipRules(RelationshipsValidatorInterface $relationships, $record = null)
+    protected function relationshipRules(RelationshipsValidatorInterface $relationships, $resourceType, $record = null)
     {
         $relationships->hasOne('author', 'people', is_null($record), false);
     }
 
     /**
-     * Define the rules to validate the filter query param.
-     *
-     * @return array
+     * @inheritdoc
      */
-    protected function filterRules()
+    protected function filterRules($resourceType)
     {
         return [
             'title' => 'string|min:1',