Improve static analysis

lib/Doctrine/Deprecations/Deprecation.php

@@ -46,7 +46,7 @@ class Deprecation
     private const TYPE_TRIGGER_ERROR      = 2;
     private const TYPE_PSR_LOGGER         = 4;
 
-    /** @var self::TYPE_*|null */
+    /** @var int-mask-of<self::TYPE_*>|null */
     private static $type;
 
     /** @var LoggerInterface|null */
@@ -271,7 +271,7 @@ public static function getTriggeredDeprecations(): array
     }
 
     /**
-     * @return self::TYPE_*
+     * @return int-mask-of<self::TYPE_*>
      */
     private static function getTypeFromEnv(): int
     {

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-    level: 3
+    level: 6
     paths:
         - lib
         - tests

psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="7"
+    errorLevel="4"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

tests/Doctrine/Deprecations/DeprecationTest.php

@@ -9,7 +9,6 @@
 use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\Foo\Baz;
 use PHPUnit\Framework\Error\Deprecated;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use ReflectionProperty;
@@ -56,12 +55,14 @@ public function expectDeprecationMessage(string $message): void
 
     public function expectErrorHandler(string $expectedMessage, string $identifier, int $times = 1): void
     {
-        set_error_handler(function ($type, $message) use ($expectedMessage, $identifier, $times): void {
+        set_error_handler(function ($type, $message) use ($expectedMessage, $identifier, $times): bool {
             $this->assertStringMatchesFormat(
                 $expectedMessage,
                 $message
             );
             $this->assertEquals([$identifier => $times], Deprecation::getTriggeredDeprecations());
+
+            return false;
         });
     }
 
@@ -152,7 +153,7 @@ public function testDeprecationResetsCounts(): void
         }
     }
 
-    public function expectDeprecationMock(string $message, string $identifier, string $package): MockObject
+    public function expectDeprecationMock(string $message, string $identifier, string $package): LoggerInterface
     {
         $mock = $this->createMock(LoggerInterface::class);
         $mock->method('notice')->with($message, $this->callback(function ($context) use ($identifier, $package) {

tests/Doctrine/Deprecations/VerifyDeprecationsTest.php

@@ -15,7 +15,8 @@ class VerifyDeprecationsTest extends TestCase
 
     public function setUp(): void
     {
-        set_error_handler(static function (): void {
+        set_error_handler(static function (): bool {
+            return false;
         });
     }