okaybueno / laravel-repositories

src/EloquentRepository.php

Spacing +37 added lines, -37 removed lines

@@ -25,12 +25,12 @@ 
      * @param Model $model
      * @throws \ReflectionException
      */
-    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;
@@ -48,9 +48,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();
 
@@ -68,9 +68,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();
 
@@ -87,7 +87,7 @@ 
     {
         $this->eagerLoadRelations();
         $this->applyCriteria();
-        $result = $this->model->whereIn( $field, $value )->get( $columns );
+        $result = $this->model->whereIn($field, $value)->get($columns);
 
         $this->resetScope();
 
@@ -98,11 +98,11 @@ 
      * @param array $columns
      * @return \Illuminate\Database\Eloquent\Collection|static[]
      */
-    public function findAll( array $columns = ['*'] )
+    public function findAll(array $columns = ['*'])
     {
         $this->eagerLoadRelations();
         $this->applyCriteria();
-        $result = $this->model->all( $columns );
+        $result = $this->model->all($columns);
 
         $this->resetScope();
 
@@ -113,9 +113,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;
 
@@ -127,7 +127,7 @@ 
      * @param CriteriaInterface $criteria
      * @return $this
      */
-    public function addCriteria( CriteriaInterface $criteria)
+    public function addCriteria(CriteriaInterface $criteria)
     {
         $this->criteria[] = $criteria;
 
@@ -139,7 +139,7 @@ 
      * @param bool $status
      * @return $this
      */
-    public function skipCriteria( $status = TRUE )
+    public function skipCriteria($status = TRUE)
     {
         $this->skipCriteria = $status;
         return $this;
@@ -155,7 +155,7 @@ 
     {
         $this->eagerLoadRelations();
         $this->applyCriteria();
-        $result = $this->model->paginate( $perPage, $columns );
+        $result = $this->model->paginate($perPage, $columns);
 
         $this->resetScope();
 
@@ -167,9 +167,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;
         });
@@ -184,9 +184,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();
 
@@ -201,14 +201,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
@@ -216,7 +216,7 @@ 
             // Mass update.
             $this->applyCriteria();
 
-            $returnedVal = $this->model->update( $cleanFields );
+            $returnedVal = $this->model->update($cleanFields);
         }
 
         $this->resetScope();
@@ -230,14 +230,14 @@ 
      * @return bool
      * @throws \Exception
      */
-    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;
         }
 
@@ -265,7 +265,7 @@ 
     public function resetScope()
     {
         $this->criteria = [];
-        $this->skipCriteria( FALSE );
+        $this->skipCriteria(FALSE);
         $this->model = new $this->modelClassName();
         return $this;
     }
@@ -279,10 +279,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;
         }
 
@@ -300,11 +300,11 @@ 
      */
     protected function eagerLoadRelations()
     {
-        if ( is_array( $this->with ) )
+        if (is_array($this->with))
         {
-            $with = new With( $this->with );
+            $with = new With($this->with);
 
-            $this->model = $this->addCriteria( $with );
+            $this->model = $this->addCriteria($with);
         }
     }
 
@@ -313,9 +313,9 @@ 
      * @param array $data
      * @return array
      */
-    protected function cleanUnfillableFields( array $data )
+    protected function cleanUnfillableFields(array $data)
     {
-        return array_filter($data, function ($key) {
+        return array_filter($data, function($key) {
             return $this->model->isFillable($key);
         }, ARRAY_FILTER_USE_KEY);
     }
@@ -325,11 +325,11 @@ 
      */
     protected 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 +31 added lines, -13 removed lines

@@ -48,7 +48,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 );
 
@@ -68,7 +70,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 );
 
@@ -115,7 +119,9 @@ 
      */
     public function with( $relations )
     {
-        if ( is_string( $relations ) ) $relations = func_get_args();
+        if ( is_string( $relations ) ) {
+            $relations = func_get_args();
+        }
 
         $this->with = $relations;
 
@@ -208,7 +214,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
@@ -234,11 +242,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();
@@ -279,11 +291,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();
@@ -329,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 );
+                }
             }
         }
 

Criteria/Eloquent/With.php

Indentation +3 added lines, -3 removed lines

@@ -23,9 +23,9 @@
     }
 
     /**
-    * @param mixed $queryBuilder
-    * @return mixed
-    */
+     * @param mixed $queryBuilder
+     * @return mixed
+     */
     public function apply( $queryBuilder )
     {
         // Do something with the query builder and return it.

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
      * With constructor.
      * @param array $with
      */
-    public function __construct( array $with  = [] )
+    public function __construct(array $with = [])
     {
         $this->with = $with;
     }
@@ -26,10 +26,10 @@ 
     * @param mixed $queryBuilder
     * @return mixed
     */
-    public function apply( $queryBuilder )
+    public function apply($queryBuilder)
     {
         // Do something with the query builder and return it.
-        if ( $this->with ) $queryBuilder->with( $this->with );
+        if ($this->with) $queryBuilder->with($this->with);
 
         return $queryBuilder;
     }

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
     public function apply( $queryBuilder )
     {
         // Do something with the query builder and return it.
-        if ( $this->with ) $queryBuilder->with( $this->with );
+        if ( $this->with ) {
+            $queryBuilder->with( $this->with );
+        }
 
         return $queryBuilder;
     }

Criteria/Eloquent/OrderByRandom.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * @param mixed $queryBuilder
      * @return mixed
      */
-    public function apply( $queryBuilder )
+    public function apply($queryBuilder)
     {
         return $queryBuilder->inRandomOrder();
     }

Criteria/Eloquent/WhereNotIn.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
      * @param $field
      * @param array $list
      */
-    public function __construct( $field, array $list )
+    public function __construct($field, array $list)
     {
         $this->field = $field;
         $this->list = $list;
@@ -28,10 +28,10 @@ 
      * @param mixed $queryBuilder
      * @return mixed
      */
-    public function apply( $queryBuilder )
+    public function apply($queryBuilder)
     {
         // Do something with the query builder and return it.
-        return $queryBuilder->whereNotIn( $this->field, $this->list );
+        return $queryBuilder->whereNotIn($this->field, $this->list);
     }
 
 }

Criteria/Eloquent/WhereRelationFieldIn.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
      * @param array $list
      * @param string $field
      */
-    public function __construct(  $relationName, array $list, $field = 'id' )
+    public function __construct($relationName, array $list, $field = 'id')
     {
         $this->relationName = $relationName;
         $this->list = $list;
@@ -31,11 +31,11 @@ 
      * @param mixed $queryBuilder
      * @return mixed
      */
-    public function apply( $queryBuilder )
+    public function apply($queryBuilder)
     {
         // Do something with the query builder and return it.
-        return $queryBuilder->whereHas( $this->relationName, function ($query) {
-            $query->whereIn( $this->field, $this->list);
+        return $queryBuilder->whereHas($this->relationName, function($query) {
+            $query->whereIn($this->field, $this->list);
         });
     }
 

Criteria/Eloquent/WhereIn.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
      * @param $field
      * @param array $list
      */
-    public function __construct( $field, array $list )
+    public function __construct($field, array $list)
     {
         $this->field = $field;
         $this->list = $list;
@@ -28,10 +28,10 @@ 
      * @param mixed $queryBuilder
      * @return mixed
      */
-    public function apply( $queryBuilder )
+    public function apply($queryBuilder)
     {
         // Do something with the query builder and return it.
-        return $queryBuilder->whereIn( $this->field, $this->list );
+        return $queryBuilder->whereIn($this->field, $this->list);
     }
 
 }