Improve error handling

Author: martin-georgiev

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

@@ -5,8 +5,8 @@
 namespace MartinGeorgiev\Doctrine\DBAL\Types;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\Type;
 use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidRangeForDatabaseException;
+use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidRangeForPHPException;
 use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Range;
 
 /**
@@ -18,18 +18,8 @@
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
  */
-abstract class BaseRangeType extends Type
+abstract class BaseRangeType extends BaseType
 {
-    public function getName(): string
-    {
-        return static::TYPE_NAME;
-    }
-
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return static::TYPE_NAME;
-    }
-
     public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         if ($value === null) {
@@ -55,7 +45,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Range
         }
 
         if (!\is_string($value)) {
-            throw InvalidRangeForDatabaseException::forInvalidType($value);
+            throw InvalidRangeForPHPException::forInvalidType($value);
         }
 
         if ($value === '') {
@@ -65,7 +55,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Range
         try {
             return $this->createFromString($value);
         } catch (\InvalidArgumentException) {
-            throw InvalidRangeForDatabaseException::forInvalidFormat($value);
+            throw InvalidRangeForPHPException::forInvalidFormat($value);
         }
     }
 

src/MartinGeorgiev/Doctrine/DBAL/Types/Exceptions/InvalidRangeForPHPException.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MartinGeorgiev\Doctrine\DBAL\Types\Exceptions;
+
+use Doctrine\DBAL\Types\ConversionException;
+
+/**
+ * Exception thrown when an invalid PHP value is provided for range creation.
+ *
+ * @since 3.3
+ *
+ * @author Martin Georgiev <martin.georgiev@gmail.com>
+ */
+class InvalidRangeForPHPException extends ConversionException
+{
+    private static function create(string $message, mixed $value): self
+    {
+        return new self(\sprintf($message, \var_export($value, true)));
+    }
+
+    public static function forInvalidNumericBound(mixed $value): self
+    {
+        return self::create('Range bound must be numeric, %s given', $value);
+    }
+
+    public static function forInvalidIntegerBound(mixed $value): self
+    {
+        return self::create('Range bound must be an integer, %s given', $value);
+    }
+
+    public static function forInvalidDateTimeBound(mixed $value): self
+    {
+        return self::create('Range bound must be a DateTimeInterface instance, %s given', $value);
+    }
+
+    public static function forInvalidType(mixed $value): self
+    {
+        return self::create('Invalid database value type for range conversion. Expected string, %s given', $value);
+    }
+
+    public static function forInvalidFormat(string $value): self
+    {
+        return new self(\sprintf('Invalid range format from database: %s', $value));
+    }
+}

src/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/BaseIntegerRange.php

@@ -4,9 +4,13 @@
 
 namespace MartinGeorgiev\Doctrine\DBAL\Types\ValueObject;
 
+use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidRangeForPHPException;
+
 /**
  * Base class for PostgreSQL integer range types.
  *
+ * @extends Range<int>
+ *
  * @since 3.3
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
@@ -30,6 +34,10 @@ protected function compareBounds(mixed $a, mixed $b): int
 
     protected function formatValue(mixed $value): string
     {
+        if (!\is_int($value)) {
+            throw InvalidRangeForPHPException::forInvalidIntegerBound($value);
+        }
+
         return (string) $value;
     }
 

src/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/BaseTimestampRange.php

@@ -4,9 +4,13 @@
 
 namespace MartinGeorgiev\Doctrine\DBAL\Types\ValueObject;
 
+use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidRangeForPHPException;
+
 /**
  * Base class for PostgreSQL timestamp range types.
  *
+ * @extends Range<\DateTimeInterface>
+ *
  * @since 3.3
  *
  * @author Martin Georgiev <martin.georgiev@gmail.com>
@@ -25,6 +29,14 @@ public function __construct(
 
     protected function compareBounds(mixed $a, mixed $b): int
     {
+        if (!$a instanceof \DateTimeInterface) {
+            throw InvalidRangeForPHPException::forInvalidDateTimeBound($a);
+        }
+
+        if (!$b instanceof \DateTimeInterface) {
+            throw InvalidRangeForPHPException::forInvalidDateTimeBound($b);
+        }
+
         $timestampComparison = $a->getTimestamp() <=> $b->getTimestamp();
         if ($timestampComparison !== 0) {
             return $timestampComparison;

src/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/DateRange.php

@@ -4,6 +4,8 @@
 
 namespace MartinGeorgiev\Doctrine\DBAL\Types\ValueObject;
 
+use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidRangeForPHPException;
+
 /**
  * Represents a PostgreSQL DATERANGE (date range).
  *
@@ -39,6 +41,14 @@ public function __construct(
 
     protected function compareBounds(mixed $a, mixed $b): int
     {
+        if (!$a instanceof \DateTimeInterface) {
+            throw InvalidRangeForPHPException::forInvalidDateTimeBound($a);
+        }
+
+        if (!$b instanceof \DateTimeInterface) {
+            throw InvalidRangeForPHPException::forInvalidDateTimeBound($b);
+        }
+
         return $a->getTimestamp() <=> $b->getTimestamp();
     }
 

src/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/NumericRange.php

@@ -4,6 +4,8 @@
 
 namespace MartinGeorgiev\Doctrine\DBAL\Types\ValueObject;
 
+use MartinGeorgiev\Doctrine\DBAL\Types\Exceptions\InvalidRangeForPHPException;
+
 /**
  * Represents a PostgreSQL NUMRANGE (numeric range).
  *
@@ -39,6 +41,14 @@ public function __construct(
 
     protected function compareBounds(mixed $a, mixed $b): int
     {
+        if (!\is_numeric($a)) {
+            throw InvalidRangeForPHPException::forInvalidNumericBound($a);
+        }
+
+        if (!\is_numeric($b)) {
+            throw InvalidRangeForPHPException::forInvalidNumericBound($b);
+        }
+
         return (float) $a <=> (float) $b;
     }
 

src/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/Range.php

@@ -75,6 +75,9 @@ abstract protected function compareBounds(mixed $a, mixed $b): int;
 
     abstract protected function formatValue(mixed $value): string;
 
+    /**
+     * @param string $rangeString The PostgreSQL range string (e.g., '[1,10)', 'empty')
+     */
     public static function fromString(string $rangeString): static
     {
         $rangeString = \trim($rangeString);
@@ -130,9 +133,6 @@ public function contains(mixed $target): bool
         return true;
     }
 
-    /**
-     * Uses PostgreSQL's explicit empty state rather than mathematical tricks.
-     */
     public static function empty(): static
     {
         return new static(null, null, true, false, true);

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

@@ -33,14 +33,6 @@ public function has_name(): void
         self::assertEquals($this->getExpectedTypeName(), $this->fixture->getName());
     }
 
-    #[Test]
-    public function can_get_sql_declaration(): void
-    {
-        $result = $this->fixture->getSQLDeclaration([], $this->platform);
-
-        self::assertEquals($this->getExpectedSqlDeclaration(), $result);
-    }
-
     #[DataProvider('provideValidTransformations')]
     #[Test]
     public function can_transform_from_php_value(?Range $range, ?string $postgresValue): void