Merge pull request #45 from b3-it/dbal4

CronExpressionType: new Exceptions for dbal4
Setono · Aug 15, 2024 · c80b1f9 · c80b1f9
2 parents 71be332 + 357802b
commit c80b1f9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=7.4",
-        "doctrine/dbal": "^3.4",
+        "doctrine/dbal": "^3.4 || ^4.0",
         "doctrine/doctrine-bundle": "^1.9 || ^2.0",
         "dragonmantank/cron-expression": "^2.2 || ^3.0",
         "symfony/config": "^5.4 || ^6.0",

diff --git a/src/Doctrine/DBAL/Types/CronExpressionType.php b/src/Doctrine/DBAL/Types/CronExpressionType.php
@@ -7,6 +7,8 @@
 use Cron\CronExpression;
 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;
 
 final class CronExpressionType extends Type
@@ -28,7 +30,14 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?CronExpr
         }
 
         if (!is_string($value)) {
-            throw ConversionException::conversionFailedInvalidType($value, CronExpression::class, ['string']);
+            if (class_exists(InvalidType::class)) {
+                throw InvalidType::new($value, CronExpression::class, ['string']);
+            } else {
+                /**
+                 * @psalm-suppress UndefinedMethod
+                 */
+                throw ConversionException::conversionFailedInvalidType($value, CronExpression::class, ['string']);
+            }
         }
 
         if ('' === $value) {
@@ -38,7 +47,14 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?CronExpr
         try {
             return CronExpression::factory($value);
         } catch (\Throwable $e) {
-            throw ConversionException::conversionFailed($value, CronExpression::class, $e);
+            if (class_exists(ValueNotConvertible::class)) {
+                throw ValueNotConvertible::new($value, CronExpression::class, null, $e);
+            } else {
+                /**
+                 * @psalm-suppress UndefinedMethod
+                 */
+                throw ConversionException::conversionFailed($value, CronExpression::class, $e);
+            }
         }
     }
 

diff --git a/tests/Doctrine/DBAL/Types/CronExpressionTypeTest.php b/tests/Doctrine/DBAL/Types/CronExpressionTypeTest.php
@@ -7,6 +7,8 @@
 use Cron\CronExpression;
 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;
 use PHPUnit\Framework\TestCase;
 use Setono\CronExpressionBundle\Doctrine\DBAL\Types\CronExpressionType;
@@ -78,6 +80,12 @@ public function convertToPhpReturnsCronExpression(): void
     public function convertFaultyTypeToPhpThrowsException(): void
     {
         self::expectException(ConversionException::class);
+        if (class_exists(InvalidType::class)) {
+            /**
+             * @psalm-suppress InvalidArgument
+             */
+            self::expectException(InvalidType::class);
+        }
 
         $this->getType()->convertToPHPValue(new stdClass(), $this->getPlatform());
     }
@@ -88,6 +96,12 @@ public function convertFaultyTypeToPhpThrowsException(): void
     public function convertFaultyStringToPhpThrowsException(): void
     {
         self::expectException(ConversionException::class);
+        if (class_exists(ValueNotConvertible::class)) {
+            /**
+             * @psalm-suppress InvalidArgument
+             */
+            self::expectException(ValueNotConvertible::class);
+        }
 
         $this->getType()->convertToPHPValue('@never', $this->getPlatform());
     }