Skip to content

Commit

Permalink
Merge pull request #198 from lucasmichot/psr2
Browse files Browse the repository at this point in the history
Ensure PSR-2 standard : remove trailing spaces
  • Loading branch information
jasonlewis committed Sep 24, 2014
2 parents 59fc421 + a32531e commit c95e981
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 39 deletions.
12 changes: 6 additions & 6 deletions src/ApiServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function boot()

/**
* Boot the container bindings.
*
*
* @return void
*/
protected function bootContainerBindings()
Expand All @@ -53,7 +53,7 @@ protected function bootContainerBindings()

/**
* Boot the response facade macro.
*
*
* @return void
*/
protected function bootResponseMacro()
Expand All @@ -65,7 +65,7 @@ protected function bootResponseMacro()

/**
* Boot the response transformer.
*
*
* @return void
*/
protected function bootResponseTransformer()
Expand Down Expand Up @@ -100,7 +100,7 @@ protected function bootResponseFormats()

/**
* Boot the current route and the authentication.
*
*
* @return void
*/
protected function bootRouteAndAuthentication()
Expand Down Expand Up @@ -142,7 +142,7 @@ public function register()

/**
* Register the booting event.
*
*
* @return void
*/
protected function registerBootingEvent()
Expand Down Expand Up @@ -180,7 +180,7 @@ protected function registerRouter()

/**
* Register the API response builder.
*
*
* @return void
*/
protected function registerResponseBuilder()
Expand Down
10 changes: 5 additions & 5 deletions src/Auth/LeagueOAuth2Provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ class LeagueOAuth2Provider extends AuthorizationProvider

/**
* Callback to fetch a user.
*
*
* @var callable
*/
protected $userCallback;

/**
* Callback to fetch a client.
*
*
* @var callable
*/
protected $clientCallback;
Expand Down Expand Up @@ -89,7 +89,7 @@ public function authenticate(Request $request, Route $route)

/**
* Resolve the resource owner.
*
*
* @return mixed
*/
protected function resolveResourceOwner()
Expand All @@ -116,7 +116,7 @@ protected function getRouteScopes(Route $route)

/**
* Set the callback to fetch a user.
*
*
* @param callable $callback
* @return \Dingo\Api\Auth\LeagueOAuth2Provider
*/
Expand All @@ -129,7 +129,7 @@ public function setUserCallback(callable $callback)

/**
* Set the callback to fetch a client.
*
*
* @param callable $callback
* @return \Dingo\Api\Auth\LeagueOAuth2Provider
*/
Expand Down
8 changes: 4 additions & 4 deletions src/Auth/Shield.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ class Shield

/**
* Illuminate request instance.
*
*
* @var \Illuminate\Http\Request
*/
protected $request;

/**
* Illuminate route instance.
*
*
* @var \Illumimate\Routing\Route
*/
protected $route;
Expand Down Expand Up @@ -180,7 +180,7 @@ public function getProviderUsed()

/**
* Set the request instance.
*
*
* @param \Illuminate\Routing\Route $route
* @return \Dingo\Api\Auth\Shield
*/
Expand All @@ -193,7 +193,7 @@ public function setRequest(Request $request)

/**
* Set the route instance.
*
*
* @param \Illuminate\Routing\Route $route
* @return \Dingo\Api\Auth\Shield
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Dispatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class Dispatcher

/**
* Request uploaded files.
*
*
* @var array
*/
protected $files = [];
Expand Down Expand Up @@ -117,7 +117,7 @@ protected function setupRequestStack()

/**
* Attach files to be uploaded.
*
*
* @param array $files
* @return \Dingo\Api\Dispatcher
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Middleware/Authentication.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ

/**
* Get the API route collection for the given request.
*
*
* @param \Symfony\Component\HttpFoundation\Request $request
* @return \Dingo\Api\Routing\ApiRouteCollection
*/
Expand Down
32 changes: 16 additions & 16 deletions src/Http/ResponseBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ class ResponseBuilder

/**
* The Fractal serializer.
*
*
* @var \League\Fractal\Serializer\SerializerAbstract
*/
protected $serializer;

/**
* Array of meta data.
*
*
* @var array
*/
protected $meta = [];
Expand Down Expand Up @@ -124,7 +124,7 @@ public function withArray(array $array)

