Merge pull request #5 from artesaos/analysis-z94Glq

Applied fixes from StyleCI
artesaos · Jan 13, 2016 · 9157d33 · 9157d33
2 parents 61c0839 + 4509f04
commit 9157d33
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 60 deletions.
diff --git a/resources/config/warehouse.php b/resources/config/warehouse.php
@@ -2,6 +2,6 @@
 
 return [
     'fractal' => [
-        'serializer' => null
-    ]
-];
+        'serializer' => null,
+    ],
+];
diff --git a/src/AbstractCrudRepository.php b/src/AbstractCrudRepository.php
@@ -5,7 +5,7 @@
 use Artesaos\Warehouse\Contracts\Segregated\CrudRepository;
 use Artesaos\Warehouse\Traits\CrudMethods;
 
-abstract class  AbstractCrudRepository extends BaseRepository implements CrudRepository
+abstract class AbstractCrudRepository extends BaseRepository implements CrudRepository
 {
     use CrudMethods;
 }
diff --git a/src/BaseRepository.php b/src/BaseRepository.php
@@ -4,10 +4,10 @@
 
 use Artesaos\Warehouse\Contracts\BaseRepository as BaseRepositoryContract;
 use Illuminate\Database\Eloquent\Builder as EloquentQueryBuilder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
-use Illuminate\Pagination\AbstractPaginator as Paginator;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Pagination\AbstractPaginator as Paginator;
 
 abstract class BaseRepository implements BaseRepositoryContract
 {
@@ -66,7 +66,7 @@ public function getAll($take = 15, $paginate = true)
     }
 
     /**
-     * @param string $column
+     * @param string      $column
      * @param string|null $key
      *
      * @return \Illuminate\Support\Collection|array
@@ -80,7 +80,7 @@ public function lists($column, $key = null)
      * Retrieves a record by his id
      * If fail is true $ fires ModelNotFoundException.
      *
-     * @param int     $id
+     * @param int  $id
      * @param bool $fail
      *
      * @return Model

diff --git a/src/Contracts/BaseRepository.php b/src/Contracts/BaseRepository.php
@@ -2,8 +2,8 @@
 
 namespace Artesaos\Warehouse\Contracts;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Pagination\AbstractPaginator as Paginator;
 
 interface BaseRepository
@@ -24,15 +24,15 @@ public function getAll($take = 15, $paginate = true);
      * Retrieves a record by his id
      * If $fail is true fires ModelNotFoundException. When no record is found.
      *
-     * @param int     $id
+     * @param int  $id
      * @param bool $fail
      *
      * @return Model
      */
     public function findByID($id, $fail = true);
 
     /**
-     * @param string $column
+     * @param string      $column
      * @param string|null $key
      *
      * @return \Illuminate\Support\Collection|array

diff --git a/src/Contracts/FractalFactory.php b/src/Contracts/FractalFactory.php
@@ -8,17 +8,17 @@
 interface FractalFactory
 {
     /**
-     * @param ArrayAccess $collection
-     * @param array $meta
+     * @param ArrayAccess              $collection
+     * @param array                    $meta
      * @param TransformerAbstract|null $transformer
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function makeCollectionResponse(ArrayAccess $collection, array $meta = array(), TransformerAbstract $transformer = null);
+    public function makeCollectionResponse(ArrayAccess $collection, array $meta = [], TransformerAbstract $transformer = null);
 
     /**
-     * @param ArrayAccess $item
-     * @param array $meta
+     * @param ArrayAccess              $item
+     * @param array                    $meta
      * @param TransformerAbstract|null $transformer
      *
      * @return \Illuminate\Http\JsonResponse
@@ -30,12 +30,12 @@ public function makeItemResponse(ArrayAccess $item, array $meta = [], Transforme
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function makeEmptyResponse(array $meta = array());
+    public function makeEmptyResponse(array $meta = []);
 
     /**
      * @param string $key
      *
      * @return array
      */
     public function getRequestIncludes($key = 'include');
