okaybueno / laravel-repositories

RepositoryInterface.php

Spacing +13 added lines, -13 removed lines

@@ -18,7 +18,7 @@ 
      * @param array $columns Columns to retrieve with the object.
      * @return mixed Model|NULL An Eloquent object when there is a result, NULL when there are no matches.
      */
-    public function findOneBy( $value = NULL, $field = 'id', array $columns = ['*'] );
+    public function findOneBy($value = NULL, $field = 'id', array $columns = ['*']);
 
     /**
      * Finds ALL items the repository abstract without any kind of filter.
@@ -26,7 +26,7 @@ 
      * @param array $columns Columns to retrieve with the objects.
      * @return mixed Collection Laravel Eloquent's Collection that may or may not be empty.
      */
-    public function findAll( array $columns = ['*'] );
+    public function findAll(array $columns = ['*']);
 
     /**
      * Finds ALL items by the provided field. If NULL specified for the first 2 parameters, then it will take ONLY the
@@ -37,7 +37,7 @@ 
      * @param array $columns Columns to retrieve with the objects.
      * @return mixed Collection Laravel Eloquent's Collection that may or may not be empty.
      */
-    public function findAllBy( $value = NULL, $field = NULL, array $columns = ['*'] );
+    public function findAllBy($value = NULL, $field = NULL, array $columns = ['*']);
 
     /**
      * Finds ALL the items in the repository where the given field is inside the given values.
@@ -47,7 +47,7 @@ 
      * @param array $columns Columns to retrieve with the objects.
      * @return mixed Collection Laravel Eloquent's Collection that may or may not be empty.
      */
-    public function findAllWhereIn( array $value, $field,  array $columns = ['*'] );
+    public function findAllWhereIn(array $value, $field, array $columns = ['*']);
 
     /**
      * Allows you to eager-load entity relationships when retrieving entities, either with or without criterias.
@@ -55,7 +55,7 @@ 
      * @param array|string $relations Relations to eager-load along with the entities.
      * @return mixed The current repository object instance.
      */
-    public function with( $relations );
+    public function with($relations);
 
     /**
      * Adds a criteria to the query.
@@ -63,7 +63,7 @@ 
      * @param CriteriaInterface $criteria Object that declares and implements the criteria used.
      * @return mixed The current repository object instance.
      */
-    public function addCriteria( CriteriaInterface $criteria );
+    public function addCriteria(CriteriaInterface $criteria);
 
     /**
      * Skips the current criteria (all of them). Useful when you don't want to reset the object but just not use the
@@ -72,7 +72,7 @@ 
      * @param bool|TRUE $status If you want to skip the criteria or not.
      * @return mixed The current repository object instance.
      */
-    public function skipCriteria( $status = TRUE );
+    public function skipCriteria($status = TRUE);
 
     /**
      * Returns a Paginator that based on the criteria or filters given.
@@ -81,7 +81,7 @@ 
      * @param array $columns Columns to retrieve with the objects.
      * @return Paginator object with the results and the paginator.
      */
-    public function paginate( $perPage, array $columns = ['*'] );
+    public function paginate($perPage, array $columns = ['*']);
 
     /**
      * Allows you to set the current page with using the paginator. Useful when you want to overwrite the $_GET['page']
@@ -90,7 +90,7 @@ 
      * @param int $page The page you want to retrieve.
      * @return mixed The current repository object instance.
      */
-    public function setCurrentPage( $page );
+    public function setCurrentPage($page);
 
     /**
      * Creates a new entity of the entity type the repository handles, given certain data.
@@ -98,7 +98,7 @@ 
      * @param array $data Data the entity will have.
      * @return mixed Model|NULL An Eloquent object when the entity was created, NULL in case of error.
      */
-    public function create( array $data );
+    public function create(array $data);
 
     /**
      * Updates as many entities as the filter matches with the given $data.
@@ -109,7 +109,7 @@ 
      * @return mixed Model|NULL|integer An Eloquent object representing the updated entity, a number of entities updated if mass updating,
      * or NULL in case of error.
      */
-    public function updateBy( array $data, $value = NULL, $field = 'id' );
+    public function updateBy(array $data, $value = NULL, $field = 'id');
 
     /**
      * Removes as many entities as the filter matches. If softdelete is applied, then they will be soft-deleted.
@@ -120,7 +120,7 @@ 
      * @param string $field Field on the database that you will filter by. Default: id.
      * @return boolean TRUE It will always return TRUE.
      */
