Skip to content

Commit 6d758ad

Browse files
committed
Merge remote-tracking branch 'origin/1.3.x' into 1.4.x
2 parents e5442ed + f3f1dae commit 6d758ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1721
-163
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
.github export-ignore
44
tests export-ignore
5+
compatibility export-ignore
56
tmp export-ignore
67
.gitattributes export-ignore
78
.gitignore export-ignore

.github/workflows/build.yml

+20
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,15 @@ jobs:
106106
dependencies:
107107
- "lowest"
108108
- "highest"
109+
update-packages:
110+
- ""
111+
include:
112+
- php-version: "8.3"
113+
dependencies: "highest"
114+
update-packages: |
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"]'
116+
composer config extra.patches.carbonphp/carbon-doctrine-types --json --merge '["compatibility/patches/DateTimeImmutableType.patch", "compatibility/patches/DateTimeType.patch"]'
117+
composer require --dev doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 -W
109118
110119
steps:
111120
- name: "Checkout"
@@ -135,6 +144,9 @@ jobs:
135144
if: ${{ matrix.dependencies == 'highest' }}
136145
run: "composer update --no-interaction --no-progress"
137146

147+
- name: "Update packages"
148+
run: ${{ matrix.update-packages }}
149+
138150
- name: "Tests"
139151
run: "make tests"
140152

@@ -152,6 +164,11 @@ jobs:
152164
- "8.1"
153165
- "8.2"
154166
- "8.3"
167+
update-packages:
168+
- ""
169+
include:
170+
- php-version: "8.3"
171+
update-packages: "composer require --dev doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 -W"
155172

156173
steps:
157174
- name: "Checkout"
@@ -172,5 +189,8 @@ jobs:
172189
- name: "Install dependencies"
173190
run: "composer update --no-interaction --no-progress"
174191

192+
- name: "Update packages"
193+
run: ${{ matrix.update-packages }}
194+
175195
- name: "PHPStan"
176196
run: "make phpstan"

0 commit comments

Comments
 (0)