Merge pull request #5 from brick/orm3

Upgrade to doctrine/orm v3 & doctrine/dbal v4
brick · Dec 19, 2024 · 477ac4e · 477ac4e
2 parents 3f309f9 + f8f0cf6
commit 477ac4e
Show file tree

Hide file tree

Showing 20 changed files with 284 additions and 400 deletions.
diff --git a/composer.json b/composer.json
@@ -10,8 +10,8 @@
     "license": "MIT",
     "require": {
         "brick/date-time": "~0.6.0 || ~0.7.0",
-        "doctrine/dbal": "^2.7.0 || ^3.0",
-        "doctrine/orm": "^2.7.0",
+        "doctrine/dbal": "^4.0",
+        "doctrine/orm": "^3.0",
         "php": "^8.1"
     },
     "require-dev": {
@@ -20,8 +20,8 @@
         "phpunit/phpunit": "^10.5",
         "php-coveralls/php-coveralls": "^2.4",
         "vimeo/psalm": "5.21.1",
-        "doctrine/annotations": "^1.0",
-        "guzzlehttp/guzzle": "^7.0"
+        "guzzlehttp/guzzle": "^7.0",
+        "symfony/cache": "^5.0 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
diff --git a/psalm.xml b/psalm.xml
@@ -5,7 +5,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm-baseline.xml"
     findUnusedBaselineEntry="true"
     findUnusedPsalmSuppress="true"
     findUnusedCode="false"

diff --git a/src/Types/DayOfWeekType.php b/src/Types/DayOfWeekType.php
@@ -6,9 +6,11 @@
 
 use Brick\DateTime\DayOfWeek;
 use Doctrine\DBAL\ParameterType;
-use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\Exception\InvalidType;
+use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use ValueError;
 
 /**
  * Doctrine type for DayOfWeek.
@@ -17,17 +19,12 @@
  */
 final class DayOfWeekType extends Type
 {
-    public function getName(): string
-    {
-        return 'DayOfWeek';
-    }
-
     public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         return $platform->getSmallIntTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int
     {
         if ($value === null) {
             return null;
@@ -37,37 +34,33 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int
             return $value->value;
         }
 
-        throw ConversionException::conversionFailedInvalidType(
+        throw InvalidType::new(
             $value,
-            $this->getName(),
-            [DayOfWeek::class, 'null']
+            static::class,
+            [DayOfWeek::class, 'null'],
         );
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): ?DayOfWeek
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?DayOfWeek
     {
         if ($value === null) {
             return null;
         }
 
-        if (is_int($value)) {
-            return DayOfWeek::from($value);
+        try {
+            return DayOfWeek::from((int) $value);
+        } catch (ValueError $e) {
+            throw ValueNotConvertible::new(
+                $value,
+                DayOfWeek::class,
+                $e->getMessage(),
+                $e,
+            );
         }
-
-        throw ConversionException::conversionFailedInvalidType(
-            $value,
-            $this->getName(),
-            [DayOfWeek::class, 'null']
-        );
     }
 
-    public function getBindingType(): int
+    public function getBindingType(): ParameterType
     {
         return ParameterType::INTEGER;
     }
-
-    public function requiresSQLCommentHint(AbstractPlatform $platform): bool
-    {
-        return true;
-    }
 }
diff --git a/src/Types/DurationType.php b/src/Types/DurationType.php
@@ -4,9 +4,11 @@
 
 namespace Brick\DateTime\Doctrine\Types;
 
+use Brick\DateTime\DateTimeException;
 use Brick\DateTime\Duration;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\Exception\InvalidType;
+use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
 use Doctrine\DBAL\Types\Type;
 
 /**
@@ -16,21 +18,16 @@
  */
 final class DurationType extends Type
 {
-    public function getName(): string
-    {
-        return 'Duration';
-    }
-
     public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         if (!isset($column['length'])) {
             $column['length'] = 64;
         }
 
-        return $platform->getVarcharTypeDeclarationSQL($column);
+        return $platform->getStringTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
     {
         if ($value === null) {
             return null;
@@ -40,24 +37,28 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
             return (string) $value;
         }
 
-        throw ConversionException::conversionFailedInvalidType(
+        throw InvalidType::new(
             $value,
-            $this->getName(),
-            [Duration::class, 'null']
+            static::class,
+            [Duration::class, 'null'],
         );
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): ?Duration
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Duration
     {
         if ($value === null) {
             return null;
         }
 
-        return Duration::parse((string) $value);
-    }
-
-    public function requiresSQLCommentHint(AbstractPlatform $platform): bool
-    {
-        return true;
+        try {
+            return Duration::parse((string) $value);
+        } catch (DateTimeException $e) {
+            throw ValueNotConvertible::new(
+                $value,
+                Duration::class,
+                $e->getMessage(),
+                $e,
+            );
+        }
     }
 }
diff --git a/src/Types/InstantType.php b/src/Types/InstantType.php
@@ -6,7 +6,7 @@
 
 use Brick\DateTime\Instant;
 use Doctrine\DBAL\ParameterType;
-use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\Exception\InvalidType;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 
@@ -17,17 +17,12 @@
  */
 final class InstantType extends Type
 {
-    public function getName(): string
-    {
-        return 'Instant';
-    }
-
     public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         return $platform->getIntegerTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?int
     {
         if ($value === null) {
             return null;
@@ -37,14 +32,14 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int
             return $value->getEpochSecond();
         }
 
-        throw ConversionException::conversionFailedInvalidType(
+        throw InvalidType::new(
             $value,
-            $this->getName(),
-            [Instant::class, 'null']
+            static::class,
+            [Instant::class, 'null'],
         );
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): ?Instant
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Instant
     {
         if ($value === null) {
             return null;
@@ -53,13 +48,8 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Instant
         return Instant::of((int) $value);
     }
 
-    public function getBindingType(): int
+    public function getBindingType(): ParameterType
     {
         return ParameterType::INTEGER;
     }
-
-    public function requiresSQLCommentHint(AbstractPlatform $platform): bool
-    {
-        return true;
-    }
 }
diff --git a/src/Types/LocalDateTimeType.php b/src/Types/LocalDateTimeType.php
@@ -4,8 +4,10 @@
 
 namespace Brick\DateTime\Doctrine\Types;
 
+use Brick\DateTime\DateTimeException;
 use Brick\DateTime\LocalDateTime;
-use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\Exception\InvalidType;
+use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 
@@ -16,17 +18,12 @@
  */
 final class LocalDateTimeType extends Type
 {
-    public function getName(): string
-    {
-        return 'LocalDateTime';
-    }
-
     public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         return $platform->getDateTimeTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
     {
         if ($value === null) {
             return null;
@@ -42,26 +39,30 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
             return $stringValue;
         }
 
-        throw ConversionException::conversionFailedInvalidType(
+        throw InvalidType::new(
             $value,
-            $this->getName(),
-            [LocalDateTime::class, 'null']
+            static::class,
+            [LocalDateTime::class, 'null'],
         );
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform): ?LocalDateTime
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?LocalDateTime
     {
         if ($value === null) {
             return null;
         }
 
         $value = str_replace(' ', 'T', (string) $value);
 
-        return LocalDateTime::parse($value);
-    }
-
-    public function requiresSQLCommentHint(AbstractPlatform $platform): bool
-    {
-        return true;
+        try {
+            return LocalDateTime::parse($value);
+        } catch (DateTimeException $e) {
+            throw ValueNotConvertible::new(
+                $value,
+                LocalDateTime::class,
+                $e->getMessage(),
+                $e,
+            );
+        }
     }
 }