-    public function delete( $value = NULL, $field = 'id' );
+    public function delete($value = NULL, $field = 'id');
 
     /**
      * @return int number of records matching the criteria (or total amount of records).
@@ -143,6 +143,6 @@ 
      * @param string $field Field on the database that you will filter by.
      * @return mixed
      */
-    public function destroy( $value = NULL, $field = 'id' );
+    public function destroy($value = NULL, $field = 'id');
 
 }
\ No newline at end of file

Extra/CountableInterface.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
      * @param int $amount
      * @return mixed
      */
-    public function incrementCounter( Model $model, $counter, $amount = 1 );
+    public function incrementCounter(Model $model, $counter, $amount = 1);
 
 
     /**
@@ -31,5 +31,5 @@ 
      * @param bool|FALSE $allowNegative
      * @return mixed
      */
-    public function decrementCounter( Model $model, $counter, $amount = 1, $allowNegative = FALSE );
+    public function decrementCounter(Model $model, $counter, $amount = 1, $allowNegative = FALSE);
 }
\ No newline at end of file

Extra/RestorableInterface.php

Spacing +1 added lines, -1 removed lines

@@ -16,5 +16,5 @@
      * @param string $field Column in the DB used for the filter.
      * @return void
      */
-    public function restore( $value, $field = 'id' );
+    public function restore($value, $field = 'id');
 }
\ No newline at end of file

Commands/MakeRepositoryCommand.php

Spacing +36 added lines, -36 removed lines

@@ -30,15 +30,15 @@ 
     public function fire()
     {
         $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 :).");
 
@@ -50,7 +50,7 @@ 
             }
 
             // Populate the properties with the right values.
-            $this->populateValuesForProperties( $model, $implementation );
+            $this->populateValuesForProperties($model, $implementation);
 
             $this->createInterface();
             $this->createRepository();
