From 92cf3f54d088ef5e22759e31162469aff3f9356f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 21:50:03 +0000 Subject: [PATCH 1/4] Bump phpseclib/phpseclib from 2.0.27 to 2.0.31 Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 2.0.27 to 2.0.31. - [Release notes](https://github.com/phpseclib/phpseclib/releases) - [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md) - [Commits](https://github.com/phpseclib/phpseclib/compare/2.0.27...2.0.31) Signed-off-by: dependabot[bot] --- composer.lock | 66 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/composer.lock b/composer.lock index 75bea110..7beeba20 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": "0f1ebec9dfdd5a85a36de4ece41c86dc", + "content-hash": "1f37f17990c83b308f46efa1584d2cd0", "packages": [ { "name": "nosto/php-sdk", @@ -110,16 +110,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.27", + "version": "2.0.31", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc" + "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc", - "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/233a920cb38636a43b18d428f9a8db1f0a1a08f4", + "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4", "shasum": "" }, "require": { @@ -127,8 +127,7 @@ }, "require-dev": { "phing/phing": "~2.7", - "phpunit/phpunit": "^4.8.35|^5.7|^6.0", - "sami/sami": "~2.0", + "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4", "squizlabs/php_codesniffer": "~2.0" }, "suggest": { @@ -198,7 +197,21 @@ "x.509", "x509" ], - "time": "2020-04-04T23:17:33+00:00" + "funding": [ + { + "url": "https://github.com/terrafrost", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpseclib", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", + "type": "tidelift" + } + ], + "time": "2021-04-06T13:56:45+00:00" }, { "name": "vlucas/phpdotenv", @@ -491,12 +504,12 @@ "version": "v1.4.1", "source": { "type": "git", - "url": "https://github.com/clue/php-stream-filter.git", + "url": "https://github.com/clue/stream-filter.git", "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71", + "url": "https://api.github.com/repos/clue/stream-filter/zipball/5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71", "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71", "shasum": "" }, @@ -536,6 +549,16 @@ "stream_filter_append", "stream_filter_register" ], + "funding": [ + { + "url": "https://clue.engineering/support", + "type": "custom" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], "time": "2019-04-09T12:31:48+00:00" }, { @@ -717,6 +740,12 @@ "Xdebug", "performance" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + } + ], "time": "2020-03-01T12:26:26+00:00" }, { @@ -1628,6 +1657,7 @@ "reflection", "static" ], + "abandoned": "roave/better-reflection", "time": "2020-03-27T11:06:43+00:00" }, { @@ -2189,6 +2219,7 @@ "keywords": [ "google" ], + "abandoned": true, "time": "2017-12-21T21:59:33+00:00" }, { @@ -2904,6 +2935,12 @@ "github", "pmd" ], + "funding": [ + { + "url": "https://github.com/mridang", + "type": "github" + } + ], "time": "2020-03-31T08:41:21+00:00" }, { @@ -4686,6 +4723,7 @@ ], "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", "homepage": "https://github.com/sebastianbergmann/finder-facade", + "abandoned": true, "time": "2020-01-16T08:08:45+00:00" }, { @@ -7498,12 +7536,12 @@ "version": "1.8.0", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", + "url": "https://github.com/webmozarts/assert.git", "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "shasum": "" }, @@ -7768,8 +7806,6 @@ "php": ">=5.4.0", "ext-json": "*" }, - "platform-dev": { - "php": ">=7.2.0" - }, + "platform-dev": [], "plugin-api-version": "1.1.0" } From 374a531642c2e149917911b3143ce540928a7a04 Mon Sep 17 00:00:00 2001 From: olsi-qose Date: Thu, 22 Apr 2021 11:22:12 +0300 Subject: [PATCH 2/4] retrigger checks From 229fcd73b97bb42bb4088ee69c4ce864d85d876c Mon Sep 17 00:00:00 2001 From: olsi-qose Date: Thu, 22 Apr 2021 11:46:43 +0300 Subject: [PATCH 3/4] Update workflows --- .github/workflows/action.yml | 8 ++++---- .github/workflows/ide.yml | 5 +---- .github/workflows/phan.yml | 5 +---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index f1595d30..aef2fd7f 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -15,7 +15,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '7.3' - tools: composer, prestissimo + tools: composer:v1, prestissimo extensions: ast coverage: none @@ -65,7 +65,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '7.3' - tools: composer, prestissimo + tools: composer:v1, prestissimo extensions: ast coverage: none @@ -112,7 +112,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '7.3' - tools: composer, prestissimo + tools: composer:v1, prestissimo extensions: ast coverage: none @@ -163,7 +163,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '7.3' - tools: composer, prestissimo + tools: composer:v1, prestissimo extensions: ast coverage: none diff --git a/.github/workflows/ide.yml b/.github/workflows/ide.yml index 2d46b712..e8231646 100644 --- a/.github/workflows/ide.yml +++ b/.github/workflows/ide.yml @@ -16,12 +16,9 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '7.3' - tools: composer, prestissimo, pecl + tools: composer:v1, prestissimo, pecl coverage: none - - name: Install AST extension - run: sudo pecl install -f ast - #https://github.com/actions/cache/blob/master/examples.md#php---composer - name: Cache composer packages id: composer-cache diff --git a/.github/workflows/phan.yml b/.github/workflows/phan.yml index 2fcae3dd..ff787f66 100644 --- a/.github/workflows/phan.yml +++ b/.github/workflows/phan.yml @@ -16,12 +16,9 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '7.3' - tools: composer, prestissimo, pecl + tools: composer:v1, prestissimo, pecl coverage: none - - name: Install AST extension - run: sudo pecl install -f ast - #https://github.com/actions/cache/blob/master/examples.md#php---composer - name: Cache composer packages id: composer-cache From 098d11ac7c720407ad752d21d449568cabae70ab Mon Sep 17 00:00:00 2001 From: olsi-qose Date: Thu, 22 Apr 2021 14:01:43 +0300 Subject: [PATCH 4/4] Suppres inspection --- Components/Model/Order/Buyer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Components/Model/Order/Buyer.php b/Components/Model/Order/Buyer.php index 604b903a..04763f48 100644 --- a/Components/Model/Order/Buyer.php +++ b/Components/Model/Order/Buyer.php @@ -83,11 +83,11 @@ public function loadData(Customer $customer) $this->setPhone($address->getPhone()); $this->setCountry($address->getCountry()->getIso()); } - } else { + } elseif (method_exists('\Shopware\Models\Customer\Customer', 'getBilling')) { /** @phan-suppress-next-line UndeclaredTypeInInlineVar */ /** @var Billing $address */ - /** @phan-suppress-next-line PhanUndeclaredMethod */ - $address = $customer->getBilling(); + /** @noinspection PhpUndefinedMethodInspection */ + $address = $customer->getBilling(); /** @phan-suppress-current-line PhanUndeclaredMethod */ if ($address instanceof Billing) { $this->setFirstName($address->getFirstName()); $this->setLastName($address->getLastName());