Skip to content

Commit 6a2b09b

Browse files
Merge pull request #2928 from dpfaffenbauer/pimcore/12.3
[Pimcore] 12.3 only
2 parents 927a370 + faa57cb commit 6a2b09b

67 files changed

Lines changed: 79 additions & 77 deletions

File tree

Some content is hidden

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

.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.2
57+
pimcore: ^12.3
5858
dependencies: highest
5959
allow-failure: false
6060
- php: 8.4
61-
pimcore: ^12.2
61+
pimcore: ^12.3
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.2
58+
pimcore: ^12.3
5959
dependencies: highest
6060
allow-failure: false
6161
- php: 8.4
62-
pimcore: ^12.2
62+
pimcore: ^12.3
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.2 ]
39+
pimcore: [ ^12.3 ]
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.2 ]
61+
pimcore: [ ^12.3 ]
6262
dependencies: [ highest ]
6363
package: "${{ fromJson(needs.list.outputs.packages) }}"
6464

.github/workflows/packages_components.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
paths:
66
- 'src/CoreShop/Component/**'
77
- '.github/workflows/packages_components.yml'
8-
pull_request_target:
8+
pull_request:
99
branches: [ '4.0', '4.1', '5.0', 'next' ]
1010
paths:
1111
- 'src/CoreShop/Component/**'
@@ -27,6 +27,7 @@ permissions:
2727

2828
jobs:
2929
list:
30+
if: github.repository == 'coreshop/CoreShop'
3031
runs-on: ubuntu-latest
3132
name: "Create a list of packages"
3233

@@ -51,13 +52,14 @@ jobs:
5152

5253
test-packages:
5354
needs: list
55+
if: github.repository == 'coreshop/CoreShop'
5456
runs-on: ubuntu-latest
5557
name: "${{ matrix.package }}, PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}"
5658
strategy:
5759
fail-fast: false
5860
matrix:
5961
php: [ 8.3, 8.4 ]
60-
pimcore: [ ^12.2 ]
62+
pimcore: [ ^12.3 ]
6163
dependencies: [ highest ]
6264
package: "${{ fromJson(needs.list.outputs.packages) }}"
6365

@@ -87,7 +89,7 @@ jobs:
8789
uses: actions/cache@v4
8890
with:
8991
path: ${{ steps.composer-cache.outputs.dir }}
90-
key: ${{ runner.os }}-php-${{ matrix.php }}-package-${{ matrix.package }}-composer-${{ hashFiles(format('src/CoreShop/{0}/composer.json', matrix.package)) }}
92+
key: ${{ runner.os }}-php-${{ matrix.php }}-pimcore-${{ matrix.pimcore }}-package-${{ matrix.package }}-composer-${{ hashFiles(format('src/CoreShop/{0}/composer.json', matrix.package)) }}
9193
restore-keys: |
9294
${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.pimcore }}-package-${{ matrix.package }}-composer-
9395
${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.pimcore }}-package-

.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.2 ]
49+
pimcore: [ ^12.3 ]
5050
dependencies: [ highest ]
5151
services:
5252
database:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.2",
106+
"pimcore/pimcore": "^12.3",
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.2"
29+
"pimcore/pimcore": "^12.3"
3030
},
3131
"require-dev": {
3232
"phpstan/phpstan": "^1.10",

src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
],
2626
"require": {
2727
"coreshop/pimcore": "^5.0",
28-
"pimcore/pimcore": "^12.2",
28+
"pimcore/pimcore": "^12.3",
2929
"sebastian/diff": "^4.0 | ^5.0 | ^6.0"
3030
},
3131
"require-dev": {

src/CoreShop/Bundle/ConfigurationBundle/composer.json

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

0 commit comments

Comments
 (0)