Finally gave in to removing preceding space on return type declarations

thephpleague · Jun 30, 2019 · ccea1e7 · ccea1e7
1 parent 9fcb2bf
commit ccea1e7
Show file tree

Hide file tree

Showing 28 changed files with 174 additions and 174 deletions.
diff --git a/docs/4.x/controllers.md b/docs/4.x/controllers.md
@@ -266,4 +266,4 @@ $router->map('GET', '/', 'Acme\controller');
 
 ## Dependency Injection
 
-Where Route is instantiating the objects for your defined controller, a dependency injection container can be used to resolve those objects. Read more on dependency injection [here](/docs/4.x/dependency-injection.md).
+Where Route is instantiating the objects for your defined controller, a dependency injection container can be used to resolve those objects. Read more on dependency injection [here](/docs/4.x/dependency-injection/).
diff --git a/src/ContainerAwareInterface.php b/src/ContainerAwareInterface.php
@@ -11,7 +11,7 @@ interface ContainerAwareInterface
      *
      * @return ContainerInterface|null
      */
-    public function getContainer() : ?ContainerInterface;
+    public function getContainer(): ?ContainerInterface;
 
     /**
      * Set the container implementation
@@ -20,5 +20,5 @@ public function getContainer() : ?ContainerInterface;
      *
      * @return static
      */
-    public function setContainer(ContainerInterface $container) : ContainerAwareInterface;
+    public function setContainer(ContainerInterface $container): ContainerAwareInterface;
 }
diff --git a/src/ContainerAwareTrait.php b/src/ContainerAwareTrait.php
@@ -14,15 +14,15 @@ trait ContainerAwareTrait
     /**
      * {@inheritdoc}
      */
