@@ -4,15 +4,15 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | namespace Sarala\Http\Controllers;  | 
                                                        
| 6 | 6 | |
| 7 | -use League\Fractal\Manager;  | 
                                                        |
| 8 | -use Illuminate\Http\Request;  | 
                                                        |
| 7 | +use Illuminate\Contracts\Pagination\LengthAwarePaginator;  | 
                                                        |
| 9 | 8 | use Illuminate\Http\JsonResponse;  | 
                                                        
| 10 | -use League\Fractal\Resource\Item;  | 
                                                        |
| 9 | +use Illuminate\Http\Request;  | 
                                                        |
| 11 | 10 | use Illuminate\Routing\Controller;  | 
                                                        
| 12 | -use Sarala\Query\ApiRequestInspector;  | 
                                                        |
| 13 | -use League\Fractal\Resource\Collection;  | 
                                                        |
| 14 | -use Illuminate\Contracts\Pagination\LengthAwarePaginator;  | 
                                                        |
| 11 | +use League\Fractal\Manager;  | 
                                                        |
| 15 | 12 | use League\Fractal\Pagination\IlluminatePaginatorAdapter;  | 
                                                        
| 13 | +use League\Fractal\Resource\Collection;  | 
                                                        |
| 14 | +use League\Fractal\Resource\Item;  | 
                                                        |
| 15 | +use Sarala\Query\ApiRequestInspector;  | 
                                                        |
| 16 | 16 | |
| 17 | 17 | class BaseController extends Controller  | 
                                                        
| 18 | 18 |  { | 
                                                        
@@ -30,6 +30,9 @@ discard block  | 
                                                    ||
| 30 | 30 | return $this->appendExact($fields, 'appendCountQuery');  | 
                                                        
| 31 | 31 | }  | 
                                                        
| 32 | 32 | |
| 33 | + /**  | 
                                                        |
| 34 | + * @param string $method  | 
                                                        |
| 35 | + */  | 
                                                        |
| 33 | 36 | private function appendExact($fields, $method)  | 
                                                        
