Merge pull request #12 from Lomkit/feature/changes-and-fixes

GautierDele · web-flow · commit 5aee8b932968 · 2023-08-13T21:29:53.000+02:00
♻️ 🐛 fixes and changes suggested
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Laravel Rest Api is an elegant way to expose your app through an API, it takes f
 
 ## Requirements
 
-PHP 7.3+ and Laravel 8.0+
+PHP 8.0+ and Laravel 8.0+
 
 # BETA
 Please note that this package is under beta and is not recommended to use for production environment for now. End of beta should be by October 2023.
@@ -69,7 +69,7 @@ Here is a quick look at what you can do using API search method:
             "type": "max",
             "field": "rate",
             "filters": [
-                {"field": "approved', "value": true}
+                {"field": "approved", "value": true}
             ]
         },
     ],
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": "^7.3|^8.0",
+    "php": "^8.0",
     "ext-json": "*",
     "illuminate/contracts": "^8.37|^9.0|^10.0",
     "illuminate/http": "^8.37|^9.0|^10.0",
diff --git a/src/Concerns/Resource/ConfiguresRestParameters.php b/src/Concerns/Resource/ConfiguresRestParameters.php
@@ -9,7 +9,7 @@
 
 trait ConfiguresRestParameters
 {
-    public function exposedFields(RestRequest $request) {
+    public function exposedFields(RestRequest $request): array {
         return [];
     }
 
@@ -47,11 +47,11 @@ function ($exposedField) use ($prefix) {
         return $exposedFields;
     }
 
-    public function exposedScopes(RestRequest $request) {
+    public function exposedScopes(RestRequest $request): array {
         return [];
     }
 
-    public function exposedLimits(RestRequest $request) {
+    public function exposedLimits(RestRequest $request): array {
         return [
             10,
             25,
diff --git a/src/Concerns/Resource/Relationable.php b/src/Concerns/Resource/Relationable.php
@@ -53,7 +53,7 @@ public function nestedRelations(RestRequest $request, string $prefix = '', array
         return $relations;
     }
 
-    public function relations(RestRequest $request) {
+    public function relations(RestRequest $request): array {
         return [];
     }
 
diff --git a/src/Console/Commands/ControllerCommand.php b/src/Console/Commands/ControllerCommand.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Composer;
 use Illuminate\Support\Str;
 use Lomkit\Rest\Console\ResolvesStubPath;
+use Lomkit\Rest\Tests\Support\Rest\Resources\ModelResource;
 
 class ControllerCommand extends GeneratorCommand implements PromptsForMissingInput
 {
@@ -58,7 +59,7 @@ protected function buildClass($name)
         $resourceNamespace = $this->getResourceNamespace();
 
         if (is_null($resource)) {
-            $resource = $resourceNamespace.str_replace('/', '\\', $this->argument('name'));
+            $resource = $resourceNamespace.'ModelResource';
         } elseif (! Str::startsWith($resource, [
             $resourceNamespace, '\\',
         ])) {
diff --git a/src/Console/Commands/QuickStartCommand.php b/src/Console/Commands/QuickStartCommand.php
@@ -33,7 +33,7 @@ public function handle()
     {
         $this->comment('Generating User Resource...');
         $this->callSilent('rest:resource', ['name' => 'UserResource']);
-        copy($this->resolveStubPath('../stubs/user-resource.stub'), app_path('Rest/Resources/UserResource.php'));
+        copy($this->resolveStubPath('/stubs/user-resource.stub'), app_path('Rest/Resources/UserResource.php'));
 
         if (file_exists(app_path('Models/User.php'))) {
             file_put_contents(
@@ -44,7 +44,7 @@ public function handle()
 
         $this->comment('Generating User Controller...');
         $this->callSilent('rest:controller', ['name' => 'UsersController']);
-        copy($this->resolveStubPath('../stubs/user-controller.stub'), app_path('Http/Controllers/UsersController.php'));
+        copy($this->resolveStubPath('/stubs/user-controller.stub'), app_path('Http/Controllers/UsersController.php'));
 
         if (file_exists(app_path('Models/User.php'))) {
             file_put_contents(
@@ -75,7 +75,7 @@ protected function setAppNamespace()
     {
         $namespace = $this->laravel->getNamespace();
 
-        $this->setAppNamespaceOn(app_path('Rest/Resource/UserResource.php'), $namespace);
+        $this->setAppNamespaceOn(app_path('Rest/Resources/UserResource.php'), $namespace);
         $this->setAppNamespaceOn(app_path('Http/Controllers/UsersController.php'), $namespace);
     }
 
diff --git a/src/Console/Commands/ResourceCommand.php b/src/Console/Commands/ResourceCommand.php
@@ -53,7 +53,7 @@ public function handle()
      */
     protected function buildClass($name)
     {
-        $model = $this->option('model');
+        $model = $this->option('model') ?? 'App\\Models\\Model';
 
         $modelNamespace = $this->getModelNamespace();
 
diff --git a/src/Console/stubs/base-resource.stub b/src/Console/stubs/base-resource.stub
@@ -10,21 +10,21 @@ abstract class Resource extends RestResource
      * Build a query for fetching resource.
      *
      * @param  \Lomkit\Rest\Http\Requests\RestRequest  $request
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
+     * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function fetchQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Database\Eloquent\Builder $query) {
+    public function fetchQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {
         return $query;
     }
 
     /**
      * Build a "destroy" query for the given resource.
      *
      * @param  \Lomkit\Rest\Http\Requests\RestRequest  $request
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
+     * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function destroyQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Database\Eloquent\Builder $query)
+    public function destroyQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
     {
         return $query;
     }
@@ -33,10 +33,10 @@ abstract class Resource extends RestResource
      * Build a "restore" query for the given resource.
      *
      * @param  \Lomkit\Rest\Http\Requests\RestRequest  $request
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
+     * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function restoreQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Database\Eloquent\Builder $query)
+    public function restoreQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
     {
         return $query;
     }
@@ -45,10 +45,10 @@ abstract class Resource extends RestResource
      * Build a "forceDelete" query for the given resource.
      *
      * @param  \Lomkit\Rest\Http\Requests\RestRequest  $request
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param  \Illuminate\Contracts\Database\Eloquent\Builder  $query
+     * @return \Illuminate\Contracts\Database\Eloquent\Builder
      */
-    public function forceDeleteQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Database\Eloquent\Builder $query)
+    public function forceDeleteQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)
     {
         return $query;
     }
diff --git a/src/Console/stubs/resource.stub b/src/Console/stubs/resource.stub
@@ -4,7 +4,7 @@ namespace {{ namespace }};
 
 use App\Rest\Resource as RestResource;
 
-class {{ class }} extends Resource
+class {{ class }} extends RestResource
 {
     /**
      * The model the resource corresponds to.
@@ -13,23 +13,25 @@ class {{ class }} extends Resource
      */
     public static $model = \{{ namespacedModel }}::class;
 
-    public function exposedFields(\Lomkit\Rest\Http\Requests\RestRequest $request)
+    public function exposedFields(\Lomkit\Rest\Http\Requests\RestRequest $request): array
     {
         return [
             'id'
         ];
     }
 
-    public function relations(\Lomkit\Rest\Http\Requests\RestRequest $request)
+    public function relations(\Lomkit\Rest\Http\Requests\RestRequest $request): array
     {
         return [];
     }
 
-    public function exposedScopes(\Lomkit\Rest\Http\Requests\RestRequest $request) {
+    public function exposedScopes(\Lomkit\Rest\Http\Requests\RestRequest $request): array
+    {
         return [];
     }
 
-    public function exposedLimits(\Lomkit\Rest\Http\Requests\RestRequest $request) {
+    public function exposedLimits(\Lomkit\Rest\Http\Requests\RestRequest $request): array
+    {
         return [
             10,
             25,
diff --git a/src/Console/stubs/user-controller.stub b/src/Console/stubs/user-controller.stub
@@ -11,5 +11,5 @@ class UsersController extends RestController
      *
      * @var class-string<\Lomkit\Rest\Http\Resource>
      */
-    public static $resource = \App\User::class;
+    public static $resource = \App\Rest\Resources\UserResource::class;
 }
diff --git a/src/Console/stubs/user-resource.stub b/src/Console/stubs/user-resource.stub
@@ -4,7 +4,7 @@ namespace App\Rest\Resources;
 
 use App\Rest\Resource as RestResource;
 
-class User extends Resource
+class User extends RestResource
 {
     /**
      * The model the resource corresponds to.
diff --git a/src/Contracts/Http/Routing/Registrar.php b/src/Contracts/Http/Routing/Registrar.php
@@ -2,6 +2,8 @@
 
 namespace Lomkit\Rest\Contracts\Http\Routing;
 
+use Lomkit\Rest\Http\Controllers\Controller;
+
 interface Registrar
 {
     /**
@@ -12,5 +14,5 @@ interface Registrar
      * @param  array  $options
      * @return Lomkit\Rest\Http\Routing\PendingResourceRegistration
      */
-    public function resource($name, $controller, array $options = []);
+    public function resource(string $name, string $controller, array $options = []);
 }
diff --git a/src/Facades/Rest.php b/src/Facades/Rest.php
@@ -7,7 +7,9 @@
 class Rest extends Facade
 {
     /**
-     * @inheritDoc
+     * @method static \Lomkit\Rest\Http\Routing\PendingResourceRegistration resource(string $name, $controller, array $options = [])
+     *
+     * @see \Lomkit\Rest\Rest
      */
     protected static function getFacadeAccessor()
     {
diff --git a/src/Http/Resource.php b/src/Http/Resource.php
@@ -62,7 +62,7 @@ public static function newResponse()
         return new $response;
     }
 
-    public function defaultOrderBy(RestRequest $request) {
+    public function defaultOrderBy(RestRequest $request): array {
         return [
             'id' => 'desc'
         ];
diff --git a/src/Rest.php b/src/Rest.php
@@ -17,7 +17,7 @@ class Rest implements Registrar
      * @param  array  $options
      * @return \Lomkit\Rest\Http\Routing\PendingResourceRegistration
      */
-    public function resource($name, $controller, array $options = [])
+    public function resource(string $name, string $controller, array $options = [])
     {
         if (app()->bound(ResourceRegistrar::class)) {
             $registrar = app()->make(ResourceRegistrar::class);
diff --git a/tests/Support/Rest/Resources/AutomaticGatingResource.php b/tests/Support/Rest/Resources/AutomaticGatingResource.php
@@ -25,7 +25,7 @@ class AutomaticGatingResource extends Resource
 
     public static $model = Model::class;
 
-    public function relations(RestRequest $request)
+    public function relations(RestRequest $request): array
     {
         return [
             BelongsToMany::make('belongsToManyRelation', BelongsToManyResource::class)
@@ -36,7 +36,7 @@ public function relations(RestRequest $request)
         ];
     }
 
-    public function exposedFields(RestRequest $request)
+    public function exposedFields(RestRequest $request): array
     {
         return [
             'id',
diff --git a/tests/Support/Rest/Resources/BelongsToManyResource.php b/tests/Support/Rest/Resources/BelongsToManyResource.php
@@ -13,12 +13,12 @@ class BelongsToManyResource extends Resource
 
     public static $model = BelongsToManyRelation::class;
 
-    public function relations(RestRequest $request)
+    public function relations(RestRequest $request): array
     {
         return [];
     }
 
-    public function exposedFields(RestRequest $request)
+    public function exposedFields(RestRequest $request): array
     {
         return [
             'id',
diff --git a/tests/Support/Rest/Resources/BelongsToResource.php b/tests/Support/Rest/Resources/BelongsToResource.php
@@ -15,14 +15,14 @@ class BelongsToResource extends Resource
 
     public static $model = BelongsToRelation::class;
 
-    public function relations(RestRequest $request)
+    public function relations(RestRequest $request): array
     {
         return [
             HasMany::make('models', ModelResource::class)
         ];
     }
 
-    public function exposedFields(RestRequest $request)
+    public function exposedFields(RestRequest $request): array
     {
         return [
             'id',
diff --git a/tests/Support/Rest/Resources/HasManyResource.php b/tests/Support/Rest/Resources/HasManyResource.php
@@ -13,12 +13,12 @@ class HasManyResource extends Resource
     use DisableAutomaticGates;
     public static $model = HasManyRelation::class;
 
-    public function relations(RestRequest $request)
+    public function relations(RestRequest $request): array
     {
         return [];
     }
 
-    public function exposedFields(RestRequest $request)
+    public function exposedFields(RestRequest $request): array
     {
         return [
             'id',
diff --git a/tests/Support/Rest/Resources/HasManyThroughResource.php b/tests/Support/Rest/Resources/HasManyThroughResource.php
@@ -15,12 +15,12 @@ class HasManyThroughResource extends Resource
     use DisableAutomaticGates;
     public static $model = HasManyThroughRelation::class;
 
-    public function relations(RestRequest $request)
+    public function relations(RestRequest $request): array
     {
         return [];
     }
 
-    public function exposedFields(RestRequest $request)
+    public function exposedFields(RestRequest $request): array
     {
         return [
             'id',
diff --git a/tests/Support/Rest/Resources/HasOneOfManyResource.php b/tests/Support/Rest/Resources/HasOneOfManyResource.php
@@ -15,12 +15,12 @@ class HasOneOfManyResource extends Resource
 
     public static $model = HasOneOfManyRelation::class;
 
-    public function relations(RestRequest $request)
+    public function relations(RestRequest $request): array
     {
         return [];
     }
 
-    public function exposedFields(RestRequest $request)
+    public function exposedFields(RestRequest $request): array
     {
         return [
             'id',
diff --git a/tests/Support/Rest/Resources/HasOneResource.php b/tests/Support/Rest/Resources/HasOneResource.php
@@ -13,12 +13,12 @@ class HasOneResource extends Resource
 
     public static $model = HasOneRelation::class;
 
-    public function relations(RestRequest $request)
+    public function relations(RestRequest $request): array
     {
         return [];
     }
 
-    public function exposedFields(RestRequest $request)
+    public function exposedFields(RestRequest $request): array
     {
         return [
             'id',
diff --git a/tests/Support/Rest/Resources/HasOneThroughResource.php b/tests/Support/Rest/Resources/HasOneThroughResource.php
@@ -15,12 +15,12 @@ class HasOneThroughResource extends Resource
 
     public static $model = HasOneThroughRelation::class;
 
-    public function relations(RestRequest $request)
+    public function relations(RestRequest $request): array
     {
         return [];
     }
 
-    public function exposedFields(RestRequest $request)
+    public function exposedFields(RestRequest $request): array
     {
         return [
             'id',
diff --git a/tests/Support/Rest/Resources/ModelResource.php b/tests/Support/Rest/Resources/ModelResource.php
diff --git a/tests/Support/Rest/Resources/MorphManyResource.php b/tests/Support/Rest/Resources/MorphManyResource.php
diff --git a/tests/Support/Rest/Resources/MorphOneOfManyResource.php b/tests/Support/Rest/Resources/MorphOneOfManyResource.php
diff --git a/tests/Support/Rest/Resources/MorphOneResource.php b/tests/Support/Rest/Resources/MorphOneResource.php
diff --git a/tests/Support/Rest/Resources/MorphToManyResource.php b/tests/Support/Rest/Resources/MorphToManyResource.php
diff --git a/tests/Support/Rest/Resources/MorphToResource.php b/tests/Support/Rest/Resources/MorphToResource.php
diff --git a/tests/Support/Rest/Resources/MorphedByManyResource.php b/tests/Support/Rest/Resources/MorphedByManyResource.php
diff --git a/tests/Support/Rest/Resources/NoAuthorizationResource.php b/tests/Support/Rest/Resources/NoAuthorizationResource.php
diff --git a/tests/Support/Rest/Resources/NoExposedFieldsResource.php b/tests/Support/Rest/Resources/NoExposedFieldsResource.php
diff --git a/tests/Support/Rest/Resources/SoftDeletedModelResource.php b/tests/Support/Rest/Resources/SoftDeletedModelResource.php

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
`13`		`- "php": "^7.3\|^8.0",`
	`13`	`+ "php": "^8.0",`
`14`	`14`	`"ext-json": "*",`
`15`	`15`	`"illuminate/contracts": "^8.37\|^9.0\|^10.0",`
`16`	`16`	`"illuminate/http": "^8.37\|^9.0\|^10.0",`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`trait ConfiguresRestParameters`
`11`	`11`	`{`
`12`		`- public function exposedFields(RestRequest $request) {`
	`12`	`+ public function exposedFields(RestRequest $request): array {`
`13`	`13`	`return [];`
`14`	`14`	`}`
`15`	`15`
`@@ -47,11 +47,11 @@ function ($exposedField) use ($prefix) {`
`47`	`47`	`return $exposedFields;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public function exposedScopes(RestRequest $request) {`
	`50`	`+ public function exposedScopes(RestRequest $request): array {`
`51`	`51`	`return [];`
`52`	`52`	`}`
`53`	`53`
`54`		`- public function exposedLimits(RestRequest $request) {`
	`54`	`+ public function exposedLimits(RestRequest $request): array {`
`55`	`55`	`return [`
`56`	`56`	`10,`
`57`	`57`	`25,`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function nestedRelations(RestRequest $request, string $prefix = '', array`
`53`	`53`	`return $relations;`
`54`	`54`	`}`
`55`	`55`
`56`		`- public function relations(RestRequest $request) {`
	`56`	`+ public function relations(RestRequest $request): array {`
`57`	`57`	`return [];`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function handle()`
`53`	`53`	`*/`
`54`	`54`	`protected function buildClass($name)`
`55`	`55`	`{`
`56`		`- $model = $this->option('model');`
	`56`	`+ $model = $this->option('model') ?? 'App\\Models\\Model';`
`57`	`57`
`58`	`58`	`$modelNamespace = $this->getModelNamespace();`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -10,21 +10,21 @@ abstract class Resource extends RestResource`
`10`	`10`	`* Build a query for fetching resource.`
`11`	`11`	`*`
`12`	`12`	`* @param \Lomkit\Rest\Http\Requests\RestRequest $request`
`13`		`- * @param \Illuminate\Database\Eloquent\Builder $query`
`14`		`- * @return \Illuminate\Database\Eloquent\Builder`
	`13`	`+ * @param \Illuminate\Contracts\Database\Eloquent\Builder $query`
	`14`	`+ * @return \Illuminate\Contracts\Database\Eloquent\Builder`
`15`	`15`	`*/`
`16`		`- public function fetchQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Database\Eloquent\Builder $query) {`
	`16`	`+ public function fetchQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query) {`
`17`	`17`	`return $query;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* Build a "destroy" query for the given resource.`
`22`	`22`	`*`
`23`	`23`	`* @param \Lomkit\Rest\Http\Requests\RestRequest $request`
`24`		`- * @param \Illuminate\Database\Eloquent\Builder $query`
`25`		`- * @return \Illuminate\Database\Eloquent\Builder`
	`24`	`+ * @param \Illuminate\Contracts\Database\Eloquent\Builder $query`
	`25`	`+ * @return \Illuminate\Contracts\Database\Eloquent\Builder`
`26`	`26`	`*/`
`27`		`- public function destroyQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Database\Eloquent\Builder $query)`
	`27`	`+ public function destroyQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)`
`28`	`28`	`{`
`29`	`29`	`return $query;`
`30`	`30`	`}`
`@@ -33,10 +33,10 @@ abstract class Resource extends RestResource`
`33`	`33`	`* Build a "restore" query for the given resource.`
`34`	`34`	`*`
`35`	`35`	`* @param \Lomkit\Rest\Http\Requests\RestRequest $request`
`36`		`- * @param \Illuminate\Database\Eloquent\Builder $query`
`37`		`- * @return \Illuminate\Database\Eloquent\Builder`
	`36`	`+ * @param \Illuminate\Contracts\Database\Eloquent\Builder $query`
	`37`	`+ * @return \Illuminate\Contracts\Database\Eloquent\Builder`
`38`	`38`	`*/`
`39`		`- public function restoreQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Database\Eloquent\Builder $query)`
	`39`	`+ public function restoreQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)`
`40`	`40`	`{`
`41`	`41`	`return $query;`
`42`	`42`	`}`
`@@ -45,10 +45,10 @@ abstract class Resource extends RestResource`
`45`	`45`	`* Build a "forceDelete" query for the given resource.`
`46`	`46`	`*`
`47`	`47`	`* @param \Lomkit\Rest\Http\Requests\RestRequest $request`
`48`		`- * @param \Illuminate\Database\Eloquent\Builder $query`
`49`		`- * @return \Illuminate\Database\Eloquent\Builder`
	`48`	`+ * @param \Illuminate\Contracts\Database\Eloquent\Builder $query`
	`49`	`+ * @return \Illuminate\Contracts\Database\Eloquent\Builder`
`50`	`50`	`*/`
`51`		`- public function forceDeleteQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Database\Eloquent\Builder $query)`
	`51`	`+ public function forceDeleteQuery(\Lomkit\Rest\Http\Requests\RestRequest $request, \Illuminate\Contracts\Database\Eloquent\Builder $query)`
`52`	`52`	`{`
`53`	`53`	`return $query;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace {{ namespace }};`
`4`	`4`
`5`	`5`	`use App\Rest\Resource as RestResource;`
`6`	`6`
`7`		`-class {{ class }} extends Resource`
	`7`	`+class {{ class }} extends RestResource`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* The model the resource corresponds to.`
`@@ -13,23 +13,25 @@ class {{ class }} extends Resource`
`13`	`13`	`*/`
`14`	`14`	`public static $model = \{{ namespacedModel }}::class;`
`15`	`15`
`16`		`- public function exposedFields(\Lomkit\Rest\Http\Requests\RestRequest $request)`
	`16`	`+ public function exposedFields(\Lomkit\Rest\Http\Requests\RestRequest $request): array`
`17`	`17`	`{`
`18`	`18`	`return [`
`19`	`19`	`'id'`
`20`	`20`	`];`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function relations(\Lomkit\Rest\Http\Requests\RestRequest $request)`
	`23`	`+ public function relations(\Lomkit\Rest\Http\Requests\RestRequest $request): array`
`24`	`24`	`{`
`25`	`25`	`return [];`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function exposedScopes(\Lomkit\Rest\Http\Requests\RestRequest $request) {`
	`28`	`+ public function exposedScopes(\Lomkit\Rest\Http\Requests\RestRequest $request): array`
	`29`	`+ {`
`29`	`30`	`return [];`
`30`	`31`	`}`
`31`	`32`
`32`		`- public function exposedLimits(\Lomkit\Rest\Http\Requests\RestRequest $request) {`
	`33`	`+ public function exposedLimits(\Lomkit\Rest\Http\Requests\RestRequest $request): array`
	`34`	`+ {`
`33`	`35`	`return [`
`34`	`36`	`10,`
`35`	`37`	`25,`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ class UsersController extends RestController`
`11`	`11`	`*`
`12`	`12`	`* @var class-string<\Lomkit\Rest\Http\Resource>`
`13`	`13`	`*/`
`14`		`- public static $resource = \App\User::class;`
	`14`	`+ public static $resource = \App\Rest\Resources\UserResource::class;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace App\Rest\Resources;`
`4`	`4`
`5`	`5`	`use App\Rest\Resource as RestResource;`
`6`	`6`
`7`		`-class User extends Resource`
	`7`	`+class User extends RestResource`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* The model the resource corresponds to.`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Lomkit\Rest\Contracts\Http\Routing;`
`4`	`4`
	`5`	`+use Lomkit\Rest\Http\Controllers\Controller;`
	`6`	`+`
`5`	`7`	`interface Registrar`
`6`	`8`	`{`
`7`	`9`	`/**`
`@@ -12,5 +14,5 @@ interface Registrar`
`12`	`14`	`* @param array $options`
`13`	`15`	`* @return Lomkit\Rest\Http\Routing\PendingResourceRegistration`
`14`	`16`	`*/`
`15`		`- public function resource($name, $controller, array $options = []);`
	`17`	`+ public function resource(string $name, string $controller, array $options = []);`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,9 @@`
`7`	`7`	`class Rest extends Facade`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`		`- * @inheritDoc`
	`10`	`+ * @method static \Lomkit\Rest\Http\Routing\PendingResourceRegistration resource(string $name, $controller, array $options = [])`
	`11`	`+ *`
	`12`	`+ * @see \Lomkit\Rest\Rest`
`11`	`13`	`*/`
`12`	`14`	`protected static function getFacadeAccessor()`
`13`	`15`	`{`