@@ -61,7 +61,7 @@ 
 
         } else
         {
-            $this->error( "The '$this->modelClassShortName' ('$this->modelClassNamespace\\$this->modelClassShortName') model does not exist. Please check that the namespace and the class name are valid.");
+            $this->error("The '$this->modelClassShortName' ('$this->modelClassNamespace\\$this->modelClassShortName') 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);
 

Commands/MakeCriteriaCommand.php

Spacing +20 added lines, -20 removed lines

@@ -28,9 +28,9 @@ 
     public function fire()
     {
         $criteria = $this->argument('criteria');
-        $implementation = strtolower( $this->option('implementation') );
+        $implementation = strtolower($this->option('implementation'));
 
-        $this->populateValuesForProperties( $criteria, $implementation );
+        $this->populateValuesForProperties($criteria, $implementation);
         $this->createCriteria();
 
         $this->info('Generating autoload...');
@@ -43,18 +43,18 @@ 
      * @param $criteria
      * @param $implementation
      */
-    protected function populateValuesForProperties( $criteria, $implementation )
+    protected function populateValuesForProperties($criteria, $implementation)
     {
         $this->implementation = $implementation ? $implementation : $this->findDefaultImplementation();
 
-        $criteriaNameForFolder = str_replace('\\', '/', $criteria );
-        $this->criteriaFolder = ucfirst( $this->implementation );
+        $criteriaNameForFolder = str_replace('\\', '/', $criteria);
+        $this->criteriaFolder = ucfirst($this->implementation);
 
-        $folder = pathinfo( $criteriaNameForFolder , PATHINFO_DIRNAME );;
-        if ( $folder ) $this->criteriaFolder .= '/'.$folder;
+        $folder = pathinfo($criteriaNameForFolder, PATHINFO_DIRNAME); ;
+        if ($folder) $this->criteriaFolder .= '/'.$folder;
 
-        $this->criteriaClassName = pathinfo( $criteriaNameForFolder , PATHINFO_FILENAME );
-        $this->criteriaClassNamespace = rtrim( config( 'repositories.criterias_namespace' ), '\\' ) . '\\' . str_replace( '/', '\\', $this->criteriaFolder );
+        $this->criteriaClassName = pathinfo($criteriaNameForFolder, PATHINFO_FILENAME);
+        $this->criteriaClassNamespace = rtrim(config('repositories.criterias_namespace'), '\\').'\\'.str_replace('/', '\\', $this->criteriaFolder);
     }
 
     /**
@@ -62,18 +62,18 @@ 
      */
     protected function createCriteria()
     {
-        $basePath = config( 'repositories.criterias_path' );
+        $basePath = config('repositories.criterias_path');
 
-        if ( $this->criteriaFolder ) $basePath .= '/'.$this->criteriaFolder;
+        if ($this->criteriaFolder) $basePath .= '/'.$this->criteriaFolder;
 
-        $this->makeDirectory( $basePath );
+        $this->makeDirectory($basePath);
 
-        $criteriaFilePath = $basePath .'/'.$this->criteriaClassName.'.php';
+        $criteriaFilePath = $basePath.'/'.$this->criteriaClassName.'.php';
 
-        if ( !$this->filesystem->exists( $criteriaFilePath ) )
+        if (!$this->filesystem->exists($criteriaFilePath))
         {
             // Read the stub and replace
-            $this->filesystem->put( $criteriaFilePath, $this->compileCriteriaStub() );
+            $this->filesystem->put($criteriaFilePath, $this->compileCriteriaStub());
             $this->info("Criteria '$this->criteriaClassName' created successfully in '$criteriaFilePath'.");
             $this->composer->dumpAutoloads();
         } else
@@ -88,10 +88,10 @@ 
      */
     protected function compileCriteriaStub( )
     {
-        $stub = $this->filesystem->get(__DIR__ . '/../stubs/eloquent-criteria.stub');
+        $stub = $this->filesystem->get(__DIR__.'/../stubs/eloquent-criteria.stub');
 
-        $stub = $this->replaceCriteriaNamespace( $stub );
-        $stub = $this->replaceCriteriaName( $stub );
+        $stub = $this->replaceCriteriaNamespace($stub);
+        $stub = $this->replaceCriteriaName($stub);
 
         return $stub;
     }
@@ -101,7 +101,7 @@ 
      * @param $stub
      * @return mixed
      */
-    private function replaceCriteriaNamespace( $stub )
+    private function replaceCriteriaNamespace($stub)
     {
         return str_replace('{{criteriaNamespace}}', $this->criteriaClassNamespace, $stub);
     }
@@ -110,7 +110,7 @@ 
      * @param $stub
      * @return mixed
      */
-    private function replaceCriteriaName( $stub )
+    private function replaceCriteriaName($stub)
     {
         return str_replace('{{criteriaClassName}}', $this->criteriaClassName, $stub);
     }

Braces +6 added lines, -2 removed lines

@@ -51,7 +51,9 @@ 
         $this->criteriaFolder = ucfirst( $this->implementation );
 
         $folder = pathinfo( $criteriaNameForFolder , PATHINFO_DIRNAME );;
-        if ( $folder ) $this->criteriaFolder .= '/'.$folder;
+        if ( $folder ) {
+            $this->criteriaFolder .= '/'.$folder;
+        }
 
         $this->criteriaClassName = pathinfo( $criteriaNameForFolder , PATHINFO_FILENAME );
         $this->criteriaClassNamespace = rtrim( config( 'repositories.criterias_namespace' ), '\\' ) . '\\' . str_replace( '/', '\\', $this->criteriaFolder );
@@ -64,7 +66,9 @@ 
     {
         $basePath = config( 'repositories.criterias_path' );
 
-        if ( $this->criteriaFolder ) $basePath .= '/'.$this->criteriaFolder;
+        if ( $this->criteriaFolder ) {
+            $basePath .= '/'.$this->criteriaFolder;
+        }
 
         $this->makeDirectory( $basePath );
 

Commands/MakeBaseCommand.php

Spacing +6 added lines, -6 removed lines

@@ -31,11 +31,11 @@ 
     /**
      * @param $path
      */
-    protected function makeDirectory( $path )
+    protected function makeDirectory($path)
     {
-        if ( !$this->filesystem->isDirectory( $path ) )
+        if (!$this->filesystem->isDirectory($path))
         {
-            $this->filesystem->makeDirectory( $path, 0775, true, true);
+            $this->filesystem->makeDirectory($path, 0775, true, true);
         }
     }
 
@@ -45,14 +45,14 @@ 
      */
     protected function findDefaultImplementation()
     {
-        $implementationBindings = config( 'repositories.bindings' );
+        $implementationBindings = config('repositories.bindings');
 
-        $filtered = array_filter( $implementationBindings, function( $k ) {
+        $filtered = array_filter($implementationBindings, 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';
     }

src/Traits/Countable.php

Spacing +11 added lines, -11 removed lines

@@ -17,12 +17,12 @@ 
      * @param int $amount
      * @return Model
      */
-    public function incrementCounter( Model $model, $counter, $amount = 1 )
+    public function incrementCounter(Model $model, $counter, $amount = 1)
     {
-        $amount = $this->getAmount( $amount );
+        $amount = $this->getAmount($amount);
 
-        if ( $amount ) $model->increment( $counter, $amount );
-        else $model->increment( $counter );
+        if ($amount) $model->increment($counter, $amount);
+        else $model->increment($counter);
 
         return $model;
     }
@@ -35,22 +35,22 @@ 
      * @param bool|FALSE $allowNegative
      * @return Model
      */
-    public function decrementCounter( Model $model, $counter, $amount = 1, $allowNegative = FALSE )
+    public function decrementCounter(Model $model, $counter, $amount = 1, $allowNegative = FALSE)
     {
-        $amount = $this->getAmount( $amount, 1 );
+        $amount = $this->getAmount($amount, 1);
 
         $currentValue = $model->{$counter};
         $final = $model->{$counter} - $amount;
 
-        if ( !$allowNegative )
+        if (!$allowNegative)
         {
-            if ( $currentValue && $final < 0 )
+            if ($currentValue && $final < 0)
             {
                 $model->{$counter} = 0;
                 $model->save();
             }
 
-        } else $model->decrement( $counter, $amount );
+        } else $model->decrement($counter, $amount);
 
         return $model;
     }
@@ -61,8 +61,8 @@ 
      * @param null $default
      * @return int|null
      */
-    private function getAmount( $amount, $default = NULL )
+    private function getAmount($amount, $default = NULL)
     {
-        return is_int( $amount ) && $amount > 1 ? $amount : $default;
+        return is_int($amount) && $amount > 1 ? $amount : $default;
     }
 }
\ No newline at end of file

Braces +8 added lines, -3 removed lines

@@ -21,8 +21,11 @@ 
     {
         $amount = $this->getAmount( $amount );
 
-        if ( $amount ) $model->increment( $counter, $amount );
-        else $model->increment( $counter );
+        if ( $amount ) {
+            $model->increment( $counter, $amount );
+        } else {
+            $model->increment( $counter );
+        }
 
         return $model;
     }
@@ -50,7 +53,9 @@ 
                 $model->save();
             }
 
-        } else $model->decrement( $counter, $amount );
+        } else {
+            $model->decrement( $counter, $amount );
+        }
 
         return $model;
     }

src/Traits/Restorable.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
      * @param $value
      * @param string $field
      */
-    public function restore( $value, $field = 'id' )
+    public function restore($value, $field = 'id')
     {
-        $this->model->where( $field, $value )->restore();
+        $this->model->where($field, $value)->restore();
     }
 }
\ No newline at end of file

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 = $this->model->where( $field, $value);
+            $this->model = $this->model->where($field, $value);
 
-            foreach( $cleanFields as $F => $V ) $this->model->{$F} = $V;
+            foreach ($cleanFields as $F => $V) $this->model->{$F} = $V;
 
             $this->model->save();
 
@@ -214,7 +214,7 @@ 
             // Mass update.
             $this->applyCriteria();
 
-            $returnedVal = $this->model->update( $cleanFields );
+            $returnedVal = $this->model->update($cleanFields);
         }
 
         $this->resetScope();