| 34 | 37 |      { | 
                                                        
| 35 | 38 |          if (is_string($fields)) { | 
                                                        
@@ -61,6 +64,9 @@ discard block  | 
                                                    ||
| 61 | 64 | return $this->appendAlias($fields, $value, 'appendCountQuery');  | 
                                                        
| 62 | 65 | }  | 
                                                        
| 63 | 66 | |
| 67 | + /**  | 
                                                        |
| 68 | + * @param string $method  | 
                                                        |
| 69 | + */  | 
                                                        |
| 64 | 70 | private function appendAlias($fields, $value, $method): self  | 
                                                        
| 65 | 71 |      { | 
                                                        
| 66 | 72 |          if (is_array($fields) && is_null($value)) { | 
                                                        
@@ -93,6 +99,9 @@ discard block  | 
                                                    ||
| 93 | 99 | );  | 
                                                        
| 94 | 100 | }  | 
                                                        
| 95 | 101 | |
| 102 | + /**  | 
                                                        |
| 103 | + * @param \Closure $value  | 
                                                        |
| 104 | + */  | 
                                                        |
| 96 | 105 | private function appendQuery($name, $value)  | 
                                                        
| 97 | 106 |      { | 
                                                        
| 98 | 107 |          if (is_callable($value)) { | 
                                                        
@@ -4,8 +4,8 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | namespace Sarala\Query;  | 
                                                        
| 6 | 6 | |
| 7 | -use Illuminate\Support\Str;  | 
                                                        |
| 8 | 7 | use Illuminate\Database\Eloquent\Builder;  | 
                                                        
| 8 | +use Illuminate\Support\Str;  | 
                                                        |
| 9 | 9 | |
| 10 | 10 | class QueryHelper  | 
                                                        
| 11 | 11 |  { | 
                                                        
@@ -2,14 +2,14 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace Sarala;  | 
                                                        
| 4 | 4 | |
| 5 | -use Sarala\Query\Sorts;  | 
                                                        |
| 6 | -use Sarala\Query\Fields;  | 
                                                        |
| 7 | -use League\Fractal\Manager;  | 
                                                        |
| 8 | 5 | use Illuminate\Http\Request;  | 
                                                        
| 9 | -use Sarala\Query\QueryParamBag;  | 
                                                        |
| 10 | 6 | use Illuminate\Support\ServiceProvider;  | 
                                                        
| 11 | -use League\Fractal\Serializer\JsonApiSerializer;  | 
                                                        |
| 7 | +use League\Fractal\Manager;  | 
                                                        |
| 12 | 8 | use League\Fractal\Serializer\DataArraySerializer;  | 
                                                        
| 9 | +use League\Fractal\Serializer\JsonApiSerializer;  | 
                                                        |
| 10 | +use Sarala\Query\Fields;  | 
                                                        |
| 11 | +use Sarala\Query\QueryParamBag;  | 
                                                        |
| 12 | +use Sarala\Query\Sorts;  | 
                                                        |
| 13 | 13 | |
| 14 | 14 | class SaralaServiceProvider extends ServiceProvider  | 
                                                        
| 15 | 15 |  { | 
                                                        
@@ -4,11 +4,11 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | namespace Sarala\Query;  | 
                                                        
| 6 | 6 | |
| 7 | -use Illuminate\Http\Request;  | 
                                                        |
| 7 | +use Illuminate\Contracts\Pagination\LengthAwarePaginator;  | 
                                                        |
| 8 | 8 | use Illuminate\Database\Eloquent\Builder;  | 
                                                        
| 9 | 9 | use Illuminate\Database\Eloquent\Relations\Relation;  | 
                                                        
| 10 | 10 | use Illuminate\Database\Query\Builder as QueryBuilder;  | 
                                                        
| 11 | -use Illuminate\Contracts\Pagination\LengthAwarePaginator;  | 
                                                        |
| 11 | +use Illuminate\Http\Request;  | 
                                                        |
| 12 | 12 | |
| 13 | 13 | abstract class QueryBuilderAbstract  | 
                                                        
| 14 | 14 |  { | 
                                                        
@@ -5,9 +5,8 @@  | 
                                                    ||
| 5 | 5 | namespace Sarala\Exceptions;  | 
                                                        
| 6 | 6 | |
| 7 | 7 | use Exception;  | 
                                                        
| 8 | -use Illuminate\Http\Request;  | 
                                                        |
| 9 | -use Illuminate\Http\Response;  | 
                                                        |
| 10 | 8 | use Illuminate\Http\JsonResponse;  | 
                                                        
| 9 | +use Illuminate\Http\Request;  | 
                                                        |
| 11 | 10 | |
| 12 | 11 | abstract class ApiException extends Exception implements JsonApiExceptionContract  | 
                                                        
| 13 | 12 |  { | 
                                                        
@@ -51,6 +51,9 @@  | 
                                                    ||
| 51 | 51 | }  | 
                                                        
| 52 | 52 | }  | 
                                                        
| 53 | 53 | |
| 54 | + /**  | 
                                                        |
| 55 | + * @param string $value  | 
                                                        |
| 56 | + */  | 
                                                        |
| 54 | 57 | private function prepareStringBasedParams($value): void  | 
                                                        
| 55 | 58 |      { | 
                                                        
| 56 | 59 |          collect(explode(',', $value))->each(function ($param) { | 
                                                        
@@ -6,8 +6,8 @@  | 
                                                    ||
| 6 | 6 | |
| 7 | 7 | use Illuminate\Http\Request;  | 
                                                        
| 8 | 8 | use Illuminate\Support\Str;  | 
                                                        
| 9 | -use Sarala\Http\Requests\ApiRequestAbstract;  | 
                                                        |
| 10 | 9 | use Sarala\Exceptions\UnauthorizedIncludeException;  | 
                                                        
| 10 | +use Sarala\Http\Requests\ApiRequestAbstract;  | 
                                                        |
| 11 | 11 | |
| 12 | 12 | class ApiRequestInspector  | 
                                                        
| 13 | 13 |  { | 
                                                        
@@ -4,10 +4,10 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | namespace Sarala\Transformer;  | 
                                                        
| 6 | 6 | |
| 7 | +use Illuminate\Support\Arr;  | 
                                                        |
| 8 | +use League\Fractal\TransformerAbstract as BaseTransformerAbstract;  | 
                                                        |
| 7 | 9 | use Sarala\Links;  | 
                                                        
| 8 | 10 | use Sarala\Query\Fields;  | 
                                                        
| 9 | -use League\Fractal\TransformerAbstract as BaseTransformerAbstract;  | 
                                                        |
| 10 | -use Illuminate\Support\Arr;  | 
                                                        |
| 11 | 11 | |
| 12 | 12 | |
| 13 | 13 | abstract class TransformerAbstract extends BaseTransformerAbstract  |