Merge branch '4.x' into AddMultipleErrorHandlers

CONTRIBUTING.md

@@ -11,7 +11,7 @@ pull request for each branch. This allows me to review and pull in new features
 
 ## Style Guide
 
-All pull requests must adhere to the [PSR-2 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md).
+All pull requests must adhere to the [PSR-12 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-12-extended-coding-style-guide.md).
 
 ## Unit Testing
 

Slim/App.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -27,6 +28,8 @@
 use Slim\Routing\RouteResolver;
 use Slim\Routing\RouteRunner;
 
+use function strtoupper;
+
 class App extends RouteCollectorProxy implements RequestHandlerInterface
 {
     /**

Slim/CallableResolver.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -16,6 +17,15 @@
 use RuntimeException;
 use Slim\Interfaces\AdvancedCallableResolverInterface;
 
+use function class_exists;
+use function is_array;
+use function is_callable;
+use function is_object;
+use function is_string;
+use function json_encode;
+use function preg_match;
+use function sprintf;
+
 final class CallableResolver implements AdvancedCallableResolverInterface
 {
     /**

Slim/Error/AbstractErrorRenderer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Error/Renderers/HtmlErrorRenderer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -12,6 +13,10 @@
 use Slim\Error\AbstractErrorRenderer;
 use Throwable;
 
+use function get_class;
+use function htmlentities;
+use function sprintf;
+
 /**
  * Default Slim application HTML Error Renderer
  */

Slim/Error/Renderers/JsonErrorRenderer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -12,6 +13,12 @@
 use Slim\Error\AbstractErrorRenderer;
 use Throwable;
 
+use function get_class;
+use function json_encode;
+
+use const JSON_PRETTY_PRINT;
+use const JSON_UNESCAPED_SLASHES;
+
 /**
  * Default Slim application JSON Error Renderer
  */

Slim/Error/Renderers/PlainTextErrorRenderer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -12,6 +13,10 @@
 use Slim\Error\AbstractErrorRenderer;
 use Throwable;
 
+use function get_class;
+use function htmlentities;
+use function sprintf;
+
 /**
  * Default Slim application Plain Text Error Renderer
  */

Slim/Error/Renderers/XmlErrorRenderer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -12,6 +13,10 @@
 use Slim\Error\AbstractErrorRenderer;
 use Throwable;
 
+use function get_class;
+use function sprintf;
+use function str_replace;
+
 /**
  * Default Slim application XML Error Renderer
  */

Slim/Exception/HttpBadRequestException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Exception/HttpException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Exception/HttpForbiddenException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Exception/HttpInternalServerErrorException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Exception/HttpMethodNotAllowedException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -9,6 +10,8 @@
 
 namespace Slim\Exception;
 
+use function implode;
+
 class HttpMethodNotAllowedException extends HttpSpecializedException
 {
     /**

Slim/Exception/HttpNotFoundException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Exception/HttpNotImplementedException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Exception/HttpSpecializedException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Exception/HttpUnauthorizedException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Factory/AppFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -179,7 +180,8 @@ protected static function attemptResponseFactoryDecoration(
         ResponseFactoryInterface $responseFactory,
         StreamFactoryInterface $streamFactory
     ): ResponseFactoryInterface {
-        if (static::$slimHttpDecoratorsAutomaticDetectionEnabled
+        if (
+            static::$slimHttpDecoratorsAutomaticDetectionEnabled
             && SlimHttpPsr17Factory::isResponseFactoryAvailable()
         ) {
             return SlimHttpPsr17Factory::createDecoratedResponseFactory($responseFactory, $streamFactory);

Slim/Factory/Psr17/GuzzlePsr17Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+class LaminasDiactorosPsr17Factory extends Psr17Factory
+{
+    protected static $responseFactoryClass = 'Laminas\Diactoros\ResponseFactory';
+    protected static $streamFactoryClass = 'Laminas\Diactoros\StreamFactory';
+    protected static $serverRequestCreatorClass = 'Laminas\Diactoros\ServerRequestFactory';
+    protected static $serverRequestCreatorMethod = 'fromGlobals';
+}

Slim/Factory/Psr17/NyholmPsr17Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Slim\Factory\Psr17;
@@ -21,7 +22,7 @@ public static function getServerRequestCreator(): ServerRequestCreatorInterface
          * Nyholm Psr17Factory implements all factories in one unified
          * factory which implements all of the PSR-17 factory interfaces
          */
-        $psr17Factory = new static::$responseFactoryClass;
+        $psr17Factory = new static::$responseFactoryClass();
 
         $serverRequestCreator = new static::$serverRequestCreatorClass(
             $psr17Factory,

Slim/Factory/Psr17/Psr17Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -15,6 +16,9 @@
 use Slim\Interfaces\Psr17FactoryInterface;
 use Slim\Interfaces\ServerRequestCreatorInterface;
 
+use function class_exists;
+use function get_called_class;
+
 abstract class Psr17Factory implements Psr17FactoryInterface
 {
     /**
@@ -46,7 +50,7 @@ public static function getResponseFactory(): ResponseFactoryInterface
             throw new RuntimeException(get_called_class() . ' could not instantiate a response factory.');
         }
 
-        return new static::$responseFactoryClass;
+        return new static::$responseFactoryClass();
     }
 
     /**
@@ -58,7 +62,7 @@ public static function getStreamFactory(): StreamFactoryInterface
             throw new RuntimeException(get_called_class() . ' could not instantiate a stream factory.');
         }
 
-        return new static::$streamFactoryClass;
+        return new static::$streamFactoryClass();
     }
 
     /**

Slim/Factory/Psr17/Psr17FactoryProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -11,6 +12,8 @@
 
 use Slim\Interfaces\Psr17FactoryProviderInterface;
 
+use function array_unshift;
+
 class Psr17FactoryProvider implements Psr17FactoryProviderInterface
 {
     /**
@@ -19,6 +22,7 @@ class Psr17FactoryProvider implements Psr17FactoryProviderInterface
     protected static $factories = [
         SlimPsr17Factory::class,
         NyholmPsr17Factory::class,
+        LaminasDiactorosPsr17Factory::class,
         ZendDiactorosPsr17Factory::class,
         GuzzlePsr17Factory::class,
     ];

Slim/Factory/Psr17/ServerRequestCreator.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Factory/Psr17/SlimHttpPsr17Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Factory/Psr17/SlimHttpServerRequestCreator.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -13,6 +14,8 @@
 use RuntimeException;
 use Slim\Interfaces\ServerRequestCreatorInterface;
 
+use function class_exists;
+
 class SlimHttpServerRequestCreator implements ServerRequestCreatorInterface
 {
     /**

Slim/Factory/Psr17/SlimPsr17Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Factory/Psr17/ZendDiactorosPsr17Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Factory/ServerRequestCreatorFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -76,7 +77,8 @@ public static function determineServerRequestCreator(): ServerRequestCreatorInte
     protected static function attemptServerRequestCreatorDecoration(
         ServerRequestCreatorInterface $serverRequestCreator
     ): ServerRequestCreatorInterface {
-        if (static::$slimHttpDecoratorsAutomaticDetectionEnabled
+        if (
+            static::$slimHttpDecoratorsAutomaticDetectionEnabled
             && SlimHttpServerRequestCreator::isServerRequestDecoratorAvailable()
         ) {
             return new SlimHttpServerRequestCreator($serverRequestCreator);

Slim/Handlers/ErrorHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -24,6 +25,18 @@
 use Slim\Interfaces\ErrorRendererInterface;
 use Throwable;
 
+use function array_intersect;
+use function array_key_exists;
+use function array_keys;
+use function call_user_func;
+use function count;
+use function current;
+use function error_log;
+use function explode;
+use function implode;
+use function next;
+use function preg_match;
+
 /**
  * Default Slim application error handler
  *

Slim/Handlers/Strategies/RequestHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

Slim/Handlers/Strategies/RequestResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *