okaybueno / laravel-repositories

RepositoryServiceProvider.php

Spacing +24 added lines, -24 removed lines

@@ -31,7 +31,7 @@ 
     {
         // merge default config
         $this->mergeConfigFrom(
-            __DIR__.$this->configPath , 'repositories'
+            __DIR__.$this->configPath, 'repositories'
         );
         
         // Bind the repositories.
@@ -49,43 +49,43 @@ 
     private function autoBindRepositories()
     {
         // Load config parameters needed.
-        $repositoriesBasePath = config( 'repositories.repositories_path' );
-        $baseNamespace = rtrim( config( 'repositories.repository_interfaces_namespace' ), '\\' ) . '\\';
-        $skipRepositories = config( 'repositories.skip' );
-        $implementationBindings = config( 'repositories.bindings' );
-        $implementation = $this->findDefaultImplementation( $implementationBindings );
+        $repositoriesBasePath = config('repositories.repositories_path');
+        $baseNamespace = rtrim(config('repositories.repository_interfaces_namespace'), '\\').'\\';
+        $skipRepositories = config('repositories.skip');
+        $implementationBindings = config('repositories.bindings');
+        $implementation = $this->findDefaultImplementation($implementationBindings);
         
-        if ( \File::exists( $repositoriesBasePath ) )
+        if (\File::exists($repositoriesBasePath))
         {
-            $allRepos = \File::files( $repositoriesBasePath );
+            $allRepos = \File::files($repositoriesBasePath);
             
-            foreach( $allRepos as $repo )
+            foreach ($allRepos as $repo)
             {
-                $interfaceName = pathinfo( $repo, PATHINFO_FILENAME );
-                if ( in_array( $interfaceName, $skipRepositories ) ) continue;
+                $interfaceName = pathinfo($repo, PATHINFO_FILENAME);
+                if (in_array($interfaceName, $skipRepositories)) continue;
                 else
                 {
-                    $commonName = str_replace( 'Interface', '', $interfaceName );
+                    $commonName = str_replace('Interface', '', $interfaceName);
                     $interfaceFullClassName = $baseNamespace.$interfaceName;
                     
-                    foreach( $implementationBindings as $engine => $bindRepositories )
+                    foreach ($implementationBindings as $engine => $bindRepositories)
                     {
-                        if ( $bindRepositories === 'default' ) continue;
-                        else if ( in_array( $interfaceName, $bindRepositories ) )
+                        if ($bindRepositories === 'default') continue;
+                        else if (in_array($interfaceName, $bindRepositories))
                         {
                             $implementation = $engine;
                             break;
                         }
                     }
                     
-                    $fullClassName = $baseNamespace.ucfirst( camel_case( $implementation ) ).'\\'.$commonName;
+                    $fullClassName = $baseNamespace.ucfirst(camel_case($implementation)).'\\'.$commonName;
                     
-                    if ( class_exists( $fullClassName ) )
+                    if (class_exists($fullClassName))
                     {
                         // Bind the class.
-                        $this->app->bind( $interfaceFullClassName, function ( $app ) use ( $fullClassName )
+                        $this->app->bind($interfaceFullClassName, function($app) use ($fullClassName)
                         {
-                            return $app->make( $fullClassName );
+                            return $app->make($fullClassName);
                         });
                     }
                 }
@@ -98,14 +98,14 @@ 
      * @param $implementations
      * @return array|mixed|string
      */
-    private function findDefaultImplementation( $implementations )
+    private function findDefaultImplementation($implementations)
     {
-        $filtered = array_filter( $implementations, function( $k ) {
+        $filtered = array_filter($implementations, function($k) {
             return $k === 'default';
         });
         
         $default = array_keys($filtered);
-        $default = is_array( $default ) ? $default[0] : $default;
+        $default = is_array($default) ? $default[0] : $default;
         
         return $default ? $default : 'eloquent';
     }
@@ -115,7 +115,7 @@ 
      */
     private function registerRepositoryGenerator()
     {
-        $this->app->singleton('command.repository', function ($app)
+        $this->app->singleton('command.repository', function($app)
         {
             return $app['OkayBueno\Repositories\Commands\MakeRepositoryCommand'];
         });
@@ -129,7 +129,7 @@ 
      */
     private function registerCriteriaGenerator()
     {
-        $this->app->singleton('command.criteria', function ($app)
+        $this->app->singleton('command.criteria', function($app)
         {
             return $app['OkayBueno\Repositories\Commands\MakeCriteriaCommand'];
         });

Braces +6 added lines, -4 removed lines

@@ -62,16 +62,18 @@
             foreach( $allRepos as $repo )
             {
                 $interfaceName = pathinfo( $repo, PATHINFO_FILENAME );
-                if ( in_array( $interfaceName, $skipRepositories ) ) continue;
-                else
+                if ( in_array( $interfaceName, $skipRepositories ) ) {
+                    continue;
+                } else
                 {
                     $commonName = str_replace( 'Interface', '', $interfaceName );
                     $interfaceFullClassName = $baseNamespace.$interfaceName;
                     
                     foreach( $implementationBindings as $engine => $bindRepositories )
                     {
-                        if ( $bindRepositories === 'default' ) continue;
-                        else if ( in_array( $interfaceName, $bindRepositories ) )
+                        if ( $bindRepositories === 'default' ) {
+                            continue;
+                        } else if ( in_array( $interfaceName, $bindRepositories ) )
                         {
                             $implementation = $engine;
                             break;

src/EloquentRepository.php

Spacing +36 added lines, -36 removed lines

@@ -22,12 +22,12 @@ 
     /**
      * @param Model $model
      */
-    public function __construct( Model $model )
+    public function __construct(Model $model)
     {
         $this->model = $model;
         
         // A clean copy of the model is needed when the scope needs to be reset.
-        $reflex = new \ReflectionClass( $model );
+        $reflex = new \ReflectionClass($model);
         $this->modelClassName = $reflex->getName();
         
         $this->skipCriteria = FALSE;
@@ -45,9 +45,9 @@ 
         $this->eagerLoadRelations();
         $this->applyCriteria();
         
-        if ( !is_null( $value ) ) $this->model = $this->model->where( $field, $value );
+        if (!is_null($value)) $this->model = $this->model->where($field, $value);
         
-        $result = $this->model->first( $columns );
+        $result = $this->model->first($columns);
         
         $this->resetScope();
         
@@ -65,9 +65,9 @@ 
         $this->eagerLoadRelations();
         $this->applyCriteria();
         
-        if ( !is_null( $value ) && !is_null( $field ) ) $this->model = $this->model->where( $field, $value );
+        if (!is_null($value) && !is_null($field)) $this->model = $this->model->where($field, $value);
         
-        $result = $this->model->get( $columns );
+        $result = $this->model->get($columns);
         
         $this->resetScope();
         
@@ -84,7 +84,7 @@ 
     {
         $this->eagerLoadRelations();
         $this->applyCriteria();
-        $result = $this->model->whereIn( $field, $value )->get( $columns );
+        $result = $this->model->whereIn($field, $value)->get($columns);
         
         $this->resetScope();
         
@@ -95,10 +95,10 @@ 
      * @param array $columns
      * @return \Illuminate\Database\Eloquent\Collection|static[]
      */
-    public function findAll( array $columns = ['*'] )
+    public function findAll(array $columns = ['*'])
     {
         $this->eagerLoadRelations();
-        $result = $this->model->all( $columns );
+        $result = $this->model->all($columns);
         
         $this->resetScope();
         
@@ -109,9 +109,9 @@ 
      * @param array|string $relations
      * @return $this
      */
-    public function with( $relations )
+    public function with($relations)
     {
-        if ( is_string( $relations ) ) $relations = func_get_args();
+        if (is_string($relations)) $relations = func_get_args();
         
         $this->with = $relations;
         
@@ -123,7 +123,7 @@ 
      * @param CriteriaInterface $criteria
      * @return $this
      */
-    public function addCriteria( CriteriaInterface $criteria)
+    public function addCriteria(CriteriaInterface $criteria)
     {
         $this->criteria[] = $criteria;
         
@@ -135,7 +135,7 @@ 
      * @param bool $status
      * @return $this
      */
-    public function skipCriteria( $status = TRUE )
+    public function skipCriteria($status = TRUE)
     {
         $this->skipCriteria = $status;
         return $this;
@@ -151,7 +151,7 @@ 
     {
         $this->eagerLoadRelations();
         $this->applyCriteria();
-        $result = $this->model->paginate( $perPage, $columns );
+        $result = $this->model->paginate($perPage, $columns);
         
         $this->resetScope();
         
@@ -163,9 +163,9 @@ 
      * @param int $currentPage
      * @return $this
      */
-    public function setCurrentPage( $currentPage )
+    public function setCurrentPage($currentPage)
     {
-        \Illuminate\Pagination\Paginator::currentPageResolver(function() use ( $currentPage )
+        \Illuminate\Pagination\Paginator::currentPageResolver(function() use ($currentPage)
         {
             return $currentPage;
         });
@@ -180,9 +180,9 @@ 
      */
     public function create(array $data)
     {
-        $cleanFields = $this->cleanUnfillableFields( $data );
+        $cleanFields = $this->cleanUnfillableFields($data);
         
-        $createdObject = $this->model->create( $cleanFields );
+        $createdObject = $this->model->create($cleanFields);
         
         $this->resetScope();
         
@@ -197,14 +197,14 @@ 
      */
     public function updateBy(array $data, $value = NULL, $field = 'id')
     {
-        $cleanFields = $this->cleanUnfillableFields( $data );
+        $cleanFields = $this->cleanUnfillableFields($data);
         
-        if ( !is_null( $value ) )
+        if (!is_null($value))
         {
             // Single update.
-            $this->model->where( $field, $value)->update( $cleanFields );
+            $this->model->where($field, $value)->update($cleanFields);
             
-            foreach( $cleanFields as $F => $V ) $this->model->{$F} = $V;
+            foreach ($cleanFields as $F => $V) $this->model->{$F} = $V;
             
             $returnedVal = $this->model;
         } else
@@ -212,7 +212,7 @@ 
             // Mass update.
             $this->applyCriteria();
             
-            $returnedVal = $this->model->update( $cleanFields );
+            $returnedVal = $this->model->update($cleanFields);
         }
         
         $this->resetScope();
@@ -225,14 +225,14 @@ 
      * @param string $field
      * @return bool
      */
-    public function delete( $value = null, $field = 'id' )
+    public function delete($value = null, $field = 'id')
     {
         $this->applyCriteria();
         
-        if ( !is_null( $value ) ) $result = $this->model->where( $field, $value )->delete();
+        if (!is_null($value)) $result = $this->model->where($field, $value)->delete();
         else
         {
-            if ( !empty( $this->criteria ) ) $result = $this->model->delete();
+            if (!empty($this->criteria)) $result = $this->model->delete();
             else $result = FALSE;
         }
         
@@ -260,7 +260,7 @@ 
     public function resetScope()
     {
         $this->criteria = [];
-        $this->skipCriteria( FALSE );
+        $this->skipCriteria(FALSE);
         $this->model = new $this->modelClassName();
         return $this;
     }
@@ -274,10 +274,10 @@ 
     {
         $this->applyCriteria();
         
-        if ( !is_null( $value ) ) $result = $this->model->where( $field, $value )->forceDelete();
+        if (!is_null($value)) $result = $this->model->where($field, $value)->forceDelete();
         else
         {
-            if ( !empty( $this->criteria ) ) $result = $this->model->forceDelete();
+            if (!empty($this->criteria)) $result = $this->model->forceDelete();
             else $result = FALSE;
         }
         
@@ -296,7 +296,7 @@ 
      */
     protected function eagerLoadRelations()
     {
-        if ( is_array( $this->with ) ) $this->model->with( $this->with );
+        if (is_array($this->with)) $this->model->with($this->with);
     }
     
     
@@ -304,13 +304,13 @@ 
      * @param array $data
      * @return array
      */
-    private function cleanUnfillableFields( array $data )
+    private function cleanUnfillableFields(array $data)
     {
         $fillableFields = $this->model->getFillable();
         
-        foreach( $data as $key => $value )
+        foreach ($data as $key => $value)
         {
-            if ( !in_array( $key, $fillableFields ) ) unset( $data[ $key ] );
+            if (!in_array($key, $fillableFields)) unset($data[$key]);
         }
         
         return $data;
@@ -321,11 +321,11 @@ 
      */
     private function applyCriteria()
     {
-        if( !$this->skipCriteria )
+        if (!$this->skipCriteria)
         {
-            foreach( $this->criteria as $criteria )
+            foreach ($this->criteria as $criteria)
             {
-                if( $criteria instanceof CriteriaInterface ) $this->model = $criteria->apply( $this->model, $this );
+                if ($criteria instanceof CriteriaInterface) $this->model = $criteria->apply($this->model, $this);
             }
         }
         

Braces +37 added lines, -15 removed lines

@@ -45,7 +45,9 @@ 
         $this->eagerLoadRelations();
         $this->applyCriteria();
         
-        if ( !is_null( $value ) ) $this->model = $this->model->where( $field, $value );
+        if ( !is_null( $value ) ) {
+            $this->model = $this->model->where( $field, $value );
+        }
         
         $result = $this->model->first( $columns );
         
@@ -65,7 +67,9 @@ 
         $this->eagerLoadRelations();
         $this->applyCriteria();
         
-        if ( !is_null( $value ) && !is_null( $field ) ) $this->model = $this->model->where( $field, $value );
+        if ( !is_null( $value ) && !is_null( $field ) ) {
+            $this->model = $this->model->where( $field, $value );
+        }
         
         $result = $this->model->get( $columns );
         
@@ -111,7 +115,9 @@ 
      */
     public function with( $relations )
     {
-        if ( is_string( $relations ) ) $relations = func_get_args();
+        if ( is_string( $relations ) ) {
+            $relations = func_get_args();
+        }
         
         $this->with = $relations;
         
@@ -204,7 +210,9 @@ 
             // Single update.
             $this->model->where( $field, $value)->update( $cleanFields );
             
-            foreach( $cleanFields as $F => $V ) $this->model->{$F} = $V;
+            foreach( $cleanFields as $F => $V ) {
+                $this->model->{$F} = $V;
+            }
             
             $returnedVal = $this->model;
         } else
@@ -229,11 +237,15 @@ 
     {
         $this->applyCriteria();
         
-        if ( !is_null( $value ) ) $result = $this->model->where( $field, $value )->delete();
-        else
+        if ( !is_null( $value ) ) {
+            $result = $this->model->where( $field, $value )->delete();
+        } else
         {
-            if ( !empty( $this->criteria ) ) $result = $this->model->delete();
-            else $result = FALSE;
+            if ( !empty( $this->criteria ) ) {
+                $result = $this->model->delete();
+            } else {
+                $result = FALSE;
+            }
         }
         
         $this->resetScope();
@@ -274,11 +286,15 @@ 
     {
         $this->applyCriteria();
         
-        if ( !is_null( $value ) ) $result = $this->model->where( $field, $value )->forceDelete();
-        else
+        if ( !is_null( $value ) ) {
+            $result = $this->model->where( $field, $value )->forceDelete();
+        } else
         {
-            if ( !empty( $this->criteria ) ) $result = $this->model->forceDelete();
-            else $result = FALSE;
+            if ( !empty( $this->criteria ) ) {
+                $result = $this->model->forceDelete();
+            } else {
+                $result = FALSE;
+            }
         }
         
         $this->resetScope();
@@ -296,7 +312,9 @@ 
      */
     protected function eagerLoadRelations()
     {
-        if ( is_array( $this->with ) ) $this->model->with( $this->with );
+        if ( is_array( $this->with ) ) {
+            $this->model->with( $this->with );
+        }
     }
     
     
@@ -310,7 +328,9 @@ 
         
         foreach( $data as $key => $value )
         {
-            if ( !in_array( $key, $fillableFields ) ) unset( $data[ $key ] );
+            if ( !in_array( $key, $fillableFields ) ) {
+                unset( $data[ $key ] );
+            }
         }
         
         return $data;
@@ -325,7 +345,9 @@ 
         {
             foreach( $this->criteria as $criteria )
             {
-                if( $criteria instanceof CriteriaInterface ) $this->model = $criteria->apply( $this->model, $this );
+                if( $criteria instanceof CriteriaInterface ) {
+                    $this->model = $criteria->apply( $this->model, $this );
+                }
             }
         }
         

Commands/MakeRepositoryCommand.php

Spacing +36 added lines, -36 removed lines

@@ -28,15 +28,15 @@ 
     public function handle()
     {
         $model = $this->argument('model');
-        $implementation = strtolower( $this->option('implementation') );
+        $implementation = strtolower($this->option('implementation'));
         
-        if ( class_exists( $model ) )
+        if (class_exists($model))
         {
-            $supportedImplementations = array_keys( config( 'repositories.supported_implementations' ) );
+            $supportedImplementations = array_keys(config('repositories.supported_implementations'));
             
-            if ( $implementation )
+            if ($implementation)
             {
-                if ( !in_array( $implementation, $supportedImplementations ) )
+                if (!in_array($implementation, $supportedImplementations))
                 {
                     $this->error("The implementation '$implementation' is not supported at this moment. Want me to provide support? Open an issue :).");
                     
@@ -48,7 +48,7 @@ 
             }
             
             // Populate the properties with the right values.
-            $this->populateValuesForProperties( $model, $implementation );
+            $this->populateValuesForProperties($model, $implementation);
             
             $this->createInterface();
             $this->createRepository();
@@ -61,7 +61,7 @@ 
             
         }
         
-        $this->error( "The '$model' model does not exist. Please check that the namespace and the class name are valid.");
+        $this->error("The '$model' model does not exist. Please check that the namespace and the class name are valid.");
         
     }
     
@@ -69,9 +69,9 @@ 
      * @param $model
      * @param $implementation
      */
-    protected function populateValuesForProperties( $model, $implementation )
+    protected function populateValuesForProperties($model, $implementation)
     {
-        $modelClass = new \ReflectionClass( $model );
+        $modelClass = new \ReflectionClass($model);
         
         $this->implementation = $implementation;
         
@@ -81,8 +81,8 @@ 
         $this->repositoryClassName = $this->modelClassShortName.'Repository';
         $this->repositoryInterfaceName = $this->repositoryClassName.'Interface';
         
-        $this->repositoryInterfaceNamespace = rtrim( config( 'repositories.repository_interfaces_namespace' ), '\\' );
-        $this->repositoryClassNamespace = $this->repositoryInterfaceNamespace.'\\'.ucfirst( $implementation );
+        $this->repositoryInterfaceNamespace = rtrim(config('repositories.repository_interfaces_namespace'), '\\');
+        $this->repositoryClassNamespace = $this->repositoryInterfaceNamespace.'\\'.ucfirst($implementation);
     }
     
     /**
@@ -90,17 +90,17 @@ 
      */
     protected function createRepository()
     {
-        $basePath = config( 'repositories.repositories_path' ).'/'.ucfirst( $this->implementation );
+        $basePath = config('repositories.repositories_path').'/'.ucfirst($this->implementation);
         
         $classFilePath = $basePath.'/'.$this->repositoryClassName.'.php';
         
-        $this->makeDirectory( $basePath );
+        $this->makeDirectory($basePath);
         
-        if ( !$this->filesystem->exists( $classFilePath ) )
+        if (!$this->filesystem->exists($classFilePath))
         {
             // Read the stub and replace
-            $this->filesystem->put( $classFilePath, $this->compileRepositoryStub() );
-            $this->info("'".ucfirst( $this->implementation )."' implementation created successfully for '$this->modelClassShortName'.");
+            $this->filesystem->put($classFilePath, $this->compileRepositoryStub());
+            $this->info("'".ucfirst($this->implementation)."' implementation created successfully for '$this->modelClassShortName'.");
             $this->composer->dumpAutoloads();
         } else
         {
@@ -114,16 +114,16 @@ 
      */
     protected function createInterface()
     {
-        $repositoriesBasePath = config( 'repositories.repositories_path' );
+        $repositoriesBasePath = config('repositories.repositories_path');
         
         $interfaceFilePath = $repositoriesBasePath.'/'.$this->repositoryInterfaceName.'.php';
         
-        $this->makeDirectory( $repositoriesBasePath );
+        $this->makeDirectory($repositoriesBasePath);
         
-        if ( !$this->filesystem->exists( $interfaceFilePath ) )
+        if (!$this->filesystem->exists($interfaceFilePath))
         {
             // Read the stub and replace
-            $this->filesystem->put( $interfaceFilePath, $this->compileRepositoryInterfaceStub() );
+            $this->filesystem->put($interfaceFilePath, $this->compileRepositoryInterfaceStub());
             $this->info("Interface created successfully for '$this->modelClassShortName'.");
             $this->composer->dumpAutoloads();
         } else
@@ -138,10 +138,10 @@ 
      */
     protected function compileRepositoryInterfaceStub()
     {
-        $stub = $this->filesystem->get(__DIR__ . '/../stubs/repository-interface.stub');
+        $stub = $this->filesystem->get(__DIR__.'/../stubs/repository-interface.stub');
         
-        $stub = $this->replaceInterfaceNamespace( $stub );
-        $stub = $this->replaceInterfaceName( $stub );
+        $stub = $this->replaceInterfaceNamespace($stub);
+        $stub = $this->replaceInterfaceName($stub);
         
         return $stub;
     }
@@ -151,13 +151,13 @@ 
      */
     protected function compileRepositoryStub()
     {
-        $stub = $this->filesystem->get(__DIR__ . '/../stubs/repository.stub');
+        $stub = $this->filesystem->get(__DIR__.'/../stubs/repository.stub');
         
-        $stub = $this->replaceInterfaceNamespace( $stub );
-        $stub = $this->replaceInterfaceName( $stub );
-        $stub = $this->replaceParentRepositoryClassNamespaceAndName( $stub );
-        $stub = $this->replaceRepositoryClassNamespaceAndName( $stub );
-        $stub = $this->replaceModelClassNamespaceAndName( $stub );
+        $stub = $this->replaceInterfaceNamespace($stub);
+        $stub = $this->replaceInterfaceName($stub);
+        $stub = $this->replaceParentRepositoryClassNamespaceAndName($stub);
+        $stub = $this->replaceRepositoryClassNamespaceAndName($stub);
+        $stub = $this->replaceModelClassNamespaceAndName($stub);
         
         return $stub;
     }
@@ -166,7 +166,7 @@ 
      * @param $stub
      * @return $this
      */
-    private function replaceInterfaceNamespace( $stub )
+    private function replaceInterfaceNamespace($stub)
     {
         return str_replace('{{repositoryInterfaceNamespace}}', $this->repositoryInterfaceNamespace, $stub);
     }
@@ -175,7 +175,7 @@ 
      * @param $stub
      * @return mixed
      */
-    private function replaceInterfaceName( $stub )
+    private function replaceInterfaceName($stub)
     {
         return str_replace('{{repositoryInterfaceName}}', $this->repositoryInterfaceName, $stub);
     }
@@ -185,11 +185,11 @@ 
      * @param $stub
      * @return mixed
      */
-    private function replaceParentRepositoryClassNamespaceAndName( $stub )
+    private function replaceParentRepositoryClassNamespaceAndName($stub)
     {
-        $implementations = config( 'repositories.supported_implementations' );
+        $implementations = config('repositories.supported_implementations');
         
-        $parentClassImplementation = $implementations[ $this->implementation ];
+        $parentClassImplementation = $implementations[$this->implementation];
         
         $reflex = new \ReflectionClass($parentClassImplementation);
         
@@ -202,7 +202,7 @@ 
      * @param $stub
      * @return mixed
      */
-    private function replaceRepositoryClassNamespaceAndName( $stub )
+    private function replaceRepositoryClassNamespaceAndName($stub)
     {
         $stub = str_replace('{{repositoryClassName}}', $this->repositoryClassName, $stub);
         
@@ -214,7 +214,7 @@ 
      * @param $stub
      * @return mixed
      */
-    private function replaceModelClassNamespaceAndName( $stub )
+    private function replaceModelClassNamespaceAndName($stub)
     {
         $stub = str_replace('{{modelName}}', $this->modelClassShortName, $stub);