Skip to content

Commit ce17b0e

Browse files
committed
More patches for Doctrine bugs
Related: doctrine/orm#11240 Related: doctrine/orm#11241
1 parent 87d961b commit ce17b0e

File tree

4 files changed

+34
-1
lines changed

4 files changed

+34
-1
lines changed

Diff for: .github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
- php-version: "8.3"
113113
dependencies: "highest"
114114
update-packages: |
115-
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"]'
115+
composer config extra.patches.doctrine/orm --json --merge '["compatibility/patches/Base.patch", "compatibility/patches/Column.patch", "compatibility/patches/DateAddFunction.patch", "compatibility/patches/DateSubFunction.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"]'
116116
composer config extra.patches.carbonphp/carbon-doctrine-types --json --merge '["compatibility/patches/DateTimeImmutableType.patch", "compatibility/patches/DateTimeType.patch"]'
117117
composer require --dev doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 -W
118118

Diff for: compatibility/patches/Base.patch

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- src/Query/Expr/Base.php 2024-02-09 14:21:17
2+
+++ src/Query/Expr/Base.php 2024-02-09 14:21:24
3+
@@ -33,6 +33,10 @@
4+
5+
public function __construct(mixed $args = [])
6+
{
7+
+ if (is_array($args) && array_key_exists(0, $args) && is_array($args[0])) {
8+
+ $args = $args[0];
9+
+ }
10+
+
11+
$this->addMultiple($args);
12+
}
13+

Diff for: compatibility/patches/DateAddFunction.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- src/Query/AST/Functions/DateAddFunction.php 2024-02-09 14:22:59
2+
+++ src/Query/AST/Functions/DateAddFunction.php 2024-02-09 14:23:02
3+
@@ -71,7 +71,6 @@
4+
private function dispatchIntervalExpression(SqlWalker $sqlWalker): string
5+
{
6+
$sql = $this->intervalExpression->dispatch($sqlWalker);
7+
- assert(is_numeric($sql));
8+
9+
return $sql;
10+
}

Diff for: compatibility/patches/DateSubFunction.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- src/Query/AST/Functions/DateSubFunction.php 2024-02-09 14:22:31
2+
+++ src/Query/AST/Functions/DateSubFunction.php 2024-02-09 14:22:50
3+
@@ -64,7 +64,6 @@
4+
private function dispatchIntervalExpression(SqlWalker $sqlWalker): string
5+
{
6+
$sql = $this->intervalExpression->dispatch($sqlWalker);
7+
- assert(is_numeric($sql));
8+
9+
return $sql;
10+
}

0 commit comments

Comments
 (0)