wip: use new validation implementation

lindyhopchris · lindyhopchris · commit 00ef9848aea0 · 2024-03-24T18:56:42.000Z
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "php": "^8.2",
         "ext-json": "*",
         "laravel-json-api/core": "^5.0",
-        "laravel-json-api/eloquent": "^5.0",
+        "laravel-json-api/eloquent": "dev-feature/validation",
         "laravel-json-api/encoder-neomerx": "^5.0",
         "laravel-json-api/exceptions": "^4.0",
         "laravel-json-api/spec": "^4.0",
diff --git a/src/Routing/ResourceRegistrar.php b/src/Routing/ResourceRegistrar.php
@@ -309,9 +309,9 @@ protected function addResourceDestroy(string $resourceType, string $controller,
     private function getResourceUri(string $resourceType): string
     {
         return $this->server
-            ->schemas()
-            ->schemaFor($resourceType)
-            ->uriType();
+            ->statics()
+            ->schemaForType($resourceType)
+            ->getUriType();
     }
 
     /**
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -74,9 +74,6 @@ public function register(): void
 
         /** @TODO wtf? why isn't it working without this? */
         $this->app->bind(Pipeline::class, \Illuminate\Pipeline\Pipeline::class);
-
-        /** @TODO will need to remove this temporary wiring */
-        $this->app->bind(Contracts\Validation\Container::class, Validation\Container::class);
     }
 
     /**
diff --git a/src/Validation/Container.php b/src/Validation/Container.php
diff --git a/src/Validation/Factory.php b/src/Validation/Factory.php
diff --git a/tests/dummy/app/JsonApi/V1/Comments/CommentSchema.php b/tests/dummy/app/JsonApi/V1/Comments/CommentSchema.php
@@ -12,6 +12,7 @@
 namespace App\JsonApi\V1\Comments;
 
 use App\Models\Comment;
+use LaravelJsonApi\Core\Schema\Attributes\Model;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsTo;
@@ -20,16 +21,9 @@
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
 use LaravelJsonApi\Eloquent\Schema;
 
+#[Model(Comment::class)]
 class CommentSchema extends Schema
 {
-
-    /**
-     * The model the schema corresponds to.
-     *
-     * @var string
-     */
-    public static string $model = Comment::class;
-
     /**
      * @inheritDoc
      */
diff --git a/tests/dummy/app/JsonApi/V1/Images/ImageSchema.php b/tests/dummy/app/JsonApi/V1/Images/ImageSchema.php
@@ -12,23 +12,17 @@
 namespace App\JsonApi\V1\Images;
 
 use App\Models\Image;
+use LaravelJsonApi\Core\Schema\Attributes\Model;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Str;
 use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
 use LaravelJsonApi\Eloquent\Schema;
 
+#[Model(Image::class)]
 class ImageSchema extends Schema
 {
-
-    /**
-     * The model the schema corresponds to.
-     *
-     * @var string
-     */
-    public static string $model = Image::class;
-
     /**
      * @inheritDoc
      */
diff --git a/tests/dummy/app/JsonApi/V1/Phones/PhoneSchema.php b/tests/dummy/app/JsonApi/V1/Phones/PhoneSchema.php
@@ -12,11 +12,13 @@
 namespace App\JsonApi\V1\Phones;
 
 use App\Models\Phone;
+use LaravelJsonApi\Core\Schema\Attributes\Model;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Str;
 use LaravelJsonApi\Eloquent\Schema;
 
+#[Model(Phone::class)]
 class PhoneSchema extends Schema
 {
     /**
diff --git a/tests/dummy/app/JsonApi/V1/Posts/PostSchema.php b/tests/dummy/app/JsonApi/V1/Posts/PostSchema.php
@@ -12,6 +12,7 @@
 namespace App\JsonApi\V1\Posts;
 
 use App\Models\Post;
+use LaravelJsonApi\Core\Schema\Attributes\Model;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsTo;
@@ -30,17 +31,11 @@
 use LaravelJsonApi\Eloquent\SoftDeletes;
 use LaravelJsonApi\Eloquent\Sorting\SortCountable;
 
+#[Model(Post::class)]
 class PostSchema extends Schema
 {
     use SoftDeletes;
 
-    /**
-     * The model the schema corresponds to.
-     *
-     * @var string
-     */
-    public static string $model = Post::class;
-
     /**
      * The maximum depth of include paths.
      *
diff --git a/tests/dummy/app/JsonApi/V1/Tags/TagSchema.php b/tests/dummy/app/JsonApi/V1/Tags/TagSchema.php
@@ -12,6 +12,7 @@
 namespace App\JsonApi\V1\Tags;
 
 use App\Models\Tag;
+use LaravelJsonApi\Core\Schema\Attributes\Model;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsToMany;
@@ -20,16 +21,9 @@
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
 use LaravelJsonApi\Eloquent\Schema;
 
+#[Model(Tag::class)]
 class TagSchema extends Schema
 {
-
-    /**
-     * The model the schema corresponds to.
-     *
-     * @var string
-     */
-    public static string $model = Tag::class;
-
     /**
      * @inheritDoc
      */
diff --git a/tests/dummy/app/JsonApi/V1/Users/UserSchema.php b/tests/dummy/app/JsonApi/V1/Users/UserSchema.php
@@ -12,6 +12,7 @@
 namespace App\JsonApi\V1\Users;
 
 use App\Models\User;
+use LaravelJsonApi\Core\Schema\Attributes\Model;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\HasOne;
@@ -21,16 +22,9 @@
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
 use LaravelJsonApi\Eloquent\Schema;
 
+#[Model(User::class)]
 class UserSchema extends Schema
 {
-
-    /**
-     * The model the schema corresponds to.
-     *
-     * @var string
-     */
-    public static string $model = User::class;
-
     /**
      * @inheritDoc
      */
diff --git a/tests/dummy/app/JsonApi/V1/Videos/VideoSchema.php b/tests/dummy/app/JsonApi/V1/Videos/VideoSchema.php
@@ -12,6 +12,7 @@
 namespace App\JsonApi\V1\Videos;
 
 use App\Models\Video;
+use LaravelJsonApi\Core\Schema\Attributes\Model;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsToMany;
@@ -20,16 +21,9 @@
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
 use LaravelJsonApi\Eloquent\Schema;
 
+#[Model(Video::class)]
 class VideoSchema extends Schema
 {
-
-    /**
-     * The model the schema corresponds to.
-     *
-     * @var string
-     */
-    public static string $model = Video::class;
-
     /**
      * @inheritDoc
      */
diff --git a/tests/lib/Integration/Routing/TestCase.php b/tests/lib/Integration/Routing/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -309,9 +309,9 @@ protected function addResourceDestroy(string $resourceType, string $controller,`
`309`	`309`	`private function getResourceUri(string $resourceType): string`
`310`	`310`	`{`
`311`	`311`	`return $this->server`
`312`		`- ->schemas()`
`313`		`- ->schemaFor($resourceType)`
`314`		`- ->uriType();`
	`312`	`+ ->statics()`
	`313`	`+ ->schemaForType($resourceType)`
	`314`	`+ ->getUriType();`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,6 @@ public function register(): void`
`74`	`74`
`75`	`75`	`/** @TODO wtf? why isn't it working without this? */`
`76`	`76`	`$this->app->bind(Pipeline::class, \Illuminate\Pipeline\Pipeline::class);`
`77`		`-`
`78`		`- /** @TODO will need to remove this temporary wiring */`
`79`		`- $this->app->bind(Contracts\Validation\Container::class, Validation\Container::class);`
`80`	`77`	`}`
`81`	`78`
`82`	`79`	`/**`