mshamaseen / laravel-repository-pattern

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/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/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'] . "%");
                 }
-                else
-                    $latest->orWhere($columns, 'like', "%" . $criteria['search'] . "%");
             }
         }
         unset($criteria['search']);

src/Forms/Forms.php

Spacing +1 added lines, -1 removed lines

@@ -78,6 +78,6 @@
 
     function getFormStub($type)
     {
-        return file_get_contents(\Config::get('repository.stubs_path') . "/fields-".$type.".stub");
+        return file_get_contents(\Config::get('repository.stubs_path') . "/fields-" . $type . ".stub");
     }
 }
\ No newline at end of file

src/Forms/Input.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 
     function template()
     {
-        $required=$this->column->getNotnull()?'required':'';
+        $required = $this->column->getNotnull() ? 'required' : '';
 
         $template = str_replace(
             [
@@ -25,7 +25,7 @@ 
                 $this->column->getName(),
                 $this->getType(),
                 $required,
-                ucfirst(str_replace('_',' ',$this->column->getName()))
+                ucfirst(str_replace('_', ' ', $this->column->getName()))
             ],
             $this->getFormStub('input')
         );

src/Forms/TextArea.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
     function template()
     {
-        $required=$this->column->getNotnull()?'required':'';
+        $required = $this->column->getNotnull() ? 'required' : '';
 
         $template = str_replace(
             [
@@ -26,7 +26,7 @@ 
                 $this->column->getName(),
                 $this->getType(),
                 $required,
-                ucfirst(str_replace('_',' ',$this->column->getName()))
+                ucfirst(str_replace('_', ' ', $this->column->getName()))
             ],
             $this->getFormStub('textArea')
         );

src/Commands/Generator.php

Spacing +30 added lines, -30 removed lines

@@ -60,16 +60,16 @@ 
      */
     public function handle()
     {
-        $file = preg_split( " (/|\\\\) ", (string)$this->argument('name')) ?? [];
+        $file = preg_split(" (/|\\\\) ", (string) $this->argument('name')) ?? [];
 
-        if(!$file) return "Something wrong with the inputs !";
+        if (!$file) return "Something wrong with the inputs !";
 
         $this->repoName = $file[count($file) - 1];
 
         unset($file[count($file) - 1]);
         $path = implode("\\", $file);
 
-        if($this->option('only-view'))
+        if ($this->option('only-view'))
         {
             $this->makeViewsAndLanguage($path);
             return null;
@@ -80,9 +80,9 @@ 
 
     function makeRepositoryPatternFiles($path)
     {
-        $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');
@@ -90,7 +90,7 @@ 
         $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');");
     }
 
     /**
@@ -103,14 +103,14 @@ 
 
         $createHtml = '';
         $editHtml = '';
-        if($entity instanceof Model)
+        if ($entity instanceof Model)
         {
             $createHtml = $this->FormGenerator->generateForm($entity);
-            $editHtml = $this->FormGenerator->generateForm($entity,'put');
+            $editHtml = $this->FormGenerator->generateForm($entity, 'put');
         }
         else
         {
-            if(!$this->confirm('There is no entity for '.$this->repoName.", do you want to continue (this will disable form generator) ?"))
+            if (!$this->confirm('There is no entity for ' . $this->repoName . ", do you want to continue (this will disable form generator) ?"))
             {
                 echo "Dispatch ..";
                 die;
@@ -119,12 +119,12 @@ 
 
         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',$createHtml);
-        $this->generate(lcfirst($this->repoName),\Config::get('repository.resources_path')."/views" , 'edit',$editHtml);
-        $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', $createHtml);
+        $this->generate(lcfirst($this->repoName), \Config::get('repository.resources_path') . "/views", 'edit', $editHtml);
+        $this->generate(lcfirst($this->repoName), \Config::get('repository.resources_path') . "/views", 'index');
+        $this->generate(lcfirst($this->repoName), \Config::get('repository.resources_path') . "/views", 'show');
     }
 
     /**
@@ -134,8 +134,8 @@ 
      */
     function getEntity($path)
     {
-        $myClass = 'App\Entities\\'.$path."\\".$this->repoName;
-        if(!class_exists($myClass))
+        $myClass = 'App\Entities\\' . $path . "\\" . $this->repoName;
+        if (!class_exists($myClass))
             return false;
 
         $refl = new ReflectionClass($myClass);
@@ -161,13 +161,13 @@ 
      * @param string $form
      * @return bool
      */
-    protected function generate($path, $folder, $type,$form ='')
+    protected function generate($path, $folder, $type, $form = '')
     {
         $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;
         }
 
@@ -186,21 +186,21 @@ 
                 str_plural(lcfirst($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')),
                 $form
             ],
             $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;
@@ -209,7 +209,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;
@@ -217,14 +217,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;
     }

Braces +7 added lines, -5 removed lines

@@ -62,7 +62,9 @@ 
     {
         $file = preg_split( " (/|\\\\) ", (string)$this->argument('name')) ?? [];
 
-        if(!$file) return "Something wrong with the inputs !";
+        if(!$file) {
+            return "Something wrong with the inputs !";
+        }
 
         $this->repoName = $file[count($file) - 1];
 
@@ -107,8 +109,7 @@ 
         {
             $createHtml = $this->FormGenerator->generateForm($entity);
             $editHtml = $this->FormGenerator->generateForm($entity,'put');
-        }
-        else
+        } else
         {
             if(!$this->confirm('There is no entity for '.$this->repoName.", do you want to continue (this will disable form generator) ?"))
             {
@@ -135,8 +136,9 @@ 
     function getEntity($path)
     {
         $myClass = 'App\Entities\\'.$path."\\".$this->repoName;
-        if(!class_exists($myClass))
-            return false;
+        if(!class_exists($myClass)) {
+                    return false;
+        }
 
         $refl = new ReflectionClass($myClass);
 

src/Forms/FormGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -71,10 +71,10 @@ 
      * @param string $method
      * @return string
      */
-    function generateForm($entity,$method = 'post')
+    function generateForm($entity, $method = 'post')
     {
         $html = '<form method="post" action="#">
-           <input type="hidden" name="__method" value="'.$method.'">';
+           <input type="hidden" name="__method" value="'.$method . '">';
         $html .= $this->getInputs($entity);
         $html .= '</form>';
         return $html;
@@ -86,7 +86,7 @@ 
      */
     function getFillables($entity)
     {
-        if(!empty($entity->getFillable()))
+        if (!empty($entity->getFillable()))
             return $entity->getFillable();
 
         $columns = \Schema::getColumnListing($entity->getTable());
@@ -107,7 +107,7 @@ 
      */
     function getInputs($entity)
     {
-        if($this->inputs)
+        if ($this->inputs)
             return $this->inputs;
 
         return $this->generateInputs($entity);
@@ -122,7 +122,7 @@ 
         $html = '';
         foreach ($this->getFillables($entity) as $fillable)
         {
-            $column = DB::connection()->getDoctrineColumn($entity->getTable(),$fillable);
+            $column = DB::connection()->getDoctrineColumn($entity->getTable(), $fillable);
 
             $html .= $this->generateFormInput($column);
         }

Braces +6 added lines, -4 removed lines

@@ -86,8 +86,9 @@ 
      */
     function getFillables($entity)
     {
-        if(!empty($entity->getFillable()))
-            return $entity->getFillable();
+        if(!empty($entity->getFillable())) {
+                    return $entity->getFillable();
+        }
 
         $columns = \Schema::getColumnListing($entity->getTable());
 
@@ -107,8 +108,9 @@ 
      */
     function getInputs($entity)
     {
-        if($this->inputs)
-            return $this->inputs;
+        if($this->inputs) {
+                    return $this->inputs;
+        }
 
         return $this->generateInputs($entity);
     }

src/GeneratorServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -26,17 +26,17 @@
         }
 
         $this->publishes([
-            __DIR__.'/config' => realpath('config'),
-            __DIR__.'/lang' => \Config::get('repository.lang_path')."/en",
-        ],'repository-generator');
+            __DIR__ . '/config' => realpath('config'),
+            __DIR__ . '/lang' => \Config::get('repository.lang_path') . "/en",
+        ], 'repository-generator');
 
         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');
     }
 
     /**