Merge pull request #87 from samsonasik/update-phpstan

 [PHPStan] Update to PHPStan ^1.6

Author: samsonasik

composer.json

@@ -71,7 +71,7 @@
         "mezzio/mezzio-laminasviewrenderer": "^2.3",
         "northwoods/container": "^3.0",
         "php-coveralls/php-coveralls": "^2.4",
-        "phpstan/phpstan": "1.5.6 as 1.6",
+        "phpstan/phpstan": "^1.6.7",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "pimple/pimple": "^3.2",
         "rector/rector": "dev-main",

phpstan.neon

@@ -1,6 +1,5 @@
 includes:
 	- vendor/phpstan/phpstan-webmozart-assert/extension.neon
-	- vendor/phpstan/phpstan/conf/bleedingEdge.neon
 
 parameters:
 	excludePaths:
@@ -9,6 +8,7 @@ parameters:
 		- src/Middleware/Routed/Preview/ErrorPreviewAction.php
 	checkMissingIterableValueType: false
 	reportUnmatchedIgnoredErrors: false
+	treatPhpDocTypesAsCertain: false
 	ignoreErrors:
 		- '#function set_error_handler expects (callable(int, string, string, int, array): bool)*#'
 		- '#Invalid type object to throw#'

src/Handler/Formatter/Json.php

@@ -22,7 +22,7 @@ class Json extends BaseJson implements FormatterInterface
     private const TIMESTAMP = 'timestamp';
 
     /**
-     * @param array $event event data
+     * @param array<string, DateTime> $event event data
      * @return string formatted line to write to the log
      */
     public function format($event): string

src/HeroConstant.php

@@ -22,7 +22,7 @@
 
 class HeroConstant
 {
-    /** @var array */
+    /** @var array<int, string> */
     public const ERROR_TYPE = [
         E_ERROR             => 'E_ERROR',
         E_WARNING           => 'E_WARNING',

src/HeroFunction.php

@@ -18,6 +18,9 @@ function detectMessageContentType(string $message): string
         : (strip_tags($message) === $message ? 'text/plain' : 'text/html');
 }
 
+/**
+ * @param array<int, string|array<int, string>> $excludeExceptionsConfig
+ */
 function isExcludedException(array $excludeExceptionsConfig, Throwable $throwable): bool
 {
     $exceptionOrErrorClass = $throwable::class;

src/HeroTrait.php

@@ -55,9 +55,9 @@ public function phpError(...$args): void
         set_error_handler([$this, 'phpErrorHandler']);
     }
 
-    private static function isUncaught(array $error): bool
+    private static function isUncaught(string $message): bool
     {
-        return str_starts_with($error['message'], 'Uncaught');
+        return str_starts_with($message, 'Uncaught');
     }
 
     public function phpFatalErrorHandler(string $buffer): string
@@ -67,7 +67,7 @@ public function phpFatalErrorHandler(string $buffer): string
             return $buffer;
         }
 
-        return self::isUncaught($error) || $this->result === ''
+        return self::isUncaught($error['message']) || $this->result === ''
             ? $buffer
             : $this->result;
     }
@@ -79,7 +79,7 @@ public function execOnShutdown(): void
             return;
         }
 
-        if (self::isUncaught($error)) {
+        if (self::isUncaught($error['message'])) {
             return;
         }
 

src/Module.php

@@ -32,7 +32,7 @@ public function doctrineTransform(ModuleEvent $moduleEvent): void
             return;
         }
 
-        /** @var array $configuration */
+        /** @var array<string, mixed> $configuration */
         $configuration = $container->get('config');
         $configuration['db'] ?? Doctrine::transform($container, $configuration);
     }