okaybueno / laravel-repositories

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 = $this->model->with( $this->with );
+        if (is_array($this->with)) $this->model = $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 = $this->model->with( $this->with );
+        if ( is_array( $this->with ) ) {
+            $this->model = $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 );
+                }
             }
         }