flugger / laravel-responder

src/Traits/RespondsWithJson.php

Spacing +6 added lines, -6 removed lines

@@ -24,9 +24,9 @@ 
      * @param  mixed       $message
      * @return JsonResponse
      */
-    public function errorResponse(string $errorCode = null, int $statusCode = null, $message = null):JsonResponse
+    public function errorResponse( string $errorCode = null, int $statusCode = null, $message = null ):JsonResponse
     {
-        return app(Responder::class)->error($errorCode, $statusCode, $message);
+        return app( Responder::class )->error( $errorCode, $statusCode, $message );
     }
 
     /**
@@ -37,9 +37,9 @@ 
      * @param  array      $meta
      * @return \Illuminate\Http\JsonResponse
      */
-    public function successResponse($data = null, $statusCode = null, array $meta = []):JsonResponse
+    public function successResponse( $data = null, $statusCode = null, array $meta = [ ] ):JsonResponse
     {
-        return app(Responder::class)->success($data, $statusCode, $meta);
+        return app( Responder::class )->success( $data, $statusCode, $meta );
     }
 
     /**
@@ -49,8 +49,8 @@ 
      * @param  callable|string|null $transformer
      * @return \Flugg\Responder\Http\SuccessResponse
      */
-    public function transform($data = null, $transformer = null):SuccessResponseBuilder
+    public function transform( $data = null, $transformer = null ):SuccessResponseBuilder
     {
-        return app(Responder::class)->transform($data, $transformer);
+        return app( Responder::class )->transform( $data, $transformer );
     }
 }
\ No newline at end of file

src/Http/SuccessResponseBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     /**
      * SuccessResponseBuilder constructor.
      *
-     * @param \Illuminate\Contracts\Routing\ResponseFactory|\Laravel\Lumen\Http\ResponseFactory $responseFactory
+     * @param \Illuminate\Contracts\Routing\ResponseFactory $responseFactory
      * @param \Flugg\Responder\ResourceFactory                                                  $resourceFactory
      * @param \League\Fractal\Manager                                                           $manager
      */

Spacing +68 added lines, -68 removed lines

@@ -37,14 +37,14 @@ 
      *
      * @var array
      */
-    protected $meta = [];
+    protected $meta = [ ];
 
     /**
      * The included relations.
      *
      * @var array
      */
-    protected $relations = [];
+    protected $relations = [ ];
 
     /**
      * The Fractal resource instance containing the data and transformer.
@@ -74,13 +74,13 @@ 
      * @param \Flugg\Responder\ResourceFactory                                                  $resourceFactory
      * @param \League\Fractal\Manager                                                           $manager
      */
-    public function __construct($responseFactory, ResourceFactory $resourceFactory, Manager $manager)
+    public function __construct( $responseFactory, ResourceFactory $resourceFactory, Manager $manager )
     {
         $this->resourceFactory = $resourceFactory;
         $this->manager = $manager;
         $this->resource = $this->resourceFactory->make();
 
-        parent::__construct($responseFactory);
+        parent::__construct( $responseFactory );
     }
 
     /**
@@ -89,9 +89,9 @@ 
      * @param  array $data
      * @return self
      */
-    public function addMeta(array $data):SuccessResponseBuilder
+    public function addMeta( array $data ):SuccessResponseBuilder
     {
-        $this->meta = array_merge($this->meta, $data);
+        $this->meta = array_merge( $this->meta, $data );
 
         return $this;
     }