-    public function getContainer() : ?ContainerInterface
+    public function getContainer(): ?ContainerInterface
     {
         return $this->container;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setContainer(ContainerInterface $container) : ContainerAwareInterface
+    public function setContainer(ContainerInterface $container): ContainerAwareInterface
     {
         $this->container = $container;
 

diff --git a/src/Dispatcher.php b/src/Dispatcher.php
@@ -25,7 +25,7 @@ class Dispatcher extends GroupCountBasedDispatcher implements
      *
      * @return ResponseInterface
      */
-    public function dispatchRequest(ServerRequestInterface $request) : ResponseInterface
+    public function dispatchRequest(ServerRequestInterface $request): ResponseInterface
     {
         $httpMethod = $request->getMethod();
         $uri        = $request->getUri()->getPath();
@@ -58,7 +58,7 @@ public function dispatchRequest(ServerRequestInterface $request) : ResponseInter
      * @return Route
      *
      */
-    private function ensureHandlerIsRoute($matchingHandler, $httpMethod, $uri) : Route
+    private function ensureHandlerIsRoute($matchingHandler, $httpMethod, $uri): Route
     {
         if (is_a($matchingHandler, Route::class)) {
             return $matchingHandler;
@@ -69,7 +69,7 @@ private function ensureHandlerIsRoute($matchingHandler, $httpMethod, $uri) : Rou
     /**
      * {@inheritdoc}
      */
-    public function handle(ServerRequestInterface $request) : ResponseInterface
+    public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $middleware = $this->shiftMiddleware();
 
@@ -83,7 +83,7 @@ public function handle(ServerRequestInterface $request) : ResponseInterface
      *
      * @return void
      */
-    protected function setFoundMiddleware(Route $route) : void
+    protected function setFoundMiddleware(Route $route): void
     {
         if ($route->getStrategy() === null) {
             $route->setStrategy($this->getStrategy());
@@ -118,7 +118,7 @@ protected function setFoundMiddleware(Route $route) : void
      *
      * @return void
      */
-    protected function setNotFoundDecoratorMiddleware() : void
+    protected function setNotFoundDecoratorMiddleware(): void
     {
         $middleware = $this->getStrategy()->getNotFoundDecorator(new NotFoundException);
         $this->prependMiddleware($middleware);
@@ -131,7 +131,7 @@ protected function setNotFoundDecoratorMiddleware() : void
      *
      * @return void
      */
-    protected function setMethodNotAllowedDecoratorMiddleware(array $allowed) : void
+    protected function setMethodNotAllowedDecoratorMiddleware(array $allowed): void
     {
         $middleware = $this->getStrategy()->getMethodNotAllowedDecorator(
             new MethodNotAllowedException($allowed)

diff --git a/src/Http/Exception.php b/src/Http/Exception.php
@@ -48,23 +48,23 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getStatusCode() : int
+    public function getStatusCode(): int
     {
         return $this->status;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getHeaders() : array
+    public function getHeaders(): array
     {
         return $this->headers;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function buildJsonResponse(ResponseInterface $response) : ResponseInterface
+    public function buildJsonResponse(ResponseInterface $response): ResponseInterface
     {
         $this->headers['content-type'] = 'application/json';
 

diff --git a/src/Http/Exception/HttpExceptionInterface.php b/src/Http/Exception/HttpExceptionInterface.php
@@ -11,14 +11,14 @@ interface HttpExceptionInterface
      *
      * @return integer
      */
-    public function getStatusCode() : int;
+    public function getStatusCode(): int;
 
     /**
      * Return an array of headers provided when the exception was thrown
      *
      * @return array
      */
-    public function getHeaders() : array;
+    public function getHeaders(): array;
 
     /**
      * Accepts a response object and builds it in to a json representation of the exception.
@@ -27,5 +27,5 @@ public function getHeaders() : array;
      *
      * @return ResponseInterface
      */
-    public function buildJsonResponse(ResponseInterface $response) : ResponseInterface;
+    public function buildJsonResponse(ResponseInterface $response): ResponseInterface;
 }
diff --git a/src/Middleware/MiddlewareAwareInterface.php b/src/Middleware/MiddlewareAwareInterface.php
@@ -13,7 +13,7 @@ interface MiddlewareAwareInterface
      *
      * @return static
      */
-    public function middleware(MiddlewareInterface $middleware) : MiddlewareAwareInterface;
+    public function middleware(MiddlewareInterface $middleware): MiddlewareAwareInterface;
 
     /**
      * Add multiple middleware to the stack
@@ -22,7 +22,7 @@ public function middleware(MiddlewareInterface $middleware) : MiddlewareAwareInt
      *
      * @return static
      */
-    public function middlewares(array $middlewares) : MiddlewareAwareInterface;
+    public function middlewares(array $middlewares): MiddlewareAwareInterface;
 
     /**
      * Prepend a middleware to the stack
@@ -31,19 +31,19 @@ public function middlewares(array $middlewares) : MiddlewareAwareInterface;
      *
      * @return static
      */
-    public function prependMiddleware(MiddlewareInterface $middleware) : MiddlewareAwareInterface;
+    public function prependMiddleware(MiddlewareInterface $middleware): MiddlewareAwareInterface;
 
     /**
      * Shift a middleware from beginning of stack
      *
      * @return MiddlewareInterface|null
      */
-    public function shiftMiddleware() : MiddlewareInterface;
+    public function shiftMiddleware(): MiddlewareInterface;
 
     /**
      * Get the stack of middleware
      *
      * @return MiddlewareInterface[]
      */
-    public function getMiddlewareStack() : iterable;
+    public function getMiddlewareStack(): iterable;
 }
diff --git a/src/Middleware/MiddlewareAwareTrait.php b/src/Middleware/MiddlewareAwareTrait.php
@@ -17,7 +17,7 @@ trait MiddlewareAwareTrait
     /**
      * {@inheritdoc}
      */
-    public function middleware(MiddlewareInterface $middleware) : MiddlewareAwareInterface
+    public function middleware(MiddlewareInterface $middleware): MiddlewareAwareInterface
     {
         $this->middleware[] = $middleware;
 
@@ -27,7 +27,7 @@ public function middleware(MiddlewareInterface $middleware) : MiddlewareAwareInt
     /**
      * {@inheritdoc}
      */
-    public function middlewares(array $middlewares) : MiddlewareAwareInterface
+    public function middlewares(array $middlewares): MiddlewareAwareInterface
     {
         foreach ($middlewares as $middleware) {
             $this->middleware($middleware);
@@ -39,7 +39,7 @@ public function middlewares(array $middlewares) : MiddlewareAwareInterface
     /**
      * {@inheritdoc}
      */
-    public function prependMiddleware(MiddlewareInterface $middleware) : MiddlewareAwareInterface
+    public function prependMiddleware(MiddlewareInterface $middleware): MiddlewareAwareInterface
     {
         array_unshift($this->middleware, $middleware);
 
@@ -53,7 +53,7 @@ public function prependMiddleware(MiddlewareInterface $middleware) : MiddlewareA
      *
      * @return static
      */
-    public function lazyMiddleware(string $middleware) : MiddlewareAwareInterface
+    public function lazyMiddleware(string $middleware): MiddlewareAwareInterface
     {
         $this->middleware[] = $middleware;
 
@@ -67,7 +67,7 @@ public function lazyMiddleware(string $middleware) : MiddlewareAwareInterface
      *
      * @return static
      */
-    public function lazyMiddlewares(array $middlewares) : MiddlewareAwareInterface
+    public function lazyMiddlewares(array $middlewares): MiddlewareAwareInterface
     {
         foreach ($middlewares as $middleware) {
             $this->lazyMiddleware($middleware);
@@ -83,7 +83,7 @@ public function lazyMiddlewares(array $middlewares) : MiddlewareAwareInterface
      *
      * @return static
      */
-    public function lazyPrependMiddleware(string $middleware) : MiddlewareAwareInterface
+    public function lazyPrependMiddleware(string $middleware): MiddlewareAwareInterface
     {
         array_unshift($this->middleware, $middleware);
 
@@ -93,7 +93,7 @@ public function lazyPrependMiddleware(string $middleware) : MiddlewareAwareInter
     /**
      * {@inheritdoc}
      */
-    public function shiftMiddleware() : MiddlewareInterface
+    public function shiftMiddleware(): MiddlewareInterface
     {
         $middleware =  array_shift($this->middleware);
 
@@ -107,7 +107,7 @@ public function shiftMiddleware() : MiddlewareInterface
     /**
      * {@inheritdoc}
      */
-    public function getMiddlewareStack() : iterable
+    public function getMiddlewareStack(): iterable
     {
         return $this->middleware;
     }
@@ -120,7 +120,7 @@ public function getMiddlewareStack() : iterable
      *
      * @return MiddlewareInterface
      */
-    protected function resolveMiddleware($middleware, ?ContainerInterface $container = null) : MiddlewareInterface
+    protected function resolveMiddleware($middleware, ?ContainerInterface $container = null): MiddlewareInterface
     {
         if ($container === null && is_string($middleware) && class_exists($middleware)) {
             $middleware = new $middleware;

diff --git a/src/Route.php b/src/Route.php
@@ -65,7 +65,7 @@ public function __construct(string $method, string $path, $handler)
     public function process(
         ServerRequestInterface $request,
         RequestHandlerInterface $requestHandler
-    ) : ResponseInterface {
+    ): ResponseInterface {
         return $this->getStrategy()->invokeRouteCallable($this, $request);
     }
 
@@ -78,7 +78,7 @@ public function process(
      *
      * @throws InvalidArgumentException
      */
-    public function getCallable(?ContainerInterface $container = null) : callable
+    public function getCallable(?ContainerInterface $container = null): callable
     {
         $callable = $this->handler;
 
@@ -127,7 +127,7 @@ protected function resolveClass(?ContainerInterface $container = null, string $c
      *
      * @return array
      */
-    public function getVars() : array
+    public function getVars(): array
     {
         return $this->vars;
     }
@@ -139,7 +139,7 @@ public function getVars() : array
      *
      * @return Route
      */
-    public function setVars(array $vars) : self
+    public function setVars(array $vars): self
     {
         $this->vars = $vars;
 
@@ -151,7 +151,7 @@ public function setVars(array $vars) : self
      *
      * @return RouteGroup
      */
-    public function getParentGroup() : ?RouteGroup
+    public function getParentGroup(): ?RouteGroup
     {
         return $this->group;
     }
@@ -163,7 +163,7 @@ public function getParentGroup() : ?RouteGroup
      *
      * @return Route
      */
-    public function setParentGroup(RouteGroup $group) : self
+    public function setParentGroup(RouteGroup $group): self
     {
         $this->group = $group;
         $prefix      = $this->group->getPrefix();
@@ -182,7 +182,7 @@ public function setParentGroup(RouteGroup $group) : self
      *
      * @return string
      */
-    public function getPath() : string
+    public function getPath(): string
     {
         return $this->path;
     }
@@ -192,7 +192,7 @@ public function getPath() : string
      *
      * @return string
      */
-    public function getMethod() : string
+    public function getMethod(): string
     {
         return $this->method;
     }

diff --git a/src/RouteCollectionInterface.php b/src/RouteCollectionInterface.php
@@ -13,7 +13,7 @@ interface RouteCollectionInterface
      *
      * @return Route
      */
-    public function map(string $method, string $path, $handler) : Route;
+    public function map(string $method, string $path, $handler): Route;
 
     /**
      * Add a route that responds to GET HTTP method