From 84f77703fa3d3ee786d69d42e7078b3773eb0956 Mon Sep 17 00:00:00 2001 From: Ondrej Mirtes Date: Fri, 9 Feb 2024 11:40:03 +0100 Subject: [PATCH] Patch Carbon return types --- .github/workflows/build.yml | 1 + compatibility/patches/DateTimeImmutableType.patch | 11 +++++++++++ compatibility/patches/DateTimeType.patch | 11 +++++++++++ 3 files changed, 23 insertions(+) create mode 100644 compatibility/patches/DateTimeImmutableType.patch create mode 100644 compatibility/patches/DateTimeType.patch diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4162bd3..66ab5b7f 100644 --- 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 new file mode 100644 index 00000000..e8525247 --- /dev/null +++ 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 new file mode 100644 index 00000000..0a36920f --- /dev/null +++ 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); + }