diff --git a/.laminas-ci.json b/.laminas-ci.json index 52a5dc86..cf74e8fe 100644 --- a/.laminas-ci.json +++ b/.laminas-ci.json @@ -3,6 +3,7 @@ "tidy" ], "ignore_php_platform_requirements": { - "8.1": true + "8.1": false, + "8.2": true } } diff --git a/composer.json b/composer.json index 7370b132..a9f8d821 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "config": { "sort-packages": true, "platform": { - "php": "7.4.99" + "php": "8.0.99" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true @@ -29,7 +29,7 @@ "extra": { }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "ext-dom": "*", "ext-libxml": "*", "laminas/laminas-escaper": "^2.9", @@ -37,16 +37,16 @@ "laminas/laminas-stdlib": "^3.6" }, "require-dev": { - "laminas/laminas-cache": "^2.13.2 || ^3.1.3", - "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.0.0", + "laminas/laminas-cache": "^2.13.2 || ^3.6", + "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.1", "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-db": "^2.13.3", - "laminas/laminas-http": "^2.15", - "laminas/laminas-validator": "^2.15", - "phpunit/phpunit": "^9.5.5", + "laminas/laminas-db": "^2.15", + "laminas/laminas-http": "^2.16", + "laminas/laminas-validator": "^2.26", + "phpunit/phpunit": "^9.5.25", "psalm/plugin-phpunit": "^0.17.0", "psr/http-message": "^1.0.1", - "vimeo/psalm": "^4.24.0" + "vimeo/psalm": "^4.29" }, "conflict": { "laminas/laminas-servicemanager": "<3.3", diff --git a/composer.lock b/composer.lock index 9fdcae26..f53d4b3c 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": "9c3c85751bec520b5b332eeb5d1be02b", + "content-hash": "65ad2cbd2ec546e8506950f0a22ee058", "packages": [ { "name": "laminas/laminas-escaper", @@ -70,21 +70,21 @@ }, { "name": "laminas/laminas-servicemanager", - "version": "3.17.0", + "version": "3.19.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "360be5f16955dd1edbcce1cfaa98ed82a17f02ec" + "reference": "ed160729bb8721127efdaac799f9a298963345b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/360be5f16955dd1edbcce1cfaa98ed82a17f02ec", - "reference": "360be5f16955dd1edbcce1cfaa98ed82a17f02ec", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/ed160729bb8721127efdaac799f9a298963345b1", + "reference": "ed160729bb8721127efdaac799f9a298963345b1", "shasum": "" }, "require": { "laminas/laminas-stdlib": "^3.2.1", - "php": "~7.4.0 || ~8.0.0 || ~8.1.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "psr/container": "^1.0" }, "conflict": { @@ -100,17 +100,16 @@ "container-interop/container-interop": "^1.2.0" }, "require-dev": { - "composer/package-versions-deprecated": "^1.0", + "composer/package-versions-deprecated": "^1.11.99.5", "laminas/laminas-coding-standard": "~2.4.0", "laminas/laminas-container-config-test": "^0.7", - "laminas/laminas-dependency-plugin": "^2.1.2", - "mikey179/vfsstream": "^1.6.10@alpha", - "ocramius/proxy-manager": "^2.11", - "phpbench/phpbench": "^1.1", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5.5", + "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.8" + "vimeo/psalm": "^4.28" }, "suggest": { "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" @@ -157,35 +156,34 @@ "type": "community_bridge" } ], - "time": "2022-09-22T11:33:46+00:00" + "time": "2022-10-10T20:59:22+00:00" }, { "name": "laminas/laminas-stdlib", - "version": "3.13.0", + "version": "3.15.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76" + "reference": "63b66bd4b696f024f42616b9d95cdb10e5109c27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/66a6d03c381f6c9f1dd988bf8244f9afb9380d76", - "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/63b66bd4b696f024f42616b9d95cdb10e5109c27", + "reference": "63b66bd4b696f024f42616b9d95cdb10e5109c27", "shasum": "" }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0" }, "conflict": { "zendframework/zend-stdlib": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", + "laminas/laminas-coding-standard": "^2.4.0", "phpbench/phpbench": "^1.2.6", - "phpstan/phpdoc-parser": "^0.5.4", - "phpunit/phpunit": "^9.5.23", + "phpunit/phpunit": "^9.5.25", "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.26" + "vimeo/psalm": "^4.28" }, "type": "library", "autoload": { @@ -217,7 +215,7 @@ "type": "community_bridge" } ], - "time": "2022-08-24T13:56:50+00:00" + "time": "2022-10-10T19:10:24+00:00" }, { "name": "psr/container", @@ -1305,32 +1303,33 @@ }, { "name": "laminas/laminas-eventmanager", - "version": "3.5.0", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-eventmanager.git", - "reference": "41f7209428f37cab9573365e361f4078209aaafa" + "reference": "3f1afbad86cd34a431fdc069f265cfe6f8fc8308" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/41f7209428f37cab9573365e361f4078209aaafa", - "reference": "41f7209428f37cab9573365e361f4078209aaafa", + "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/3f1afbad86cd34a431fdc069f265cfe6f8fc8308", + "reference": "3f1afbad86cd34a431fdc069f265cfe6f8fc8308", "shasum": "" }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0" }, "conflict": { "container-interop/container-interop": "<1.2", "zendframework/zend-eventmanager": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.2.1", - "laminas/laminas-stdlib": "^3.6", - "phpbench/phpbench": "^1.1", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5.5", - "psr/container": "^1.1.2 || ^2.0.2" + "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-stdlib": "^3.15", + "phpbench/phpbench": "^1.2.6", + "phpunit/phpunit": "^9.5.25", + "psalm/plugin-phpunit": "^0.17.0", + "psr/container": "^1.1.2 || ^2.0.2", + "vimeo/psalm": "^4.28" }, "suggest": { "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature", @@ -1368,7 +1367,7 @@ "type": "community_bridge" } ], - "time": "2022-04-06T21:05:17+00:00" + "time": "2022-10-11T12:46:13+00:00" }, { "name": "laminas/laminas-http", @@ -1551,22 +1550,22 @@ }, { "name": "laminas/laminas-validator", - "version": "2.25.0", + "version": "2.26.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "42de39b78e73b321db7d948cf8530a2764f8b9aa" + "reference": "a995b21d18c63cd1f5d123d0d2cd31a1c2d828dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/42de39b78e73b321db7d948cf8530a2764f8b9aa", - "reference": "42de39b78e73b321db7d948cf8530a2764f8b9aa", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/a995b21d18c63cd1f5d123d0d2cd31a1c2d828dc", + "reference": "a995b21d18c63cd1f5d123d0d2cd31a1c2d828dc", "shasum": "" }, "require": { "laminas/laminas-servicemanager": "^3.12.0", "laminas/laminas-stdlib": "^3.13", - "php": "^7.4 || ~8.0.0 || ~8.1.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0" }, "conflict": { "zendframework/zend-validator": "*" @@ -1574,18 +1573,17 @@ "require-dev": { "laminas/laminas-coding-standard": "^2.4.0", "laminas/laminas-db": "^2.15.0", - "laminas/laminas-filter": "^2.18.0", + "laminas/laminas-filter": "^2.22", "laminas/laminas-http": "^2.16.0", - "laminas/laminas-i18n": "^2.17.0", + "laminas/laminas-i18n": "^2.19", "laminas/laminas-session": "^2.13.0", "laminas/laminas-uri": "^2.9.1", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5.24", + "phpunit/phpunit": "^9.5.25", "psalm/plugin-phpunit": "^0.17.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "vimeo/psalm": "^4.27.0" + "psr/http-client": "^1.0.1", + "psr/http-factory": "^1.0.1", + "psr/http-message": "^1.0.1", + "vimeo/psalm": "^4.28" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -1633,7 +1631,7 @@ "type": "community_bridge" } ], - "time": "2022-09-20T11:33:19+00:00" + "time": "2022-10-11T12:58:36+00:00" }, { "name": "myclabs/deep-copy", @@ -2077,25 +2075,30 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "type": "library", "extra": { @@ -2121,9 +2124,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" }, - "time": "2022-03-15T21:29:03+00:00" + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -2753,30 +2756,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -2797,9 +2800,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/3.0.0" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:46:02+00:00" }, { "name": "psr/simple-cache", @@ -3982,46 +3985,42 @@ }, { "name": "symfony/console", - "version": "v5.4.14", + "version": "v6.0.14", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "984ea2c0f45f42dfed01d2f3987b187467c4b16d" + "reference": "1f89cab8d52c84424f798495b3f10342a7b1a070" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/984ea2c0f45f42dfed01d2f3987b187467c4b16d", - "reference": "984ea2c0f45f42dfed01d2f3987b187467c4b16d", + "url": "https://api.github.com/repos/symfony/console/zipball/1f89cab8d52c84424f798495b3f10342a7b1a070", + "reference": "1f89cab8d52c84424f798495b3f10342a7b1a070", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.0.2", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.1|^6.0" + "symfony/string": "^5.4|^6.0" }, "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" }, "provide": { - "psr/log-implementation": "1.0|2.0" + "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/lock": "^4.4|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0", - "symfony/var-dumper": "^4.4|^5.0|^6.0" + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/lock": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/var-dumper": "^5.4|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -4061,7 +4060,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.14" + "source": "https://github.com/symfony/console/tree/v6.0.14" }, "funding": [ { @@ -4077,29 +4076,29 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:01:20+00:00" + "time": "2022-10-07T08:02:12+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -4128,7 +4127,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" }, "funding": [ { @@ -4144,7 +4143,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-01-02T09:55:41+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4476,85 +4475,6 @@ ], "time": "2022-05-24T11:49:31+00:00" }, - { - "name": "symfony/polyfill-php73", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-24T11:49:31+00:00" - }, { "name": "symfony/polyfill-php80", "version": "v1.26.0", @@ -4723,34 +4643,33 @@ }, { "name": "symfony/string", - "version": "v5.4.14", + "version": "v6.0.14", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4" + "reference": "3db7da820a6e4a584b714b3933c34c6a7db4d86c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/089e7237497fae7a9c404d0c3aeb8db3254733e4", - "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4", + "url": "https://api.github.com/repos/symfony/string/zipball/3db7da820a6e4a584b714b3933c34c6a7db4d86c", + "reference": "3db7da820a6e4a584b714b3933c34c6a7db4d86c", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": ">=3.0" + "symfony/translation-contracts": "<2.0" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0|^6.0" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/translation-contracts": "^2.0|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -4789,7 +4708,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.14" + "source": "https://github.com/symfony/string/tree/v6.0.14" }, "funding": [ { @@ -4805,7 +4724,7 @@ "type": "tidelift" } ], - "time": "2022-10-05T15:16:54+00:00" + "time": "2022-10-10T09:34:08+00:00" }, { "name": "theseer/tokenizer", @@ -5136,13 +5055,13 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4 || ~8.0.0 || ~8.1.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "ext-dom": "*", "ext-libxml": "*" }, "platform-dev": [], "platform-overrides": { - "php": "7.4.99" + "php": "8.0.99" }, "plugin-api-version": "2.3.0" } diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 12972f06..88062856 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $this->httpResponse === null @@ -1802,8 +1802,7 @@ is_object($statusCode) is_string($statusCode) - - $statusCode + $statusCode @@ -2350,10 +2349,7 @@ is_object($number) is_object($type) - - $number - $number - $type + $value @@ -2382,8 +2378,7 @@ is_bool($status) is_object($type) - - $type + $val $value $value diff --git a/src/Reader/ExtensionPluginManager.php b/src/Reader/ExtensionPluginManager.php index eab798f2..56bd0f1f 100644 --- a/src/Reader/ExtensionPluginManager.php +++ b/src/Reader/ExtensionPluginManager.php @@ -11,7 +11,6 @@ use Laminas\ServiceManager\Exception\InvalidServiceException; use Laminas\ServiceManager\Factory\InvokableFactory; -use function get_class; use function gettype; use function is_object; use function sprintf; @@ -222,7 +221,7 @@ public function validate($instance) throw new InvalidServiceException(sprintf( 'Plugin of type %s is invalid; must implement %s or %s', - is_object($instance) ? get_class($instance) : gettype($instance), + is_object($instance) ? $instance::class : gettype($instance), AbstractEntry::class, AbstractFeed::class )); @@ -245,7 +244,7 @@ public function validatePlugin($plugin) } catch (InvalidServiceException $e) { throw new Exception\InvalidArgumentException(sprintf( 'Plugin of type %s is invalid; must implement %s or %s', - is_object($plugin) ? get_class($plugin) : gettype($plugin), + is_object($plugin) ? $plugin::class : gettype($plugin), AbstractEntry::class, AbstractFeed::class )); diff --git a/src/Reader/Http/LaminasHttpClientDecorator.php b/src/Reader/Http/LaminasHttpClientDecorator.php index e197cd29..0cfcac4a 100644 --- a/src/Reader/Http/LaminasHttpClientDecorator.php +++ b/src/Reader/Http/LaminasHttpClientDecorator.php @@ -8,7 +8,6 @@ use Laminas\Http\Client as LaminasHttpClient; use Laminas\Http\Headers; -use function get_class; use function gettype; use function implode; use function is_array; @@ -76,7 +75,7 @@ private function injectHeaders(array $headerValues) throw new Exception\InvalidArgumentException(sprintf( 'Header values provided to %s::get must be arrays of values; received %s', self::class, - is_object($values) ? get_class($values) : gettype($values) + is_object($values) ? $values::class : gettype($values) )); } @@ -86,7 +85,7 @@ private function injectHeaders(array $headerValues) 'Individual header values provided to %s::get must be strings or numbers; ' . 'received %s for header %s', self::class, - is_object($value) ? get_class($value) : gettype($value), + is_object($value) ? $value::class : gettype($value), $name )); } diff --git a/src/Reader/Http/Response.php b/src/Reader/Http/Response.php index 67bbba64..a3f77726 100644 --- a/src/Reader/Http/Response.php +++ b/src/Reader/Http/Response.php @@ -6,7 +6,6 @@ use Laminas\Feed\Reader\Exception; -use function get_class; use function gettype; use function intval; use function is_numeric; @@ -80,7 +79,7 @@ private function validateStatusCode($statusCode) throw new Exception\InvalidArgumentException(sprintf( '%s expects a numeric status code; received %s', self::class, - is_object($statusCode) ? get_class($statusCode) : gettype($statusCode) + is_object($statusCode) ? $statusCode::class : gettype($statusCode) )); } @@ -122,7 +121,7 @@ private function validateBody($body) throw new Exception\InvalidArgumentException(sprintf( '%s expects a string body, or an object that can cast to string; received %s', self::class, - is_object($body) ? get_class($body) : gettype($body) + is_object($body) ? $body::class : gettype($body) )); } @@ -147,7 +146,7 @@ private function validateHeaders(array $headers) throw new Exception\InvalidArgumentException(sprintf( 'Individual header values provided to %s must be a string or numeric; received %s for header %s', self::class, - is_object($value) ? get_class($value) : gettype($value), + is_object($value) ? $value::class : gettype($value), $name )); } diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php index 39a080dc..f38bce72 100644 --- a/src/Reader/Reader.php +++ b/src/Reader/Reader.php @@ -14,7 +14,6 @@ use function array_unique; use function file_get_contents; use function function_exists; -use function get_class; use function gettype; use function in_array; use function ini_restore; @@ -130,7 +129,7 @@ class Reader implements ReaderImportInterface public static function disableEntityLoader($flag = true) { if (LIBXML_VERSION < 20900) { - return libxml_disable_entity_loader($flag); + return libxml_disable_entity_loader($flag); // phpcs:ignore } return $flag; } @@ -331,7 +330,7 @@ public static function importRemoteFeed($uri, Http\ClientInterface $client) throw new Exception\RuntimeException(sprintf( 'Did not receive a %s\Http\ResponseInterface from the provided HTTP client; received "%s"', __NAMESPACE__, - is_object($response) ? get_class($response) : gettype($response) + is_object($response) ? $response::class : gettype($response) )); } diff --git a/src/Writer/Extension/ITunes/Entry.php b/src/Writer/Extension/ITunes/Entry.php index 18b2d407..892fb47e 100644 --- a/src/Writer/Extension/ITunes/Entry.php +++ b/src/Writer/Extension/ITunes/Entry.php @@ -13,7 +13,6 @@ use function count; use function ctype_alpha; use function ctype_digit; -use function get_class; use function gettype; use function implode; use function in_array; @@ -326,7 +325,7 @@ public function setItunesEpisode($number) if (! is_numeric($number) || is_float($number)) { throw new Writer\Exception\InvalidArgumentException(sprintf( 'invalid parameter: "number" may only be an integer; received %s', - is_object($number) ? get_class($number) : gettype($number) + is_object($number) ? $number::class : gettype($number) )); } @@ -349,7 +348,7 @@ public function setItunesEpisodeType($type) throw new Writer\Exception\InvalidArgumentException(sprintf( 'invalid parameter: "episodeType" MUST be one of the strings [%s]; received %s', implode(', ', $validTypes), - is_object($type) ? get_class($type) : var_export($type, true) + is_object($type) ? $type::class : var_export($type, true) )); } @@ -370,7 +369,7 @@ public function setItunesIsClosedCaptioned($status) if (! is_bool($status)) { throw new Writer\Exception\InvalidArgumentException(sprintf( 'invalid parameter: "isClosedCaptioned" MUST be a boolean; received %s', - is_object($status) ? get_class($status) : var_export($status, true) + is_object($status) ? $status::class : var_export($status, true) )); } @@ -395,7 +394,7 @@ public function setItunesSeason($number) if (! is_numeric($number) || is_float($number)) { throw new Writer\Exception\InvalidArgumentException(sprintf( 'invalid parameter: "season" may only be an integer; received %s', - is_object($number) ? get_class($number) : gettype($number) + is_object($number) ? $number::class : gettype($number) )); } diff --git a/src/Writer/Extension/ITunes/Feed.php b/src/Writer/Extension/ITunes/Feed.php index 193868e5..0bb48de0 100644 --- a/src/Writer/Extension/ITunes/Feed.php +++ b/src/Writer/Extension/ITunes/Feed.php @@ -13,7 +13,6 @@ use function count; use function ctype_alpha; use function ctype_digit; -use function get_class; use function implode; use function in_array; use function is_array; @@ -405,7 +404,7 @@ public function setItunesType($type) throw new Writer\Exception\InvalidArgumentException(sprintf( 'invalid parameter: "type" MUST be one of [%s]; received %s', implode(', ', $validTypes), - is_object($type) ? get_class($type) : var_export($type, true) + is_object($type) ? $type::class : var_export($type, true) )); } $this->data['type'] = $type; @@ -424,7 +423,7 @@ public function setItunesComplete($status) if (! is_bool($status)) { throw new Writer\Exception\InvalidArgumentException(sprintf( 'invalid parameter: "complete" MUST be boolean; received %s', - is_object($status) ? get_class($status) : var_export($status, true) + is_object($status) ? $status::class : var_export($status, true) )); } diff --git a/src/Writer/ExtensionPluginManager.php b/src/Writer/ExtensionPluginManager.php index 40bd1889..9cb0a614 100644 --- a/src/Writer/ExtensionPluginManager.php +++ b/src/Writer/ExtensionPluginManager.php @@ -9,7 +9,6 @@ use Laminas\ServiceManager\Exception\InvalidServiceException; use Laminas\ServiceManager\Factory\InvokableFactory; -use function get_class; use function gettype; use function is_object; use function sprintf; @@ -248,12 +247,12 @@ public function validate($instance) return; } - if (is_object($instance) && 'Feed' === substr(get_class($instance), -4)) { + if (is_object($instance) && 'Feed' === substr($instance::class, -4)) { // we're okay return; } - if (is_object($instance) && 'Entry' === substr(get_class($instance), -5)) { + if (is_object($instance) && 'Entry' === substr($instance::class, -5)) { // we're okay return; } @@ -261,7 +260,7 @@ public function validate($instance) throw new InvalidServiceException(sprintf( 'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface ' . 'or the classname must end in "Feed" or "Entry"', - is_object($instance) ? get_class($instance) : gettype($instance), + is_object($instance) ? $instance::class : gettype($instance), __NAMESPACE__ )); } @@ -281,7 +280,7 @@ public function validatePlugin($plugin) throw new Exception\InvalidArgumentException(sprintf( 'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface ' . 'or the classname must end in "Feed" or "Entry"', - is_object($plugin) ? get_class($plugin) : gettype($plugin), + is_object($plugin) ? $plugin::class : gettype($plugin), __NAMESPACE__ )); } diff --git a/src/Writer/FeedFactory.php b/src/Writer/FeedFactory.php index 46031961..f162a11c 100644 --- a/src/Writer/FeedFactory.php +++ b/src/Writer/FeedFactory.php @@ -7,7 +7,6 @@ use Traversable; use function array_key_exists; -use function get_class; use function gettype; use function is_array; use function is_object; @@ -32,7 +31,7 @@ public static function factory($data) throw new Exception\InvalidArgumentException(sprintf( '%s expects an array or Traversable argument; received "%s"', __METHOD__, - is_object($data) ? get_class($data) : gettype($data) + is_object($data) ? $data::class : gettype($data) )); } @@ -97,7 +96,7 @@ protected static function createEntries($entries, Feed $feed) throw new Exception\InvalidArgumentException(sprintf( '%s::factory expects the "entries" value to be an array or Traversable; received "%s"', static::class, - is_object($entries) ? get_class($entries) : gettype($entries) + is_object($entries) ? $entries::class : gettype($entries) )); } @@ -106,7 +105,7 @@ protected static function createEntries($entries, Feed $feed) throw new Exception\InvalidArgumentException(sprintf( '%s expects an array, Traversable, or Laminas\Feed\Writer\Entry argument; received "%s"', __METHOD__, - is_object($data) ? get_class($data) : gettype($data) + is_object($data) ? $data::class : gettype($data) )); }