Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/behat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:

strategy:
matrix:
php: [ 8.1, 8.2 ]
pimcore: [ ~11.1.0, ~11.2.0 ]
php: [ 8.2, 8.3 ]
pimcore: [ ~11.5 ]
jms: [ ^4.0, ^5.0 ]
dependencies: [ highest ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/behat_ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
php: [ 8.1, 8.2 ]
pimcore: [ ~11.1.0, ~11.2.0 ]
pimcore: [ ~11.5 ]
jms: [ ^4.0, ^5.0 ]
dependencies: [ highest ]
exclude:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packages_bundles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ 8.1, 8.2 ]
pimcore: [ ~11.1.0, ~11.2.0 ]
php: [ 8.2, 8.3 ]
pimcore: [ ~11.5 ]
dependencies: [ highest ]
package: "${{ fromJson(needs.list.outputs.packages) }}"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packages_components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ 8.1, 8.2 ]
pimcore: [ ~11.1.0, ~11.2.0 ]
php: [ 8.2, 8.3 ]
pimcore: [ ~11.5 ]
dependencies: [ highest ]
package: "${{ fromJson(needs.list.outputs.packages) }}"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:

strategy:
matrix:
php: [ 8.1, 8.2 ]
pimcore: [ ~11.1.0, ~11.2.0 ]
php: [ 8.2, 8.3 ]
pimcore: [ ~11.5 ]
jms: [ ^4.0, ^5.0 ]
dependencies: [ highest ]
services:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pimcore/pimcore:php8.2-debug-latest as dev
FROM pimcore/pimcore:php8.3-debug-latest as dev
RUN set -eux; \
apt-get update; \
apt-get install -y $PHPIZE_DEPS libxslt1-dev; \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ transcends ordinary transactions.

# Requirements

- Pimcore `^11.1`
- Pimcore `^11.5`

# Installation

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"pimcore/admin-ui-classic-bundle": "^1.2",
"pimcore/google-marketing-bundle": "^1.0",
"pimcore/newsletter-bundle": "^1.0",
"pimcore/pimcore": "^11.1",
"pimcore/pimcore": "^11.5",
"pimcore/web-to-print-bundle": "^1.3",
"rinvex/countries": "^7.3",
"sebastian/diff": "^4.0 | ^5.0 | ^6.0",
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ services:
php:
<<: *php
container_name: coreshop4.1-php
image: coreshop/coreshop:PHP8.2-fpm-debug
image: coreshop/coreshop:PHP8.3-fpm-debug
build:
target: dev
args:
Expand All @@ -73,7 +73,7 @@ services:
behat:
<<: *php
container_name: coreshop4.1-behat
image: coreshop/coreshop:PHP8.2-fpm-debug-behat
image: coreshop/coreshop:PHP8.3-fpm-debug-behat
build:
target: behat
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function listFailedMessages(string $receiverName, int $limit = 10): array
$failedMessageDetails = new FailedMessageDetails(
$this->getMessageId($envelope),
$envelope->getMessage()::class,
$lastRedeliveryStamp?->getRedeliveredAt()->format('Y-m-d H:i:s') ?? '',
$lastRedeliveryStamp?->getRedeliveredAt()->format('Y-m-d H:i:s'),
$lastErrorDetailsStamp?->getExceptionMessage() ?? '',
'<pre>' . print_r($envelope->getMessage(), true) . '</pre>',
);
Expand Down