Compat with old dbal

Author: janedbal

phpstan.neon.dist

@@ -10,6 +10,9 @@ parameters:
     paths:
         - src
         - tests
+    excludePaths:
+        analyse:
+            - tests/Fixtures/Compat
     checkMissingCallableSignature: true
     checkUninitializedProperties: true
     checkTooWideReturnTypesInProtectedAndPublicMethods: true
@@ -29,6 +32,10 @@ parameters:
             identifier: 'identical.alwaysFalse'
             reportUnmatched: false
             path: 'src/EntityPreloader.php'
+        -
+            identifier: shipmonk.defaultMatchArmWithEnum
+            reportUnmatched: false # only new dbal issue
+            path: 'src/EntityPreloader.php'
         -
             message: '#Result of \|\| is always false#'
             identifier: 'booleanOr.alwaysFalse'

src/EntityPreloader.php

@@ -457,14 +457,14 @@ private function loadEntitiesBy(
         return $queryBuilder->getQuery()->getResult();
     }
 
-    private function deduceArrayParameterType(Type $dbalType): ?ArrayParameterType
+    private function deduceArrayParameterType(Type $dbalType): ArrayParameterType|int|null // @phpstan-ignore return.unusedType (old dbal compat)
     {
         return match ($dbalType->getBindingType()) {
             ParameterType::INTEGER => ArrayParameterType::INTEGER,
             ParameterType::STRING => ArrayParameterType::STRING,
             ParameterType::ASCII => ArrayParameterType::ASCII,
             ParameterType::BINARY => ArrayParameterType::BINARY,
-            default => null, // @phpstan-ignore shipmonk.defaultMatchArmWithEnum
+            default => null,
         };
     }
 

tests/Fixtures/Blog/BinaryIdType.php

@@ -6,10 +6,13 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 use LogicException;
+use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Compat\CompatibilityType;
 
 final class BinaryIdType extends Type
 {
 
+    use CompatibilityType;
+
     public const NAME = 'binary_id';
 
     public function convertToPHPValue(
@@ -60,7 +63,7 @@ public function getName(): string
         return self::NAME;
     }
 
-    public function getBindingType(): ParameterType
+    public function doGetBindingType(): ParameterType|int // @phpstan-ignore return.unusedType (old dbal compat)
     {
         return ParameterType::BINARY;
     }

tests/Fixtures/Compat/CompatibilityType.php

@@ -0,0 +1,38 @@
+<?php declare(strict_types = 1);
+
+namespace ShipMonkTests\DoctrineEntityPreloader\Fixtures\Compat;
+
+use Doctrine\DBAL\ParameterType;
+use function enum_exists;
+
+if (!enum_exists(ParameterType::class)) {
+    trait CompatibilityType
+    {
+
+        public function getBindingType(): int
+        {
+            return $this->doGetBindingType();
+        }
+
+        private function doGetBindingType(): int|ParameterType
+        {
+            return parent::getBindingType();
+        }
+
+    }
+} else {
+    trait CompatibilityType
+    {
+
+        public function getBindingType(): ParameterType
+        {
+            return $this->doGetBindingType();
+        }
+
+        private function doGetBindingType(): int|ParameterType
+        {
+            return parent::getBindingType();
+        }
+
+    }
+}