/**
* Return an error response.
*
*
* @param string|array $error
* @param int $statusCode
* @return \Illuminate\Http\Response
Expand All @@ -142,7 +142,7 @@ public function withError($error, $statusCode)

/**
* Add a Fractal meta key and value pair.
*
*
* @param string $key
* @param mixed $value
* @return \Dingo\Api\Http\ResponseBuilder
Expand All @@ -156,7 +156,7 @@ public function addMeta($key, $value)

/**
* Add a Fractal meta key and value pair.
*
*
* @param string $key
* @param mixed $value
* @return \Dingo\Api\Http\ResponseBuilder
Expand Down Expand Up @@ -197,7 +197,7 @@ protected function build($data)

/**
* Reset this response builder instance.
*
*
* @return void
*/
protected function reset()
Expand All @@ -224,7 +224,7 @@ public function addHeader($name, $value)

/**
* Add an array of headers.
*
*
* @param array $headers
* @return \Dingo\Api\Http\ResponseBuilder
*/
Expand All @@ -237,7 +237,7 @@ public function addHeaders(array $headers)

/**
* Add a header to the response.
*
*
* @param string $name
* @param string $value
* @return \Dingo\Api\Http\ResponseBuilder
Expand All @@ -249,7 +249,7 @@ public function header($name, $value)

/**
* Add an array of headers.
*
*
* @param array $headers
* @return \Dingo\Api\Http\ResponseBuilder
*/
Expand All @@ -273,7 +273,7 @@ public function setStatusCode($statusCode)

/**
* Return a 404 not found error.
*
*
* @param string|array $message
* @return \Illuminate\Http\Response
*/
Expand All @@ -284,7 +284,7 @@ public function errorNotFound($message = 'Not Found')

/**
* Return a 400 bad request error.
*
*
* @param string|array $message
* @return \Illuminate\Http\Response
*/
Expand All @@ -295,7 +295,7 @@ public function errorBadRequest($message = 'Bad Request')

/**
* Return a 403 forbidden error.
*
*
* @param string|array $message
* @return \Illuminate\Http\Response
*/
Expand All @@ -306,7 +306,7 @@ public function errorForbidden($message = 'Forbidden')

/**
* Return a 500 internal server error.
*
*
* @param string|array $message
* @return \Illuminate\Http\Response
*/
Expand All @@ -317,7 +317,7 @@ public function errorInternal($message = 'Internal Error')

/**
* Return a 401 unauthorized error.
*
*
* @param string|array $message
* @return \Illuminate\Http\Response
*/
Expand All @@ -328,7 +328,7 @@ public function errorUnauthorized($message = 'Unauthorized')

/**
* Set the Fractal serializer.
*
*
* @param \League\Fractal\Serializer\SerializerAbstract $serializer
* @return \Dingo\Api\Http\ResponseBuilder
*/
Expand All @@ -341,7 +341,7 @@ public function setSerializer(SerializerAbstract $serializer)

/**
* Set the Fractal serializer.
*
*
* @param \League\Fractal\Serializer\SerializerAbstract $serializer
* @return \Dingo\Api\Http\ResponseBuilder
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Http/ResponseFormat/JsonpResponseFormat.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected function hasValidCallback()

/**
* Get the callback from the query string.
*
*
* @return string
*/
protected function getCallback()
Expand Down
2 changes: 1 addition & 1 deletion src/Http/ResponseFormat/ResponseFormat.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ abstract class ResponseFormat

/**
* Set the request intance.
*
*
* @param \Illuminate\Http\Request $request
* @return \Dingo\Api\Http\ResponseFormat\ResponseFormat
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Routing/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ abstract class Controller extends IlluminateController

/**
* API response builder instance.
*
*
* @var \Dingo\Api\Http\ResponseBuilder
*/
protected $response;
Expand Down Expand Up @@ -144,7 +144,7 @@ public function getScopedMethods()

/**
* Magically handle calls to the response builder.
*
*
* @param string $method
* @param array $parameters
* @return mixed
Expand Down
2 changes: 1 addition & 1 deletion src/Routing/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public function getApiRouteCollectionFromRequest(Request $request)

/**
* Get the default API route collection.
*
*
* @return \Dingo\Api\Routing\ApiRouteCollection|null
*/
public function getDefaultApiRouteCollection()
Expand Down

0 comments on commit c95e981

Please sign in to comment.