Skip to content

Commit 0089b2f

Browse files
Merge pull request #2922 from dpfaffenbauer/pimcore-compatibility
[Pimcore] downgrade doctrine/dbal
2 parents f0e14a2 + 4a1c08d commit 0089b2f

File tree

71 files changed

+154
-128
lines changed

Some content is hidden

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

71 files changed

+154
-128
lines changed

.allowed-licenses.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
'OSL-3.0',
1414
'Artistic-1.0',
1515
'ISC',
16-
1716
)
18-
->addAllowedPackage('pimcore/admin-ui-classic-bundle')
19-
->addAllowedPackage('pimcore/google-marketing-bundle')
20-
->addAllowedPackage('pimcore/newsletter-bundle')
21-
->addAllowedPackage('pimcore/opensearch-client')
22-
->addAllowedPackage('pimcore/pimcore')
17+
->addAllowedVendor('pimcore')
2318
->build();

.github/workflows/behat.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454
matrix:
5555
include:
5656
- php: 8.3
57-
pimcore: ^12.0
57+
pimcore: ^12.2
5858
dependencies: highest
5959
allow-failure: false
6060
- php: 8.4
61-
pimcore: ^12.0
61+
pimcore: ^12.2
6262
dependencies: highest
6363
allow-failure: true
6464

.github/workflows/behat_ui.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ jobs:
5555
matrix:
5656
include:
5757
- php: 8.3
58-
pimcore: ^12.0
58+
pimcore: ^12.2
5959
dependencies: highest
6060
allow-failure: false
6161
- php: 8.4
62-
pimcore: ^12.0
62+
pimcore: ^12.2
6363
dependencies: highest
6464
allow-failure: true
6565

.github/workflows/license-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
matrix:
3838
php: [ 8.3, 8.4 ]
39-
pimcore: [ ^12.0 ]
39+
pimcore: [ ^12.2 ]
4040
dependencies: [ highest ]
4141
services:
4242
database:

.github/workflows/packages_bundles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
fail-fast: false
5959
matrix:
6060
php: [ 8.3, 8.4 ]
61-
pimcore: [ ^12.0 ]
61+
pimcore: [ ^12.2 ]
6262
dependencies: [ highest ]
6363
package: "${{ fromJson(needs.list.outputs.packages) }}"
6464

.github/workflows/packages_components.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
php: [ 8.3, 8.4 ]
60-
pimcore: [ ^12.0 ]
60+
pimcore: [ ^12.2 ]
6161
dependencies: [ highest ]
6262
package: "${{ fromJson(needs.list.outputs.packages) }}"
6363

.github/workflows/static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
matrix:
4848
php: [ 8.3, 8.4 ]
49-
pimcore: [ ^12.0 ]
49+
pimcore: [ ^12.2 ]
5050
dependencies: [ highest ]
5151
services:
5252
database:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ transcends ordinary transactions.
1919

2020
# Requirements
2121

22-
- Pimcore `^12.0`
22+
- Pimcore `^12.2`
2323

2424
# Installation
2525

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"php": "^8.3",
8989
"ext-json": "*",
9090
"doctrine/data-fixtures": "^1.5",
91-
"doctrine/dbal": "^4.3",
91+
"doctrine/dbal": "^4.2",
9292
"doctrine/doctrine-bundle": "^2.4",
9393
"doctrine/doctrine-fixtures-bundle": "^3.4",
9494
"doctrine/orm": "^3.0",
@@ -103,7 +103,7 @@
103103
"pimcore/admin-ui-classic-bundle": "^2.0",
104104
"pimcore/google-marketing-bundle": "^2.0",
105105
"pimcore/newsletter-bundle": "^2.0",
106-
"pimcore/pimcore": "^12.0",
106+
"pimcore/pimcore": "^12.2",
107107
"rinvex/countries": "^9.0",
108108
"sebastian/diff": "^4.0 | ^5.0 | ^6.0",
109109
"stof/doctrine-extensions-bundle": "^1.6",

src/CoreShop/Bundle/AddressBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"require": {
2727
"coreshop/address": "^5.0",
2828
"coreshop/resource-bundle": "^5.0",
29-
"pimcore/pimcore": "^12.0"
29+
"pimcore/pimcore": "^12.2"
3030
},
3131
"require-dev": {
3232
"phpstan/phpstan": "^1.10",

0 commit comments

Comments
 (0)