diff --git a/composer.json b/composer.json index 0893c5944..e4611915e 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "laminas/laminas-paginator": "^2.5", "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", - "laminas/laminas-servicemanager": "^3.3", + "laminas/laminas-servicemanager": "^3.4", "laminas/laminas-session": "^2.12", "laminas/laminas-uri": "^2.5", "phpspec/prophecy": "^1.12", @@ -54,6 +54,7 @@ "vimeo/psalm": "^4.10" }, "conflict": { + "container-interop/container-interop": "<1.2", "laminas/laminas-servicemanager": "<3.3", "laminas/laminas-router": "<3.0.1", "zendframework/zend-view": "*" diff --git a/composer.lock b/composer.lock index e89a58d3f..3aa6e5e82 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": "242f3bed2b23c313b8c0bcc3bf1fa9fc", + "content-hash": "b3cb8004a09d9bf61df06defca4178a4", "packages": [ { "name": "laminas/laminas-eventmanager", @@ -135,16 +135,16 @@ }, { "name": "laminas/laminas-stdlib", - "version": "3.6.0", + "version": "3.6.2", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "c53d8537f108fac3fae652677a19735db730ba46" + "reference": "6fe0842909638ca6bea8401b7e8168fb154bffb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/c53d8537f108fac3fae652677a19735db730ba46", - "reference": "c53d8537f108fac3fae652677a19735db730ba46", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/6fe0842909638ca6bea8401b7e8168fb154bffb5", + "reference": "6fe0842909638ca6bea8401b7e8168fb154bffb5", "shasum": "" }, "require": { @@ -190,7 +190,7 @@ "type": "community_bridge" } ], - "time": "2021-09-02T16:11:32+00:00" + "time": "2021-12-07T21:06:58+00:00" } ], "packages-dev": [ @@ -476,18 +476,89 @@ ], "time": "2021-09-13T08:41:34+00:00" }, + { + "name": "composer/pcre", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-12-06T15:17:27+00:00" + }, { "name": "composer/semver", - "version": "3.2.5", + "version": "3.2.6", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" + "reference": "83e511e247de329283478496f7a1e114c9517506" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", + "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506", + "reference": "83e511e247de329283478496f7a1e114c9517506", "shasum": "" }, "require": { @@ -539,7 +610,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.5" + "source": "https://github.com/composer/semver/tree/3.2.6" }, "funding": [ { @@ -555,29 +626,31 @@ "type": "tidelift" } ], - "time": "2021-05-24T12:41:47+00:00" + "time": "2021-10-25T11:34:17+00:00" }, { "name": "composer/xdebug-handler", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339" + "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e", + "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e", "shasum": "" }, "require": { + "composer/pcre": "^1", "php": "^5.3.2 || ^7.0 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" }, "type": "library", "autoload": { @@ -603,7 +676,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.2" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.3" }, "funding": [ { @@ -619,7 +692,7 @@ "type": "tidelift" } ], - "time": "2021-07-31T17:03:58+00:00" + "time": "2021-12-08T13:07:32+00:00" }, { "name": "container-interop/container-interop", @@ -866,37 +939,37 @@ }, { "name": "laminas/laminas-authentication", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-authentication.git", - "reference": "0b77d353a3a039d65c15318c98dd055d62f010b6" + "reference": "cf611a6fe50b4e4905be22a4cd59ba303bc039fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-authentication/zipball/0b77d353a3a039d65c15318c98dd055d62f010b6", - "reference": "0b77d353a3a039d65c15318c98dd055d62f010b6", + "url": "https://api.github.com/repos/laminas/laminas-authentication/zipball/cf611a6fe50b4e4905be22a4cd59ba303bc039fc", + "reference": "cf611a6fe50b4e4905be22a4cd59ba303bc039fc", "shasum": "" }, "require": { "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, - "replace": { - "zendframework/zend-authentication": "^2.7.0" + "conflict": { + "zendframework/zend-authentication": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", "laminas/laminas-crypt": "^2.6 || ^3.2.1", - "laminas/laminas-db": "^2.8.2", - "laminas/laminas-http": "^2.7", - "laminas/laminas-ldap": "^2.8", - "laminas/laminas-session": "^2.8", + "laminas/laminas-db": "^2.13", + "laminas/laminas-http": "^2.15.0", + "laminas/laminas-ldap": "^2.12", + "laminas/laminas-session": "^2.12", "laminas/laminas-uri": "^2.5.2", "laminas/laminas-validator": "^2.10.1", "phpunit/phpunit": "^9.3", "psalm/plugin-phpunit": "^0.15.1", + "squizlabs/php_codesniffer": "^2.9.2 || ^3.6", "vimeo/psalm": "^4.6" }, "suggest": { @@ -938,20 +1011,20 @@ "type": "community_bridge" } ], - "time": "2021-03-17T13:48:31+00:00" + "time": "2021-12-04T16:13:05+00:00" }, { "name": "laminas/laminas-cache", - "version": "2.13.0", + "version": "2.13.2", "source": { "type": "git", "url": "https://github.com/laminas/laminas-cache.git", - "reference": "566948e32f30881cb903ffbd0e3e20dac00cd83e" + "reference": "fc3255833c1c687ed2c5312e9663ef062be155c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/566948e32f30881cb903ffbd0e3e20dac00cd83e", - "reference": "566948e32f30881cb903ffbd0e3e20dac00cd83e", + "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/fc3255833c1c687ed2c5312e9663ef062be155c9", + "reference": "fc3255833c1c687ed2c5312e9663ef062be155c9", "shasum": "" }, "require": { @@ -1043,7 +1116,7 @@ "type": "community_bridge" } ], - "time": "2021-08-08T10:21:18+00:00" + "time": "2021-11-07T13:11:51+00:00" }, { "name": "laminas/laminas-cache-storage-adapter-apc", @@ -2219,16 +2292,16 @@ }, { "name": "laminas/laminas-feed", - "version": "2.15.0", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-feed.git", - "reference": "3ef837a12833c74b438d2c3780023c4244e0abae" + "reference": "cbd0e10c867a1efa6594164d229d8caf4a4ae4c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/3ef837a12833c74b438d2c3780023c4244e0abae", - "reference": "3ef837a12833c74b438d2c3780023c4244e0abae", + "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/cbd0e10c867a1efa6594164d229d8caf4a4ae4c7", + "reference": "cbd0e10c867a1efa6594164d229d8caf4a4ae4c7", "shasum": "" }, "require": { @@ -2292,20 +2365,20 @@ "type": "community_bridge" } ], - "time": "2021-09-20T18:11:11+00:00" + "time": "2021-12-17T09:12:35+00:00" }, { "name": "laminas/laminas-filter", - "version": "2.11.1", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "671724e163aa75c210e94d12b77a0f3f8240d4b2" + "reference": "0fc5dcd27dc22dba1a2544123684c67768fc5f88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/671724e163aa75c210e94d12b77a0f3f8240d4b2", - "reference": "671724e163aa75c210e94d12b77a0f3f8240d4b2", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/0fc5dcd27dc22dba1a2544123684c67768fc5f88", + "reference": "0fc5dcd27dc22dba1a2544123684c67768fc5f88", "shasum": "" }, "require": { @@ -2374,20 +2447,20 @@ "type": "community_bridge" } ], - "time": "2021-05-24T18:29:02+00:00" + "time": "2021-10-24T21:01:15+00:00" }, { "name": "laminas/laminas-http", - "version": "2.15.0", + "version": "2.15.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-http.git", - "reference": "e1f3420ab35e21ea135913d213b8d570e5e7b513" + "reference": "261f079c3dffcf6f123484db43c40e44c4bf1c79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-http/zipball/e1f3420ab35e21ea135913d213b8d570e5e7b513", - "reference": "e1f3420ab35e21ea135913d213b8d570e5e7b513", + "url": "https://api.github.com/repos/laminas/laminas-http/zipball/261f079c3dffcf6f123484db43c40e44c4bf1c79", + "reference": "261f079c3dffcf6f123484db43c40e44c4bf1c79", "shasum": "" }, "require": { @@ -2401,6 +2474,7 @@ "zendframework/zend-http": "*" }, "require-dev": { + "ext-curl": "*", "laminas/laminas-coding-standard": "~2.2.1", "phpunit/phpunit": "^9.5.5" }, @@ -2438,43 +2512,42 @@ "type": "community_bridge" } ], - "time": "2021-09-10T10:45:31+00:00" + "time": "2021-12-03T10:17:11+00:00" }, { "name": "laminas/laminas-i18n", - "version": "2.11.3", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-i18n.git", - "reference": "563b1b720ee53f2748473656a250d65911fc4462" + "reference": "b3a55d05818ed37ed18e76c103727e95e32cf591" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/563b1b720ee53f2748473656a250d65911fc4462", - "reference": "563b1b720ee53f2748473656a250d65911fc4462", + "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/b3a55d05818ed37ed18e76c103727e95e32cf591", + "reference": "b3a55d05818ed37ed18e76c103727e95e32cf591", "shasum": "" }, "require": { "ext-intl": "*", "laminas/laminas-stdlib": "^2.7 || ^3.0", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, "conflict": { - "phpspec/prophecy": "<1.9.0" - }, - "replace": { - "zendframework/zend-i18n": "^2.10.1" + "phpspec/prophecy": "<1.9.0", + "zendframework/zend-i18n": "*" }, "require-dev": { - "laminas/laminas-cache": "^2.6.1", + "laminas/laminas-cache": "^3.1.2", + "laminas/laminas-cache-storage-adapter-memory": "^2.0.0", + "laminas/laminas-cache-storage-deprecated-factory": "^1.0.0", "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-config": "^2.6", - "laminas/laminas-eventmanager": "^2.6.2 || ^3.0", - "laminas/laminas-filter": "^2.6.1", - "laminas/laminas-servicemanager": "^3.2.1", - "laminas/laminas-validator": "^2.6", - "laminas/laminas-view": "^2.6.3", + "laminas/laminas-config": "^3.4.0", + "laminas/laminas-eventmanager": "^3.4.0", + "laminas/laminas-filter": "^2.10.0", + "laminas/laminas-servicemanager": "^3.7.0", + "laminas/laminas-validator": "^2.14.0", + "laminas/laminas-view": "^2.12.0", "phpunit/phpunit": "^9.3" }, "suggest": { @@ -2523,7 +2596,7 @@ "type": "community_bridge" } ], - "time": "2021-10-13T08:07:28+00:00" + "time": "2021-12-06T00:44:40+00:00" }, { "name": "laminas/laminas-loader", @@ -2735,16 +2808,16 @@ }, { "name": "laminas/laminas-mvc-i18n", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-mvc-i18n.git", - "reference": "7ece491a02000a6c4ea2c4457fead3d12efc6eba" + "reference": "1df255e2840eafdd814f5f7f4a46ef192aa5f880" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-mvc-i18n/zipball/7ece491a02000a6c4ea2c4457fead3d12efc6eba", - "reference": "7ece491a02000a6c4ea2c4457fead3d12efc6eba", + "url": "https://api.github.com/repos/laminas/laminas-mvc-i18n/zipball/1df255e2840eafdd814f5f7f4a46ef192aa5f880", + "reference": "1df255e2840eafdd814f5f7f4a46ef192aa5f880", "shasum": "" }, "require": { @@ -2754,15 +2827,12 @@ "laminas/laminas-servicemanager": "^3.6", "laminas/laminas-stdlib": "^3.3", "laminas/laminas-validator": "^2.14", - "laminas/laminas-zendframework-bridge": "^1.2", - "php": "^7.3 || ~8.0.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, "conflict": { "laminas/laminas-mvc": "<3.0.0", - "phpspec/prophecy": "<1.8.0" - }, - "replace": { - "zendframework/zend-mvc-i18n": "^1.1.1" + "phpspec/prophecy": "<1.8.0", + "zendframework/zend-mvc-i18n": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", @@ -2811,20 +2881,20 @@ "type": "community_bridge" } ], - "time": "2021-04-02T15:49:43+00:00" + "time": "2021-11-30T17:32:48+00:00" }, { "name": "laminas/laminas-mvc-plugin-flashmessenger", - "version": "1.3.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-mvc-plugin-flashmessenger.git", - "reference": "f7569d05dfd774a2c84328792ee716e2d8b1e33e" + "reference": "178339e7eb0e34e220e2fe543832f4eed7fb5705" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-mvc-plugin-flashmessenger/zipball/f7569d05dfd774a2c84328792ee716e2d8b1e33e", - "reference": "f7569d05dfd774a2c84328792ee716e2d8b1e33e", + "url": "https://api.github.com/repos/laminas/laminas-mvc-plugin-flashmessenger/zipball/178339e7eb0e34e220e2fe543832f4eed7fb5705", + "reference": "178339e7eb0e34e220e2fe543832f4eed7fb5705", "shasum": "" }, "require": { @@ -2832,14 +2902,11 @@ "laminas/laminas-session": "^2.8.5", "laminas/laminas-stdlib": "^3.2.1", "laminas/laminas-view": "^2.12", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, "conflict": { - "laminas/laminas-mvc": "<3.0.0" - }, - "replace": { - "zendframework/zend-mvc-plugin-flashmessenger": "^1.2.0" + "laminas/laminas-mvc": "<3.0.0", + "zendframework/zend-mvc-plugin-flashmessenger": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", @@ -2881,29 +2948,28 @@ "type": "community_bridge" } ], - "time": "2021-04-13T16:30:26+00:00" + "time": "2021-12-08T07:02:11+00:00" }, { "name": "laminas/laminas-navigation", - "version": "2.11.1", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-navigation.git", - "reference": "59f69237a6ae31135841c5e188f363d46101e145" + "reference": "1d29047b49ea978756e6f10921ec3e96f5bc6147" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/59f69237a6ae31135841c5e188f363d46101e145", - "reference": "59f69237a6ae31135841c5e188f363d46101e145", + "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/1d29047b49ea978756e6f10921ec3e96f5bc6147", + "reference": "1d29047b49ea978756e6f10921ec3e96f5bc6147", "shasum": "" }, "require": { "laminas/laminas-stdlib": "^2.7 || ^3.0", - "laminas/laminas-zendframework-bridge": "^1.0", "php": "^7.3 || ~8.0.0" }, - "replace": { - "zendframework/zend-navigation": "^2.9.1" + "conflict": { + "zendframework/zend-navigation": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", @@ -2964,41 +3030,40 @@ "type": "community_bridge" } ], - "time": "2021-04-12T09:14:02+00:00" + "time": "2021-12-06T01:40:32+00:00" }, { "name": "laminas/laminas-paginator", - "version": "2.10.0", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-paginator.git", - "reference": "14ce4a397e6329954389cc40aa635caa9573f695" + "reference": "7f00d5fdecd1b4f67c8e84e6f6d57bbabda4b7d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/14ce4a397e6329954389cc40aa635caa9573f695", - "reference": "14ce4a397e6329954389cc40aa635caa9573f695", + "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/7f00d5fdecd1b4f67c8e84e6f6d57bbabda4b7d8", + "reference": "7f00d5fdecd1b4f67c8e84e6f6d57bbabda4b7d8", "shasum": "" }, "require": { "ext-json": "*", - "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-zendframework-bridge": "^1.0.4", - "php": "^7.3 || ~8.0.0" + "laminas/laminas-stdlib": "^3.6.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, - "replace": { - "zendframework/zend-paginator": "^2.8.2" + "conflict": { + "zendframework/zend-paginator": "*" }, "require-dev": { - "laminas/laminas-cache": "^2.9.0", + "laminas/laminas-cache": "^2.13.0", "laminas/laminas-coding-standard": "~2.1.4", "laminas/laminas-config": "^2.6.0", - "laminas/laminas-filter": "^2.9.4", - "laminas/laminas-servicemanager": "^3.4.1", - "laminas/laminas-view": "^2.11.4", - "phpunit/phpunit": "^9.3", + "laminas/laminas-filter": "^2.11.1", + "laminas/laminas-servicemanager": "^3.7.0", + "laminas/laminas-view": "^2.14.1", + "phpunit/phpunit": "^9.5.10", "psalm/plugin-phpunit": "^0.15.1", - "vimeo/psalm": "^4.6" + "vimeo/psalm": "^4.10.0" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component to support cache features", @@ -3043,36 +3108,35 @@ "type": "community_bridge" } ], - "time": "2021-02-25T21:39:49+00:00" + "time": "2021-10-14T15:59:50+00:00" }, { "name": "laminas/laminas-permissions-acl", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-permissions-acl.git", - "reference": "7af6463695d76dbf25c6b03e6ebb792c8f1ab67e" + "reference": "cd5689d8360c9a3f29bb62b32fc8ad45e0947e1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-permissions-acl/zipball/7af6463695d76dbf25c6b03e6ebb792c8f1ab67e", - "reference": "7af6463695d76dbf25c6b03e6ebb792c8f1ab67e", + "url": "https://api.github.com/repos/laminas/laminas-permissions-acl/zipball/cd5689d8360c9a3f29bb62b32fc8ad45e0947e1e", + "reference": "cd5689d8360c9a3f29bb62b32fc8ad45e0947e1e", "shasum": "" }, "require": { - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, "conflict": { - "laminas/laminas-servicemanager": "<3.0" - }, - "replace": { - "zendframework/zend-permissions-acl": "^2.7.1" + "laminas/laminas-servicemanager": "<3.0", + "zendframework/zend-permissions-acl": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", "laminas/laminas-servicemanager": "^3.0.3", - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^9.5.0", + "psalm/plugin-phpunit": "^0.15.1", + "vimeo/psalm": "^4.7" }, "suggest": { "laminas/laminas-servicemanager": "To support Laminas\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage" @@ -3107,7 +3171,7 @@ "type": "community_bridge" } ], - "time": "2021-04-08T12:56:14+00:00" + "time": "2021-12-03T08:59:59+00:00" }, { "name": "laminas/laminas-router", @@ -3412,16 +3476,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.15.0", + "version": "2.15.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "270380e87904f5a1a1fba3059989d4ca157e16a9" + "reference": "fbd87f30c0a27aaeeee8adb2f934c14fb6046c80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/270380e87904f5a1a1fba3059989d4ca157e16a9", - "reference": "270380e87904f5a1a1fba3059989d4ca157e16a9", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/fbd87f30c0a27aaeeee8adb2f934c14fb6046c80", + "reference": "fbd87f30c0a27aaeeee8adb2f934c14fb6046c80", "shasum": "" }, "require": { @@ -3498,7 +3562,7 @@ "type": "community_bridge" } ], - "time": "2021-09-08T23:16:56+00:00" + "time": "2021-12-02T14:23:06+00:00" }, { "name": "laminas/laminas-zendframework-bridge", @@ -3673,16 +3737,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.13.0", + "version": "v4.13.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "50953a2691a922aa1769461637869a0a2faa3f53" + "reference": "210577fe3cf7badcc5814d99455df46564f3c077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53", - "reference": "50953a2691a922aa1769461637869a0a2faa3f53", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077", "shasum": "" }, "require": { @@ -3723,9 +3787,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" }, - "time": "2021-09-20T12:20:58+00:00" + "time": "2021-11-30T19:35:32+00:00" }, { "name": "openlss/lib-array2xml", @@ -3946,16 +4010,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -3966,7 +4030,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -3996,9 +4061,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -4052,16 +4117,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.14.0", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e" + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", "shasum": "" }, "require": { @@ -4113,9 +4178,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.14.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" }, - "time": "2021-09-10T09:02:12+00:00" + "time": "2021-12-08T12:19:24+00:00" }, { "name": "phpspec/prophecy-phpunit", @@ -4171,23 +4236,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.7", + "version": "9.2.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218" + "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218", - "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687", + "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.12.0", + "nikic/php-parser": "^4.13.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -4236,7 +4301,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.7" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10" }, "funding": [ { @@ -4244,20 +4309,20 @@ "type": "github" } ], - "time": "2021-09-17T05:39:03+00:00" + "time": "2021-12-05T09:12:13+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "3.0.5", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8" + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8", - "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", "shasum": "" }, "require": { @@ -4296,7 +4361,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" }, "funding": [ { @@ -4304,7 +4369,7 @@ "type": "github" } ], - "time": "2020-09-28T05:57:25+00:00" + "time": "2021-12-02T12:48:52+00:00" }, { "name": "phpunit/php-invoker", @@ -5277,16 +5342,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65" + "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65", - "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", "shasum": "" }, "require": { @@ -5335,14 +5400,14 @@ } ], "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "homepage": "https://www.github.com/sebastianbergmann/exporter", "keywords": [ "export", "exporter" ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" }, "funding": [ { @@ -5350,7 +5415,7 @@ "type": "github" } ], - "time": "2020-09-28T05:24:23+00:00" + "time": "2021-11-11T14:18:36+00:00" }, { "name": "sebastian/global-state", @@ -5897,26 +5962,26 @@ }, { "name": "symfony/console", - "version": "v5.3.7", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8b1008344647462ae6ec57559da166c2bfa5e16a" + "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8b1008344647462ae6ec57559da166c2bfa5e16a", - "reference": "8b1008344647462ae6ec57559da166c2bfa5e16a", + "url": "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", + "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" }, "conflict": { "psr/log": ">=3", @@ -5931,12 +5996,12 @@ }, "require-dev": { "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "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" }, "suggest": { "psr/log": "For using the console logger", @@ -5976,7 +6041,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.3.7" + "source": "https://github.com/symfony/console/tree/v5.4.1" }, "funding": [ { @@ -5992,20 +6057,20 @@ "type": "tidelift" } ], - "time": "2021-08-25T20:02:16+00:00" + "time": "2021-12-09T11:22:43+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", "shasum": "" }, "require": { @@ -6014,7 +6079,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -6043,7 +6108,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.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" }, "funding": [ { @@ -6059,7 +6124,7 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-07-12T14:48:14+00:00" }, { "name": "symfony/polyfill-ctype", @@ -6549,21 +6614,25 @@ }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.1" + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -6571,7 +6640,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -6608,7 +6677,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" }, "funding": [ { @@ -6624,20 +6693,20 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2021-11-04T16:48:04+00:00" }, { "name": "symfony/string", - "version": "v5.3.7", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "8d224396e28d30f81969f083a58763b8b9ceb0a5" + "reference": "9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/8d224396e28d30f81969f083a58763b8b9ceb0a5", - "reference": "8d224396e28d30f81969f083a58763b8b9ceb0a5", + "url": "https://api.github.com/repos/symfony/string/zipball/9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d", + "reference": "9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d", "shasum": "" }, "require": { @@ -6648,11 +6717,14 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "~1.15" }, + "conflict": { + "symfony/translation-contracts": ">=3.0" + }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", + "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" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -6691,7 +6763,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.3.7" + "source": "https://github.com/symfony/string/tree/v5.4.0" }, "funding": [ { @@ -6707,7 +6779,7 @@ "type": "tidelift" } ], - "time": "2021-08-26T08:00:08+00:00" + "time": "2021-11-24T10:02:00+00:00" }, { "name": "theseer/tokenizer", @@ -6761,16 +6833,16 @@ }, { "name": "vimeo/psalm", - "version": "4.10.0", + "version": "v4.15.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "916b098b008f6de4543892b1e0651c1c3b92cbfa" + "reference": "a1b5e489e6fcebe40cb804793d964e99fc347820" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/916b098b008f6de4543892b1e0651c1c3b92cbfa", - "reference": "916b098b008f6de4543892b1e0651c1c3b92cbfa", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/a1b5e489e6fcebe40cb804793d964e99fc347820", + "reference": "a1b5e489e6fcebe40cb804793d964e99fc347820", "shasum": "" }, "require": { @@ -6790,11 +6862,11 @@ "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.5", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "nikic/php-parser": "^4.12", + "nikic/php-parser": "^4.13", "openlss/lib-array2xml": "^1.0", "php": "^7.1|^8", "sebastian/diff": "^3.0 || ^4.0", - "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0", + "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0", "webmozart/path-util": "^2.3" }, "provide": { @@ -6812,11 +6884,12 @@ "psalm/plugin-phpunit": "^0.16", "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.5", - "symfony/process": "^4.3 || ^5.0", + "symfony/process": "^4.3 || ^5.0 || ^6.0", "weirdan/prophecy-shim": "^1.0 || ^2.0" }, "suggest": { - "ext-igbinary": "^2.0.5" + "ext-curl": "In order to send data to shepherd", + "ext-igbinary": "^2.0.5 is required, used to serialize caching data" }, "bin": [ "psalm", @@ -6860,9 +6933,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.10.0" + "source": "https://github.com/vimeo/psalm/tree/v4.15.0" }, - "time": "2021-09-04T21:00:09+00:00" + "time": "2021-12-07T11:25:29+00:00" }, { "name": "webimpress/safe-writer", @@ -7029,6 +7102,7 @@ "issues": "https://github.com/webmozart/path-util/issues", "source": "https://github.com/webmozart/path-util/tree/2.3.0" }, + "abandoned": "symfony/filesystem", "time": "2015-12-17T08:42:14+00:00" } ], diff --git a/psalm-baseline.xml b/psalm-baseline.xml index eef46874e..ca6109115 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $templatePath @@ -246,7 +246,8 @@ (string) $messageOpenFormat (string) $messageSeparatorString - + + $this->escapeHtmlHelper $this->escapeHtmlHelper null !== $this->view @@ -382,7 +383,8 @@ (string) $conditionalStylesheet - + + $args $args @@ -574,7 +576,9 @@ (bool) $flag - + + $this->view + $this->view $this->view (null !== $spec) && is_string($spec) is_string($spec) @@ -656,8 +660,7 @@ $captureLock $captureType - - $this->view instanceof View\Renderer\RendererInterface + (null !== $content) && is_string($content) is_string($content) @@ -707,24 +710,6 @@ HeadTitle - - - $this->getView()->plugin('escapehtml')->getEscaper() - $this->getView()->plugin('escapehtmlattr')->getEscaper() - - - getEscaper - getEscaper - - - plugin - plugin - - - plugin - plugin - - $htmlObject @@ -834,9 +819,6 @@ - - $this->authenticationService instanceof AuthenticationServiceInterface - $authenticationService @@ -935,11 +917,15 @@ (bool) $injectTranslator (string) $proxy - + + $view $view - + + $helper $helper + $this->getServiceLocator() + $this->plugins $view && $this->plugins @@ -953,9 +939,9 @@ getServiceLocator + ! $services ! is_int($this->minDepth) ! is_string($message) - $container instanceof Navigation\AbstractContainer $services $this->acl === null $this->role === null @@ -1058,7 +1044,8 @@ (string) $indent - + + $serviceLocator->getServiceLocator() $this->acl === null && static::$defaultAcl !== null $this->role === null && static::$defaultRole !== null is_int($maxDepth) @@ -1075,6 +1062,9 @@ setSharedManager + + return ''; + @@ -1198,7 +1188,8 @@ (int) $renderFlag - + + $this->root $this->root @@ -1338,17 +1329,9 @@ - - $factories - $instanceOf + + $aliases - - PluginManager - PluginManager - - - null|ConfigInterface|ContainerInterface - @@ -1462,9 +1445,6 @@ $values - - $values - $name @@ -1575,9 +1555,6 @@ - - $this->container instanceof AbstractContainer - $this->getContainer()->offsetSet($offset, $value) $this->getContainer()->offsetUnset($offset) @@ -1685,7 +1662,8 @@ getChildren render - + + $this->viewModelHelper $this->viewModelHelper @@ -1943,7 +1921,8 @@ Helper\FlashMessenger::class \Zend\View\Helper\FlashMessenger::class - + + ! $events ! $events @@ -1970,44 +1949,19 @@ has - $factories + $aliases - - $renderer - HelperPluginManager - - - null|ConfigInterface|ContainerInterface - getServiceLocator getServiceLocator - - $value - - - $name - $value - - - $key + $value - - $this[$name] - - - $name - $name - $name + $storeValue - $this[$name] - $value - $value - $value $value @@ -2202,8 +2156,8 @@ - ! is_array($variables) && ! $variables instanceof ArrayAccess gettype($helpers) + gettype($variables) is_callable($plugin) null === $this->__filterChain null === $this->__helpers @@ -2288,8 +2242,9 @@ (bool) $renderTrees - + is_object($helpers) + is_object($variables) setCurrent @@ -2332,8 +2287,8 @@ - ! is_array($map) && ! $map instanceof Traversable - ! is_array($map) && ! $map instanceof Traversable + gettype($map) + gettype($map) is_string($nameOrMap) @@ -2345,10 +2300,14 @@ $this->map[$name] + + is_object($map) + is_object($map) + - ! is_array($options) && ! $options instanceof Traversable + gettype($options) is_string($path) @@ -2388,8 +2347,9 @@ (bool) $flag (string) $defaultSuffix - + is_array($paths) + is_object($options) @@ -2505,9 +2465,6 @@ - - $this->events instanceof EventManagerInterface - View @@ -2583,19 +2540,6 @@ ViewEvent - - - AbstractHtmlElement|\PHPUnit_Framework_MockObject_MockObject - - - - - $value - - - testInvokeResult - - (string) $this->helper->toString() @@ -2638,8 +2582,7 @@ $this->view - - $this->view + $this->view $this->view $this->view @@ -3503,40 +3446,9 @@ - - $helper - $helper - $result - - - $helper('alternate/layout') - $helper() - - - getLayout - getTemplate - getTemplate - setTemplate - - - setRoot + setTemplate - - $this->helper - $this->parent - $this->renderer - $this->viewModelHelper - - - $this->helper - $this->helper - $this->helper - $this->helper - $this->parent - $this->parent - $this->parent - @@ -3545,7 +3457,8 @@ $_helper - + + $this->_helper $this->_helper @@ -3729,9 +3642,6 @@ plugin - - $this->_doctypeHelper->setDoctype($this->_oldDoctype); - $discard $discard @@ -3755,9 +3665,6 @@ - - getServiceLocator - [$this, 'toStringErrorHandler'] @@ -3786,9 +3693,6 @@ $_helper - - method_exists($plugins, 'configure') - @@ -3796,9 +3700,6 @@ $this->getServiceNotFoundException() $this->getServiceNotFoundException() - - new Config([]) - method_exists($helpers, 'configure') method_exists($helpers, 'configure') @@ -3833,8 +3734,16 @@ plugin - + + $nav = clone $this->_nav2; $nav = clone $this->_nav2; + $nav->addPage(['label' => 'Invalid', 'uri' => 'http://w.']); + $nav->addPage(['label' => 'Invalid', 'uri' => 'http://w.']); + $this->_helper->setUseSchemaValidation(true); + $this->_helper->setUseSitemapValidators(false); + $this->fail('A Laminas\View\Exception\InvalidArgumentException was not thrown on invalid <loc />'); + $this->fail('A Laminas\View\Exception\InvalidArgumentException was not thrown when using Schema validation'); + return; @@ -4091,42 +4000,6 @@ addPath - - - $lastIndex - $lastIndex - - - $value - $value - $value - $value - $value - $value - $value - $value[$lastIndex - 1] - $value[$lastIndex] - - - $value[$lastIndex - 1] - $value[$lastIndex - 1] - $value[$lastIndex] - $value[$lastIndex] - - - $return - $value - $value - $value - $value - $value - $value - $value - - - new \Laminas\View\Helper\Placeholder\Container([]) - - new Container(['foo', 'bar']) @@ -4225,13 +4098,6 @@ method_exists($helpers, 'configure') - - - $factory - $factory - $factory - - getContainerForFactory @@ -4519,9 +4385,6 @@ - - new Config([]) - $container $container @@ -5396,12 +5259,4 @@ $e - - - PHPUnit_Framework_Error_Deprecated::class - - - PHPUnit_Framework_Error_Deprecated - - diff --git a/src/Helper/Navigation/PluginManager.php b/src/Helper/Navigation/PluginManager.php index 4025ce2a2..f532f69c3 100644 --- a/src/Helper/Navigation/PluginManager.php +++ b/src/Helper/Navigation/PluginManager.php @@ -3,6 +3,7 @@ namespace Laminas\View\Helper\Navigation; use Interop\Container\ContainerInterface; +use Laminas\ServiceManager\ConfigInterface; use Laminas\ServiceManager\Factory\InvokableFactory; use Laminas\View\HelperPluginManager; @@ -15,15 +16,12 @@ */ class PluginManager extends HelperPluginManager { - /** - * @var string Valid instance types. - */ protected $instanceOf = AbstractHelper::class; /** * Default aliases * - * @var string[] + * @var array */ protected $aliases = [ 'breadcrumbs' => Breadcrumbs::class, @@ -46,8 +44,6 @@ class PluginManager extends HelperPluginManager /** * Default factories - * - * @var string[] */ protected $factories = [ Breadcrumbs::class => InvokableFactory::class, @@ -70,31 +66,12 @@ class PluginManager extends HelperPluginManager */ public function __construct($configOrContainerInstance = null, array $v3config = []) { - $this->initializers[] = function ($first, $second): void { - // v2 vs v3 argument order - if ($first instanceof ContainerInterface) { - // v3 - $container = $first; - $instance = $second; - } else { - // v2 - $container = $second; - $instance = $first; - } - + /** @psalm-suppress MissingClosureParamType */ + $this->initializers[] = function (ContainerInterface $container, $instance): void { if (! $instance instanceof AbstractHelper) { return; } - // This initializer was written with v2 functionality in mind; as such, - // we need to test and see if we're called in a v2 context, and, if so, - // set the service locator to the parent locator. - // - // Under v3, the parent locator is what is passed to the method already. - if (! method_exists($container, 'configure') && $container->getServiceLocator()) { - $container = $container->getServiceLocator(); - } - $instance->setServiceLocator($container); }; diff --git a/src/Helper/Service/AssetFactory.php b/src/Helper/Service/AssetFactory.php index b4f039143..1aa1c925b 100644 --- a/src/Helper/Service/AssetFactory.php +++ b/src/Helper/Service/AssetFactory.php @@ -11,8 +11,6 @@ class AssetFactory implements FactoryInterface { /** - * {@inheritDoc} - * * @param ContainerInterface $container * @param string $name * @param null|array $options diff --git a/src/Helper/Service/IdentityFactory.php b/src/Helper/Service/IdentityFactory.php index fd77a7951..da8374a2c 100644 --- a/src/Helper/Service/IdentityFactory.php +++ b/src/Helper/Service/IdentityFactory.php @@ -2,18 +2,16 @@ namespace Laminas\View\Helper\Service; -use Interop\Container\ContainerInterface; use Laminas\Authentication\AuthenticationService; use Laminas\Authentication\AuthenticationServiceInterface; use Laminas\ServiceManager\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use Laminas\View\Helper\Identity; +use Interop\Container\ContainerInterface; class IdentityFactory implements FactoryInterface { /** - * {@inheritDoc} - * * @param ContainerInterface $container * @param string $name * @param null|array $options diff --git a/src/HelperPluginManager.php b/src/HelperPluginManager.php index ad053af52..3a6e0f7a3 100644 --- a/src/HelperPluginManager.php +++ b/src/HelperPluginManager.php @@ -2,15 +2,16 @@ namespace Laminas\View; -use Interop\Container\ContainerInterface; use Laminas\EventManager\EventManagerAwareInterface; use Laminas\EventManager\SharedEventManagerInterface; use Laminas\I18n\Translator\TranslatorAwareInterface; use Laminas\I18n\Translator\TranslatorInterface; use Laminas\ServiceManager\AbstractPluginManager; +use Laminas\ServiceManager\ConfigInterface; use Laminas\ServiceManager\Exception\InvalidServiceException; use Laminas\ServiceManager\Factory\InvokableFactory; use Laminas\View\Exception\InvalidHelperException; +use Psr\Container\ContainerInterface; /** * Plugin manager implementation for view helpers @@ -27,7 +28,7 @@ class HelperPluginManager extends AbstractPluginManager * Most of these are present for legacy purposes, as v2 of the service * manager normalized names when fetching services. * - * @var string[] + * @var array */ protected $aliases = [ 'asset' => Helper\Asset::class, @@ -218,8 +219,6 @@ class HelperPluginManager extends AbstractPluginManager * basepath and url are not very useful without their factories, however the doctype * helper works fine as an invokable. The factory for doctype simply checks for the * config value from the merged config. - * - * @var array */ protected $factories = [ Helper\Asset::class => Helper\Service\AssetFactory::class, @@ -303,7 +302,7 @@ class HelperPluginManager extends AbstractPluginManager ]; /** - * @var Renderer\RendererInterface + * @var Renderer\RendererInterface|null */ protected $renderer; diff --git a/test/Helper/Navigation/NavigationTest.php b/test/Helper/Navigation/NavigationTest.php index ee0079954..f60bc0001 100644 --- a/test/Helper/Navigation/NavigationTest.php +++ b/test/Helper/Navigation/NavigationTest.php @@ -8,6 +8,7 @@ use Laminas\Navigation\Page; use Laminas\Permissions\Acl; use Laminas\Permissions\Acl\Role; +use Laminas\ServiceManager\PsrContainerDecorator; use Laminas\ServiceManager\ServiceManager; use Laminas\View; use Laminas\View\Helper\Navigation; @@ -589,17 +590,18 @@ public function testInjectsLazyInstantiatedPluginManagerWithCurrentServiceLocato $plugins = $helper->getPluginManager(); $this->assertInstanceOf(Navigation\PluginManager::class, $plugins); - if (method_exists($plugins, 'configure')) { - // v3 - $pluginsReflection = new \ReflectionObject($plugins); - $creationContext = $pluginsReflection->getProperty('creationContext'); - $creationContext->setAccessible(true); - $creationContextValue = $creationContext->getValue($plugins); - $this->assertSame($creationContextValue, $services); - } else { - // v2 - $this->assertSame($services, $plugins->getServiceLocator()); + $pluginsReflection = new \ReflectionObject($plugins); + $creationContext = $pluginsReflection->getProperty('creationContext'); + $creationContext->setAccessible(true); + $creationContextValue = $creationContext->getValue($plugins); + + /** Later versions of AbstractPluginManager Decorate Psr Containers */ + if ($creationContextValue instanceof PsrContainerDecorator) { + /** @psalm-suppress InternalMethod */ + $creationContextValue = $creationContextValue->getContainer(); } + + $this->assertSame($creationContextValue, $services); } /** diff --git a/test/Helper/Service/DoctypeFactoryTest.php b/test/Helper/Service/DoctypeFactoryTest.php index 6e1176d9b..c8944fcda 100644 --- a/test/Helper/Service/DoctypeFactoryTest.php +++ b/test/Helper/Service/DoctypeFactoryTest.php @@ -2,11 +2,11 @@ namespace LaminasTest\View\Helper\Service; -use Interop\Container\ContainerInterface; use Laminas\View\Helper\Doctype; use Laminas\View\Helper\Service\DoctypeFactory; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; +use Psr\Container\ContainerInterface; final class DoctypeFactoryTest extends TestCase { @@ -20,7 +20,7 @@ public function testServiceIsCreatedOnInvocation(): void $container = $this->createContainer(); $factory = new DoctypeFactory(); - $service = $factory($container, ''); + $service = $factory($container); self::assertInstanceOf(Doctype::class, $service); } @@ -31,7 +31,7 @@ public function testFactorySetsDoctypeBasedOnConfig(): void $container = $this->createContainer($config); $factory = new DoctypeFactory(); - $service = $factory($container, ''); + $service = $factory($container); self::assertSame(Doctype::XHTML1_STRICT, $service->getDoctype()); } @@ -42,7 +42,7 @@ public function testDefaultDoctypeIsUsedIfConfigIsMissing(): void $container = $this->createContainer($config); $factory = new DoctypeFactory(); - $service = $factory($container, ''); + $service = $factory($container); self::assertSame(Doctype::HTML4_LOOSE, $service->getDoctype()); }