@@ -227,14 +227,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;
         }
 
@@ -262,7 +262,7 @@ 
     public function resetScope()
     {
         $this->criteria = [];
-        $this->skipCriteria( FALSE );
+        $this->skipCriteria(FALSE);
         $this->model = new $this->modelClassName();
         return $this;
     }
@@ -276,10 +276,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;
         }
 
@@ -298,7 +298,7 @@ 
      */
     protected function eagerLoadRelations()
     {
-        if ( is_array( $this->with ) ) $this->model->with( $this->with );
+        if (is_array($this->with)) $this->model->with($this->with);
     }
 
 
@@ -306,13 +306,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;
@@ -323,11 +323,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 = $this->model->where( $field, $value);
 
-            foreach( $cleanFields as $F => $V ) $this->model->{$F} = $V;
+            foreach( $cleanFields as $F => $V ) {
+                $this->model->{$F} = $V;
+            }
 
             $this->model->save();
 
@@ -231,11 +239,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();
@@ -276,11 +288,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();
@@ -298,7 +314,9 @@ 
      */
     protected function eagerLoadRelations()
     {
-        if ( is_array( $this->with ) ) $this->model->with( $this->with );
+        if ( is_array( $this->with ) ) {
+            $this->model->with( $this->with );
+        }
     }
 
 
@@ -312,7 +330,9 @@ 
 
         foreach( $data as $key => $value )
         {
-            if ( !in_array( $key, $fillableFields ) ) unset( $data[ $key ] );
+            if ( !in_array( $key, $fillableFields ) ) {
+                unset( $data[ $key ] );
+            }
         }
 
         return $data;
@@ -327,7 +347,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 );
+                }
             }
         }