From 5929bdd92c95b0e37e54f381f71989fdf390714b Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 9 Jan 2023 10:54:47 +0100 Subject: [PATCH 1/6] Fix PHP 8.2 support Signed-off-by: Filippo Tessarotto --- src/Client.php | 6 ++---- src/Client/Common.php | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/Client.php b/src/Client.php index 5677169..747a77a 100644 --- a/src/Client.php +++ b/src/Client.php @@ -1073,16 +1073,14 @@ public function _doRequest(Client\Common $client, $request, $location, $action, { // Perform request as is if ($oneWay === null) { - return call_user_func( - [$client, 'SoapClient::__doRequest'], + return $client->parent__doRequest( $request, $location, $action, $version ); } - return call_user_func( - [$client, 'SoapClient::__doRequest'], + return $client->parent__doRequest( $request, $location, $action, diff --git a/src/Client/Common.php b/src/Client/Common.php index 3734bb6..43bc1ce 100644 --- a/src/Client/Common.php +++ b/src/Client/Common.php @@ -58,4 +58,26 @@ public function __doRequest($request, $location, $action, $version, $oneWay = nu return ($this->doRequestCallback)($this, ltrim($request), $location, $action, $version, $oneWay); } + + /** + * Performs SOAP request on parent class explicitly. + * Required since PHP 8.2 due to a deprecation on call_user_func([$client, 'SoapClient::__doRequest'], ...) + * + * @internal + * + * @param string $request + * @param string $location + * @param string $action + * @param int $version + * @param int $oneWay + * @return mixed + */ + public function parent__doRequest($request, $location, $action, $version, $oneWay = null) + { + if ($oneWay === null) { + return parent::__doRequest($request, $location, $action, $version); + } + + return parent::__doRequest($request, $location, $action, $version, $oneWay); + } } From e7cf5bba40f0370cec60dee1fd74443a3199c33d Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 9 Jan 2023 12:17:57 +0100 Subject: [PATCH 2/6] Require `laminas/laminas-server` v2.15 for PHP 8.2 Signed-off-by: Filippo Tessarotto --- composer.json | 16 ++-- composer.lock | 234 +++++++++++++++++++++++++------------------------- 2 files changed, 125 insertions(+), 125 deletions(-) diff --git a/composer.json b/composer.json index e126357..250c14b 100644 --- a/composer.json +++ b/composer.json @@ -28,17 +28,17 @@ "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "ext-dom": "*", "ext-soap": "*", - "laminas/laminas-server": "^2.11", - "laminas/laminas-stdlib": "^3.6", - "laminas/laminas-uri": "^2.9.1" + "laminas/laminas-server": "^2.15", + "laminas/laminas-stdlib": "^3.16", + "laminas/laminas-uri": "^2.10" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4", - "laminas/laminas-config": "^3.7", - "laminas/laminas-http": "^2.15", + "laminas/laminas-coding-standard": "^2.5", + "laminas/laminas-config": "^3.8", + "laminas/laminas-http": "^2.18", "phpspec/prophecy-phpunit": "^2.0.1", - "phpunit/phpunit": "^9.5.5", - "psalm/plugin-phpunit": "^0.18.3", + "phpunit/phpunit": "^9.5.27", + "psalm/plugin-phpunit": "^0.18.4", "vimeo/psalm": "^4.30" }, "suggest": { diff --git a/composer.lock b/composer.lock index f2d8b3e..1efb331 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8a83f12fe97dd8221322a36c7f1f8b38", + "content-hash": "527dc6a362bfa2369431c6096add3d17", "packages": [ { "name": "laminas/laminas-code", - "version": "4.7.0", + "version": "4.7.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "0337d9265bc2e6376babad8c511500821620cb30" + "reference": "91aabc066d5620428120800c0eafc0411e441a62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/0337d9265bc2e6376babad8c511500821620cb30", - "reference": "0337d9265bc2e6376babad8c511500821620cb30", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/91aabc066d5620428120800c0eafc0411e441a62", + "reference": "91aabc066d5620428120800c0eafc0411e441a62", "shasum": "" }, "require": { @@ -70,7 +70,7 @@ "type": "community_bridge" } ], - "time": "2022-09-13T10:33:30+00:00" + "time": "2022-11-21T01:32:31+00:00" }, { "name": "laminas/laminas-escaper", @@ -136,20 +136,20 @@ }, { "name": "laminas/laminas-server", - "version": "2.12.0", + "version": "2.15.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-server.git", - "reference": "c249f0638c8bdd67305509b7173bd535c21d109d" + "reference": "7f4862913ab95ea5decd08e6c3717edbb398fde8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-server/zipball/c249f0638c8bdd67305509b7173bd535c21d109d", - "reference": "c249f0638c8bdd67305509b7173bd535c21d109d", + "url": "https://api.github.com/repos/laminas/laminas-server/zipball/7f4862913ab95ea5decd08e6c3717edbb398fde8", + "reference": "7f4862913ab95ea5decd08e6c3717edbb398fde8", "shasum": "" }, "require": { - "laminas/laminas-code": "^3.5.1 || ^4.0.0", + "laminas/laminas-code": "^4.7.1", "laminas/laminas-stdlib": "^3.3.1", "laminas/laminas-zendframework-bridge": "^1.2.0", "php": "~8.0.0 || ~8.1.0 || ~8.2.0" @@ -158,7 +158,7 @@ "zendframework/zend-server": "^2.8.1" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-coding-standard": "~2.4.0", "phpunit/phpunit": "^9.5.5", "psalm/plugin-phpunit": "^0.15.1", "vimeo/psalm": "^4.6.4" @@ -193,20 +193,20 @@ "type": "community_bridge" } ], - "time": "2022-11-16T02:20:32+00:00" + "time": "2022-12-27T17:14:59+00:00" }, { "name": "laminas/laminas-servicemanager", - "version": "3.19.0", + "version": "3.20.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "ed160729bb8721127efdaac799f9a298963345b1" + "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/ed160729bb8721127efdaac799f9a298963345b1", - "reference": "ed160729bb8721127efdaac799f9a298963345b1", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", + "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", "shasum": "" }, "require": { @@ -229,14 +229,14 @@ "require-dev": { "composer/package-versions-deprecated": "^1.11.99.5", "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-container-config-test": "^0.7", + "laminas/laminas-container-config-test": "^0.8", "laminas/laminas-dependency-plugin": "^2.2", "mikey179/vfsstream": "^1.6.11@alpha", "ocramius/proxy-manager": "^2.14.1", - "phpbench/phpbench": "^1.2.6", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.28" + "phpbench/phpbench": "^1.2.7", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^5.0.0" }, "suggest": { "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" @@ -283,20 +283,20 @@ "type": "community_bridge" } ], - "time": "2022-10-10T20:59:22+00:00" + "time": "2022-12-01T17:03:38+00:00" }, { "name": "laminas/laminas-stdlib", - "version": "3.15.0", + "version": "3.16.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "63b66bd4b696f024f42616b9d95cdb10e5109c27" + "reference": "f4f773641807c7ccee59b758bfe4ac4ba33ecb17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/63b66bd4b696f024f42616b9d95cdb10e5109c27", - "reference": "63b66bd4b696f024f42616b9d95cdb10e5109c27", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/f4f773641807c7ccee59b758bfe4ac4ba33ecb17", + "reference": "f4f773641807c7ccee59b758bfe4ac4ba33ecb17", "shasum": "" }, "require": { @@ -307,10 +307,10 @@ }, "require-dev": { "laminas/laminas-coding-standard": "^2.4.0", - "phpbench/phpbench": "^1.2.6", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.28" + "phpbench/phpbench": "^1.2.7", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^5.0.0" }, "type": "library", "autoload": { @@ -342,7 +342,7 @@ "type": "community_bridge" } ], - "time": "2022-10-10T19:10:24+00:00" + "time": "2022-12-03T18:48:01+00:00" }, { "name": "laminas/laminas-uri", @@ -404,16 +404,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.28.0", + "version": "2.29.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "695bfa40b0a83dc1c5c58bdf74a03fdbeb516c39" + "reference": "e40ee8d86cc1907083e273bfd6ed8b6dde2d9850" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/695bfa40b0a83dc1c5c58bdf74a03fdbeb516c39", - "reference": "695bfa40b0a83dc1c5c58bdf74a03fdbeb516c39", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/e40ee8d86cc1907083e273bfd6ed8b6dde2d9850", + "reference": "e40ee8d86cc1907083e273bfd6ed8b6dde2d9850", "shasum": "" }, "require": { @@ -427,17 +427,17 @@ }, "require-dev": { "laminas/laminas-coding-standard": "^2.4.0", - "laminas/laminas-db": "^2.15.0", - "laminas/laminas-filter": "^2.23.0", - "laminas/laminas-http": "^2.17.0", + "laminas/laminas-db": "^2.16", + "laminas/laminas-filter": "^2.28.1", + "laminas/laminas-http": "^2.18", "laminas/laminas-i18n": "^2.19", - "laminas/laminas-session": "^2.13.0", + "laminas/laminas-session": "^2.15", "laminas/laminas-uri": "^2.10.0", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.18.0", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.3", "psr/http-client": "^1.0.1", "psr/http-factory": "^1.0.1", - "vimeo/psalm": "^4.28" + "vimeo/psalm": "^5.0" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -485,30 +485,30 @@ "type": "community_bridge" } ], - "time": "2022-11-14T08:50:44+00:00" + "time": "2022-12-13T22:53:38+00:00" }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "e112dd2c099f4f6142c16fc65fda89a638e06885" + "reference": "5ef52e26392777a26dbb8f20fe24f91b406459f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/e112dd2c099f4f6142c16fc65fda89a638e06885", - "reference": "e112dd2c099f4f6142c16fc65fda89a638e06885", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/5ef52e26392777a26dbb8f20fe24f91b406459f6", + "reference": "5ef52e26392777a26dbb8f20fe24f91b406459f6", "shasum": "" }, "require": { - "php": ">=7.4, <8.2" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0" }, "require-dev": { - "phpunit/phpunit": "^9.5.14", - "psalm/plugin-phpunit": "^0.15.2", - "squizlabs/php_codesniffer": "^3.6.2", - "vimeo/psalm": "^4.21.0" + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "squizlabs/php_codesniffer": "^3.7.1", + "vimeo/psalm": "^4.29.0" }, "type": "library", "extra": { @@ -547,7 +547,7 @@ "type": "community_bridge" } ], - "time": "2022-07-29T13:28:29+00:00" + "time": "2022-12-12T11:44:10+00:00" }, { "name": "psr/container", @@ -1223,30 +1223,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -1273,7 +1273,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -1289,7 +1289,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -1394,20 +1394,20 @@ }, { "name": "laminas/laminas-coding-standard", - "version": "2.4.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-coding-standard.git", - "reference": "eb076dd86aa93dd424856b150c9b6f76c1fdfabc" + "reference": "c1aaa18a7c860c6932677a3e4ec13161f9fc7d61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/eb076dd86aa93dd424856b150c9b6f76c1fdfabc", - "reference": "eb076dd86aa93dd424856b150c9b6f76c1fdfabc", + "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/c1aaa18a7c860c6932677a3e4ec13161f9fc7d61", + "reference": "c1aaa18a7c860c6932677a3e4ec13161f9fc7d61", "shasum": "" }, "require": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0", "php": "^7.4 || ^8.0", "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.6", @@ -1446,7 +1446,7 @@ "type": "community_bridge" } ], - "time": "2022-08-24T17:45:47+00:00" + "time": "2023-01-05T15:53:40+00:00" }, { "name": "laminas/laminas-config", @@ -1518,16 +1518,16 @@ }, { "name": "laminas/laminas-http", - "version": "2.17.1", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-http.git", - "reference": "324e5895235fe40bfd5a4e2a0337bd7bf9a97a50" + "reference": "76de9008f889bc7088f85a41d0d2b06c2b59c53d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-http/zipball/324e5895235fe40bfd5a4e2a0337bd7bf9a97a50", - "reference": "324e5895235fe40bfd5a4e2a0337bd7bf9a97a50", + "url": "https://api.github.com/repos/laminas/laminas-http/zipball/76de9008f889bc7088f85a41d0d2b06c2b59c53d", + "reference": "76de9008f889bc7088f85a41d0d2b06c2b59c53d", "shasum": "" }, "require": { @@ -1579,7 +1579,7 @@ "type": "community_bridge" } ], - "time": "2022-11-11T09:16:23+00:00" + "time": "2022-11-23T15:45:41+00:00" }, { "name": "laminas/laminas-loader", @@ -1698,16 +1698,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.0.0", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" + "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", "shasum": "" }, "require": { @@ -1743,9 +1743,9 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" }, - "time": "2020-12-01T19:48:11+00:00" + "time": "2022-12-08T20:46:14+00:00" }, { "name": "nikic/php-parser", @@ -2134,21 +2134,21 @@ }, { "name": "phpspec/prophecy", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" + "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be8cac52a0827776ff9ccda8c381ac5b71aeb359", + "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0", "sebastian/recursion-context": "^3.0 || ^4.0" @@ -2195,9 +2195,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.16.0" }, - "time": "2021-12-08T12:19:24+00:00" + "time": "2022-11-29T15:06:56+00:00" }, { "name": "phpspec/prophecy-phpunit", @@ -2297,16 +2297,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.19", + "version": "9.2.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", "shasum": "" }, "require": { @@ -2362,7 +2362,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" }, "funding": [ { @@ -2370,7 +2370,7 @@ "type": "github" } ], - "time": "2022-11-18T07:47:47+00:00" + "time": "2022-12-28T12:41:10+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2615,16 +2615,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.26", + "version": "9.5.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" + "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", + "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", "shasum": "" }, "require": { @@ -2697,7 +2697,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" }, "funding": [ { @@ -2713,20 +2713,20 @@ "type": "tidelift" } ], - "time": "2022-10-28T06:00:21+00:00" + "time": "2022-12-09T07:31:23+00:00" }, { "name": "psalm/plugin-phpunit", - "version": "0.18.3", + "version": "0.18.4", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-phpunit.git", - "reference": "057c1cdf7546c1e427f6fd83b635d0cc18c252bf" + "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/057c1cdf7546c1e427f6fd83b635d0cc18c252bf", - "reference": "057c1cdf7546c1e427f6fd83b635d0cc18c252bf", + "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", + "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", "shasum": "" }, "require": { @@ -2734,7 +2734,7 @@ "composer/semver": "^1.4 || ^2.0 || ^3.0", "ext-simplexml": "*", "php": "^7.1 || ^8.0", - "vimeo/psalm": "dev-master || dev-4.x || ^4.5 || ^5@beta" + "vimeo/psalm": "dev-master || dev-4.x || ^4.7.1 || ^5@beta || ^5.0" }, "conflict": { "phpunit/phpunit": "<7.5" @@ -2771,9 +2771,9 @@ "description": "Psalm plugin for PHPUnit", "support": { "issues": "https://github.com/psalm/psalm-plugin-phpunit/issues", - "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.18.3" + "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.18.4" }, - "time": "2022-11-03T18:17:28+00:00" + "time": "2022-12-03T07:47:07+00:00" }, { "name": "psr/log", @@ -3908,16 +3908,16 @@ }, { "name": "symfony/console", - "version": "v6.0.15", + "version": "v6.0.17", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "b0b910724a0a0326b4481e4f8a30abb2dd442efb" + "reference": "2ab307342a7233b9a260edd5ef94087aaca57d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/b0b910724a0a0326b4481e4f8a30abb2dd442efb", - "reference": "b0b910724a0a0326b4481e4f8a30abb2dd442efb", + "url": "https://api.github.com/repos/symfony/console/zipball/2ab307342a7233b9a260edd5ef94087aaca57d18", + "reference": "2ab307342a7233b9a260edd5ef94087aaca57d18", "shasum": "" }, "require": { @@ -3983,7 +3983,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.0.15" + "source": "https://github.com/symfony/console/tree/v6.0.17" }, "funding": [ { @@ -3999,7 +3999,7 @@ "type": "tidelift" } ], - "time": "2022-10-26T21:42:20+00:00" + "time": "2022-12-28T14:21:34+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4566,16 +4566,16 @@ }, { "name": "symfony/string", - "version": "v6.0.15", + "version": "v6.0.17", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "51ac0fa0ccf132a00519b87c97e8f775fa14e771" + "reference": "3f57003dd8a67ed76870cc03092f8501db7788d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/51ac0fa0ccf132a00519b87c97e8f775fa14e771", - "reference": "51ac0fa0ccf132a00519b87c97e8f775fa14e771", + "url": "https://api.github.com/repos/symfony/string/zipball/3f57003dd8a67ed76870cc03092f8501db7788d9", + "reference": "3f57003dd8a67ed76870cc03092f8501db7788d9", "shasum": "" }, "require": { @@ -4631,7 +4631,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.15" + "source": "https://github.com/symfony/string/tree/v6.0.17" }, "funding": [ { @@ -4647,7 +4647,7 @@ "type": "tidelift" } ], - "time": "2022-10-10T09:34:08+00:00" + "time": "2022-12-14T15:52:41+00:00" }, { "name": "theseer/tokenizer", From f01f441415cb8da1773736407cc823e986f59f67 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 9 Jan 2023 12:19:48 +0100 Subject: [PATCH 3/6] PHP-CS Signed-off-by: Filippo Tessarotto --- src/Client.php | 4 ++-- src/Client/Common.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Client.php b/src/Client.php index 747a77a..cbef8c4 100644 --- a/src/Client.php +++ b/src/Client.php @@ -1073,14 +1073,14 @@ public function _doRequest(Client\Common $client, $request, $location, $action, { // Perform request as is if ($oneWay === null) { - return $client->parent__doRequest( + return $client->parentDoRequest( $request, $location, $action, $version ); } - return $client->parent__doRequest( + return $client->parentDoRequest( $request, $location, $action, diff --git a/src/Client/Common.php b/src/Client/Common.php index 43bc1ce..30dc76c 100644 --- a/src/Client/Common.php +++ b/src/Client/Common.php @@ -72,7 +72,7 @@ public function __doRequest($request, $location, $action, $version, $oneWay = nu * @param int $oneWay * @return mixed */ - public function parent__doRequest($request, $location, $action, $version, $oneWay = null) + public function parentDoRequest($request, $location, $action, $version, $oneWay = null) { if ($oneWay === null) { return parent::__doRequest($request, $location, $action, $version); From e02db61e75ceeddb7687ed6b17a0e940b89af14f Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 9 Jan 2023 12:20:12 +0100 Subject: [PATCH 4/6] Update PSalm baseline to match current signatures Signed-off-by: Filippo Tessarotto --- psalm-baseline.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 7e95a20..69da486 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -175,7 +175,8 @@ $type['type_name'] $type['type_name'] - + + $class $options['classmap'] $result $this->connectionTimeout @@ -265,6 +266,9 @@ $oneWay + + $oneWay + @@ -1070,9 +1074,6 @@ MockServer - - public function addMultiple($test) - $arg @@ -1299,8 +1300,7 @@ $this->wsdl 1 - - public function ampersandInUrlDataProvider(): array + public function dataProviderForAddService(): array From e3557e8fac1cceb71f5dc087233bdec5904b19fe Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 9 Jan 2023 12:24:05 +0100 Subject: [PATCH 5/6] Restore some ignored PSalm errors deleted by wrong local cache Signed-off-by: Filippo Tessarotto --- psalm-baseline.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 69da486..47706b7 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1074,6 +1074,9 @@ MockServer + + public function addMultiple($test) + $arg @@ -1300,7 +1303,8 @@ $this->wsdl 1 - + + public function ampersandInUrlDataProvider(): array public function dataProviderForAddService(): array From 23e469a400db4120d595c52cb94d25e7b6e2fe69 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 9 Jan 2023 14:12:18 +0100 Subject: [PATCH 6/6] `\Laminas\Soap\Client\Common::parentDoRequest`: allow `null` for `$oneWay` argument Signed-off-by: Filippo Tessarotto --- src/Client/Common.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Client/Common.php b/src/Client/Common.php index 30dc76c..926521e 100644 --- a/src/Client/Common.php +++ b/src/Client/Common.php @@ -65,11 +65,11 @@ public function __doRequest($request, $location, $action, $version, $oneWay = nu * * @internal * - * @param string $request - * @param string $location - * @param string $action - * @param int $version - * @param int $oneWay + * @param string $request + * @param string $location + * @param string $action + * @param int $version + * @param null|int $oneWay * @return mixed */ public function parentDoRequest($request, $location, $action, $version, $oneWay = null)