🔧 Update PHPStan

Makefile

@@ -27,7 +27,7 @@ composer-validate: vendor ## Validate composer.json file
 
 .PHONY: phpstan
 phpstan: vendor ## Check PHP code style
-	vendor/bin/phpstan analyse -l7 -- src tests
+	vendor/bin/phpstan analyse
 
 .PHONY: phpunit
 phpunit: vendor ## Run PhpUnit tests

composer.json

@@ -35,9 +35,9 @@
     "require-dev": {
         "coduo/php-matcher": "^3.2.2",
         "friendsofphp/php-cs-fixer": "^2.15",
-        "jangregor/phpstan-prophecy": "0.4.2",
-        "phpstan/phpstan": "0.11.19",
-        "phpstan/phpstan-phpunit": "0.11.2",
+        "jangregor/phpstan-prophecy": "0.8.0",
+        "phpstan/phpstan": "0.12.25",
+        "phpstan/phpstan-phpunit": "0.12.8",
         "phpunit/phpunit": "^7.5||^8.3",
         "sentry/sdk": "^2.0",
         "symfony/phpunit-bridge": "^4.3",

phpstan.neon.dist

@@ -1,7 +1,16 @@
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
-    - vendor/jangregor/phpstan-prophecy/src/extension.neon
+    - vendor/jangregor/phpstan-prophecy/extension.neon
 parameters:
     inferPrivatePropertyTypeFromConstructor: true
     tipsOfTheDay: false
+    checkMissingIterableValueType: false
+
+    level: 8
+    paths: [src, tests]
+
+    ignoreErrors:
+        - message: "#^Method .*\\\\SpyTransport\\:\\:getSpiedEventsAsArray\\(\\) should return array\\(.*\\) but returns array\\(.*\\)\\.$#"
+          count: 1
+          path: tests/SentryHandlerTest.php

src/SentryHandler.php

@@ -15,7 +15,14 @@
 
 class SentryHandler extends AbstractProcessingHandler
 {
+    /**
+     * @var HubInterface
+     */
     protected $hub;
+
+    /**
+     * @var array
+     */
     private $breadcrumbsBuffer = [];
 
     /**

tests/SentryHandlerTest.php

@@ -24,7 +24,14 @@ class SentryHandlerTest extends TestCase
 {
     use PHPMatcherAssertions;
 
+    /**
+     * @var Hub
+     */
     private $hub;
+
+    /**
+     * @var SpyTransport
+     */
     private $transport;
 
     protected function setUp(): void
@@ -41,8 +48,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        $this->hub       = null;
-        $this->transport = null;
+        unset($this->hub, $this->transport);
     }
 
     public function testHandle(): void
@@ -386,7 +392,7 @@ public function testHandleBatchCanBeCalledTwiceWithoutSideEffects(): void
 
     private function assertCapturedEvent(Severity $severity, string $message, array $extra, \Exception $exception = null, array $breadcrumbs = []): void
     {
-        $event = $this->transport->spiedEvent->toArray();
+        $event = $this->transport->getSpiedEventsAsArray();
 
         if (null !== $exception) {
             $this->assertCount(1, $event['exception']['values']);
@@ -457,6 +463,9 @@ private function createSentryHandler(int $level = null): SpySentryHandler
 
 class SpySentryHandler extends SentryHandler
 {
+    /**
+     * @var bool
+     */
     public $afterWriteCalled = false;
 
     /** {@inheritdoc} */
@@ -504,22 +513,28 @@ public function resetSpy(): void
         $this->isFlushed  = false;
     }
 
-    public function getBreadcrumbsAsArray(): array
+    /**
+     * @return array{
+     *     "exception": array,
+     *     "breadcrumbs": array,
+     *     "message": string,
+     *     "level": string,
+     *     "event_id": string,
+     *     "timestamp": int,
+     *     "platform": string,
+     *     "server_name": string,
+     *     "extra": array,
+     *     "sdk": string,
+     *     "contexts": array
+     * }
+     */
+    public function getSpiedEventsAsArray(): array
     {
         if (null === $this->spiedEvent) {
             throw new \RuntimeException('No spied scope');
         }
 
-        return array_map(
-            function (Breadcrumb $breadcrumb) {
-                $array = $breadcrumb->toArray();
-
-                unset($array['timestamp']);
-
-                return $array;
-            },
-            $this->spiedEvent->getBreadcrumbs()
-        );
+        return $this->spiedEvent->toArray();
     }
 
     public function close(?int $timeout = null): PromiseInterface