@@ -104,11 +104,11 @@ 
      */
     public function include($relations):SuccessResponseBuilder
     {
-        if (is_string($relations)) {
-            $relations = explode(',', $relations);
+        if ( is_string( $relations ) ) {
+            $relations = explode( ',', $relations );
         }
 
-        $this->relations = array_merge($this->relations, (array) $relations);
+        $this->relations = array_merge( $this->relations, (array) $relations );
 
         return $this;
     }
@@ -119,9 +119,9 @@ 
      * @param  \League\Fractal\Serializer\SerializerAbstract|string $serializer
      * @return self
      */
-    public function serializer($serializer):SuccessResponseBuilder
+    public function serializer( $serializer ):SuccessResponseBuilder
     {
-        $this->manager->setSerializer($this->resolveSerializer($serializer));
+        $this->manager->setSerializer( $this->resolveSerializer( $serializer ) );
 
         return $this;
     }
@@ -133,13 +133,13 @@ 
      * @return self
      * @throws \InvalidArgumentException
      */
-    public function setStatus(int $statusCode):ResponseBuilder
+    public function setStatus( int $statusCode ):ResponseBuilder
     {
-        if ($statusCode < 100 || $statusCode >= 400) {
-            throw new InvalidArgumentException("{$statusCode} is not a valid success HTTP status code.");
+        if ( $statusCode < 100 || $statusCode >= 400 ) {
+            throw new InvalidArgumentException( "{$statusCode} is not a valid success HTTP status code." );
         }
 
-        return parent::setStatus($statusCode);
+        return parent::setStatus( $statusCode );
     }
 
     /**
@@ -151,25 +151,25 @@ 
      * @param  string|null          $resourceKey
      * @return self
      */
-    public function transform($data = null, $transformer = null, string $resourceKey = null):SuccessResponseBuilder
+    public function transform( $data = null, $transformer = null, string $resourceKey = null ):SuccessResponseBuilder
     {
-        $resource = $this->resourceFactory->make($data);
+        $resource = $this->resourceFactory->make( $data );
 
-        if (! is_null($resource->getData())) {
-            $model = $this->resolveModel($resource->getData());
-            $transformer = $this->resolveTransformer($model, $transformer);
-            $resourceKey = $this->resolveResourceKey($model, $resourceKey);
+        if ( ! is_null( $resource->getData() ) ) {
+            $model = $this->resolveModel( $resource->getData() );
+            $transformer = $this->resolveTransformer( $model, $transformer );
+            $resourceKey = $this->resolveResourceKey( $model, $resourceKey );
         }
 
-        if ($transformer instanceof Transformer) {
-            $this->include($relations = $this->resolveNestedRelations($resource->getData()));
+        if ( $transformer instanceof Transformer ) {
+            $this->include( $relations = $this->resolveNestedRelations( $resource->getData() ) );
 
-            if ($transformer->allRelationsAllowed()) {
-                $transformer->setRelations($relations);
+            if ( $transformer->allRelationsAllowed() ) {
+                $transformer->setRelations( $relations );
             }
         }
 
-        $this->resource = $resource->setTransformer($transformer)->setResourceKey($resourceKey);
+        $this->resource = $resource->setTransformer( $transformer )->setResourceKey( $resourceKey );
 
         return $this;
     }
@@ -181,7 +181,7 @@ 
      */
     public function toArray():array
     {
-        return $this->serialize($this->getResource());
+        return $this->serialize( $this->getResource() );
     }
 
     /**
@@ -191,14 +191,14 @@ 
      */
     public function getResource():ResourceInterface
     {
-        $this->manager->parseIncludes($this->relations);
+        $this->manager->parseIncludes( $this->relations );
         $transformer = $this->resource->getTransformer();
 
-        if ($transformer instanceof Transformer && $transformer->allRelationsAllowed()) {
-            $this->resource->setTransformer($transformer->setRelations($this->manager->getRequestedIncludes()));
+        if ( $transformer instanceof Transformer && $transformer->allRelationsAllowed() ) {
+            $this->resource->setTransformer( $transformer->setRelations( $this->manager->getRequestedIncludes() ) );
         }
 
-        return $this->resource->setMeta($this->meta);
+        return $this->resource->setMeta( $this->meta );
     }
 
     /**
@@ -218,13 +218,13 @@ 
      * @return \League\Fractal\Serializer\SerializerAbstract
      * @throws \Flugg\Responder\Exceptions\InvalidSerializerException
      */
-    protected function resolveSerializer($serializer):SerializerAbstract
+    protected function resolveSerializer( $serializer ):SerializerAbstract
     {
-        if (is_string($serializer)) {
+        if ( is_string( $serializer ) ) {
             $serializer = new $serializer;
         }
 
-        if (! $serializer instanceof SerializerAbstract) {
+        if ( ! $serializer instanceof SerializerAbstract ) {
             throw new InvalidSerializerException();
         }
 
@@ -238,15 +238,15 @@ 
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \InvalidArgumentException
      */
-    protected function resolveModel($data):Model
+    protected function resolveModel( $data ):Model
     {
-        if ($data instanceof Model) {
+        if ( $data instanceof Model ) {
             return $data;
         }
 
-        $model = array_values($data)[0];
-        if (! $model instanceof Model) {
-            throw new InvalidArgumentException('You can only transform data containing Eloquent models.');
+        $model = array_values( $data )[ 0 ];
+        if ( ! $model instanceof Model ) {
+            throw new InvalidArgumentException( 'You can only transform data containing Eloquent models.' );
         }
 
         return $model;
@@ -259,15 +259,15 @@ 
      * @param  \Flugg\Responder\Transformer|callable|null $transformer
      * @return \Flugg\Responder\Transformer|callable
      */
-    protected function resolveTransformer(Model $model, $transformer = null)
+    protected function resolveTransformer( Model $model, $transformer = null )
     {
-        $transformer = $transformer ?: $this->resolveTransformerFromModel($model);
+        $transformer = $transformer ?: $this->resolveTransformerFromModel( $model );
 
-        if (is_string($transformer)) {
+        if ( is_string( $transformer ) ) {
             $transformer = new $transformer;
         }
 
-        return $this->parseTransformer($transformer, $model);
+        return $this->parseTransformer( $transformer, $model );
     }
 
     /**
@@ -277,10 +277,10 @@ 
      * @param  \Illuminate\Database\ELoquent\Model $model
      * @return \Flugg\Responder\Transformer|callable
      */
-    protected function resolveTransformerFromModel(Model $model)
+    protected function resolveTransformerFromModel( Model $model )
     {
-        if (! $model instanceof Transformable) {
-            return function ($model) {
+        if ( ! $model instanceof Transformable ) {
+            return function ( $model ) {
                 return $model->toArray();
             };
         }
@@ -296,14 +296,14 @@ 
      * @return \Flugg\Responder\Transformer|callable
      * @throws \InvalidTransformerException
      */
-    protected function parseTransformer($transformer, Model $model)
+    protected function parseTransformer( $transformer, Model $model )
     {
-        if ($transformer instanceof Transformer) {
-            $relations = $transformer->allRelationsAllowed() ? $this->resolveRelations($model) : $transformer->getRelations();
-            $transformer = $transformer->setRelations($relations);
+        if ( $transformer instanceof Transformer ) {
+            $relations = $transformer->allRelationsAllowed() ? $this->resolveRelations( $model ) : $transformer->getRelations();
+            $transformer = $transformer->setRelations( $relations );
 
-        } elseif (! is_callable($transformer)) {
-            throw new InvalidTransformerException($model);
+        } elseif ( ! is_callable( $transformer ) ) {
+            throw new InvalidTransformerException( $model );
         }
 
         return $transformer;
@@ -315,9 +315,9 @@ 
      * @param  \Illuminate\Database\Eloquent\Model $model
      * @return array
      */
-    protected function resolveRelations(Model $model):array
+    protected function resolveRelations( Model $model ):array
     {
-        return array_keys($model->getRelations());
+        return array_keys( $model->getRelations() );
     }
 
     /**
@@ -326,22 +326,22 @@ 
      * @param  \Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model $data
      * @return array
      */
-    protected function resolveNestedRelations($data):array
+    protected function resolveNestedRelations( $data ):array
     {
-        if (is_null($data)) {
-            return [];
+        if ( is_null( $data ) ) {
+            return [ ];
         }
 
-        $data = $data instanceof Model ? [$data] : $data;
+        $data = $data instanceof Model ? [ $data ] : $data;
 
-        return collect($data)->flatMap(function ($model) {
-            $relations = collect($model->getRelations());
+        return collect( $data )->flatMap( function ( $model ) {
+            $relations = collect( $model->getRelations() );
 
-            return $relations->keys()->merge($relations->flatMap(function ($relation, $key) {
-                return collect($this->resolveNestedRelations($relation))->map(function ($nestedRelation) use ($key) {
+            return $relations->keys()->merge( $relations->flatMap( function ( $relation, $key ) {
+                return collect( $this->resolveNestedRelations( $relation ) )->map( function ( $nestedRelation ) use ($key) {
                     return $key . '.' . $nestedRelation;
                 });
-            }));
+            }) );
         })->unique()->toArray();
     }
 
@@ -352,13 +352,13 @@ 
      * @param  string|null                         $resourceKey
      * @return string
      */
-    protected function resolveResourceKey(Model $model, string $resourceKey = null):string
+    protected function resolveResourceKey( Model $model, string $resourceKey = null ):string
     {
-        if (! is_null($resourceKey)) {
+        if ( ! is_null( $resourceKey ) ) {
             return $resourceKey;
         }
 
-        if (method_exists($model, 'getResourceKey')) {
+        if ( method_exists( $model, 'getResourceKey' ) ) {
             return $model->getResourceKey();
         }
 
@@ -371,8 +371,8 @@ 
      * @param  ResourceInterface $resource
      * @return array
      */
-    protected function serialize(ResourceInterface $resource):array
+    protected function serialize( ResourceInterface $resource ):array
     {
-        return $this->manager->createData($resource)->toArray();
+        return $this->manager->createData( $resource )->toArray();
     }
 }

Unused Use Statements -2 removed lines

@@ -6,8 +6,6 @@
 use Flugg\Responder\Exceptions\InvalidSerializerException;
 use Flugg\Responder\Exceptions\InvalidTransformerException;
 use Flugg\Responder\ResourceFactory;
-use Flugg\Responder\ResourceResolver;
-use Flugg\Responder\Transformation;
 use Flugg\Responder\Transformer;
 use Illuminate\Database\Eloquent\Model;
 use InvalidArgumentException;

src/Transformer.php

Spacing +19 added lines, -19 removed lines

@@ -22,7 +22,7 @@ 
      *
      * @var array
      */
-    protected $relations = ['*'];
+    protected $relations = [ '*' ];
 
     /**
      * Get relations set on the transformer.
@@ -31,9 +31,9 @@ 
      */
     public function getRelations():array
     {
-        $relations = array_unique(array_merge($this->getAvailableIncludes(), $this->relations));
+        $relations = array_unique( array_merge( $this->getAvailableIncludes(), $this->relations ) );
 
-        return array_filter($relations, function($relation) {
+        return array_filter( $relations, function ( $relation ) {
             return $relation !== '*';
         });
     }
@@ -44,9 +44,9 @@ 
      * @param  array|string $relations
      * @return self
      */
-    public function setRelations($relations)
+    public function setRelations( $relations )
     {
-        $this->setAvailableIncludes(array_unique(array_merge($this->availableIncludes, (array) $relations)));
+        $this->setAvailableIncludes( array_unique( array_merge( $this->availableIncludes, (array) $relations ) ) );
 
         return $this;
     }
@@ -58,7 +58,7 @@ 
      */
     public function allRelationsAllowed():bool
     {
-        return $this->relations == ['*'];
+        return $this->relations == [ '*' ];
     }
 
     /**
@@ -71,24 +71,24 @@ 
      * @return \League\Fractal\Resource\ResourceInterface|bool
      * @throws \Exception
      */
-    protected function callIncludeMethod(Scope $scope, $includeName, $data)
+    protected function callIncludeMethod( Scope $scope, $includeName, $data )
     {
-        if ($includeName === 'pivot') {
-            return $this->includePivot($data->$includeName);
+        if ( $includeName === 'pivot' ) {
+            return $this->includePivot( $data->$includeName );
         }
 
-        $params = $scope->getManager()->getIncludeParams($scope->getIdentifier($includeName));
+        $params = $scope->getManager()->getIncludeParams( $scope->getIdentifier( $includeName ) );
 
-        if (method_exists($this, $includeName)) {
-            $include = call_user_func([$this, $includeName], $data, $params);
+        if ( method_exists( $this, $includeName ) ) {
+            $include = call_user_func( [ $this, $includeName ], $data, $params );
 
-            if ($include instanceof ResourceAbstract) {
+            if ( $include instanceof ResourceAbstract ) {
                 return $include;
             }
 
-            return app(Responder::class)->transform($include)->getResource();
+            return app( Responder::class )->transform( $include )->getResource();
         } else {
-            return app(Responder::class)->transform($data->$includeName)->getResource();
+            return app( Responder::class )->transform( $data->$includeName )->getResource();
         }
     }
 
@@ -98,14 +98,14 @@ 
      * @param  Pivot $pivot
      * @return \League\Fractal\Resource\ResourceInterface|bool
      */
-    protected function includePivot(Pivot $pivot)
+    protected function includePivot( Pivot $pivot )
     {
-        if (! method_exists($this, 'transformPivot')) {
+        if ( ! method_exists( $this, 'transformPivot' ) ) {
             return false;
         }
 
-        return app(Responder::class)->transform($pivot, function ($pivot) {
-            return $this->transformPivot($pivot);
+        return app( Responder::class )->transform( $pivot, function ( $pivot ) {
+            return $this->transformPivot( $pivot );
         })->getResource();
     }
 }
\ No newline at end of file

src/Exceptions/Http/ApiException.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
      *
      * @param mixed $message
      */
-    public function __construct($message = null)
+    public function __construct( $message = null )
     {
-        parent::__construct($this->statusCode, $this->message ?? $message);
+        parent::__construct( $this->statusCode, $this->message ?? $message );
     }
 
     /**

src/Serializers/ApiSerializer.php

Spacing +22 added lines, -22 removed lines

@@ -22,9 +22,9 @@ 
      * @param  array  $data
      * @return array
      */
-    public function collection($resourceKey, array $data)
+    public function collection( $resourceKey, array $data )
     {
-        return $this->item($resourceKey, $data);
+        return $this->item( $resourceKey, $data );
     }
 
     /**
@@ -34,11 +34,11 @@ 
      * @param  array  $data
      * @return array
      */
-    public function item($resourceKey, array $data)
+    public function item( $resourceKey, array $data )
     {
-        return array_merge($this->null(), [
+        return array_merge( $this->null(), [
             'data' => $data
-        ]);
+        ] );
     }
 
     /**
@@ -60,7 +60,7 @@ 
      * @param  array $meta
      * @return array
      */
-    public function meta(array $meta)
+    public function meta( array $meta )
     {
         return $meta;
     }
@@ -72,20 +72,20 @@ 
      *
      * @return array
      */
-    public function paginator(PaginatorInterface $paginator)
+    public function paginator( PaginatorInterface $paginator )
     {
-        $pagination = parent::paginator($paginator)['pagination'];
+        $pagination = parent::paginator( $paginator )[ 'pagination' ];
 
         $data = [
-            'total' => $pagination['total'],
-            'count' => $pagination['count'],
-            'perPage' => $pagination['per_page'],
-            'currentPage' => $pagination['current_page'],
-            'totalPages' => $pagination['total_pages'],
-            'links' => $pagination['links'],
+            'total' => $pagination[ 'total' ],
+            'count' => $pagination[ 'count' ],
+            'perPage' => $pagination[ 'per_page' ],
+            'currentPage' => $pagination[ 'current_page' ],
+            'totalPages' => $pagination[ 'total_pages' ],
+            'links' => $pagination[ 'links' ],
         ];
 
-        return ['pagination' => $data];
+        return [ 'pagination' => $data ];
     }
 
     /**
@@ -105,15 +105,15 @@ 
      * @param  array $includedData
      * @return array
      */
-    public function mergeIncludes($transformedData, $includedData)
+    public function mergeIncludes( $transformedData, $includedData )
     {
-        $keys = array_keys($includedData);
+        $keys = array_keys( $includedData );
 
-        foreach ($keys as $key) {
-            $includedData[$key] = $includedData[$key]['data'];
+        foreach ( $keys as $key ) {
+            $includedData[ $key ] = $includedData[ $key ][ 'data' ];
         }
 
-        return array_merge($transformedData, $includedData);
+        return array_merge( $transformedData, $includedData );
     }
 
     /**
@@ -124,8 +124,8 @@ 
      *
      * @return array
      */
-    public function includedData(ResourceInterface $resource, array $data)
+    public function includedData( ResourceInterface $resource, array $data )
     {
-        return [];
+        return [ ];
     }
 }

src/ResourceFactory.php

Spacing +28 added lines, -28 removed lines

@@ -46,17 +46,17 @@ 
      * @param  mixed|null $data
      * @return \League\Fractal\Resource\ResourceInterface
      */
-    public function make($data = null)
+    public function make( $data = null )
     {
-        if (is_null($data)) {
+        if ( is_null( $data ) ) {
             return new NullResource();
-        } elseif (is_array($data)) {
-            return static::makeFromArray($data);
+        } elseif ( is_array( $data ) ) {
+            return static::makeFromArray( $data );
         }
 
-        $method = static::getMakeMethod($data);
+        $method = static::getMakeMethod( $data );
 
-        return static::$method($data);
+        return static::$method( $data );
     }
 
     /**
@@ -66,15 +66,15 @@ 
      * @return string
      * @throws \InvalidArgumentException
      */
-    protected function getMakeMethod($data):string
+    protected function getMakeMethod( $data ):string
     {
-        foreach (static::MAKE_METHODS as $class => $method) {
-            if ($data instanceof $class) {
+        foreach ( static::MAKE_METHODS as $class => $method ) {
+            if ( $data instanceof $class ) {
                 return $method;
             }
         }
 
-        throw new InvalidArgumentException('Given data cannot be transformed.');
+        throw new InvalidArgumentException( 'Given data cannot be transformed.' );
     }
 
     /**
@@ -83,9 +83,9 @@ 
      * @param  \Illuminate\Database\Eloquent\Model $model
      * @return \League\Fractal\Resource\ResourceInterface
      */
-    protected function makeFromModel(Model $model):ResourceInterface
+    protected function makeFromModel( Model $model ):ResourceInterface
     {
-        return new ItemResource($model);
+        return new ItemResource( $model );
     }
 
     /**
@@ -94,9 +94,9 @@ 
      * @param  array $array
      * @return \League\Fractal\Resource\ResourceInterface
      */
-    protected function makeFromArray(array $array):ResourceInterface
+    protected function makeFromArray( array $array ):ResourceInterface
     {
-        return empty($array) ? new NullResource() : new CollectionResource($array);
+        return empty($array) ? new NullResource() : new CollectionResource( $array );
     }
 
     /**
@@ -105,9 +105,9 @@ 
      * @param  \Illuminate\Support\Collection $collection
      * @return \League\Fractal\Resource\ResourceInterface
      */
-    protected function makeFromCollection(Collection $collection):ResourceInterface
+    protected function makeFromCollection( Collection $collection ):ResourceInterface
     {
-        return static::makeFromArray($collection->all());
+        return static::makeFromArray( $collection->all() );
     }
 
     /**
@@ -116,9 +116,9 @@ 
      * @param  \Illuminate\Database\Eloquent\Builder $query
      * @return \League\Fractal\Resource\ResourceInterface
      */
-    protected function makeFromBuilder(Builder $query):ResourceInterface
+    protected function makeFromBuilder( Builder $query ):ResourceInterface
     {
-        return static::makeFromCollection($query->get());
+        return static::makeFromCollection( $query->get() );
     }
 
     /**
@@ -127,15 +127,15 @@ 
      * @param  \Illuminate\Contracts\Pagination\LengthAwarePaginator $paginator
      * @return \League\Fractal\Resource\ResourceInterface
      */
-    protected function makeFromPaginator(Paginator $paginator):ResourceInterface
+    protected function makeFromPaginator( Paginator $paginator ):ResourceInterface
     {
-        $resource = static::makeFromCollection($paginator->getCollection());
+        $resource = static::makeFromCollection( $paginator->getCollection() );
 
-        if ($resource instanceof CollectionResource) {
-            $queryParams = array_diff_key(request()->all(), array_flip(['page']));
-            $paginator->appends($queryParams);
+        if ( $resource instanceof CollectionResource ) {
+            $queryParams = array_diff_key( request()->all(), array_flip( [ 'page' ] ) );
+            $paginator->appends( $queryParams );
 
-            $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+            $resource->setPaginator( new IlluminatePaginatorAdapter( $paginator ) );
         }
 
         return $resource;
@@ -147,9 +147,9 @@ 
      * @param  \Illuminate\Database\Eloquent\Relations\Pivot $pivot
      * @return \League\Fractal\Resource\ResourceInterface
      */
-    protected function makeFromPivot(Pivot $pivot):ResourceInterface
+    protected function makeFromPivot( Pivot $pivot ):ResourceInterface
     {
-        return static::makeFromModel($pivot);
+        return static::makeFromModel( $pivot );
     }
 
     /**
@@ -158,8 +158,8 @@ 
      * @param  \Illuminate\Database\Eloquent\Relations\Relation $relation
      * @return \League\Fractal\Resource\ResourceInterface
      */
-    protected function makeFromRelation(Relation $relation):ResourceInterface
+    protected function makeFromRelation( Relation $relation ):ResourceInterface
     {
-        return static::makeFromCollection($relation->get());
+        return static::makeFromCollection( $relation->get() );
     }
 }

src/Http/ErrorResponseBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     /**
      * Constructor.
      *
-     * @param \Illuminate\Contracts\Routing\ResponseFactory|\Laravel\Lumen\Http\ResponseFactory $responseFactory
+     * @param \Illuminate\Contracts\Routing\ResponseFactory $responseFactory
      * @param \Symfony\Component\Translation\TranslatorInterface|Illuminate\Contracts\Translation\Translator $translator
      */
     public function __construct($responseFactory, $translator)

Spacing +16 added lines, -16 removed lines

@@ -19,7 +19,7 @@ 
      *
      * @var array
      */
-    protected $data = [];
+    protected $data = [ ];
 
     /**
      * The error code used to identify the error.
@@ -40,7 +40,7 @@ 
      *
      * @var array
      */
-    protected $parameters = [];
+    protected $parameters = [ ];
 
     /**
      * The HTTP status code for the response.
@@ -62,11 +62,11 @@ 
      * @param \Illuminate\Contracts\Routing\ResponseFactory|\Laravel\Lumen\Http\ResponseFactory $responseFactory
      * @param \Symfony\Component\Translation\TranslatorInterface|Illuminate\Contracts\Translation\Translator $translator
      */
-    public function __construct($responseFactory, $translator)
+    public function __construct( $responseFactory, $translator )
     {
         $this->translator = $translator;
 
-        parent::__construct($responseFactory);
+        parent::__construct( $responseFactory );
     }
 
     /**
@@ -75,9 +75,9 @@ 
      * @param  array $data
      * @return self
      */
-    public function addData(array $data):ErrorResponseBuilder
+    public function addData( array $data ):ErrorResponseBuilder
     {
-        $this->data = array_merge($this->data, $data);
+        $this->data = array_merge( $this->data, $data );
 
         return $this;
     }
@@ -89,11 +89,11 @@ 
      * @param  string|array|null $message
      * @return self
      */
-    public function setError($errorCode = null, $message = null):ErrorResponseBuilder
+    public function setError( $errorCode = null, $message = null ):ErrorResponseBuilder
     {
         $this->errorCode = $errorCode;
 
-        if (is_array($message)) {
+        if ( is_array( $message ) ) {
             $this->parameters = $message;
         } else {
             $this->message = $message;
@@ -109,12 +109,12 @@ 
      * @return self
      * @throws \InvalidArgumentException
      */
-    public function setStatus(int $statusCode):ResponseBuilder
+    public function setStatus( int $statusCode ):ResponseBuilder
     {
-        if ($statusCode < 400 || $statusCode >= 600) {
-            throw new InvalidArgumentException("{$statusCode} is not a valid error HTTP status code.");
+        if ( $statusCode < 400 || $statusCode >= 600 ) {
+            throw new InvalidArgumentException( "{$statusCode} is not a valid error HTTP status code." );
         }
-        return parent::setStatus($statusCode);
+        return parent::setStatus( $statusCode );
     }
 
     /**
@@ -136,7 +136,7 @@ 
      */
     protected function buildErrorData()
     {
-        if (is_null($this->errorCode)) {
+        if ( is_null( $this->errorCode ) ) {
             return null;
         }
 
@@ -145,7 +145,7 @@ 
             'message' => $this->message ?: $this->resolveMessage()
         ];
 
-        return array_merge($data, $this->data);
+        return array_merge( $data, $this->data );
     }
 
     /**
@@ -155,10 +155,10 @@ 
      */
     protected function resolveMessage()
     {
-        if (! $this->translator->has($code = "errors.$this->errorCode")) {
+        if ( ! $this->translator->has( $code = "errors.$this->errorCode" ) ) {
             return null;
         }
 
-        return $this->translator->trans($code, $this->parameters);
+        return $this->translator->trans( $code, $this->parameters );
     }
 }
\ No newline at end of file

src/Traits/MakesApiRequests.php

Spacing +40 added lines, -40 removed lines

@@ -22,10 +22,10 @@ 
      * @param  int   $status
      * @return $this
      */
-    protected function seeSuccess($data = null, $status = 200)
+    protected function seeSuccess( $data = null, $status = 200 )
     {
-        $response = $this->seeSuccessResponse($data, $status);
-        $this->seeSuccessData($response->getData(true)['data']);
+        $response = $this->seeSuccessResponse( $data, $status );
+        $this->seeSuccessData( $response->getData( true )[ 'data' ] );
 
         return $this;
     }
@@ -37,10 +37,10 @@ 
      * @param  int   $status
      * @return $this
      */
-    protected function seeSuccessEquals($data = null, $status = 200)
+    protected function seeSuccessEquals( $data = null, $status = 200 )
     {
-        $response = $this->seeSuccessResponse($data, $status);
-        $this->seeJsonEquals($response->getData(true));
+        $response = $this->seeSuccessResponse( $data, $status );
+        $this->seeJsonEquals( $response->getData( true ) );
 
         return $this;
     }
@@ -51,11 +51,11 @@ 
      * @param  mixed $data
      * @return $this
      */
-    protected function seeSuccessStructure($data = null)
+    protected function seeSuccessStructure( $data = null )
     {
-        $this->seeJsonStructure([
+        $this->seeJsonStructure( [
             'data' => $data
-        ]);
+        ] );
 
         return $this;
     }
@@ -67,14 +67,14 @@ 
      * @param  int   $status
      * @return JsonResponse
      */
-    protected function seeSuccessResponse($data = null, $status = 200):JsonResponse
+    protected function seeSuccessResponse( $data = null, $status = 200 ):JsonResponse
     {
-        $response = app(Responder::class)->success($data, $status);
+        $response = app( Responder::class )->success( $data, $status );
 
-        $this->seeStatusCode($response->getStatusCode())->seeJson([
+        $this->seeStatusCode( $response->getStatusCode() )->seeJson( [
             'success' => true,
             'status' => $response->getStatusCode()
-        ])->seeJsonStructure(['data']);
+        ] )->seeJsonStructure( [ 'data' ] );
 
         return $response;
     }
@@ -85,13 +85,13 @@ 
      * @param  mixed $data
      * @return $this
      */
-    protected function seeSuccessData($data = null)
+    protected function seeSuccessData( $data = null )
     {
-        collect($data)->each(function ($value, $key) {
-            if (is_array($value)) {
-                $this->seeSuccessData($value);
+        collect( $data )->each( function ( $value, $key ) {
+            if ( is_array( $value ) ) {
+                $this->seeSuccessData( $value );
             } else {
-                $this->seeJson([$key => $value]);
+                $this->seeJson( [ $key => $value ] );
             }
         });
 
@@ -104,20 +104,20 @@ 
      * @param  string|array|null $attributes
      * @return array
      */
-    protected function getSuccessData($attributes = null)
+    protected function getSuccessData( $attributes = null )
     {
-        $rawData = $this->decodeResponseJson()['data'];
+        $rawData = $this->decodeResponseJson()[ 'data' ];
 
-        if (is_null($attributes)) {
+        if ( is_null( $attributes ) ) {
             return $rawData;
-        } elseif (is_string($attributes)) {
-            return array_get($rawData, $attributes);
+        } elseif ( is_string( $attributes ) ) {
+            return array_get( $rawData, $attributes );
         }
 
-        $data = [];
+        $data = [ ];
 
-        foreach ($attributes as $attribute) {
-            $data[] = array_get($rawData, $attribute);
+        foreach ( $attributes as $attribute ) {
+            $data[ ] = array_get( $rawData, $attribute );
         }
 
         return $data;
@@ -130,25 +130,25 @@ 
      * @param  int|null $status
      * @return $this
      */
-    protected function seeError(string $error, int $status = null)
+    protected function seeError( string $error, int $status = null )
     {
-        if (! is_null($status)) {
-            $this->seeStatusCode($status);
+        if ( ! is_null( $status ) ) {
+            $this->seeStatusCode( $status );
         }
 
-        if ($this->app->config->get('responder.status_code')) {
-            $this->seeJson([
+        if ( $this->app->config->get( 'responder.status_code' ) ) {
+            $this->seeJson( [
                 'status' => $status
-            ]);
+            ] );
         }
 
-        return $this->seeJson([
+        return $this->seeJson( [
             'success' => false
-        ])->seeJsonSubset([
+        ] )->seeJsonSubset( [
             'error' => [
                 'code' => $error
             ]
-        ]);
+        ] );
     }
 
     /**
@@ -157,7 +157,7 @@ 
      * @param  int $status
      * @return $this
      */
-    abstract protected function seeStatusCode($status);
+    abstract protected function seeStatusCode( $status );
 
     /**
      * Assert that the response contains JSON.
@@ -166,7 +166,7 @@ 
      * @param  bool       $negate
      * @return $this
      */
-    abstract public function seeJson(array $data = null, $negate = false);
+    abstract public function seeJson( array $data = null, $negate = false );
 
     /**
      * Assert that the JSON response has a given structure.
@@ -175,7 +175,7 @@ 
      * @param  array|null $responseData
      * @return $this
      */
-    abstract public function seeJsonStructure(array $structure = null, $responseData = null);
+    abstract public function seeJsonStructure( array $structure = null, $responseData = null );
 
     /**
      * Assert that the response is a superset of the given JSON.
@@ -183,7 +183,7 @@ 
      * @param  array $data
      * @return $this
      */
-    abstract protected function seeJsonSubset(array $data);
+    abstract protected function seeJsonSubset( array $data );
 
     /**
      * Assert that the response contains an exact JSON array.
@@ -191,7 +191,7 @@ 
      * @param  array $data
      * @return $this
      */
-    abstract public function seeJsonEquals(array $data);
+    abstract public function seeJsonEquals( array $data );
 
     /**
      * Validate and return the decoded response JSON.

src/Http/ResponseBuilder.php

Spacing +19 added lines, -19 removed lines

@@ -59,7 +59,7 @@ 
      *
      * @param \Illuminate\Contracts\Routing\ResponseFactory|\Laravel\Lumen\Http\ResponseFactory $responseFactory
      */
-    public function __construct($responseFactory)
+    public function __construct( $responseFactory )
     {
         $this->responseFactory = $responseFactory;
     }
@@ -71,17 +71,17 @@ 
      * @param  array    $headers
      * @return \Illuminate\Http\JsonResponse
      */
-    public function respond(int $statusCode = null, array $headers = []):JsonResponse
+    public function respond( int $statusCode = null, array $headers = [ ] ):JsonResponse
     {
-        if (! is_null($statusCode)) {
-            $this->setStatus($statusCode);
+        if ( ! is_null( $statusCode ) ) {
+            $this->setStatus( $statusCode );
         }
 
         $data = $this->toArray();
-        $data = $this->includeStatusCode($data);
-        $data = $this->includeSuccessFlag($data);
+        $data = $this->includeStatusCode( $data );
+        $data = $this->includeSuccessFlag( $data );
 
-        return $this->responseFactory->json($data, $this->statusCode, $headers);
+        return $this->responseFactory->json( $data, $this->statusCode, $headers );
     }
 
     /**
@@ -90,7 +90,7 @@ 
      * @param  int $statusCode
      * @return self
      */
-    public function setStatus(int $statusCode):ResponseBuilder
+    public function setStatus( int $statusCode ):ResponseBuilder
     {
         $this->statusCode = $statusCode;
 
@@ -110,7 +110,7 @@ 
      * @param  bool $includeSuccessFlag
      * @return self
      */
-    public function setIncludeSuccessFlag(bool $includeSuccessFlag):ResponseBuilder
+    public function setIncludeSuccessFlag( bool $includeSuccessFlag ):ResponseBuilder
     {
         $this->includeSuccessFlag = $includeSuccessFlag;
 
@@ -123,7 +123,7 @@ 
      * @param  bool $includeStatusCode
      * @return self
      */
-    public function setIncludeStatusCode(bool $includeStatusCode):ResponseBuilder
+    public function setIncludeStatusCode( bool $includeStatusCode ):ResponseBuilder
     {
         $this->includeStatusCode = $includeStatusCode;
 
@@ -137,7 +137,7 @@ 
      */
     public function toCollection():Collection
     {
-        return new Collection($this->toArray());
+        return new Collection( $this->toArray() );
     }
 
     /**
@@ -146,9 +146,9 @@ 
      * @param  int $options
      * @return string
      */
-    public function toJson($options = 0)
+    public function toJson( $options = 0 )
     {
-        return json_encode($this->jsonSerialize(), $options);
+        return json_encode( $this->jsonSerialize(), $options );
     }
 
     /**
@@ -174,13 +174,13 @@ 
      * @param  array $data
      * @return array
      */
-    protected function includeSuccessFlag(array $data):array
+    protected function includeSuccessFlag( array $data ):array
     {
-        if (! $this->includeSuccessFlag) {
+        if ( ! $this->includeSuccessFlag ) {
             return $data;
         }
 
-        return array_merge(['success' => $this->isSuccessResponse()], $data);
+        return array_merge( [ 'success' => $this->isSuccessResponse() ], $data );
     }
 
     /**
@@ -189,12 +189,12 @@ 
      * @param  array $data
      * @return array
      */
-    protected function includeStatusCode(array $data):array
+    protected function includeStatusCode( array $data ):array
     {
-        if (! $this->includeStatusCode) {
+        if ( ! $this->includeStatusCode ) {
             return $data;
         }
 
-        return array_merge(['status' => $this->statusCode], $data);
+        return array_merge( [ 'status' => $this->statusCode ], $data );
     }
 }
\ No newline at end of file