Add dependency on saritasa/dingo-api-custom

Author: populov

.gitignore

@@ -2,3 +2,4 @@
 package.xml
 /vendor
 .idea
+*.cache

CHANGES.md

@@ -1,5 +1,11 @@
 # Changes History
 
+4.0.0
+-----
++ Add PageRequest, ChangePassword request
++ Depend on [saritasa/laravel-fluent-validation](https://github.com/Saritasa/php-laravel-fluent-validation) and [saritasa/dingo-api-custom](https://github.com/Saritasa/php-dingo-api-custom)
++ Remove ApiResourceRegistrar and WebResourceRegistrar (standard router is enough)
+
 3.3.5
 -----
 Require release tymon/jwt-auth version instead of RC

README.md

@@ -33,23 +33,23 @@ Recommended to use as base controller for other API controllers.
 
 #### Methods    
 * function json($data, IDataTransformer $transformer = null): Response    
-* function validate(Request $request, array $rules, array $messages = [], array $customAttributes = [])    
 
 **Example**:    
 ```php
 class UserApiController extends BaseApiController
 {    
-    public function __construct(UserTransformer $userTransformer)  
-	 {      
-		 parent::__construct($userTransformer);  
-	 }
-	 public function editUserProfile(Request $request, User $user): Response  
-	 {
-		 $this->validate($request, $user->getRuels());
-		 $user->fill($request->all());
-		 $user->save();
-		 return $this->json($user);
-	  }
+  public function __construct(UserTransformer $userTransformer)
+  {      
+    parent::__construct($userTransformer);  
+  }
+
+  public function editUserProfile(Request $request, User $user): Response  
+  {
+    $this->validate($request, $user->getRuels());
+    $user->fill($request->all());
+    $user->save();
+    return $this->json($user);
+  }
 }
 ```    
  ### JWTAuthApiController Authenticate API Controller. Uses JWT authentication    
@@ -59,77 +59,23 @@ settings and underlying [tymon\jwt-auth](https://github.com/tymondesigns/jwt-aut
 **Example**: routes\api.php:    
 ```php
 app('api.router')->version(config('api.version'), ['namespace' => 'Saritasa\Laravel\Controllers\Api'],    
- function (\Dingo\Api\Routing\Router $api) {  
- // Authentication $api->post('auth', 'AuthController@login');   // Login $api->put('auth', 'AuthController@refreshToken'); // Refresh expired token                
- $api->delete('auth', 'AuthController@logout')->middleware('api.auth'); // Logout  
- });
+  function (\Dingo\Api\Routing\Router $api) {  
+    // Authentication $api->post('auth', 'AuthController@login');   // Login $api->put('auth', 'AuthController@refreshToken'); // Refresh expired token                
+    $api->delete('auth', 'AuthController@logout')->middleware('api.auth'); // Logout  
+  });
 ```  
-### ResourceApiController  
-Controller for typical CRUD operations when you don't need many additional logic.  
-For using this functionality you can just create controller and set needed model class in property $modelClass  
-**Example**:  
-```php  
-class CustomApiController extends ResourceApiController
-{    
-    /**
-    * Define model class that is managed by this controller.
-    *
-    * @var string
-    */
-    protected $modelClass = App\Models\User::class;  
- }
- ```  
+
 ### ForgotPasswordApiController, ResetPasswordApiController These controllers are responsible for handling password reset emails.    
 Utilize native Laravel password management without UI, in JSON API.    
 
 **Example**: routes\api.php:    
 ```php
-app('api.router')->version(config('api.version'), ['namespace' => 'Saritasa\Laravel\Controllers\Api'],    
-function (\Dingo\Api\Routing\Router $api) { $api->post('auth/password/reset', 'ForgotPasswordApiController@sendResetLinkEmail'); $api->put('auth/password/reset', 'ResetPasswordApiController@reset');});
-```    
- ## Routes registration examples:    
- ### Simple route
- ```php
- $registrar->get('users', ApiController::class, 'list'); 
+app('api.router')->version(config('api.version'), ['namespace' => 'Saritasa\Laravel\Controllers\Api'],
+  function (\Dingo\Api\Routing\Router $api) {
+    $api->post('auth/password/reset', 'ForgotPasswordApiController@sendResetLinkEmail');
+    $api->put('auth/password/reset', 'ResetPasswordApiController@reset');
+  });
 ```    
-In this case ApiController::list will be calling with default dependency injection.    
-    
-### Route with parameters
-```php    
- // Controller example
- class ApiController {    
- 	public function show(int $id) {}
- }    
- // Route example
- $registrar->get('users/{id}', ApiController::class, 'show');
-```
-In this case ApiController::show will receive directly parameter from url. Ex: /user/5    
-    
-### Route with binding on controller side
-```php
-// Controller example
-class ApiController {    
- 	public function show(User $user) {}
-}    
- // Route example
- $registrar->get('users/{user}', ApiController::class, 'show');
-```
-In this case ApiController::show try to find Model user by id and if not exists throws ModelNotFoundException.    
-    
-### Route with binding on route side
-```php
-// Controller example
-class ApiController {    
- 	public function show(Model $user) {}
-}    
- // Route example
- $registrar->get('users/{user}', ApiController::class, 'show', null, ['user' => User::class]);
-```
-In this case no matter what type hint in controller, container will be trying to give object of class that you pass in router registrar.
-So if method has type hinting of class which not a parent for given in router, TypeError will be thrown.    
-    
-#### Note: In 2 last cases classes which uses for model bindings must implement Illuminate\Contracts\Routing\UrlRoutable otherwise this parameters    
-will be ignored.    
 
 ## Contributing    
 1. Create fork, checkout it    

composer.json

@@ -13,15 +13,16 @@
     "require": {
         "php": ">=7.1",
         "ext-json": "*",
-        "illuminate/support": "^5.7 || ^6.0",
-        "saritasa/laravel-entity-services": "^1.3",
+        "illuminate/http": "^5.7 | 6.*",
+        "illuminate/support": "^5.7 | 6.*",
+        "saritasa/dingo-api-custom": "^2.2",
         "saritasa/laravel-fluent-validation": "^1.2",
         "saritasa/transformers": "^1.0",
         "tymon/jwt-auth": "^1.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.1",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": ">=6.0",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "minimum-stability": "beta",

src/Requests/ChangePasswordRequest.php

@@ -2,6 +2,7 @@
 
 namespace Saritasa\LaravelControllers\Requests;
 
+use Illuminate\Foundation\Http\FormRequest;
 use Saritasa\Laravel\Validation\Rules\ContainsLowercase;
 use Saritasa\Laravel\Validation\Rules\ContainsNumeral;
 use Saritasa\Laravel\Validation\Rules\ContainsUppercase;
@@ -12,7 +13,7 @@
  * @property-read string $oldPassword The old user password
  * @property-read string $newPassword The new password to set
  */
-class ChangePasswordRequest extends Request
+class ChangePasswordRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

src/Requests/PageRequest.php

@@ -2,6 +2,7 @@
 
 namespace Saritasa\LaravelControllers\Requests;
 
+use Illuminate\Foundation\Http\FormRequest;
 use Saritasa\DingoApi\Paging\PagingInfo;
 
 /**
@@ -10,7 +11,7 @@
  * @property-read int $page
  * @property-read int $per_page
  */
-class PageRequest extends Request
+class PageRequest extends FormRequest
 {
     public const PER_PAGE = 'per_page';
     public const PAGE = 'page';