From d28a81cd4f234956d2d670eeee9917a78aaa803d Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 17 Jan 2022 15:12:50 -0600 Subject: [PATCH 1/4] feat: Bump PHP and library dependencies to support PHP 8.1 - New PHP minimum version is 7.4. - Adds PHP 8.1 to supported versions. - Drops v2 support for each of: - laminas-mvc - laminas-servicemanager - laminas-stdlib - Bumps minimum supported version of most libraries to versions known to work with PHP 8.1. Signed-off-by: Matthew Weier O'Phinney --- composer.json | 29 +++++----- composer.lock | 145 ++++++++++++++++++++++++-------------------------- 2 files changed, 83 insertions(+), 91 deletions(-) diff --git a/composer.json b/composer.json index 06f8946..7bb5399 100644 --- a/composer.json +++ b/composer.json @@ -15,29 +15,28 @@ } }, "require": { - "php": "^7.3 || ~8.0.0", - "laminas-api-tools/api-tools-configuration": "^1.2", - "laminas-api-tools/api-tools-content-negotiation": "^1.2.1", - "laminas-api-tools/api-tools-provider": "^1.2", - "laminas/laminas-inputfilter": "^2.7.2", - "laminas/laminas-modulemanager": "^2.7.2", - "laminas/laminas-mvc": "^2.7.15 || ^3.0.4", - "laminas/laminas-servicemanager": "^2.7.6 || ^3.1", - "laminas/laminas-view": "^2.11.3", - "laminas/laminas-zendframework-bridge": "^1.1", + "php": "^7.4 || ~8.0.0 || ~8.1.0", + "laminas-api-tools/api-tools-configuration": "^1.5", + "laminas-api-tools/api-tools-content-negotiation": "^1.7", + "laminas-api-tools/api-tools-provider": "^1.5", + "laminas/laminas-inputfilter": "^2.13", + "laminas/laminas-modulemanager": "^2.11", + "laminas/laminas-mvc": "^3.3", + "laminas/laminas-servicemanager": "^3.8", + "laminas/laminas-view": "^2.13", "michelf/php-markdown": "^1.5" }, - "replace": { - "zfcampus/zf-apigility-documentation": "^1.3.0" + "conflict": { + "zfcampus/zf-apigility-documentation": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~2.2.0", - "laminas/laminas-stdlib": "^2.7.8 || ^3.0.1", - "phpunit/phpunit": "^9.3", + "laminas/laminas-stdlib": "^3.6.4", + "phpunit/phpunit": "^9.5.10", "vimeo/psalm": "^4.7", "psalm/plugin-phpunit": "^0.16.0", "webmozart/assert": "^1.10", - "laminas/laminas-db": "^2.13" + "laminas/laminas-db": "^2.13.4" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index b4e77b3..45c00ed 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": "4c4c2a33424e465bc24864bc24b48b35", + "content-hash": "41f4faa8f0f167a0c6f39552a80e936f", "packages": [ { "name": "brick/varexporter", @@ -564,40 +564,37 @@ }, { "name": "laminas/laminas-filter", - "version": "2.12.0", + "version": "2.13.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "0fc5dcd27dc22dba1a2544123684c67768fc5f88" + "reference": "79e8baa62035397044087907e89034726b3056a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/0fc5dcd27dc22dba1a2544123684c67768fc5f88", - "reference": "0fc5dcd27dc22dba1a2544123684c67768fc5f88", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/79e8baa62035397044087907e89034726b3056a0", + "reference": "79e8baa62035397044087907e89034726b3056a0", "shasum": "" }, "require": { - "laminas/laminas-stdlib": "^3.3", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0" + "laminas/laminas-stdlib": "^3.6.1", + "php": "^7.4 || ~8.0.0 || ~8.1.0" }, "conflict": { - "laminas/laminas-validator": "<2.10.1" - }, - "replace": { - "zendframework/zend-filter": "^2.9.2" + "laminas/laminas-validator": "<2.10.1", + "zendframework/zend-filter": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-crypt": "^3.2.1", - "laminas/laminas-servicemanager": "^3.3", - "laminas/laminas-uri": "^2.6", - "pear/archive_tar": "^1.4.3", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.15.1", - "psr/http-factory": "^1.0", - "vimeo/psalm": "^4.6" + "laminas/laminas-coding-standard": "^2.3.0", + "laminas/laminas-crypt": "^3.5.1", + "laminas/laminas-servicemanager": "^3.7.0", + "laminas/laminas-uri": "^2.9.1", + "pear/archive_tar": "^1.4.14", + "phpspec/prophecy-phpunit": "^2.0.1", + "phpunit/phpunit": "^9.5.10", + "psalm/plugin-phpunit": "^0.15.2", + "psr/http-factory": "^1.0.1", + "vimeo/psalm": "^4.13.1" }, "suggest": { "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters", @@ -642,7 +639,7 @@ "type": "community_bridge" } ], - "time": "2021-10-24T21:01:15+00:00" + "time": "2021-12-23T12:46:20+00:00" }, { "name": "laminas/laminas-http", @@ -711,34 +708,34 @@ }, { "name": "laminas/laminas-inputfilter", - "version": "2.12.1", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-inputfilter.git", - "reference": "461a7a27b70bd440f925a31221b7a5348cd0d0fd" + "reference": "6124b3678051b792d1444be689cf9370531593a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/461a7a27b70bd440f925a31221b7a5348cd0d0fd", - "reference": "461a7a27b70bd440f925a31221b7a5348cd0d0fd", + "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/6124b3678051b792d1444be689cf9370531593a6", + "reference": "6124b3678051b792d1444be689cf9370531593a6", "shasum": "" }, "require": { - "laminas/laminas-filter": "^2.9.1", + "laminas/laminas-filter": "^2.13", "laminas/laminas-servicemanager": "^3.3.1", "laminas/laminas-stdlib": "^3.0", - "laminas/laminas-validator": "^2.11", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0" + "laminas/laminas-validator": "^2.15", + "php": "^7.4 || ~8.0.0 || ~8.1.0" }, - "replace": { - "zendframework/zend-inputfilter": "^2.10.1" + "conflict": { + "zendframework/zend-inputfilter": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-db": "^2.12", + "laminas/laminas-coding-standard": "~2.2.1", + "laminas/laminas-db": "^2.13.4", + "phpspec/prophecy": "^1.14", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.4.2", + "phpunit/phpunit": "^9.5.5", "psalm/plugin-phpunit": "^0.15.1", "psr/http-message": "^1.0", "vimeo/psalm": "^4.6" @@ -782,7 +779,7 @@ "type": "community_bridge" } ], - "time": "2021-11-27T14:17:43+00:00" + "time": "2021-12-02T14:46:43+00:00" }, { "name": "laminas/laminas-json", @@ -1127,46 +1124,43 @@ }, { "name": "laminas/laminas-servicemanager", - "version": "3.7.0", + "version": "3.10.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "2b0aee477fdbd3191af7c302b93dbc5fda0626f4" + "reference": "e52b985909e0940bf22d34f322eb3f48bbef6bd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/2b0aee477fdbd3191af7c302b93dbc5fda0626f4", - "reference": "2b0aee477fdbd3191af7c302b93dbc5fda0626f4", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/e52b985909e0940bf22d34f322eb3f48bbef6bd1", + "reference": "e52b985909e0940bf22d34f322eb3f48bbef6bd1", "shasum": "" }, "require": { "container-interop/container-interop": "^1.2", "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0", "psr/container": "^1.0" }, "conflict": { "laminas/laminas-code": "<3.3.1", - "zendframework/zend-code": "<3.3.1" + "zendframework/zend-code": "<3.3.1", + "zendframework/zend-servicemanager": "*" }, "provide": { "container-interop/container-interop-implementation": "^1.2", "psr/container-implementation": "^1.0" }, - "replace": { - "zendframework/zend-servicemanager": "^3.4.0" - }, "require-dev": { "composer/package-versions-deprecated": "^1.0", - "laminas/laminas-coding-standard": "~2.2.0", + "laminas/laminas-coding-standard": "~2.2.1", "laminas/laminas-container-config-test": "^0.3", "laminas/laminas-dependency-plugin": "^2.1.2", - "mikey179/vfsstream": "^1.6.8", - "ocramius/proxy-manager": "^2.2.3", - "phpbench/phpbench": "^1.0.4", + "mikey179/vfsstream": "^1.6.10@alpha", + "ocramius/proxy-manager": "^2.11", + "phpbench/phpbench": "^1.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.4", + "phpunit/phpunit": "^9.5.5", "psalm/plugin-phpunit": "^0.16.1", "vimeo/psalm": "^4.8" }, @@ -1212,7 +1206,7 @@ "type": "community_bridge" } ], - "time": "2021-07-24T19:33:07+00:00" + "time": "2021-09-18T20:19:36+00:00" }, { "name": "laminas/laminas-stdlib", @@ -1423,52 +1417,51 @@ }, { "name": "laminas/laminas-view", - "version": "2.16.0", + "version": "2.19.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-view.git", - "reference": "cc803ea899e6ca35670b3f21f0b74e93053f2c86" + "reference": "5f2ed1af896543e986090afb6433e32409c99d4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-view/zipball/cc803ea899e6ca35670b3f21f0b74e93053f2c86", - "reference": "cc803ea899e6ca35670b3f21f0b74e93053f2c86", + "url": "https://api.github.com/repos/laminas/laminas-view/zipball/5f2ed1af896543e986090afb6433e32409c99d4d", + "reference": "5f2ed1af896543e986090afb6433e32409c99d4d", "shasum": "" }, "require": { "ext-json": "*", "laminas/laminas-eventmanager": "^3.4", - "laminas/laminas-json": "^2.6.1 || ^3.3", + "laminas/laminas-json": "^3.3", "laminas/laminas-stdlib": "^3.6", - "php": "^7.3 || ~8.0.0 || ~8.1.0" + "php": "^7.4 || ~8.0.0 || ~8.1.0" }, "conflict": { "container-interop/container-interop": "<1.2", "laminas/laminas-router": "<3.0.1", "laminas/laminas-servicemanager": "<3.3", + "laminas/laminas-session": "<2.12", "zendframework/zend-view": "*" }, "require-dev": { "ext-dom": "*", "laminas/laminas-authentication": "^2.5", - "laminas/laminas-cache": "^2.6.1", - "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-coding-standard": "~2.3.0", "laminas/laminas-console": "^2.6", "laminas/laminas-escaper": "^2.5", "laminas/laminas-feed": "^2.15", - "laminas/laminas-filter": "^2.6.1", + "laminas/laminas-filter": "^2.13.0", "laminas/laminas-http": "^2.15", "laminas/laminas-i18n": "^2.6", "laminas/laminas-modulemanager": "^2.7.1", - "laminas/laminas-mvc": "^2.7.14 || ^3.0", + "laminas/laminas-mvc": "^3.0", "laminas/laminas-mvc-i18n": "^1.1", - "laminas/laminas-mvc-plugin-flashmessenger": "^1.2", - "laminas/laminas-navigation": "^2.8.1", - "laminas/laminas-paginator": "^2.5", + "laminas/laminas-mvc-plugin-flashmessenger": "^1.5.0", + "laminas/laminas-navigation": "^2.13.1", + "laminas/laminas-paginator": "^2.11.0", "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", "laminas/laminas-servicemanager": "^3.4", - "laminas/laminas-session": "^2.12", "laminas/laminas-uri": "^2.5", "phpspec/prophecy": "^1.12", "phpspec/prophecy-phpunit": "^2.0", @@ -1524,7 +1517,7 @@ "type": "community_bridge" } ], - "time": "2021-12-30T12:32:07+00:00" + "time": "2022-01-12T16:20:05+00:00" }, { "name": "laminas/laminas-zendframework-bridge", @@ -1699,20 +1692,20 @@ }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -1741,9 +1734,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "webimpress/safe-writer", @@ -5980,7 +5973,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.3 || ~8.0.0" + "php": "^7.4 || ~8.0.0 || ~8.1.0" }, "platform-dev": [], "plugin-api-version": "2.2.0" From 995656c8dfa9ddc343f931d68637beb71ea3bc5a Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 17 Jan 2022 15:17:08 -0600 Subject: [PATCH 2/4] qa: convert deprecations to exceptions when testin Signed-off-by: Matthew Weier O'Phinney --- phpunit.xml.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3fd70a2..b588c46 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,6 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" + convertDeprecationsToExceptions="true" colors="true"> From 4cab209a9a224c570329aec2595de8bce5fb0a8b Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 17 Jan 2022 15:19:36 -0600 Subject: [PATCH 3/4] qa: update to laminas-coding-standard 2.3 - Allows usage with PHP 8.1 - Exclude the rule requiring `declare(strict_types=1)` (adding strict types in a minor version can introduce subtle BC breaks) Signed-off-by: Matthew Weier O'Phinney --- composer.json | 2 +- composer.lock | 82 ++++++++++++++++++++++++-------------------------- phpcs.xml.dist | 4 ++- 3 files changed, 43 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index 7bb5399..0ae8547 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "zfcampus/zf-apigility-documentation": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.2.0", + "laminas/laminas-coding-standard": "~2.3.0", "laminas/laminas-stdlib": "^3.6.4", "phpunit/phpunit": "^9.5.10", "vimeo/psalm": "^4.7", diff --git a/composer.lock b/composer.lock index 45c00ed..8537ebb 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": "41f4faa8f0f167a0c6f39552a80e936f", + "content-hash": "a2e465001f4c9d8b88c5d4a2bdf7408e", "packages": [ { "name": "brick/varexporter", @@ -2535,24 +2535,24 @@ }, { "name": "laminas/laminas-coding-standard", - "version": "2.2.1", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-coding-standard.git", - "reference": "c953ecb1d37034f4aa326046e2c24a10fe0a2845" + "reference": "bcf6e07fe4690240be7beb6d884d0b0fafa6a251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/c953ecb1d37034f4aa326046e2c24a10fe0a2845", - "reference": "c953ecb1d37034f4aa326046e2c24a10fe0a2845", + "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/bcf6e07fe4690240be7beb6d884d0b0fafa6a251", + "reference": "bcf6e07fe4690240be7beb6d884d0b0fafa6a251", "shasum": "" }, "require": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", - "php": "^7.3 || ~8.0.0", - "slevomat/coding-standard": "^6.4.1", - "squizlabs/php_codesniffer": "^3.5.8", - "webimpress/coding-standard": "^1.1.6" + "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "php": "^7.3 || ^8.0", + "slevomat/coding-standard": "^7.0", + "squizlabs/php_codesniffer": "^3.6", + "webimpress/coding-standard": "^1.2" }, "type": "phpcodesniffer-standard", "autoload": { @@ -2584,7 +2584,7 @@ "type": "community_bridge" } ], - "time": "2021-05-17T17:39:41+00:00" + "time": "2021-05-29T15:53:59+00:00" }, { "name": "laminas/laminas-db", @@ -3156,37 +3156,33 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "0.4.9", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "98a088b17966bdf6ee25c8a4b634df313d8aa531" + "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/98a088b17966bdf6ee25c8a4b634df313d8aa531", - "reference": "98a088b17966bdf6ee25c8a4b634df313d8aa531", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/dbc093d7af60eff5cd575d2ed761b15ed40bd08e", + "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "consistence/coding-standard": "^3.5", - "ergebnis/composer-normalize": "^2.0.2", - "jakub-onderka/php-parallel-lint": "^0.9.2", - "phing/phing": "^2.16.0", + "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.26", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^6.3", - "slevomat/coding-standard": "^4.7.2", - "symfony/process": "^4.0" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.4-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -3203,9 +3199,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/master" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.2.0" }, - "time": "2020-08-03T20:32:43+00:00" + "time": "2021-09-16T20:46:02+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4704,37 +4700,37 @@ }, { "name": "slevomat/coding-standard", - "version": "6.4.1", + "version": "7.0.18", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "696dcca217d0c9da2c40d02731526c1e25b65346" + "reference": "b81ac84f41a4797dc25c8ede1b0718e2a74be0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/696dcca217d0c9da2c40d02731526c1e25b65346", - "reference": "696dcca217d0c9da2c40d02731526c1e25b65346", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b81ac84f41a4797dc25c8ede1b0718e2a74be0fc", + "reference": "b81ac84f41a4797dc25c8ede1b0718e2a74be0fc", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.1 || ^8.0", - "phpstan/phpdoc-parser": "0.4.5 - 0.4.9", - "squizlabs/php_codesniffer": "^3.5.6" + "phpstan/phpdoc-parser": "^1.0.0", + "squizlabs/php_codesniffer": "^3.6.1" }, "require-dev": { - "phing/phing": "2.16.3", - "php-parallel-lint/php-parallel-lint": "1.2.0", - "phpstan/phpstan": "0.12.48", - "phpstan/phpstan-deprecation-rules": "0.12.5", - "phpstan/phpstan-phpunit": "0.12.16", - "phpstan/phpstan-strict-rules": "0.12.5", - "phpunit/phpunit": "7.5.20|8.5.5|9.4.0" + "phing/phing": "2.17.0", + "php-parallel-lint/php-parallel-lint": "1.3.1", + "phpstan/phpstan": "1.2.0", + "phpstan/phpstan-deprecation-rules": "1.0.0", + "phpstan/phpstan-phpunit": "1.0.0", + "phpstan/phpstan-strict-rules": "1.1.0", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.10" }, "type": "phpcodesniffer-standard", "extra": { "branch-alias": { - "dev-master": "6.x-dev" + "dev-master": "7.x-dev" } }, "autoload": { @@ -4749,7 +4745,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/6.4.1" + "source": "https://github.com/slevomat/coding-standard/tree/7.0.18" }, "funding": [ { @@ -4761,7 +4757,7 @@ "type": "tidelift" } ], - "time": "2020-10-05T12:39:37+00:00" + "time": "2021-12-07T17:19:06+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 7100e9e..b4a5795 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -19,5 +19,7 @@ view - + + + From 8caf97eeed76a9e90a72aaa964e6a9ceb29cf42c Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 17 Jan 2022 15:22:53 -0600 Subject: [PATCH 4/4] fix: add `#[ReturnTypeWillChange]` attributes where needed `IteratorAggregate::getIterator()` definitions Signed-off-by: Matthew Weier O'Phinney --- src/Api.php | 2 ++ src/Field.php | 2 ++ src/Operation.php | 2 ++ src/Service.php | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/Api.php b/src/Api.php index 8a179ac..47513c2 100644 --- a/src/Api.php +++ b/src/Api.php @@ -4,6 +4,7 @@ use ArrayIterator; use IteratorAggregate; +use ReturnTypeWillChange; //use Laminas\ApiTools\ContentNegotiation\ViewModel; @@ -110,6 +111,7 @@ public function toArray() * * @return ArrayIterator */ + #[ReturnTypeWillChange] public function getIterator() { return new ArrayIterator($this->toArray()); diff --git a/src/Field.php b/src/Field.php index e604245..eaa4481 100644 --- a/src/Field.php +++ b/src/Field.php @@ -4,6 +4,7 @@ use ArrayIterator; use IteratorAggregate; +use ReturnTypeWillChange; class Field implements IteratorAggregate { @@ -146,6 +147,7 @@ public function toArray() * * @return ArrayIterator */ + #[ReturnTypeWillChange] public function getIterator() { return new ArrayIterator($this->toArray()); diff --git a/src/Operation.php b/src/Operation.php index 2b87ae1..ef76a0a 100644 --- a/src/Operation.php +++ b/src/Operation.php @@ -4,6 +4,7 @@ use ArrayIterator; use IteratorAggregate; +use ReturnTypeWillChange; class Operation implements IteratorAggregate { @@ -158,6 +159,7 @@ public function toArray() * * @return ArrayIterator */ + #[ReturnTypeWillChange] public function getIterator() { return new ArrayIterator($this->toArray()); diff --git a/src/Service.php b/src/Service.php index 1311021..e15cbf8 100644 --- a/src/Service.php +++ b/src/Service.php @@ -5,6 +5,7 @@ use ArrayIterator; use IteratorAggregate; use Laminas\ApiTools\Documentation\Api; +use ReturnTypeWillChange; class Service implements IteratorAggregate { @@ -287,6 +288,7 @@ public function toArray() * * @return ArrayIterator */ + #[ReturnTypeWillChange] public function getIterator() { return new ArrayIterator($this->toArray());