platine-php / framework

src/Http/RouteHelper.php

Braces +2 added lines, -4 removed lines

@@ -55,8 +55,7 @@ 
  * @class RouteHelper

  * @package Platine\Framework\Http

  */

-class RouteHelper

-{

+class RouteHelper {
     /**

      * The router instance

      * @var Router

@@ -67,8 +66,7 @@ 
      * Create new instance

      * @param Router $router

      */

-    public function __construct(Router $router)

-    {

+    public function __construct(Router $router) {
         $this->router = $router;

     }

 

src/Http/Middleware/RouteDispatcherMiddleware.php

Braces +4 added lines, -6 removed lines

@@ -59,8 +59,7 @@ 
  * @class RouteDispatcherMiddleware

  * @package Platine\Framework\Http\Middleware

  */

-class RouteDispatcherMiddleware implements MiddlewareInterface

-{

+class RouteDispatcherMiddleware implements MiddlewareInterface {
     /**

      * The Middleware resolver instance

      * @var MiddlewareResolverInterface

@@ -71,8 +70,7 @@ 
      * Create new instance

      * @param MiddlewareResolverInterface $resolver

      */

-    public function __construct(MiddlewareResolverInterface $resolver)

-    {

+    public function __construct(MiddlewareResolverInterface $resolver) {
         $this->resolver = $resolver;

     }

 

@@ -83,11 +81,11 @@ 
         ServerRequestInterface $request,

         RequestHandlerInterface $handler

     ): ResponseInterface {

-        if (!$result = $request->getAttribute(Route::class)) {

+        if (!$result = $request->getAttribute(Route::class)) {
             return $handler->handle($request);

         }

 

-        if ($result instanceof Route) {

+        if ($result instanceof Route) {
             $result = $result->getHandler();

         }

 

src/Http/Middleware/CorsMiddleware.php

Indentation +6 added lines, -6 removed lines

@@ -174,14 +174,14 @@
     {

         if ($this->isPreflight()) {

             $this->setOrigin()

-                 ->setMaxAge()

-                 ->setAllowCredentials()

-                 ->setAllowMethods()

-                 ->setAllowHeaders();

+                    ->setMaxAge()

+                    ->setAllowCredentials()

+                    ->setAllowMethods()

+                    ->setAllowHeaders();

         } else {

             $this->setOrigin()

-                 ->setExposedHeaders()

-                 ->setAllowCredentials();

+                    ->setExposedHeaders()

+                    ->setAllowCredentials();

         }

     }

 

Braces +18 added lines, -19 removed lines

@@ -62,8 +62,7 @@ 
  * @package Platine\Framework\Http\Middleware

  * @template T

  */

-class CorsMiddleware implements MiddlewareInterface

-{

+class CorsMiddleware implements MiddlewareInterface {
     /**

      * The configuration instance

      * @var Config<T>

@@ -96,7 +95,7 @@ 
     public function __construct(

         LoggerInterface $logger,

         Config $config

-    ) {

+    ) {
         $this->config = $config;

         $this->logger = $logger;

     }

@@ -108,13 +107,13 @@ 
         ServerRequestInterface $request,

         RequestHandlerInterface $handler

     ): ResponseInterface {

-        if (!$this->shouldBeProcessed($request)) {

+        if (!$this->shouldBeProcessed($request)) {
             return $handler->handle($request);

         }

 

         $this->request = $request;

 

-        if ($this->isPreflight()) {

+        if ($this->isPreflight()) {
             $response = new Response(204);

 

             $this->logger->info(

@@ -124,7 +123,7 @@ 
                     'url' => (string) $request->getUri(),

                 ]

             );

-        } else {

+        } else {
             $response = $handler->handle($request);

         }

         $this->response = $response;

@@ -144,13 +143,13 @@ 
         //If no route has been match no need check for CORS

         /** @var ?Route $route */

         $route = $request->getAttribute(Route::class);

-        if (!$route) {

+        if (!$route) {
             return false;

         }

 

         //Check if the path match

         $path = $this->config->get('security.cors.path', '/');

-        if (!preg_match('~^' . $path . '~', $route->getPattern())) {

+        if (!preg_match('~^' . $path . '~', $route->getPattern())) {
             return false;

         }

 

@@ -172,13 +171,13 @@ 
      */

     protected function setCorsHeaders(): void

     {

-        if ($this->isPreflight()) {

+        if ($this->isPreflight()) {
             $this->setOrigin()

                  ->setMaxAge()

                  ->setAllowCredentials()

                  ->setAllowMethods()

                  ->setAllowHeaders();

-        } else {

+        } else {
             $this->setOrigin()

                  ->setExposedHeaders()

                  ->setAllowCredentials();

@@ -195,8 +194,8 @@ 
         // default to the first allowed origin

         $origin = reset($origins);

 

-        foreach ($origins as $ori) {

-            if ($ori === $this->request->getHeaderLine('Origin')) {

+        foreach ($origins as $ori) {
+            if ($ori === $this->request->getHeaderLine('Origin')) {
                 $origin = $ori;

                 break;

             }

@@ -219,7 +218,7 @@ 
     {

 

         $headers = $this->config->get('security.cors.expose_headers', []);

-        if (!empty($headers)) {

+        if (!empty($headers)) {
             $this->response = $this->response

                                 ->withHeader(

                                     'Access-Control-Expose-Headers',

@@ -255,7 +254,7 @@ 
     {

         $allowCredentials = $this->config->get('security.cors.allow_credentials', false);

 

-        if ($allowCredentials) {

+        if ($allowCredentials) {
             $this->response = $this->response

                                 ->withHeader(

                                     'Access-Control-Allow-Credential',

@@ -274,7 +273,7 @@ 
     {

         $methods = $this->config->get('security.cors.allow_methods', []);

 

-        if (!empty($methods)) {

+        if (!empty($methods)) {
             $this->response = $this->response

                                 ->withHeader(

                                     'Access-Control-Allow-Methods',

@@ -294,17 +293,17 @@ 
 

         $headers = $this->config->get('security.cors.allow_headers', []);

 

-        if (empty($headers)) {

+        if (empty($headers)) {
             //use request headers

             $requestHeaders = $this->request

                                     ->getHeaderLine('Access-Control-Request-Headers');

 

-            if (!empty($requestHeaders)) {

+            if (!empty($requestHeaders)) {
                 $headers = $requestHeaders;

             }

         }

-        if (!empty($headers)) {

-            if (is_array($headers)) {

+        if (!empty($headers)) {
+            if (is_array($headers)) {
                 $headers = implode(', ', $headers);

             }

 

src/Http/Middleware/MaintenanceMiddleware.php

Indentation +2 added lines, -2 removed lines

@@ -138,8 +138,8 @@
             );

 

             $httpException->setTitle('Service Unavailable')

-                          ->setDescription($message)

-                          ->setHeaders($this->getHeaders($data));

+                            ->setDescription($message)

+                            ->setHeaders($this->getHeaders($data));

 

             // TODO Add headers

             throw $httpException;

Braces +15 added lines, -16 removed lines

@@ -71,8 +71,7 @@ 
  * @package Platine\Framework\Http\Middleware

  * @template T

  */

-class MaintenanceMiddleware implements MiddlewareInterface

-{

+class MaintenanceMiddleware implements MiddlewareInterface {
     /**

      * The configuration instance

      * @var Config<T>

@@ -93,7 +92,7 @@ 
     public function __construct(

         Config $config,

         Application $app

-    ) {

+    ) {
         $this->config = $config;

         $this->app = $app;

     }

@@ -106,26 +105,26 @@ 
         RequestHandlerInterface $handler

     ): ResponseInterface {

 

-        if ($this->isExceptUrl($request)) {

+        if ($this->isExceptUrl($request)) {
             return $handler->handle($request);

         }

 

-        if ($this->app->isInMaintenance()) {

-            try {

+        if ($this->app->isInMaintenance()) {
+            try {
                 $data = $this->app->maintenance()->data();

-            } catch (Throwable $ex) {

+            } catch (Throwable $ex) {
                 throw $ex;

             }

 

-            if (isset($data['secret']) && trim($request->getUri()->getPath(), '/') === $data['secret']) {

+            if (isset($data['secret']) && trim($request->getUri()->getPath(), '/') === $data['secret']) {
                 return $this->bypassResponse($data['secret']);

             }

 

-            if ($this->hasValidBypassCookie($request, $data)) {

+            if ($this->hasValidBypassCookie($request, $data)) {
                 return $handler->handle($request);

             }

 

-            if (isset($data['template'])) {

+            if (isset($data['template'])) {
                 return $this->templateResponse($data['template'], $data);

             }

 

@@ -179,7 +178,7 @@ 
             $data['status'] ?? 503

         );

 

-        foreach ($this->getHeaders($data) as $name => $value) {

+        foreach ($this->getHeaders($data) as $name => $value) {
             $response = $response->withAddedHeader($name, $value);

         }

 

@@ -194,8 +193,8 @@ 
     protected function isExceptUrl(ServerRequestInterface $request): bool

     {

         $path = $request->getUri()->getPath();

-        foreach ($this->getExceptUrls() as $url) {

-            if (Str::is($url, $path)) {

+        foreach ($this->getExceptUrls() as $url) {
+            if (Str::is($url, $path)) {
                 return true;

             }

         }

@@ -220,7 +219,7 @@ 
      */

     protected function hasValidBypassCookie(ServerRequestInterface $request, array $data): bool

     {

-        if (!isset($data['secret'])) {

+        if (!isset($data['secret'])) {
             return false;

         }

 

@@ -228,7 +227,7 @@ 
         $secret = $data['secret'];

         $name = $this->getCookieName();

         $cookieValue = (new RequestData($request))->cookie($name);

-        if (empty($cookieValue)) {

+        if (empty($cookieValue)) {
             return false;

         }

 

@@ -278,7 +277,7 @@ 
     protected function getHeaders(array $data): array

     {

         $headers = isset($data['retry']) ? ['Retry-After' => $data['retry']] : [];

-        if (isset($data['refresh'])) {

+        if (isset($data['refresh'])) {
             $headers['Refresh'] = $data['refresh'];

         }

 

src/Http/Middleware/SecurityPolicyMiddleware.php

Indentation +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
      */

     protected function shouldBeProcessed(ServerRequestInterface $request): bool

     {

-       //If no route has been match no need check for CSRF

+        //If no route has been match no need check for CSRF

         /** @var ?Route $route */

         $route = $request->getAttribute(Route::class);

         if (!$route) {

Braces +5 added lines, -7 removed lines

@@ -59,8 +59,7 @@ 
  * @package Platine\Framework\Http\Middleware

  * @template T

  */

-class SecurityPolicyMiddleware implements MiddlewareInterface

-{

+class SecurityPolicyMiddleware implements MiddlewareInterface {
     /**

      * The SecurityPolicy instance

      * @var SecurityPolicy<T>

@@ -71,8 +70,7 @@ 
      * Create new instance

      * @param SecurityPolicy<T> $securityPolicy

      */

-    public function __construct(SecurityPolicy $securityPolicy)

-    {

+    public function __construct(SecurityPolicy $securityPolicy) {
         $this->securityPolicy = $securityPolicy;

     }

 

@@ -84,7 +82,7 @@ 
         RequestHandlerInterface $handler

     ): ResponseInterface {

 

-        if (!$this->shouldBeProcessed($request)) {

+        if (!$this->shouldBeProcessed($request)) {
             return $handler->handle($request);

         }

 

@@ -102,7 +100,7 @@ 
         $response = $handler->handle($request);

 

         $headers = $this->securityPolicy->headers();

-        foreach ($headers as $name => $value) {

+        foreach ($headers as $name => $value) {
             $response = $response->withAddedHeader($name, $value);

         }

 

@@ -119,7 +117,7 @@ 
        //If no route has been match no need check for CSRF

         /** @var ?Route $route */

         $route = $request->getAttribute(Route::class);

-        if (!$route) {

+        if (!$route) {
             return false;

         }

 

src/Http/Middleware/ErrorHandlerMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
         ServerRequestInterface $request,

         RequestHandlerInterface $handler

     ): ResponseInterface {

-        set_error_handler(static function (

+        set_error_handler(static function(

             int $severity,

             string $message,

             string $file,

Braces +12 added lines, -14 removed lines

@@ -63,8 +63,7 @@ 
  * @class ErrorHandlerMiddleware

  * @package Platine\Framework\Http\Middleware

  */

-class ErrorHandlerMiddleware implements MiddlewareInterface

-{

+class ErrorHandlerMiddleware implements MiddlewareInterface {
     /**

      * The logger instance to use to save error

      * @var LoggerInterface

@@ -100,8 +99,7 @@ 
      * @param bool $detail

      * @param LoggerInterface $logger

      */

-    public function __construct(bool $detail, LoggerInterface $logger)

-    {

+    public function __construct(bool $detail, LoggerInterface $logger) {
         $this->detail = $detail;

         $this->logger = $logger;

         $this->errorHandler = $this->getDefaultErrorHandler();

@@ -131,9 +129,9 @@ 
         ErrorHandlerInterface $handler,

         bool $useSubClasses = false

     ): self {

-        if ($useSubClasses) {

+        if ($useSubClasses) {
             $this->subClassHandlers[$type] = $handler;

-        } else {

+        } else {
             $this->handlers[$type] = $handler;

         }

 

@@ -155,7 +153,7 @@ 
         ): bool {

             // https://www.php.net/manual/en/function.error-reporting.php#8866

             // Usages the defined levels of `error_reporting()`.

-            if (!(error_reporting() & $severity)) {

+            if (!(error_reporting() & $severity)) {
                 // This error code is not included in `error_reporting()`.

                 return true;

             }

@@ -163,9 +161,9 @@ 
             throw new ErrorException($message, 0, $severity, $file, $line);

         });

 

-        try {

+        try {
             $response = $handler->handle($request);

-        } catch (Throwable $exception) {

+        } catch (Throwable $exception) {
             $response = $this->handleException($request, $exception);

         }

 

@@ -183,7 +181,7 @@ 
         ServerRequestInterface $request,

         Throwable $exception

     ): ResponseInterface {

-        if ($exception instanceof HttpException) {

+        if ($exception instanceof HttpException) {
             $request = $exception->getRequest();

         }

 

@@ -201,16 +199,16 @@ 
      */

     protected function getExceptionErrorHandler(string $type): ErrorHandlerInterface

     {

-        if (isset($this->handlers[$type])) {

+        if (isset($this->handlers[$type])) {
             return $this->handlers[$type];

         }

 

-        if (isset($this->subClassHandlers[$type])) {

+        if (isset($this->subClassHandlers[$type])) {
             return $this->subClassHandlers[$type];

         }

 

-        foreach ($this->subClassHandlers as $class => $handler) {

-            if (is_subclass_of($type, $class)) {

+        foreach ($this->subClassHandlers as $class => $handler) {
+            if (is_subclass_of($type, $class)) {
                 return $handler;

             }

         }

src/Http/Middleware/RouteMatchMiddleware.php

Braces +7 added lines, -9 removed lines

@@ -60,8 +60,7 @@ 
  * @class RouteMatchMiddleware

  * @package Platine\Framework\Http\Middleware

  */

-class RouteMatchMiddleware implements MiddlewareInterface

-{

+class RouteMatchMiddleware implements MiddlewareInterface {
     /**

      * The Router instance

      * @var Router

@@ -79,12 +78,11 @@ 
      * @param Router $router

      * @param array<string>  $allowedMethods the default allowed methods

      */

-    public function __construct(Router $router, array $allowedMethods = ['HEAD'])

-    {

+    public function __construct(Router $router, array $allowedMethods = ['HEAD']) {
         $this->router = $router;

 

-        foreach ($allowedMethods as $method) {

-            if (is_string($method)) {

+        foreach ($allowedMethods as $method) {
+            if (is_string($method)) {
                 $this->allowedMethods[] = strtoupper($method);

             }

         }

@@ -97,7 +95,7 @@ 
         ServerRequestInterface $request,

         RequestHandlerInterface $handler

     ): ResponseInterface {

-        if (!$route = $this->router->match($request, false)) {

+        if (!$route = $this->router->match($request, false)) {
             return $handler->handle($request);

         }

 

@@ -105,14 +103,14 @@ 
             !$this->isAllowedMethod($request->getMethod())

             && !$route->isAllowedMethod($request->getMethod())

             && $request->getMethod() !== 'OPTIONS'

-        ) {

+        ) {
             $exception = new HttpMethodNotAllowedException($request);

             $exception->setAllowedMethods($route->getMethods());

 

             throw $exception;

         }

 

-        foreach ($route->getParameters()->all() as $parameter) {

+        foreach ($route->getParameters()->all() as $parameter) {
             $request = $request->withAttribute(

                 $parameter->getName(),

                 $parameter->getValue()

src/Http/Middleware/BodyParserMiddleware.php

Indentation +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
         }

 

         if (!$this->hasParser($contentType)) {

-             // If not, look for a media type with a structured syntax suffix (RFC 6839)

+                // If not, look for a media type with a structured syntax suffix (RFC 6839)

             $parts = explode('+', $contentType);

 

             if (count($parts) >= 2) {

Spacing +2 added lines, -2 removed lines

@@ -138,11 +138,11 @@
      */

     protected function registerDefaultParsers(): void

     {

-        $this->registerParser('application/json', static function ($body) {

+        $this->registerParser('application/json', static function($body) {

             return Json::decode($body, true);

         });

 

-        $this->registerParser('application/x-www-form-urlencoded', static function ($body) {

+        $this->registerParser('application/x-www-form-urlencoded', static function($body) {

             $data = [];

             parse_str($body, $data);

 

Braces +13 added lines, -16 removed lines

@@ -58,8 +58,7 @@ 
  * @class BodyParserMiddleware

  * @package Platine\Framework\Http\Middleware

  */

-class BodyParserMiddleware implements MiddlewareInterface

-{

+class BodyParserMiddleware implements MiddlewareInterface {
     /**

      * List of body parser to use

      * @var array<string, callable>

@@ -69,8 +68,7 @@ 
     /**

      * Create new instance

      */

-    public function __construct()

-    {

+    public function __construct() {
         $this->registerDefaultParsers();

     }

 

@@ -82,7 +80,7 @@ 
         RequestHandlerInterface $handler

     ): ResponseInterface {

         $parsedBody = $request->getParsedBody();

-        if ($parsedBody === null || empty($parsedBody)) {

+        if ($parsedBody === null || empty($parsedBody)) {
             $parsedBody = $this->parseBody($request);

 

             $request = $request->withParsedBody($parsedBody);

@@ -122,7 +120,7 @@ 
      */

     public function getParser(string $contentType): callable

     {

-        if (!isset($this->parsers[$contentType])) {

+        if (!isset($this->parsers[$contentType])) {
             throw new RuntimeException(sprintf(

                 'Can not find the parser for the given content type [%s]',

                 $contentType

@@ -138,11 +136,11 @@ 
      */

     protected function registerDefaultParsers(): void

     {

-        $this->registerParser('application/json', static function ($body) {

+        $this->registerParser('application/json', static function ($body) {
             return Json::decode($body, true);

         });

 

-        $this->registerParser('application/x-www-form-urlencoded', static function ($body) {

+        $this->registerParser('application/x-www-form-urlencoded', static function ($body) {
             $data = [];

             parse_str($body, $data);

 

@@ -155,28 +153,27 @@ 
      * @param ServerRequestInterface $request

      * @return null|array<mixed>|object

      */

-    protected function parseBody(ServerRequestInterface $request)

-    {

+    protected function parseBody(ServerRequestInterface $request) {
         $contentType = $this->getRequestContentType($request);

-        if ($contentType === null) {

+        if ($contentType === null) {
             return null;

         }

 

-        if (!$this->hasParser($contentType)) {

+        if (!$this->hasParser($contentType)) {
              // If not, look for a media type with a structured syntax suffix (RFC 6839)

             $parts = explode('+', $contentType);

 

-            if (count($parts) >= 2) {

+            if (count($parts) >= 2) {
                 $contentType = 'application/' . $parts[count($parts) - 1];

             }

         }

 

-        if ($this->hasParser($contentType)) {

+        if ($this->hasParser($contentType)) {
             $body = (string) $request->getBody();

             $parser = $this->getParser($contentType);

 

             $parsed = $parser($body);

-            if (!is_null($parsed) && !is_array($parsed) && !is_object($parsed)) {

+            if (!is_null($parsed) && !is_array($parsed) && !is_object($parsed)) {
                 throw new RuntimeException(sprintf(

                     'The return value of body parser must be an array, an '

                         . 'object, or null, got [%s]',

@@ -200,7 +197,7 @@ 
         $contentTypes = $request->getHeader('Content-Type');

         $contentType = $contentTypes[0] ?? null;

 

-        if (is_string($contentType) && trim($contentType) !== '') {

+        if (is_string($contentType) && trim($contentType) !== '') {
             $parts = explode(';', $contentType);

 

             return strtolower(trim($parts[0]));

src/Http/Middleware/CsrfMiddleware.php

Braces +7 added lines, -8 removed lines

@@ -64,8 +64,7 @@ 
  * @package Platine\Framework\Http\Middleware

  * @template T

  */

-class CsrfMiddleware implements MiddlewareInterface

-{

+class CsrfMiddleware implements MiddlewareInterface {
     /**

      * The configuration instance

      * @var Config<T>

@@ -108,7 +107,7 @@ 
         Lang $lang,

         Config $config,

         CsrfManager $csrfManager

-    ) {

+    ) {
         $this->config = $config;

         $this->csrfManager = $csrfManager;

         $this->lang = $lang;

@@ -123,13 +122,13 @@ 
         RequestHandlerInterface $handler

     ): ResponseInterface {

 

-        if (!$this->shouldBeProcessed($request)) {

+        if (!$this->shouldBeProcessed($request)) {
             return $handler->handle($request);

         }

 

         $this->request = $request;

 

-        if ($this->isValid() === false) {

+        if ($this->isValid() === false) {
             return $this->unauthorizedResponse();

         }

 

@@ -155,7 +154,7 @@ 
        //If no route has been match no need check for CSRF

         /** @var ?Route $route */

         $route = $request->getAttribute(Route::class);

-        if (!$route) {

+        if (!$route) {
             return false;

         }

 

@@ -164,13 +163,13 @@ 
 

         $methods = $this->config->get('security.csrf.http_methods', []);

 

-        if (!in_array($request->getMethod(), $methods) && $csrf === false) {

+        if (!in_array($request->getMethod(), $methods) && $csrf === false) {
             return false;

         }

 

         //check if is url whitelist

         $urls = $this->config->get('security.csrf.url_whitelist', []);

-        if (in_array($route->getName(), $urls)) {

+        if (in_array($route->getName(), $urls)) {
             return false;

         }

 

Indentation +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
      */

     protected function shouldBeProcessed(ServerRequestInterface $request): bool

     {

-       //If no route has been match no need check for CSRF

+        //If no route has been match no need check for CSRF

         /** @var ?Route $route */

         $route = $request->getAttribute(Route::class);

         if (!$route) {