From 95aa056782238f17a797b2fb4599b29e4b40cf73 Mon Sep 17 00:00:00 2001 From: Vitalij Mik Date: Wed, 24 Jan 2024 10:02:14 +0100 Subject: [PATCH] NTR: test newer shopware version (#696) Co-authored-by: Vitalij Mik --- .github/actions/build-plugin/action.yml | 2 +- .github/workflows/ci_pipe.yml | 2 +- .github/workflows/nightly_pipe.yml | 2 +- .github/workflows/pr_pipe.yml | 2 +- composer.json | 2 +- composer.lock | 26 ++++++++++++------------- src/MolliePayments.php | 2 +- switch-composer.php | 1 + 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/actions/build-plugin/action.yml b/.github/actions/build-plugin/action.yml index 034c89ba0..516e4c0c2 100644 --- a/.github/actions/build-plugin/action.yml +++ b/.github/actions/build-plugin/action.yml @@ -8,7 +8,7 @@ runs: - name: Start Docker shell: bash run: | - docker run --rm --name shop --env NODE_VERSION=18 --env PHP_VERSION=8.1 -d dockware/dev:6.5.7.4 + docker run --rm --name shop --env NODE_VERSION=18 --env PHP_VERSION=8.1 -d dockware/dev:6.5.8.2 sleep 20 docker logs shop diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml index 0e398c4b0..0e2f925d3 100644 --- a/.github/workflows/ci_pipe.yml +++ b/.github/workflows/ci_pipe.yml @@ -340,7 +340,7 @@ jobs: fail-fast: false matrix: include: - - shopware: '6.5.7.4' + - shopware: '6.5.8.2' php: '8.2' - shopware: '6.5.6.1' php: '8.2' diff --git a/.github/workflows/nightly_pipe.yml b/.github/workflows/nightly_pipe.yml index e34622847..819eab8c6 100644 --- a/.github/workflows/nightly_pipe.yml +++ b/.github/workflows/nightly_pipe.yml @@ -334,7 +334,7 @@ jobs: fail-fast: false matrix: include: - - shopware: '6.5.7.4' + - shopware: '6.5.8.2' php: '8.2' - shopware: '6.5.6.1' php: '8.2' diff --git a/.github/workflows/pr_pipe.yml b/.github/workflows/pr_pipe.yml index 25e44a828..f2ac8b31f 100644 --- a/.github/workflows/pr_pipe.yml +++ b/.github/workflows/pr_pipe.yml @@ -333,7 +333,7 @@ jobs: fail-fast: false matrix: include: - - shopware: '6.5.7.4' + - shopware: '6.5.8.2' php: '8.2' - shopware: '6.5.5.2' php: '8.2' diff --git a/composer.json b/composer.json index 8fd7990d7..92ae63c84 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "kiener/mollie-payments-plugin", "description": "Mollie Payments", - "version": "v4.4.1", + "version": "v4.4.2", "type": "shopware-platform-plugin", "license": "MIT", "authors": [ diff --git a/composer.lock b/composer.lock index c42991d17..7008afb70 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e1eda73b34c0600f1aabc7e016fca71f", + "content-hash": "40fe21aa04e3cd2a19c569d548e951ca", "packages": [], "packages-dev": [ { @@ -63,16 +63,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.296.5", + "version": "3.296.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "23b009f305278e227bc5149bcb8fc9c1503fb130" + "reference": "da296909ceb8a4c156c4e849fe1c43ec9e2bb4b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/23b009f305278e227bc5149bcb8fc9c1503fb130", - "reference": "23b009f305278e227bc5149bcb8fc9c1503fb130", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/da296909ceb8a4c156c4e849fe1c43ec9e2bb4b0", + "reference": "da296909ceb8a4c156c4e849fe1c43ec9e2bb4b0", "shasum": "" }, "require": { @@ -152,9 +152,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.296.5" + "source": "https://github.com/aws/aws-sdk-php/tree/3.296.7" }, - "time": "2024-01-18T19:06:27+00:00" + "time": "2024-01-22T19:11:58+00:00" }, { "name": "boxblinkracer/phpunuhi", @@ -162,12 +162,12 @@ "source": { "type": "git", "url": "https://github.com/boxblinkracer/phpunuhi.git", - "reference": "775dc6146b07f4a612775d5d462f7dccbf59e7d3" + "reference": "3286aa7bd310bebb02a9c83b7e739eb082849a17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/boxblinkracer/phpunuhi/zipball/775dc6146b07f4a612775d5d462f7dccbf59e7d3", - "reference": "775dc6146b07f4a612775d5d462f7dccbf59e7d3", + "url": "https://api.github.com/repos/boxblinkracer/phpunuhi/zipball/3286aa7bd310bebb02a9c83b7e739eb082849a17", + "reference": "3286aa7bd310bebb02a9c83b7e739eb082849a17", "shasum": "" }, "require": { @@ -188,7 +188,7 @@ "phpstan/phpstan": "*", "phpunit/phpunit": "^9.6", "povils/phpmnd": "^3.3", - "rector/rector": "^0.18.12", + "rector/rector": "0.19.1", "roave/security-advisories": "dev-latest", "rregeer/phpunit-coverage-check": "^0.3.1", "spaze/phpstan-disallowed-calls": "^3.0", @@ -226,9 +226,9 @@ ], "support": { "issues": "https://github.com/boxblinkracer/phpunuhi/issues", - "source": "https://github.com/boxblinkracer/phpunuhi/tree/main" + "source": "https://github.com/boxblinkracer/phpunuhi/tree/v1.16.0" }, - "time": "2024-01-17T18:15:03+00:00" + "time": "2024-01-21T22:35:43+00:00" }, { "name": "brick/math", diff --git a/src/MolliePayments.php b/src/MolliePayments.php index 7809a1a09..7f6fdd702 100644 --- a/src/MolliePayments.php +++ b/src/MolliePayments.php @@ -24,7 +24,7 @@ class MolliePayments extends Plugin { - const PLUGIN_VERSION = '4.4.1'; + const PLUGIN_VERSION = '4.4.2'; /** diff --git a/switch-composer.php b/switch-composer.php index 6c7e7c25b..540f13663 100644 --- a/switch-composer.php +++ b/switch-composer.php @@ -6,6 +6,7 @@ $composerContent = file_get_contents(__DIR__ . '/composer.json'); $composerContent = json_decode($composerContent, true); + // >= 6.4.0.0 const SW_VERSIONS_RELEASE = '>=6.4.0'; const SW_VERSIONS_DEV = '*';