mshamaseen / laravel-repository-pattern

src/Commands/Generator.php

Indentation -1 removed lines

@@ -51,7 +51,6 @@
     /**
      * Execute the console command.
      *
-
      */
     public function handle()
     {

Spacing +23 added lines, -23 removed lines

@@ -55,9 +55,9 @@ 
      */
     public function handle()
     {
-        $file = preg_split( " (/|\\\\) ", (string)$this->argument('name')) ?? [];
+        $file = preg_split(" (/|\\\\) ", (string) $this->argument('name')) ?? [];
         $this->repoName = $file[count($file) - 1];
-        if($this->option('only-view'))
+        if ($this->option('only-view'))
         {
             $this->makeViewsAndLanguage();
             return null;
@@ -71,9 +71,9 @@ 
         unset($file[count($file) - 1]);
         $path = implode("\\", $file);
 
-        $model= str_plural(\Config::get('repository.model'));
-        $interface= str_plural(\Config::get('repository.interface'));
-        $repository= str_plural(\Config::get('repository.repository'));
+        $model = str_plural(\Config::get('repository.model'));
+        $interface = str_plural(\Config::get('repository.interface'));
+        $repository = str_plural(\Config::get('repository.repository'));
 
         $this->generate($path, \Config::get('repository.controllers_folder'), 'Controller');
         $this->generate($path, $model, 'Entity');
@@ -81,19 +81,19 @@ 
         $this->generate($path, $interface, 'Interface');
         $this->generate($path, $repository, 'Repository');
 
-        File::append(\Config::get('repository.route_path') . '/web.php', "\n" . 'Route::resource(\'' . strtolower(str_plural($this->repoName)) . "', '".$path."\\".$this->repoName."Controller');");
+        File::append(\Config::get('repository.route_path') . '/web.php', "\n" . 'Route::resource(\'' . strtolower(str_plural($this->repoName)) . "', '" . $path . "\\" . $this->repoName . "Controller');");
     }
 
     function makeViewsAndLanguage()
     {
         foreach (\Config::get('repository.languages') as $lang)
         {
-            $this->generate(lcfirst($this->repoName),\Config::get('repository.lang_path')."/{$lang}" , 'lang');
+            $this->generate(lcfirst($this->repoName), \Config::get('repository.lang_path') . "/{$lang}", 'lang');
         }
-        $this->generate(lcfirst($this->repoName),\Config::get('repository.resources_path')."/views" , 'create');
-        $this->generate(lcfirst($this->repoName),\Config::get('repository.resources_path')."/views" , 'edit');
-        $this->generate(lcfirst($this->repoName),\Config::get('repository.resources_path')."/views" , 'index');
-        $this->generate(lcfirst($this->repoName),\Config::get('repository.resources_path')."/views" , 'show');
+        $this->generate(lcfirst($this->repoName), \Config::get('repository.resources_path') . "/views", 'create');
+        $this->generate(lcfirst($this->repoName), \Config::get('repository.resources_path') . "/views", 'edit');
+        $this->generate(lcfirst($this->repoName), \Config::get('repository.resources_path') . "/views", 'index');
+        $this->generate(lcfirst($this->repoName), \Config::get('repository.resources_path') . "/views", 'show');
     }
 
     /**
@@ -117,9 +117,9 @@ 
     {
         $content = $this->getStub($type);
 
-        if($content === false)
+        if ($content === false)
         {
-            echo 'file '.$type.".stub is not exist !";
+            echo 'file ' . $type . ".stub is not exist !";
             return false;
         }
 
@@ -135,20 +135,20 @@ 
                 $this->repoName,
                 str_plural($folder),
                 $path,
-                str_plural(\Config::get('repository.model','Entity')),
-                str_plural(\Config::get('repository.interface','Interface')),
+                str_plural(\Config::get('repository.model', 'Entity')),
+                str_plural(\Config::get('repository.interface', 'Interface')),
             ],
             $this->getStub($type)
         );
 
-        $folder = str_replace('\\','/',$folder);
-        $path = str_replace('\\','/',$path);
+        $folder = str_replace('\\', '/', $folder);
+        $path = str_replace('\\', '/', $path);
         
         switch ($type)
         {
             case 'Entity':
                 $filePath = $this->getFolderOrCreate(\Config::get('repository.app_path') . "/{$folder}/{$path}");
-                $filePath = rtrim($filePath,'/');
+                $filePath = rtrim($filePath, '/');
                 $filePath .= "/";
                 file_put_contents($filePath . "{$this->repoName}.php", $template);
                 break;
@@ -157,7 +157,7 @@ 
             case 'Repository':
             case 'Interface':
                 $filePath = $this->getFolderOrCreate(\Config::get('repository.app_path') . "/{$folder}/{$path}");
-                $filePath = rtrim($filePath,'/');
+                $filePath = rtrim($filePath, '/');
                 $filePath .= "/";
                 file_put_contents($filePath . "{$this->repoName}{$type}.php", $template);
                 break;
@@ -165,14 +165,14 @@ 
             case 'edit':
             case 'index':
             case 'show':
-                $filePath = $this->getFolderOrCreate($folder."/".str_plural($path))."/";
+                $filePath = $this->getFolderOrCreate($folder . "/" . str_plural($path)) . "/";
                 $repoName = lcfirst($type);
-                file_put_contents($filePath . $repoName.".blade.php", $template);
+                file_put_contents($filePath . $repoName . ".blade.php", $template);
             break;
             default:
-                $filePath = $this->getFolderOrCreate($folder)."/";
+                $filePath = $this->getFolderOrCreate($folder) . "/";
                 $repoName = lcfirst($this->repoName);
-                file_put_contents($filePath . $repoName.".php", $template);
+                file_put_contents($filePath . $repoName . ".php", $template);
         }
         return true;
     }

src/Utility/Request.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
     protected function failedValidation(Validator $validator)
     {
 
-        if (strpos($this->path(),'api') !== false) {
+        if (strpos($this->path(), 'api') !== false) {
             $errors = (new ValidationException($validator))->errors();
             throw new HttpResponseException(response()->json(['success' => false, 'errors' => $errors,
             ], JsonResponse::HTTP_UNPROCESSABLE_ENTITY));
@@ -37,7 +37,7 @@ 
         parent::failedValidation($validator);
     }
 
-    public function rules(){
-        \App::setLocale($this->header('Language','en'));
+    public function rules() {
+        \App::setLocale($this->header('Language', 'en'));
     }
 }

src/Utility/Controller.php

Braces +3 added lines, -2 removed lines

@@ -344,9 +344,10 @@
         }
 
         if ($entity) {
-            if($appendEntity)
-                return response()->json(  ['status' => true, 'message' => __('messages.success'), 'data' => $entity],
+            if($appendEntity) {
+                            return response()->json(  ['status' => true, 'message' => __('messages.success'), 'data' => $entity],
                     JsonResponse::HTTP_OK);
+            }
             return response()->json(null, JsonResponse::HTTP_NO_CONTENT);
         }
 

Spacing +19 added lines, -19 removed lines

@@ -58,7 +58,7 @@ 
         $this->breadcrumbs = new Collection();
 
         $language = $request->header('Language', 'en');
-        if (! in_array($language, \Config::get('app.locales', []))) {
+        if (!in_array($language, \Config::get('app.locales', []))) {
             $language = 'en';
         }
         $limit = $request->get('limit', 10);
@@ -81,10 +81,10 @@ 
         $this->interface = $interface;
         $this->isAPI = $request->expectsJson();
 
-        if (! $this->isAPI) {
+        if (!$this->isAPI) {
             $this->breadcrumbs = new Collection();
             $this->search = new Collection();
-            \View::share('pageTitle', $this->pageTitle.' | '.\Config::get('app.name'));
+            \View::share('pageTitle', $this->pageTitle . ' | ' . \Config::get('app.name'));
             \View::share('breadcrumbs', $this->breadcrumbs);
             \View::share('menu', $this->menu);
             \View::share('search', $this->search);
@@ -102,8 +102,8 @@ 
     public function index()
     {
         $data = $this->interface->simplePaginate($this->limit, $this->request->all());
-        if (! $this->isAPI) {
-            \View::share('pageTitle', 'List '.$this->pageTitle.' | '.\Config::get('app.name'));
+        if (!$this->isAPI) {
+            \View::share('pageTitle', 'List ' . $this->pageTitle . ' | ' . \Config::get('app.name'));
             $this->breadcrumbs->put('index', [
                 'link' => $this->routeIndex,
                 'text' => $this->pageTitle,
@@ -131,8 +131,8 @@ 
      */
     public function create()
     {
-        if (! $this->isAPI) {
-            \View::share('pageTitle', 'Create '.$this->pageTitle.' | '.\Config::get('app.name'));
+        if (!$this->isAPI) {
+            \View::share('pageTitle', 'Create ' . $this->pageTitle . ' | ' . \Config::get('app.name'));
             $this->breadcrumbs->put('create', [
                 'link' => $this->createRoute,
                 'text' => trans('common/others.create'),
@@ -152,7 +152,7 @@ 
     public function store()
     {
         $entity = $this->interface->create($this->request->except(['_token', '_method']));
-        return $this->makeResponse($entity,true);
+        return $this->makeResponse($entity, true);
     }
 
     /**
@@ -165,11 +165,11 @@ 
     public function show($entityId)
     {
         $entity = $this->interface->find($entityId);
-        if (! $this->isAPI) {
-            if (! $entity) {
+        if (!$this->isAPI) {
+            if (!$entity) {
                 return \Redirect::to($this->routeIndex)->with('warning', __('messages.not_found'));
             }
-            \View::share('pageTitle', 'View '.$this->pageTitle.' | '.\Config::get('app.name'));
+            \View::share('pageTitle', 'View ' . $this->pageTitle . ' | ' . \Config::get('app.name'));
             $this->breadcrumbs->put('view', [
                 'link' => '',
                 'text' => $entity->name ?? $entity->title ?? __('messages.view'),
@@ -178,7 +178,7 @@ 
             return view($this->viewShow, $this->params)
                 ->with('entity', $entity);
         }
-        if (! $entity) {
+        if (!$entity) {
             return response()->json(null, JsonResponse::HTTP_NOT_FOUND);
         }
 
@@ -198,8 +198,8 @@ 
     public function edit($entityId)
     {
         $entity = $this->interface->find($entityId);
-        if (! $this->isAPI) {
-            if (! $entity) {
+        if (!$this->isAPI) {
+            if (!$entity) {
                 return \Redirect::to($this->routeIndex)->with('warning', __('messages.not_found'));
             }
             $this->breadcrumbs->put('edit', [
@@ -225,7 +225,7 @@ 
     {
         $entity = $this->interface->update($entityId, $this->request->except(['_token', '_method']));
 
-        return $this->makeResponse($entity,true);
+        return $this->makeResponse($entity, true);
     }
 
     /**
@@ -279,9 +279,9 @@ 
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    function makeResponse($entity,$appendEntity = false)
+    function makeResponse($entity, $appendEntity = false)
     {
-        if (! $this->isAPI) {
+        if (!$this->isAPI) {
             if ($entity) {
                 return \Redirect::to($this->routeIndex)->with('message', __('messages.success'));
             }
@@ -294,8 +294,8 @@ 
         }
 
         if ($entity) {
-            if($appendEntity)
-                return response()->json(  ['status' => true, 'message' => __('messages.success'), 'data' => $entity],
+            if ($appendEntity)
+                return response()->json(['status' => true, 'message' => __('messages.success'), 'data' => $entity],
                     JsonResponse::HTTP_OK);
             return response()->json(null, JsonResponse::HTTP_NO_CONTENT);
         }

src/GeneratorServiceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -26,16 +26,16 @@
         }
 
         $this->publishes([
-            __DIR__.'/config' => realpath('config'),
-        ],'repository-config');
+            __DIR__ . '/config' => realpath('config'),
+        ], 'repository-config');
 
         if ($this->app['config']->get('repository') === null) {
-            $this->app['config']->set('repository', require __DIR__.'/config/repository.php');
+            $this->app['config']->set('repository', require __DIR__ . '/config/repository.php');
         }
-        $this->mergeConfigFrom(__DIR__.'/config/repository.php', 'repository-config');
+        $this->mergeConfigFrom(__DIR__ . '/config/repository.php', 'repository-config');
         $this->publishes([
-            realpath(__DIR__ . '/../stubs') => \Config::get('repository.resources_path',realpath(__DIR__.'/../../../../resources/')),
-        ],'repository-stub');
+            realpath(__DIR__ . '/../stubs') => \Config::get('repository.resources_path', realpath(__DIR__ . '/../../../../resources/')),
+        ], 'repository-stub');
     }
 
     /**

src/RepositoryServiceProvider.php

Spacing +9 added lines, -9 removed lines

@@ -35,14 +35,14 @@ 
         parent::__construct($app);
 
         if ($this->app['config']->get('repository') === null) {
-            $this->app['config']->set('repository', require __DIR__.'/config/repository.php');
+            $this->app['config']->set('repository', require __DIR__ . '/config/repository.php');
         }
-        $interfaces= str_plural(Config::get('repository.interface'));
-        $repositories= str_plural(Config::get('repository.repository'));
-        $interface= Config::get('repository.interface');
-        $repository= Config::get('repository.repository');
+        $interfaces = str_plural(Config::get('repository.interface'));
+        $repositories = str_plural(Config::get('repository.repository'));
+        $interface = Config::get('repository.interface');
+        $repository = Config::get('repository.repository');
 
-        $contractsFolder = Config::get('repository.app_path').'/'.$interfaces;
+        $contractsFolder = Config::get('repository.app_path') . '/' . $interfaces;
 
         if ($contractsFolder) {
             $directory = new \RecursiveDirectoryIterator($contractsFolder);
@@ -50,13 +50,13 @@ 
             $regex = new \RegexIterator($iterator, '/^.+\.php$/i', \RecursiveRegexIterator::GET_MATCH);
             foreach ($regex as $name => $value) {
                 
-                $contract = strstr($name,'app/') ?: strstr($name,'app\\');
-                $contract = rtrim($contract,'.php');
+                $contract = strstr($name, 'app/') ?: strstr($name, 'app\\');
+                $contract = rtrim($contract, '.php');
                 
                 $contractName = str_replace('/', '\\', ucfirst($contract));
 
                 $repositoryClass = str_replace($interfaces, $repositories, $contractName);
-                $repositoryClass = str_replace([$interface,'Interface'], $repository, $repositoryClass);
+                $repositoryClass = str_replace([$interface, 'Interface'], $repository, $repositoryClass);
 
                 $this->providers[] = $contractName;
                 $this->bindings[$contractName] = $repositoryClass;

src/config/repository.php

Spacing +4 added lines, -4 removed lines

@@ -6,11 +6,11 @@
  * Time: 09:58 am
  */
 return [
-    'app_path' => realpath(__DIR__.'/../app/'),
+    'app_path' => realpath(__DIR__ . '/../app/'),
     'route_path' => realpath('routes/'),
-    'resources_path' => realpath(__DIR__.'/../vendor/shamaseen/repository-generator/stubs'),
-    'stubs_path' => realpath('resources')."/stubs",
-    'lang_path' => realpath('resources')."/lang",
+    'resources_path' => realpath(__DIR__ . '/../vendor/shamaseen/repository-generator/stubs'),
+    'stubs_path' => realpath('resources') . "/stubs",
+    'lang_path' => realpath('resources') . "/lang",
 
     //relative to app path
     'interface' => 'Interface',

src/Utility/AbstractRepository.php

Spacing +8 added lines, -8 removed lines

@@ -77,7 +77,7 @@ 
      */
     public function filter($criteria = [])
     {
-        $criteria= $this->order($criteria);
+        $criteria = $this->order($criteria);
 
         /** @var Entity $latest */
         $latest = $this->model->with($this->with);
@@ -87,12 +87,12 @@ 
 
         if (isset($criteria['search'])) {
             foreach ($this->model->searchable as $method => $columns) {
-                if(method_exists($this->model,$method))
+                if (method_exists($this->model, $method))
                 {
-                    $latest->orWhereHas($method,function ($query) use ($criteria,$columns)
+                    $latest->orWhereHas($method, function($query) use ($criteria, $columns)
                     {
                         /** @var $query Builder */
-                        $query->where(function ($query2) use($criteria,$columns){
+                        $query->where(function($query2) use($criteria, $columns){
                             /** @var $query2 Builder */
                             foreach ((array) $columns as $column)
                             {
@@ -124,7 +124,7 @@ 
      *
      * @return array
      */
-    private function order($criteria=[]){
+    private function order($criteria = []) {
 
         if (isset($criteria['order'])) {
             $this->order = $criteria['order'];
@@ -171,7 +171,7 @@ 
     {
         $item = $this->model->findOrFail($entityId);
 
-        if($item->update($attributes))
+        if ($item->update($attributes))
         {
             return $item;
         }
@@ -234,7 +234,7 @@ 
      */
     public function find($entityId = 0, $columns = ['*'])
     {
-        return $this->model->with($this->with)->find($entityId,$columns);
+        return $this->model->with($this->with)->find($entityId, $columns);
     }
 
     /**
@@ -245,7 +245,7 @@ 
      */
     public function findOrFail($entityId = 0, $columns = ['*'])
     {
-        return $this->model->with($this->with)->findOrFail($entityId,$columns);
+        return $this->model->with($this->with)->findOrFail($entityId, $columns);
     }
     /**
      * @param array $filter

Braces +2 added lines, -2 removed lines

@@ -100,9 +100,9 @@
                             }
                         });
                     });
+                } else {
+                                    $latest->orWhere($columns, 'like', "%" . $criteria['search'] . "%", 'or');
                 }
-                else
-                    $latest->orWhere($columns, 'like', "%" . $criteria['search'] . "%", 'or');
             }
         }
         unset($criteria['search']);