Merge pull request #3193 from ashleycoles/handlersTypes

Handlers types
slimphp · May 5, 2022 · 187d99d · 187d99d
2 parents f8f1377 + 16af910
commit 187d99d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 53 deletions.
diff --git a/Slim/Handlers/ErrorHandler.php b/Slim/Handlers/ErrorHandler.php
@@ -46,10 +46,7 @@
  */
 class ErrorHandler implements ErrorHandlerInterface
 {
-    /**
-     * @var string
-     */
-    protected $defaultErrorRendererContentType = 'text/html';
+    protected string $defaultErrorRendererContentType = 'text/html';
 
     /**
      * @var ErrorRendererInterface|string|callable
@@ -64,68 +61,35 @@ class ErrorHandler implements ErrorHandlerInterface
     /**
      * @var array<string|callable>
      */
-    protected $errorRenderers = [
+    protected array $errorRenderers = [
         'application/json' => JsonErrorRenderer::class,
         'application/xml' => XmlErrorRenderer::class,
         'text/xml' => XmlErrorRenderer::class,
         'text/html' => HtmlErrorRenderer::class,
         'text/plain' => PlainTextErrorRenderer::class,
     ];
 
-    /**
-     * @var bool
-     */
-    protected $displayErrorDetails;
+    protected bool $displayErrorDetails = false;
 
-    /**
-     * @var bool
-     */
-    protected $logErrors;
+    protected bool $logErrors;
 
-    /**
-     * @var bool
-     */
-    protected $logErrorDetails;
+    protected bool $logErrorDetails = false;
 
-    /**
-     * @var string|null
-     */
-    protected $contentType;
+    protected ?string $contentType = null;
 
-    /**
-     * @var string
-     */
-    protected $method;
+    protected ?string $method = null;
 
-    /**
-     * @var ServerRequestInterface
-     */
-    protected $request;
+    protected ServerRequestInterface $request;
 
-    /**
-     * @var Throwable
-     */
-    protected $exception;
+    protected Throwable $exception;
 
-    /**
-     * @var int
-     */
-    protected $statusCode;
+    protected int $statusCode;
 
-    /**
-     * @var CallableResolverInterface
-     */
-    protected $callableResolver;
+    protected CallableResolverInterface $callableResolver;
 
-    /**
-     * @var ResponseFactoryInterface
-     */
-    protected $responseFactory;
+    protected ResponseFactoryInterface $responseFactory;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
+    protected LoggerInterface $logger;
 
     /**
      * @param CallableResolverInterface $callableResolver

diff --git a/Slim/Handlers/Strategies/RequestHandler.php b/Slim/Handlers/Strategies/RequestHandler.php
@@ -19,10 +19,7 @@
  */
 class RequestHandler implements RequestHandlerInvocationStrategyInterface
 {
-    /**
-     * @var bool
-     */
-    protected $appendRouteArgumentsToRequestAttributes;
+    protected bool $appendRouteArgumentsToRequestAttributes;
 
     /**
      * @param bool $appendRouteArgumentsToRequestAttributes