-}
+}
diff --git a/src/Contracts/Segregated/CrudRepository.php b/src/Contracts/Segregated/CrudRepository.php
@@ -14,6 +14,7 @@ interface CrudRepository
      * @return Model
      */
     public function create(array $data = []);
+
     /**
      * Updated model data, using $data
      * The sequence performs the Model update.
@@ -24,6 +25,7 @@ public function create(array $data = []);
      * @return bool
      */
     public function update($model, array $data = []);
+
     /**
      * Performs the save method of the model
      * The goal is to enable the implementation of your business logic before the command.
@@ -33,6 +35,7 @@ public function update($model, array $data = []);
      * @return bool
      */
     public function save($model);
+
     /**
      * Run the delete command model.
      * The goal is to enable the implementation of your business logic before the command.

diff --git a/src/Contracts/Segregated/FractalAvailable.php b/src/Contracts/Segregated/FractalAvailable.php
@@ -9,17 +9,17 @@ interface FractalAvailable
 {
     /**
      * @param Model|Arrayable $item
-     * @param array $meta
+     * @param array           $meta
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function makeResponseItem($item, $meta = array());
+    public function makeResponseItem($item, $meta = []);
 
     /**
      * @param \Illuminate\Database\Eloquent\Collection $collection
-     * @param array $meta
+     * @param array                                    $meta
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function makeResponseCollection($collection, $meta = array());
-}
+    public function makeResponseCollection($collection, $meta = []);
+}
diff --git a/src/Fractal/FractalFactory.php b/src/Fractal/FractalFactory.php
@@ -1,21 +1,22 @@
-<?php 
+<?php
+
 
 namespace Artesaos\Warehouse\Fractal;
 
 use ArrayAccess;
 use Artesaos\Warehouse\Contracts\FractalFactory as FractalFactoryContract;
 use Artesaos\Warehouse\Fractal\Transformers\GenericTransformer;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Contracts\Pagination\Paginator;
 use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 use League\Fractal\Manager as LeagueFractalFactory;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item as FractalItem;
 use League\Fractal\Resource\ResourceAbstract;
 use League\Fractal\TransformerAbstract;
-use Illuminate\Contracts\Pagination\Paginator;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Request;
 
 class FractalFactory implements FractalFactoryContract
 {
@@ -42,8 +43,8 @@ class FractalFactory implements FractalFactoryContract
     /**
      * FractalFactory constructor.
      *
-     * @param Request $request
-     * @param Container $app
+     * @param Request         $request
+     * @param Container       $app
      * @param ResponseFactory $response
      */
     public function __construct(Request $request, Container $app, ResponseFactory $response)
@@ -60,7 +61,7 @@ public function __construct(Request $request, Container $app, ResponseFactory $r
      */
     protected function isPaged($collection)
     {
-        return (is_a($collection, \Illuminate\Contracts\Pagination\LengthAwarePaginator::class));
+        return is_a($collection, \Illuminate\Contracts\Pagination\LengthAwarePaginator::class);
     }
 
     /**
@@ -93,20 +94,20 @@ protected function getFractalFactory()
         if (!$this->fractal):
             $this->fractal = new LeagueFractalFactory();
 
-            $serializer = $this->app['config']->get('warehouse.fractal.serializer', null);
+        $serializer = $this->app['config']->get('warehouse.fractal.serializer', null);
 
-            if(!empty($serializer)) {
-                $this->fractal->setSerializer($this->app->make($serializer));
-            }
+        if (!empty($serializer)) {
+            $this->fractal->setSerializer($this->app->make($serializer));
+        }
         endif;
 
         return $this->fractal;
     }
 
     /**
      * @param ResourceAbstract $resource
-     * @param string $key
-     * @param string|null $value
+     * @param string           $key
+     * @param string|null      $value
      *
      * @return void
      */
@@ -115,8 +116,7 @@ protected function addFractalMeta(ResourceAbstract $resource, $key, $value = nul
         if (is_array($key)):
             foreach ($key as $k => $v):
                 $resource->setMetaValue($k, $v);
-            endforeach;
-        else:
+        endforeach; else:
             $resource->setMetaValue($key, $value);
         endif;
     }
@@ -142,7 +142,9 @@ public function getRequestIncludes($key = 'include')
     {
         $include = $this->request->get($key, '');
 
-        if (empty($include)) return [];
+        if (empty($include)) {
+            return [];
+        }
 
         $include = explode(',', $include);
 
@@ -156,7 +158,9 @@ protected function loadFractalIncludes()
     {
         $include = $this->getRequestIncludes();
 
-        if (!empty($include)) $this->getFractalFactory()->parseIncludes($include);
+        if (!empty($include)) {
+            $this->getFractalFactory()->parseIncludes($include);
+        }
     }
 
     /**
@@ -165,7 +169,9 @@ protected function loadFractalIncludes()
      */
     protected function modelIncludes($item, $include)
     {
-        if ($item instanceof Model) $item->load($include);
+        if ($item instanceof Model) {
+            $item->load($include);
+        }
     }
 
     /**
@@ -192,7 +198,7 @@ protected function getTransformer(TransformerAbstract $transformer = null)
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function makeEmptyResponse(array $metas = array())
+    public function makeEmptyResponse(array $metas = [])
     {
         $resource = $this->makeFractalItem([], $this->getTransformer());
 
@@ -224,13 +230,13 @@ public function makeItemResponse(ArrayAccess $item, array $meta = [], Transforme
     }
 
     /**
-     * @param ArrayAccess $collection
-     * @param array $meta
+     * @param ArrayAccess              $collection
+     * @param array                    $meta
      * @param TransformerAbstract|null $transformer
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function makeCollectionResponse(ArrayAccess $collection, array $meta = array(), TransformerAbstract $transformer = null)
+    public function makeCollectionResponse(ArrayAccess $collection, array $meta = [], TransformerAbstract $transformer = null)
     {
         $this->loadFractalIncludes();
 
@@ -241,12 +247,12 @@ public function makeCollectionResponse(ArrayAccess $collection, array $meta = ar
             $collection = $collection->getIterator();
             $resource = $this->makeFractalCollection($collection, $this->getTransformer($transformer));
             $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-        }else {
+        } else {
             $resource = $this->makeFractalCollection($collection, $this->getTransformer($transformer));
         }
 
         $this->addFractalMeta($resource, $meta);
 
         return $this->responseFractal($resource);
     }
-}
+}
diff --git a/src/Fractal/Transformers/GenericTransformer.php b/src/Fractal/Transformers/GenericTransformer.php
@@ -21,9 +21,9 @@ public function transform($data)
         if (is_object($data)):
             if ($data instanceof Arrayable):
                 return $data->toArray();
-            endif;
+        endif;
         endif;
 
         return (array) $data;
     }
-}
+}
diff --git a/src/Traits/CrudMethods.php b/src/Traits/CrudMethods.php
@@ -37,7 +37,7 @@ public function factory(array $data = [])
 
         return $model;
     }
-    
+
     /**
      * @param Model $model
      * @param array $data

diff --git a/src/Traits/ImplementsFractal.php b/src/Traits/ImplementsFractal.php
@@ -3,7 +3,6 @@
 namespace Artesaos\Warehouse\Traits;
 
 use Artesaos\Warehouse\Contracts\FractalFactory;
-
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
@@ -25,7 +24,7 @@ protected function getFractalFactory()
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function makeResponseItem($item, $meta = array())
+    public function makeResponseItem($item, $meta = [])
     {
         return $this->getFractalFactory()->makeItemResponse($item, $meta, $this->getTransformer());
     }
@@ -36,7 +35,7 @@ public function makeResponseItem($item, $meta = array())
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function makeResponseCollection($collection, $meta = array())
+    public function makeResponseCollection($collection, $meta = [])
     {
         return $this->getFractalFactory()->makeCollectionResponse($collection, $meta, $this->getTransformer());
     }
@@ -48,4 +47,4 @@ protected function getTransformer()
     {
         return app($this->transformerClass);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ public function factory(array $data = []) @@
             return $model;
         }
         /**
          * @param Model $model
          * @param array $data
@@ Expand Down @@