Use template for BaseRangeTestCase

Author: martin-georgiev

src/MartinGeorgiev/Doctrine/DBAL/Types/BaseRangeType.php

@@ -12,14 +12,17 @@
 /**
  * Base class for PostgreSQL range types.
  *
- * @template T of Range
+ * @template R of Range
  *
  * @since 3.3
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
  */
 abstract class BaseRangeType extends BaseType
 {
+    /**
+     * @param R|null $value
+     */
     public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         if ($value === null) {
@@ -34,9 +37,9 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
     }
 
     /**
-     * @param mixed $value
+     * @param string|null $value
      *
-     * @return T|null
+     * @return R|null
      */
     public function convertToPHPValue($value, AbstractPlatform $platform): ?Range
     {
@@ -60,7 +63,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Range
     }
 
     /**
-     * @return T
+     * @return R
      */
     abstract protected function createFromString(string $value): Range;
 }

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/BaseRangeTestCase.php

@@ -5,21 +5,26 @@
 namespace Tests\Unit\MartinGeorgiev\Doctrine\DBAL\Types;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\Type;
 use MartinGeorgiev\Doctrine\DBAL\Types\BaseRangeType;
 use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Range;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @template R of Range
+ */
 abstract class BaseRangeTestCase extends TestCase
 {
     /**
      * @var AbstractPlatform&MockObject
      */
     protected MockObject $platform;
 
+    /**
+     * @var BaseRangeType<R>
+     */
     protected BaseRangeType $fixture;
 
     protected function setUp(): void
@@ -34,13 +39,19 @@ public function has_name(): void
         self::assertEquals($this->getExpectedTypeName(), $this->fixture->getName());
     }
 
+    /**
+     * @param R|null $range
+     */
     #[DataProvider('provideValidTransformations')]
     #[Test]
     public function can_transform_from_php_value(?Range $range, ?string $postgresValue): void
     {
         self::assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($range, $this->platform));
     }
 
+    /**
+     * @param R|null $range
+     */
     #[DataProvider('provideValidTransformations')]
     #[Test]
     public function can_transform_to_php_value(?Range $range, ?string $postgresValue): void
@@ -87,6 +98,9 @@ public function can_handle_postgres_empty_range(): void
      */
     abstract public static function provideValidTransformations(): \Generator;
 
+    /**
+     * @return BaseRangeType<R>
+     */
     abstract protected function createRangeType(): BaseRangeType;
 
     /**
@@ -95,9 +109,7 @@ abstract protected function createRangeType(): BaseRangeType;
     abstract protected function getExpectedTypeName(): string;
 
     /**
-     * Returns the expected SQL declaration (e.g., 'NUMRANGE', 'INT4RANGE').
+     * @return class-string<R>
      */
-    abstract protected function getExpectedSqlDeclaration(): string;
-
     abstract protected function getExpectedValueObjectClass(): string;
 }

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/DateRangeTest.php

@@ -7,6 +7,9 @@
 use MartinGeorgiev\Doctrine\DBAL\Types\DateRange;
 use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\DateRange as DateRangeValueObject;
 
+/**
+ * @extends BaseRangeTestCase<DateRangeValueObject>
+ */
 final class DateRangeTest extends BaseRangeTestCase
 {
     protected function createRangeType(): DateRange
@@ -19,11 +22,6 @@ protected function getExpectedTypeName(): string
         return 'daterange';
     }
 
-    protected function getExpectedSqlDeclaration(): string
-    {
-        return 'daterange';
-    }
-
     protected function getExpectedValueObjectClass(): string
     {
         return DateRangeValueObject::class;

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/Int4RangeTest.php

@@ -7,6 +7,9 @@
 use MartinGeorgiev\Doctrine\DBAL\Types\Int4Range;
 use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Int4Range as Int4RangeValueObject;
 
+/**
+ * @extends BaseRangeTestCase<Int4RangeValueObject>
+ */
 final class Int4RangeTest extends BaseRangeTestCase
 {
     protected function createRangeType(): Int4Range
@@ -19,11 +22,6 @@ protected function getExpectedTypeName(): string
         return 'int4range';
     }
 
-    protected function getExpectedSqlDeclaration(): string
-    {
-        return 'int4range';
-    }
-
     protected function getExpectedValueObjectClass(): string
     {
         return Int4RangeValueObject::class;

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/Int8RangeTest.php

@@ -7,6 +7,9 @@
 use MartinGeorgiev\Doctrine\DBAL\Types\Int8Range;
 use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Int8Range as Int8RangeValueObject;
 
+/**
+ * @extends BaseRangeTestCase<Int8RangeValueObject>
+ */
 final class Int8RangeTest extends BaseRangeTestCase
 {
     protected function createRangeType(): Int8Range
@@ -19,11 +22,6 @@ protected function getExpectedTypeName(): string
         return 'int8range';
     }
 
-    protected function getExpectedSqlDeclaration(): string
-    {
-        return 'int8range';
-    }
-
     protected function getExpectedValueObjectClass(): string
     {
         return Int8RangeValueObject::class;

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/NumRangeTest.php

@@ -7,6 +7,9 @@
 use MartinGeorgiev\Doctrine\DBAL\Types\NumRange;
 use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\NumericRange;
 
+/**
+ * @extends BaseRangeTestCase<NumericRange>
+ */
 final class NumRangeTest extends BaseRangeTestCase
 {
     protected function createRangeType(): NumRange
@@ -19,11 +22,6 @@ protected function getExpectedTypeName(): string
         return 'numrange';
     }
 
-    protected function getExpectedSqlDeclaration(): string
-    {
-        return 'numrange';
-    }
-
     protected function getExpectedValueObjectClass(): string
     {
         return NumericRange::class;

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/TsRangeTest.php

@@ -7,6 +7,9 @@
 use MartinGeorgiev\Doctrine\DBAL\Types\TsRange;
 use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\TsRange as TsRangeValueObject;
 
+/**
+ * @extends BaseRangeTestCase<TsRangeValueObject>
+ */
 final class TsRangeTest extends BaseRangeTestCase
 {
     protected function createRangeType(): TsRange
@@ -19,11 +22,6 @@ protected function getExpectedTypeName(): string
         return 'tsrange';
     }
 
-    protected function getExpectedSqlDeclaration(): string
-    {
-        return 'tsrange';
-    }
-
     protected function getExpectedValueObjectClass(): string
     {
         return TsRangeValueObject::class;

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/TstzRangeTest.php

@@ -7,6 +7,9 @@
 use MartinGeorgiev\Doctrine\DBAL\Types\TstzRange;
 use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\TstzRange as TstzRangeValueObject;
 
+/**
+ * @extends BaseRangeTestCase<TstzRangeValueObject>
+ */
 final class TstzRangeTest extends BaseRangeTestCase
 {
     protected function createRangeType(): TstzRange
@@ -19,11 +22,6 @@ protected function getExpectedTypeName(): string
         return 'tstzrange';
     }
 
-    protected function getExpectedSqlDeclaration(): string
-    {
-        return 'tstzrange';
-    }
-
     protected function getExpectedValueObjectClass(): string
     {
         return TstzRangeValueObject::class;