Resove conflicts

src/Contracts/RestifySearchable.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 
 /**
- * @package Binaryk\LaravelRestify\Contracts;
  * @author Eduard Lupacescu <[email protected]>
  */
 interface RestifySearchable
@@ -42,7 +41,7 @@ public static function getInFields();
      * Find matches in the table by given value
      * Returns an array like:
      * [ 'table_column_name' => 'type' ], type can be: text, bool, boolean, int, integer, number
-     * e.g. [ 'id' => 'int' ]
+     * e.g. [ 'id' => 'int' ].
      *
      * To use this filter we have to send in query:
      * [  'match' => [ 'id' => 1 ] ]

src/Controllers/RestIndexController.php

@@ -2,12 +2,7 @@
 
 namespace Binaryk\LaravelRestify\Controllers;
 
-use Binaryk\LaravelRestify\Tests\Fixtures\User;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Request;
-
 /**
- * @package Binaryk\LaravelRestify\Controllers;
  * @author Eduard Lupacescu <[email protected]>
  */
 trait RestIndexController

src/Http/Middleware/BeforeEach.php

@@ -3,9 +3,6 @@
 namespace Binaryk\LaravelRestify\Http\Middleware;
 
 use Binaryk\LaravelRestify\Events\RestifyBeforeEach;
-use Binaryk\LaravelRestify\Events\RestifyServiceProviderRegistered;
-use Binaryk\LaravelRestify\Restify;
-use Binaryk\LaravelRestify\RestifyServiceProvider;
 use Closure;
 
 /**
@@ -23,6 +20,7 @@ class BeforeEach
     public function handle($request, Closure $next)
     {
         RestifyBeforeEach::dispatch($request);
+
         return $next($request);
     }
 }

src/Http/Middleware/RestifyInjector.php

@@ -25,7 +25,7 @@ public function handle($request, Closure $next)
         $path = trim(Restify::path(), '/') ?: '/';
 
         $isRestify = $request->is($path) ||
-            $request->is(trim($path . '/*', '/')) ||
+            $request->is(trim($path.'/*', '/')) ||
             $request->is('restify-api/*');
 
         if ($isRestify) {

src/LaravelRestifyServiceProvider.php

@@ -48,15 +48,15 @@ public function register()
     protected function registerPublishing()
     {
         $this->publishes([
-            __DIR__ . '/Commands/stubs/RestifyServiceProvider.stub' => app_path('Providers/RestifyServiceProvider.php'),
+            __DIR__.'/Commands/stubs/RestifyServiceProvider.stub' => app_path('Providers/RestifyServiceProvider.php'),
         ], 'restify-provider');
 
         $this->publishes([
-            __DIR__ . '/../config/config.php' => config_path('restify.php'),
+            __DIR__.'/../config/config.php' => config_path('restify.php'),
         ], 'restify-config');
 
-        if ( ! $this->app->configurationIsCached()) {
-            $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'laravel-restify');
+        if (! $this->app->configurationIsCached()) {
+            $this->mergeConfigFrom(__DIR__.'/../config/config.php', 'laravel-restify');
         }
     }
 }

src/Traits/AuthorizableModels.php

@@ -41,7 +41,7 @@ public static function authorizable()
      */
     public function authorizeToViewAny(Request $request)
     {
-        if ( ! static::authorizable()) {
+        if (! static::authorizable()) {
             return;
         }
 
@@ -58,7 +58,7 @@ public function authorizeToViewAny(Request $request)
      */
     public static function authorizedToViewAny(Request $request)
     {
-        if ( ! static::authorizable()) {
+        if (! static::authorizable()) {
             return true;
         }
 
@@ -198,11 +198,11 @@ public function authorizedToForceDelete(Request $request)
      */
     public function authorizedToAdd(Request $request, $model)
     {
-        if ( ! static::authorizable()) {
+        if (! static::authorizable()) {
             return true;
         }
 
-        $method = 'add' . class_basename($model);
+        $method = 'add'.class_basename($model);
 
         return method_exists(Gate::getPolicyFor($this->model()), $method)
             ? Gate::check($method, $this->model())
@@ -218,11 +218,11 @@ public function authorizedToAdd(Request $request, $model)
      */
     public function authorizedToAttachAny(Request $request, $model)
     {
-        if ( ! static::authorizable()) {
+        if (! static::authorizable()) {
             return true;
         }
 
-        $method = 'attachAny' . Str::singular(class_basename($model));
+        $method = 'attachAny'.Str::singular(class_basename($model));
 
         return method_exists(Gate::getPolicyFor($this->model()), $method)
             ? Gate::check($method, [$this->model()])
@@ -238,11 +238,11 @@ public function authorizedToAttachAny(Request $request, $model)
      */
     public function authorizedToAttach(Request $request, $model)
     {
-        if ( ! static::authorizable()) {
+        if (! static::authorizable()) {
             return true;
         }
 
-        $method = 'attach' . Str::singular(class_basename($model));
+        $method = 'attach'.Str::singular(class_basename($model));
 
         return method_exists(Gate::getPolicyFor($this->model()), $method)
             ? Gate::check($method, [$this->model(), $model])
@@ -259,11 +259,11 @@ public function authorizedToAttach(Request $request, $model)
      */
     public function authorizedToDetach(Request $request, $model, $relationship)
     {
-        if ( ! static::authorizable()) {
+        if (! static::authorizable()) {
             return true;
         }
 
-        $method = 'detach' . Str::singular(class_basename($model));
+        $method = 'detach'.Str::singular(class_basename($model));
 
         return method_exists(Gate::getPolicyFor($this->model()), $method)
             ? Gate::check($method, [$this->model(), $model])

src/Traits/InteractWithSearch.php

@@ -5,14 +5,13 @@
 use Illuminate\Http\Request;
 
 /**
- * @package Binaryk\LaravelRestify\Traits;
  * @author Eduard Lupacescu <[email protected]>
  */
 trait InteractWithSearch
 {
     use AuthorizableModels;
 
-    static $defaultPerPage = 15;
+    public static $defaultPerPage = 15;
 
     /**
      * @return array
@@ -45,6 +44,7 @@ public static function getMatchByFields()
     {
         return static::$match ?? [];
     }
+
     /**
      * @return array
      */

tests/Fixtures/User.php

@@ -20,7 +20,6 @@ class User extends Authenticatable implements Passportable, MustVerifyEmail, Res
     use Notifiable,
         InteractWithSearch;
 
-
     public static $search = ['id'];
     public static $match = [
         'id' => 'int',

tests/InteractWithModels.php

@@ -5,7 +5,6 @@
 use Binaryk\LaravelRestify\Tests\Fixtures\User;
 
 /**
- * @package Binaryk\LaravelRestify\Tests;
  * @author Eduard Lupacescu <[email protected]>
  */
 trait InteractWithModels
@@ -14,12 +13,11 @@ public function mockUsers($count = 1)
     {
         $users = collect([]);
         $i = 0;
-        while($i < $count) {
+        while ($i < $count) {
             $users->push(factory(User::class)->create());
             $i++;
         }
 
         return $users;
     }
-
 }