Patch Carbon return types

phpstan · Feb 9, 2024 · 84f7770 · 84f7770
1 parent 7960553
commit 84f7770
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -113,6 +113,7 @@ jobs:
             dependencies: "highest"
             update-packages: |
               composer config extra.patches.doctrine/orm --json --merge '["compatibility/patches/Column.patch", "compatibility/patches/DiscriminatorColumn.patch", "compatibility/patches/DiscriminatorMap.patch", "compatibility/patches/Embeddable.patch", "compatibility/patches/Embedded.patch", "compatibility/patches/Entity.patch", "compatibility/patches/GeneratedValue.patch", "compatibility/patches/Id.patch", "compatibility/patches/InheritanceType.patch", "compatibility/patches/JoinColumn.patch", "compatibility/patches/JoinColumns.patch", "compatibility/patches/ManyToMany.patch", "compatibility/patches/ManyToOne.patch", "compatibility/patches/MappedSuperclass.patch", "compatibility/patches/OneToMany.patch", "compatibility/patches/OneToOne.patch", "compatibility/patches/OrderBy.patch", "compatibility/patches/UniqueConstraint.patch", "compatibility/patches/Version.patch"]'
+              composer config extra.patches.carbonphp/carbon-doctrine-types --json --merge '["compatibility/patches/DateTimeImmutableType.patch", "compatibility/patches/DateTimeType.patch"]'
               composer require --dev doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 -W
 
     steps:

diff --git a/compatibility/patches/DateTimeImmutableType.patch b/compatibility/patches/DateTimeImmutableType.patch
@@ -0,0 +1,11 @@
+--- src/Carbon/Doctrine/DateTimeImmutableType.php	2023-12-10 16:33:53
++++ src/Carbon/Doctrine/DateTimeImmutableType.php	2024-02-09 11:36:50
+@@ -17,7 +17,7 @@
+     /**
+      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+      */
+-    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?DateTimeImmutable
++    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?CarbonImmutable
+     {
+         return $this->doConvertToPHPValue($value);
+     }
diff --git a/compatibility/patches/DateTimeType.patch b/compatibility/patches/DateTimeType.patch
@@ -0,0 +1,11 @@
+--- src/Carbon/Doctrine/DateTimeType.php	2023-12-10 16:33:53
++++ src/Carbon/Doctrine/DateTimeType.php	2024-02-09 11:36:58
+@@ -17,7 +17,7 @@
+     /**
+      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+      */
+-    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?DateTime
++    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Carbon
+     {
+         return $this->doConvertToPHPValue($value);
+     }