From 5cb12c47a7190a28bc2e545990aa17d49abac3ed Mon Sep 17 00:00:00 2001 From: George Steel Date: Wed, 3 Jan 2024 15:17:16 +0000 Subject: [PATCH] Refresh lock and baseline post merge-up Signed-off-by: George Steel --- composer.lock | 477 ++++++++++++++++++++++++--------------------- psalm-baseline.xml | 248 +++++++++-------------- 2 files changed, 344 insertions(+), 381 deletions(-) diff --git a/composer.lock b/composer.lock index 9d6e326cf..803a4e08c 100644 --- a/composer.lock +++ b/composer.lock @@ -1117,16 +1117,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "0.5.1", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623" + "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077", + "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077", "shasum": "" }, "require": { @@ -1134,13 +1134,13 @@ }, "require-dev": { "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", "phpstan/extension-installer": "^1.2.0", "phpstan/phpstan": "^1.9.2", "phpstan/phpstan-deprecation-rules": "^1.0.0", "phpstan/phpstan-phpunit": "^1.2.2", "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.26 || ^8.5.31", - "theofidry/php-cs-fixer-config": "^1.0", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", "webmozarts/strict-phpunit": "^7.5" }, "type": "library", @@ -1166,7 +1166,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0" }, "funding": [ { @@ -1174,42 +1174,42 @@ "type": "github" } ], - "time": "2022-12-24T12:35:10+00:00" + "time": "2023-09-17T21:38:23+00:00" }, { "name": "laminas/laminas-authentication", - "version": "2.15.0", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-authentication.git", - "reference": "9036ae55a84862b16f8631460f90eeea6c19c54e" + "reference": "755b30a37de0f8649bad86dfdc46a0d57cb0d70f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-authentication/zipball/9036ae55a84862b16f8631460f90eeea6c19c54e", - "reference": "9036ae55a84862b16f8631460f90eeea6c19c54e", + "url": "https://api.github.com/repos/laminas/laminas-authentication/zipball/755b30a37de0f8649bad86dfdc46a0d57cb0d70f", + "reference": "755b30a37de0f8649bad86dfdc46a0d57cb0d70f", "shasum": "" }, "require": { "laminas/laminas-stdlib": "^3.6.0", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-authentication": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-crypt": "^2.6.0 || ^3.9.0", - "laminas/laminas-db": "^2.15.0", - "laminas/laminas-http": "^2.17.0", - "laminas/laminas-ldap": "^2.16", - "laminas/laminas-session": "^2.13.0", + "laminas/laminas-crypt": "^2.6.0 || ^3.10.0", + "laminas/laminas-db": "^2.18.0", + "laminas/laminas-http": "^2.18.0", + "laminas/laminas-ldap": "^2.17", + "laminas/laminas-session": "^2.16.0", "laminas/laminas-uri": "^2.10.0", - "laminas/laminas-validator": "^2.26.0", - "phpunit/phpunit": "^9.5.25", + "laminas/laminas-validator": "^2.30.1", + "phpunit/phpunit": "^9.6.13", "psalm/plugin-phpunit": "^0.17.0", - "squizlabs/php_codesniffer": "^3.7.1", - "vimeo/psalm": "^4.29.0" + "squizlabs/php_codesniffer": "^3.7.2", + "vimeo/psalm": "^4.30.0" }, "suggest": { "laminas/laminas-crypt": "Laminas\\Crypt component", @@ -1250,7 +1250,7 @@ "type": "community_bridge" } ], - "time": "2023-07-12T08:21:19+00:00" + "time": "2023-11-06T09:32:35+00:00" }, { "name": "laminas/laminas-coding-standard", @@ -1602,41 +1602,41 @@ }, { "name": "laminas/laminas-i18n", - "version": "2.23.1", + "version": "2.25.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-i18n.git", - "reference": "970a2775732d56b89434ec283577096887e68167" + "reference": "4b6df8501bfe96648dadaf8de681cbbaea906e04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/970a2775732d56b89434ec283577096887e68167", - "reference": "970a2775732d56b89434ec283577096887e68167", + "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/4b6df8501bfe96648dadaf8de681cbbaea906e04", + "reference": "4b6df8501bfe96648dadaf8de681cbbaea906e04", "shasum": "" }, "require": { "ext-intl": "*", "laminas/laminas-servicemanager": "^3.21.0", "laminas/laminas-stdlib": "^3.0", - "php": "~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "laminas/laminas-view": "<2.20.0", "zendframework/zend-i18n": "*" }, "require-dev": { - "laminas/laminas-cache": "^3.10.1", - "laminas/laminas-cache-storage-adapter-memory": "^2.2.0", + "laminas/laminas-cache": "^3.11.0", + "laminas/laminas-cache-storage-adapter-memory": "^2.3.0", "laminas/laminas-cache-storage-deprecated-factory": "^1.1", "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-config": "^3.8.0", - "laminas/laminas-eventmanager": "^3.10", - "laminas/laminas-filter": "^2.31", - "laminas/laminas-validator": "^2.30.1", - "laminas/laminas-view": "^2.27", - "phpunit/phpunit": "^10.1.3", + "laminas/laminas-config": "^3.9.0", + "laminas/laminas-eventmanager": "^3.12", + "laminas/laminas-filter": "^2.33", + "laminas/laminas-validator": "^2.41", + "laminas/laminas-view": "^2.32", + "phpunit/phpunit": "^10.4.2", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.11" + "vimeo/psalm": "^5.15.0" }, "suggest": { "laminas/laminas-cache": "You should install this package to cache the translations", @@ -1683,7 +1683,7 @@ "type": "community_bridge" } ], - "time": "2023-10-09T12:00:55+00:00" + "time": "2023-12-22T15:51:21+00:00" }, { "name": "laminas/laminas-loader", @@ -1815,16 +1815,16 @@ }, { "name": "laminas/laminas-mvc", - "version": "3.6.1", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-mvc.git", - "reference": "f12e801c31c04a4b35017354ff84070f5573879f" + "reference": "3f65447addf487189000e54dc1525cd952951da4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/f12e801c31c04a4b35017354ff84070f5573879f", - "reference": "f12e801c31c04a4b35017354ff84070f5573879f", + "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/3f65447addf487189000e54dc1525cd952951da4", + "reference": "3f65447addf487189000e54dc1525cd952951da4", "shasum": "" }, "require": { @@ -1836,17 +1836,17 @@ "laminas/laminas-servicemanager": "^3.20.0", "laminas/laminas-stdlib": "^3.6", "laminas/laminas-view": "^2.14", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-mvc": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "^2.4.0", - "laminas/laminas-json": "^3.3", - "phpspec/prophecy": "^1.15.0", - "phpspec/prophecy-phpunit": "^2.0.1", - "phpunit/phpunit": "^9.5.25", + "laminas/laminas-coding-standard": "^2.5.0", + "laminas/laminas-json": "^3.6", + "phpspec/prophecy": "^1.17.0", + "phpspec/prophecy-phpunit": "^2.0.2", + "phpunit/phpunit": "^9.6.13", "webmozart/assert": "^1.11" }, "suggest": { @@ -1892,20 +1892,20 @@ "type": "community_bridge" } ], - "time": "2023-03-15T10:21:03+00:00" + "time": "2023-11-14T09:44:53+00:00" }, { "name": "laminas/laminas-mvc-i18n", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-mvc-i18n.git", - "reference": "571f3e34afbff14351677c450f872a0dd19f9d28" + "reference": "669a00f36dd9fba8ec95516fe4afde7c4d8b8faa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-mvc-i18n/zipball/571f3e34afbff14351677c450f872a0dd19f9d28", - "reference": "571f3e34afbff14351677c450f872a0dd19f9d28", + "url": "https://api.github.com/repos/laminas/laminas-mvc-i18n/zipball/669a00f36dd9fba8ec95516fe4afde7c4d8b8faa", + "reference": "669a00f36dd9fba8ec95516fe4afde7c4d8b8faa", "shasum": "" }, "require": { @@ -1916,7 +1916,7 @@ "laminas/laminas-servicemanager": "^3.15.1", "laminas/laminas-stdlib": "^3.10.1", "laminas/laminas-validator": "^2.19.0", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "laminas/laminas-mvc": "<3.0.0", @@ -1924,11 +1924,11 @@ "zendframework/zend-mvc-i18n": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", - "phpspec/prophecy-phpunit": "^2.0.1", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "laminas/laminas-coding-standard": "~2.5.0", + "phpspec/prophecy-phpunit": "^2.0.2", + "phpunit/phpunit": "^9.6.13", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.15" }, "suggest": { "laminas/laminas-cache": "To enable caching of translation strings" @@ -1970,43 +1970,43 @@ "type": "community_bridge" } ], - "time": "2022-12-02T15:45:50+00:00" + "time": "2023-11-06T09:31:01+00:00" }, { "name": "laminas/laminas-navigation", - "version": "2.18.1", + "version": "2.19.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-navigation.git", - "reference": "f685f8b34db462d84617c5ad440f9f273e2558f4" + "reference": "9d212fb17dbb2da4172a7248a67483ebe38ad3a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/f685f8b34db462d84617c5ad440f9f273e2558f4", - "reference": "f685f8b34db462d84617c5ad440f9f273e2558f4", + "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/9d212fb17dbb2da4172a7248a67483ebe38ad3a7", + "reference": "9d212fb17dbb2da4172a7248a67483ebe38ad3a7", "shasum": "" }, "require": { "laminas/laminas-stdlib": "^2.7 || ^3.0", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-navigation": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-config": "^3.8.0", "laminas/laminas-http": "^2.18", "laminas/laminas-i18n": "^2.21", "laminas/laminas-mvc": "^3.6", "laminas/laminas-permissions-acl": "^2.13", - "laminas/laminas-router": "^3.11", + "laminas/laminas-router": "^3.11.1", "laminas/laminas-servicemanager": "^3.20", "laminas/laminas-uri": "^2.10.0", - "laminas/laminas-view": "^2.25", - "phpunit/phpunit": "^9.5.26", + "laminas/laminas-view": "^2.26", + "phpunit/phpunit": "^9.5.28", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.1" + "vimeo/psalm": "^5.6" }, "suggest": { "laminas/laminas-config": "^3.7, to provide page configuration (optional, as arrays and Traversables are also allowed)", @@ -2051,41 +2051,41 @@ "type": "community_bridge" } ], - "time": "2022-12-06T18:03:48+00:00" + "time": "2023-11-14T21:49:15+00:00" }, { "name": "laminas/laminas-paginator", - "version": "2.17.0", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-paginator.git", - "reference": "d0fca60a32656fe095045d76af7ad3a3bfc297f9" + "reference": "caacfd2625bf354be32888dd55767c893b89d38f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/d0fca60a32656fe095045d76af7ad3a3bfc297f9", - "reference": "d0fca60a32656fe095045d76af7ad3a3bfc297f9", + "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/caacfd2625bf354be32888dd55767c893b89d38f", + "reference": "caacfd2625bf354be32888dd55767c893b89d38f", "shasum": "" }, "require": { "ext-json": "*", "laminas/laminas-stdlib": "^3.10.1", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-paginator": "*" }, "require-dev": { - "laminas/laminas-cache": "^3.6.0", + "laminas/laminas-cache": "^3.9", "laminas/laminas-cache-storage-adapter-memory": "^2.2.0", "laminas/laminas-coding-standard": "^2.4.0", "laminas/laminas-config": "^3.8.0", - "laminas/laminas-filter": "^2.23.0", - "laminas/laminas-servicemanager": "^3.19.0", - "laminas/laminas-view": "^2.24.0", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "laminas/laminas-filter": "^2.30", + "laminas/laminas-servicemanager": "^3.22", + "laminas/laminas-view": "^2.25", + "phpunit/phpunit": "^9.5.27", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.4" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component to support cache features", @@ -2130,7 +2130,7 @@ "type": "community_bridge" } ], - "time": "2022-12-05T16:02:38+00:00" + "time": "2023-11-08T15:42:20+00:00" }, { "name": "laminas/laminas-permissions-acl", @@ -2327,16 +2327,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.41.0", + "version": "2.46.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "ca27df621e12cbd4c138dab7abf3e7e5692c582c" + "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/ca27df621e12cbd4c138dab7abf3e7e5692c582c", - "reference": "ca27df621e12cbd4c138dab7abf3e7e5692c582c", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/98330256f8d8a1357a93f6f7f1a987036aff6329", + "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329", "shasum": "" }, "require": { @@ -2351,15 +2351,15 @@ "require-dev": { "laminas/laminas-coding-standard": "^2.5", "laminas/laminas-db": "^2.18", - "laminas/laminas-filter": "^2.32", - "laminas/laminas-i18n": "^2.23", - "laminas/laminas-session": "^2.16", - "laminas/laminas-uri": "^2.10.0", - "phpunit/phpunit": "^10.3.3", + "laminas/laminas-filter": "^2.33", + "laminas/laminas-i18n": "^2.24.1", + "laminas/laminas-session": "^2.17", + "laminas/laminas-uri": "^2.11.0", + "phpunit/phpunit": "^10.5.2", "psalm/plugin-phpunit": "^0.18.4", - "psr/http-client": "^1.0.2", + "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", - "vimeo/psalm": "^5.15" + "vimeo/psalm": "^5.17" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -2407,7 +2407,7 @@ "type": "community_bridge" } ], - "time": "2023-10-30T08:22:19+00:00" + "time": "2024-01-03T12:43:04+00:00" }, { "name": "myclabs/deep-copy", @@ -2521,16 +2521,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -2571,9 +2571,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "phar-io/manifest", @@ -2897,23 +2897,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.7", + "version": "10.1.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "355324ca4980b8916c18b9db29f3ef484078f26e" + "reference": "78c3b7625965c2513ee96569a4dbb62601784145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/355324ca4980b8916c18b9db29f3ef484078f26e", - "reference": "355324ca4980b8916c18b9db29f3ef484078f26e", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", + "reference": "78c3b7625965c2513ee96569a4dbb62601784145", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1", "phpunit/php-file-iterator": "^4.0", "phpunit/php-text-template": "^3.0", @@ -2963,7 +2963,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.7" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" }, "funding": [ { @@ -2971,7 +2971,7 @@ "type": "github" } ], - "time": "2023-10-04T15:34:17+00:00" + "time": "2023-12-21T15:38:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3218,16 +3218,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.4.2", + "version": "10.5.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "cacd8b9dd224efa8eb28beb69004126c7ca1a1a1" + "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/cacd8b9dd224efa8eb28beb69004126c7ca1a1a1", - "reference": "cacd8b9dd224efa8eb28beb69004126c7ca1a1a1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ed21115d505b4b4f7dc7b5651464e19a2c7f7856", + "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856", "shasum": "" }, "require": { @@ -3267,7 +3267,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.4-dev" + "dev-main": "10.5-dev" } }, "autoload": { @@ -3299,7 +3299,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.4.2" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.5" }, "funding": [ { @@ -3315,7 +3315,7 @@ "type": "tidelift" } ], - "time": "2023-10-26T07:21:45+00:00" + "time": "2023-12-27T15:13:52+00:00" }, { "name": "psalm/plugin-phpunit", @@ -3726,20 +3726,20 @@ }, { "name": "sebastian/complexity", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957" + "reference": "68ff824baeae169ec9f2137158ee529584553799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", + "reference": "68ff824baeae169ec9f2137158ee529584553799", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -3748,7 +3748,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.2-dev" } }, "autoload": { @@ -3772,7 +3772,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0" + "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" }, "funding": [ { @@ -3780,20 +3780,20 @@ "type": "github" } ], - "time": "2023-09-28T11:50:59+00:00" + "time": "2023-12-21T08:37:17+00:00" }, { "name": "sebastian/diff", - "version": "5.0.3", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", "shasum": "" }, "require": { @@ -3806,7 +3806,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -3839,7 +3839,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" }, "funding": [ { @@ -3847,7 +3847,7 @@ "type": "github" } ], - "time": "2023-05-01T07:48:21+00:00" + "time": "2023-12-22T10:55:06+00:00" }, { "name": "sebastian/environment", @@ -4055,20 +4055,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d" + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -4101,7 +4101,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" }, "funding": [ { @@ -4109,7 +4109,7 @@ "type": "github" } ], - "time": "2023-08-31T09:25:50+00:00" + "time": "2023-12-21T08:38:20+00:00" }, { "name": "sebastian/object-enumerator", @@ -4458,16 +4458,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.2.0", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "f9ab39c808500c347d5a8b6b13310bd5221e39e7" + "reference": "96be97e664c87613121d073ea39af4c74e57a7f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f9ab39c808500c347d5a8b6b13310bd5221e39e7", - "reference": "f9ab39c808500c347d5a8b6b13310bd5221e39e7", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/96be97e664c87613121d073ea39af4c74e57a7f8", + "reference": "96be97e664c87613121d073ea39af4c74e57a7f8", "shasum": "" }, "require": { @@ -4505,7 +4505,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.2.0" + "source": "https://github.com/spatie/array-to-xml/tree/3.2.2" }, "funding": [ { @@ -4517,20 +4517,20 @@ "type": "github" } ], - "time": "2023-07-19T18:30:26+00:00" + "time": "2023-11-14T14:08:51+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.8.0", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7", "shasum": "" }, "require": { @@ -4540,7 +4540,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/phpcs", @@ -4559,35 +4559,58 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T12:32:31+00:00" }, { "name": "symfony/console", - "version": "v6.3.4", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", + "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625", + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625", "shasum": "" }, "require": { @@ -4595,7 +4618,7 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0" + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -4609,12 +4632,16 @@ }, "require-dev": { "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" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -4648,7 +4675,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.4" + "source": "https://github.com/symfony/console/tree/v6.4.2" }, "funding": [ { @@ -4664,11 +4691,11 @@ "type": "tidelift" } ], - "time": "2023-08-16T10:10:12+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -4715,7 +4742,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -4735,16 +4762,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.3.1", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae" + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", "shasum": "" }, "require": { @@ -4778,7 +4805,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.3.1" + "source": "https://github.com/symfony/filesystem/tree/v6.4.0" }, "funding": [ { @@ -4794,7 +4821,7 @@ "type": "tidelift" } ], - "time": "2023-06-01T08:30:39+00:00" + "time": "2023-07-26T17:27:13+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5128,33 +5155,29 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" + "php": ">=8.1", + "psr/container": "^1.1|^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" }, - "suggest": { - "symfony/service-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -5164,7 +5187,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Service\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5191,7 +5217,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" }, "funding": [ { @@ -5207,20 +5233,20 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/string", - "version": "v6.3.5", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", + "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", "shasum": "" }, "require": { @@ -5234,11 +5260,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -5277,7 +5303,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" + "source": "https://github.com/symfony/string/tree/v6.4.2" }, "funding": [ { @@ -5293,20 +5319,20 @@ "type": "tidelift" } ], - "time": "2023-09-18T10:38:32+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -5335,7 +5361,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -5343,20 +5369,20 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "vimeo/psalm", - "version": "5.15.0", + "version": "5.18.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "5c774aca4746caf3d239d9c8cadb9f882ca29352" + "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/5c774aca4746caf3d239d9c8cadb9f882ca29352", - "reference": "5c774aca4746caf3d239d9c8cadb9f882ca29352", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/b113f3ed0259fd6e212d87c3df80eec95a6abf19", + "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19", "shasum": "" }, "require": { @@ -5375,14 +5401,14 @@ "ext-tokenizer": "*", "felixfbecker/advanced-json-rpc": "^3.1", "felixfbecker/language-server-protocol": "^1.5.2", - "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", + "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", "nikic/php-parser": "^4.16", "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "sebastian/diff": "^4.0 || ^5.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", - "symfony/console": "^4.1.6 || ^5.0 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0" + "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0" }, "conflict": { "nikic/php-parser": "4.17.0" @@ -5404,7 +5430,7 @@ "psalm/plugin-phpunit": "^0.18", "slevomat/coding-standard": "^8.4", "squizlabs/php_codesniffer": "^3.6", - "symfony/process": "^4.4 || ^5.0 || ^6.0" + "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "suggest": { "ext-curl": "In order to send data to shepherd", @@ -5417,7 +5443,7 @@ "psalm-refactor", "psalter" ], - "type": "library", + "type": "project", "extra": { "branch-alias": { "dev-master": "5.x-dev", @@ -5449,23 +5475,24 @@ "static analysis" ], "support": { + "docs": "https://psalm.dev/docs", "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/5.15.0" + "source": "https://github.com/vimeo/psalm" }, - "time": "2023-08-20T23:07:30+00:00" + "time": "2023-12-16T09:37:35+00:00" }, { "name": "webimpress/coding-standard", - "version": "1.3.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/webimpress/coding-standard.git", - "reference": "b26557e2386711ecb74f22718f4b4bde5ddbc899" + "reference": "710f71ac95d36d931e76b47132b599c39abfab11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/b26557e2386711ecb74f22718f4b4bde5ddbc899", - "reference": "b26557e2386711ecb74f22718f4b4bde5ddbc899", + "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/710f71ac95d36d931e76b47132b599c39abfab11", + "reference": "710f71ac95d36d931e76b47132b599c39abfab11", "shasum": "" }, "require": { @@ -5473,7 +5500,7 @@ "squizlabs/php_codesniffer": "^3.7.2" }, "require-dev": { - "phpunit/phpunit": "^9.6.4" + "phpunit/phpunit": "^9.6.15" }, "type": "phpcodesniffer-standard", "extra": { @@ -5499,7 +5526,7 @@ ], "support": { "issues": "https://github.com/webimpress/coding-standard/issues", - "source": "https://github.com/webimpress/coding-standard/tree/1.3.1" + "source": "https://github.com/webimpress/coding-standard/tree/1.3.2" }, "funding": [ { @@ -5507,7 +5534,7 @@ "type": "github" } ], - "time": "2023-03-09T15:05:18+00:00" + "time": "2023-12-18T07:25:41+00:00" }, { "name": "webimpress/safe-writer", diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 1c86d84ee..f9f7a4e2d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $closingBracket @@ -39,9 +39,6 @@ Cycle Cycle - - __toString - Iterator @@ -101,21 +98,18 @@ null === static::$registeredDoctypes - - __toString - registry['doctypes'][$type]]]> - - array - string - getDoctype()]]]> + + registry['doctype']]]> registry['doctypes']]]> - + array + string + $registry @@ -130,9 +124,6 @@ $flag === null - - __toString - $attributes $email @@ -202,9 +193,6 @@ $type $value - - $index - $index view]]> @@ -311,9 +299,6 @@ parent::__call($method, $args) parent::__call($method, $args) - - $index - (bool) $flag @@ -348,20 +333,13 @@ $content $index - - $index - is_string($content) - - is_array($content) - - $content $options @@ -454,9 +432,6 @@ Navigation\Exception\ExceptionInterface - - __toString - $container $container @@ -490,14 +465,11 @@ bool - string $label - $message - $message last()]]> @@ -525,8 +497,6 @@ acl === null && static::$defaultAcl !== null]]> - is_int($maxDepth) - is_int($minDepth) container]]> static::$defaultAcl !== null @@ -659,9 +629,6 @@ null - - $found[0] - (int) $renderFlag @@ -983,7 +950,15 @@ containerClass($value)]]> + + + Container + + + + is_scalar($key) + $this @@ -996,24 +971,25 @@ nextIndex()]]> $this[$key] .= $data + + TKey + max($keys) + 1 int - - __toString - $items - getArrayCopy()]]> - $values $this[$key] max($keys) + + captureKey]]> + (string) $postfix (string) $prefix @@ -1021,9 +997,23 @@ - - __toString - + + $container + containerClass()]]> + + + container]]> + + + ]]> + + + ]]> + |null]]> + + + getContainer()]]> + $return @@ -1159,12 +1149,18 @@ - $reuseMatchedParams + + $params + $reuseMatchedParams + $options + + $reuseMatchedParams + @@ -1174,9 +1170,6 @@ ! $events ! $events - - get - get('EventManager')]]> get('MvcTranslator')]]> @@ -1290,6 +1283,9 @@ + + (array) $nameOrModel + @@ -1299,6 +1295,9 @@ $type + + $values + is_string($nameOrModel) @@ -1307,15 +1306,16 @@ $jsonpCallback - - $nameOrModel - $child $value + + $nameOrModel + $nameOrModel + $childValues $children @@ -1332,11 +1332,14 @@ ! is_object($nameOrModel) jsonpCallback]]> + + $nameOrModel instanceof Traversable + + gettype($helpers) - gettype($variables) __templateResolver->resolve($name, $this)]]> @@ -1348,51 +1351,27 @@ string|Resolver - $__vars __template]]> __template]]> __varsCache)]]> - - $vars[$name] - $vars[$name] - - - $vars[$name] - - - __vars[$key]]]> - __vars[$key]]]> - $includeReturn - $setting __template]]> - __vars]]> $value $value $variablesAsArray[$key] - $vars - $vars - $vars - $vars $vars[$name] - - vars()]]> - string - getArrayCopy new $helpers(new ServiceManager()) - - $setting - __filterChain->filter($this->__content)]]> + __vars[$key]]]> __templateResolver]]> @@ -1409,10 +1388,8 @@ __vars[$key]]]> - __vars[$key]]]> - __vars]]> __vars]]> resolve @@ -1421,7 +1398,6 @@ is_object($helpers) - is_object($variables) __file]]> @@ -1539,15 +1515,13 @@ - - Variables - - $key $value $key + $key + ArrayIterator::class $return @@ -1608,6 +1582,9 @@ $name $name + + $params[$param] + @@ -1615,35 +1592,22 @@ - - $vars - $vars - - - setStrictVars - - - $vars - $vars - $vars - - - varName1]]> - varName1]]> - varName2]]> - varName2]]> - varName3]]> - varName3]]> - varName4]]> - varName4]]> - varName5]]> - addPath + + assertTrue + assertTrue + assertTrue + addPath + + varName2]]> + varName3]]> + varName5]]> + @@ -2240,9 +2204,6 @@ $value $value - - vars()]]> - getVariables()]]> getVariables()]]> @@ -2287,6 +2248,9 @@ addPath addPath + + vars()->message]]> + @@ -2422,6 +2386,13 @@ new stdClass() new stdClass() + + $options + $vars + + + $variables + @@ -2434,21 +2405,12 @@ $foo $return - - assign - assign - assign - assign - assign - getArrayCopy - getArrayCopy - - - renderer->vars()->foo]]> - + + renderer->vars()->foo]]> + $errno $errstr @@ -2569,43 +2531,17 @@ - - $e - $e - $e - $e - $e - $e - $e - $e - $e - $e - $e - content]]> result->content]]> - - $result[] - - - getModel - getModel - getResult - getResult - getResult - getResult - getResult - null - - $e - $e - $e - $e - + + assertIsArray + assertIsArray + assertIsArray +