From e3f38d1d428c384e16032d264ac4ac6fd9041d97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 04:40:17 +0000 Subject: [PATCH 1/3] Update dependency psalm/plugin-phpunit to ^0.19.0 | datasource | package | from | to | | ---------- | -------------------- | ------ | ------ | | packagist | psalm/plugin-phpunit | 0.18.4 | 0.19.0 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index cfd0fb51e..b30b82ed5 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "laminas/laminas-router": "^3.12.0", "laminas/laminas-uri": "^2.11", "phpunit/phpunit": "^10.5.9", - "psalm/plugin-phpunit": "^0.18.4", + "psalm/plugin-phpunit": "^0.19.0", "vimeo/psalm": "^5.20" }, "conflict": { diff --git a/composer.lock b/composer.lock index 4ad480fc7..97b39fcf4 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": "592dafb0d2f33db8a69049bf7183ec67", + "content-hash": "81ebe898c617543f57f6baf6754e3af6", "packages": [ { "name": "laminas/laminas-escaper", @@ -3477,24 +3477,24 @@ }, { "name": "psalm/plugin-phpunit", - "version": "0.18.4", + "version": "0.19.0", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-phpunit.git", - "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc" + "reference": "e344eaaa27871e79c6cb97b9efe52a735f9d1966" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", - "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", + "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/e344eaaa27871e79c6cb97b9efe52a735f9d1966", + "reference": "e344eaaa27871e79c6cb97b9efe52a735f9d1966", "shasum": "" }, "require": { "composer/package-versions-deprecated": "^1.10", "composer/semver": "^1.4 || ^2.0 || ^3.0", "ext-simplexml": "*", - "php": "^7.1 || ^8.0", - "vimeo/psalm": "dev-master || dev-4.x || ^4.7.1 || ^5@beta || ^5.0" + "php": "^7.4 || ^8.0", + "vimeo/psalm": "dev-master || ^5@beta || ^5.0" }, "conflict": { "phpunit/phpunit": "<7.5" @@ -3531,9 +3531,9 @@ "description": "Psalm plugin for PHPUnit", "support": { "issues": "https://github.com/psalm/psalm-plugin-phpunit/issues", - "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.18.4" + "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.19.0" }, - "time": "2022-12-03T07:47:07+00:00" + "time": "2024-03-15T10:43:15+00:00" }, { "name": "psr/http-message", From 075496aecf1a988300ab034771a1b57fe692b4b6 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 18 Mar 2024 09:17:02 +0000 Subject: [PATCH 2/3] Bump dev deps, refresh lock Signed-off-by: George Steel --- composer.json | 6 +++--- composer.lock | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b30b82ed5..b23207d39 100644 --- a/composer.json +++ b/composer.json @@ -50,11 +50,11 @@ "laminas/laminas-navigation": "^2.19.1", "laminas/laminas-paginator": "^2.18.1", "laminas/laminas-permissions-acl": "^2.16", - "laminas/laminas-router": "^3.12.0", + "laminas/laminas-router": "^3.13.0", "laminas/laminas-uri": "^2.11", - "phpunit/phpunit": "^10.5.9", + "phpunit/phpunit": "^10.5.13", "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.20" + "vimeo/psalm": "^5.23.1" }, "conflict": { "container-interop/container-interop": "<1.2", diff --git a/composer.lock b/composer.lock index 97b39fcf4..afb3eaa7a 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": "81ebe898c617543f57f6baf6754e3af6", + "content-hash": "c4cd433fb697af1660745f76e5f9183e", "packages": [ { "name": "laminas/laminas-escaper", From 9413d4c4c4b369714c1b1b147b9bcdecf0ab2b45 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 18 Mar 2024 09:17:28 +0000 Subject: [PATCH 3/3] Minor SA Fixes Signed-off-by: George Steel --- psalm-baseline.xml | 2521 ++++++++--------- test/HelperPluginManagerCompatibilityTest.php | 4 +- 2 files changed, 1262 insertions(+), 1263 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index c1d5abb8d..e442c2a50 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,53 +1,53 @@ - + - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket + + + + + + + + + + + + - $val + - $val + - $attribs + - plugin - plugin + + - (array) $attribs + - plugin - plugin + + - setResourceMap + - Cycle - Cycle + + - Iterator + data[$this->name]]]> @@ -58,8 +58,8 @@ data[$this->name][$this->key()]]]> - array - int + + pointers[$this->name]]]> @@ -70,48 +70,48 @@ pointers[$this->name]]]> - getName + - $view + - $key - $value + + - $name + - $key - $value - $vars + + + $key]]> - $view + - vars - vars + + - vars - vars + + - self + - null === static::$registeredDoctypes + registry['doctypes'][$type]]]> @@ -122,17 +122,17 @@ registry['doctype']]]> registry['doctypes']]]> - array - string + + - $registry + - $v - $value[$k] + + @@ -140,33 +140,33 @@ pluginFlashMessenger]]> - $item + - $escapeHtmlHelper - $pluginFlashMessenger + + - $item - $item + + - $classes - $classes - $messagesToPrint + + + - $classes - $classes - $messagesToPrint[] - $messagesToPrint[] + + + + escapeHtmlHelper]]> - (bool) $autoEscape - (string) $messageCloseString - (string) $messageOpenFormat - (string) $messageSeparatorString + + + + escapeHtmlHelper]]> @@ -174,21 +174,21 @@ - $flag === null + - $attributes - $email - $emailIsHashed + + + - $value + - bool - int - string - string + + + + options['default_img']]]> @@ -200,186 +200,186 @@ ]]> - (bool) $flag - (int) $imgSize + + - (bool) $flag + - $item + - offsetSet + - $args - $args - $args - $args[0] - $attributes[$itemKey] - $href - $index + + + + + + + autoEscape ? $this->escapeAttribute($attributes[$itemKey]) : $attributes[$itemKey]]]> autoEscape ? $this->escapeAttribute($value) : $value]]> - $value + - $media + - $args[0] - $args[0] + + - $conditionalStylesheet - $extras - $extras - $href - $href - $index - $item - $media - $title - $type - $value + + + + + + + + + + + - $index + view]]> - createDataAlternate - createDataNext - createDataPrev - createDataStylesheet + + + + - AbstractContainer - AbstractContainer + + - (string) $conditionalStylesheet + - $item - $value - $value + + + - offsetSet - offsetUnset + + - $args[0] - $args[1] - $args[2] - $index + + + + $type]]> content]]> type]]> - $key + autoEscape ? $this->escapeAttribute($item->$type) : $item->$type]]> autoEscape ? $this->escapeAttribute($item->content) : $item->content]]> autoEscape ? $this->escapeAttribute($value) : $value]]> - $type - $value - $value + + + - $doctype - $index - $key - $type - $value + + + + + - $this + - isHtml5 - isHtml5 - isHtml5 - isHtml5 - isRdfa - isXhtml + + + + + + - parent::__call($method, $args) - parent::__call($method, $args) + + - $index - $index + + view]]> - plugin - plugin - plugin + + + - AbstractContainer - AbstractContainer + + - plugin - plugin - plugin + + + - offsetSet + - $content - $content - $index - $index + + + + autoEscape ? $this->escapeAttribute($value) : $value]]> - $value + - $attrs - $attrs + + - $content - $index - $value + + + - $this + - isHtml5 + - parent::__call($method, $args) - parent::__call($method, $args) + + - AbstractContainer - AbstractContainer + + - (bool) $flag + - is_string($spec) + - plugin + @@ -389,139 +389,139 @@ content) || ! is_string($item->content)]]> - offsetSet + - ObjectShape + - $content - $index + + - $attrs + - $content - $index + + - AbstractContainer - AbstractContainer + + - is_string($content) + - $indent + - HelperInterface + - $htmlObject + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - string + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - plugin + - plugin + - $options + - $options + - $content + - $htmlObject + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - string + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - plugin + - plugin + - $htmlObject + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - string + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - plugin + - plugin + - $value + - $name + - $value + view]]> - (bool) $useNamespaces + - getAuthenticationService - setAuthenticationService + + - $response + - null + response instanceof Response]]> @@ -529,98 +529,98 @@ - plugin + - __construct + - (string) $template + - plugin + - call_user_func_array($helper, $arguments) + - ExceptionInterface + - $container + - (bool) $injectAcl - (bool) $injectContainer - (bool) $injectTranslator - (string) $proxy + + + + - $view + - hasTranslator - setTranslator + + minDepth)]]> - ! is_string($message) - $container instanceof AbstractContainer + + container]]> - AbstractHelper - null|EventManagerInterface + + - Navigation\Exception\ExceptionInterface + - $container - $container - $container - $container - $container - $events - $events - $events - $events - $events - $maxDepth - $maxDepth - $maxDepth - $maxDepth - $maxDepth - $minDepth - $minDepth - $minDepth - $minDepth + + + + + + + + + + + + + + + + + + + getTextDomain()]]> getTextDomain()]]> - $container - $container - $label - $value + + + + - bool + - $label + last()]]> - $events + @@ -629,32 +629,32 @@ getTitle()]]> - $maxDepth - $minDepth + + - attach - getParent - plugin + + + - (bool) $renderInvisible - (bool) $useAcl - (string) $indent + + + acl === null && static::$defaultAcl !== null]]> container]]> - static::$defaultAcl !== null + - return; + - plugin + - setSharedManager + @@ -662,160 +662,160 @@ - null === $partial + renderPartialModel($params, $container, $partial)]]> renderPartialModel([], $container, $partial)]]> - string - string + + - $partial + - $active + getLabel()]]> getTextDomain()]]> - $partial[0] + - $active - $active - $active - $label + + + + - $parent + - getLabel - getParent - getParent - getTextDomain + + + + - $label + - $container + - $partial + - plugin - plugin + + - (bool) $linkLast + - is_array($partial) - is_string($separator) + + - null === $container - null === $container + + - plugin - plugin + + - HelperInterface - HelperInterface - HelperInterface + + + - $relFlag + - $root + - $active - $arguments[0] - $intermediate - $intermediate - $page - $page + + + + + + $meth()]]> - $type + - $relation + - $result[$rel][$type] + - $active - $found - $intermediate - $intermediate - $page - $page - $result - $type - $value + + + + + + + + + - AbstractPage|array|null - array|null + + - $found - $found - count($result) === 1 ? $result[0] : $result - count($result) === 1 ? $result[0] : $result + + + + - null + - searchRelChapter - searchRelNext - searchRelPrev - searchRelSection - searchRelStart - searchRelSubsection - searchRevSection - searchRevSubsection + + + + + + + + - (int) $renderFlag + root]]> - null === $container + - $acl - $page - $privilege - $resource - $role + + + + + - getPrivilege - getResource - hasResource - isAllowed + + + + @@ -823,23 +823,23 @@ - bool + - null === $partial + renderPartialModel($params, $container, $partial)]]> renderPartialModel([], $container, $partial)]]> - string - string + + - $partial + @@ -858,268 +858,268 @@ - $page - $page + + getTextDomain()]]> getTextDomain()]]> - $partial[0] - $subPage + + - $liClasses + - $foundDepth - $foundPage - $isActive - $liClasses[] - $page - $subPage + + + + + + - getClass - getClass - getParent - getParent - getParent - hasPage - hasPage - hasPages - hasPages - hasPages - isActive + + + + + + + + + + + - $escaper($label) - $escaper($ulClass) - $escaper($ulClass) + + + - $foundDepth + - $container + getTitle()]]> - $minDepth - $minDepth + + - $partial + - plugin - plugin - plugin - plugin + + + + - escapeLabels - setAddClassToListItem + + - (bool) $flag - (bool) $flag - (bool) $flag - (bool) $flag + + + + - is_array($partial) - is_string($liActiveClass) - is_string($ulClass) + + + - null === $container - null === $container + + - plugin - plugin - plugin - plugin + + + + - $aliases + - $serverUrl + - $changefreq - $changefreq - $curDoc - $page - $page - $priority - $priority + + + + + + + - $basePathHelper - $changefreq - $curDoc - $escaper - $page - $priority - $serverUrlHelper + + + + + + + serverUrl]]> - $basePathHelper() - $escaper($string) - $serverUrlHelper() + + + - string - string + + - $escaper($string) + serverUrl]]> serverUrl]]> - $container + - $lastmod + - isValid - isValid - isValid - isValid - plugin - plugin - plugin + + + + + + + - (bool) $formatOutput - (bool) $schemaValidation - (bool) $useSitemapValidators - (bool) $useXmlDecl - (string) $href - (string) $href + + + + + + serverUrl)]]> - plugin - plugin - plugin + + + - static::$defaultViewPartial === null + - $partial - $partialHelper - $partialHelper + + + - $partialHelper($partial, $pages) - $partialHelper($partial[0], $pages) + + - string + - $partialHelper($partial, $pages) - $partialHelper($partial[0], $pages) + + view->paginator]]> - plugin - plugin + + - plugin - plugin + + - is_scalar($values) + - $objectKey - $objectKey + + - $values + - $values + - $name + - null + - render - render + + - (string) $key + - parent::setObjectKey($key) + - $item + - $item + objectKey]]> - array + toArray()]]> - $name - $values + + - self + - parent::__invoke($name, $item) + - self + - (string) $key + - (string) $key - (string) $key - (string) $key - (string) $key - (string) $name + + + + + containerClass($value)]]> @@ -1127,53 +1127,53 @@ - Container + - is_scalar($key) + - $this + - $data - $data - $data - $data + + + + nextIndex()]]> nextIndex()]]> - $this[$key] .= $data + - TKey + - max($keys) + 1 + - int + - $items + - $this[$key] - max($keys) + + captureKey]]> - (string) $postfix - (string) $prefix - (string) $separator + + + - $container + containerClass()]]> @@ -1190,16 +1190,16 @@ getContainer()]]> - $return + - __get - __set + + - (bool) $autoEscape - (string) $string - (string) $string + + + containerClass()]]> @@ -1207,7 +1207,7 @@ - null === static::$instance + containerClass($value)]]> @@ -1216,39 +1216,39 @@ items[$key]]]> - AbstractContainer + items[$key]]]> - AbstractContainer + - getRegistry - unsetRegistry + + - (string) $key - (string) $key - (string) $key - (string) $key - (string) $key + + + + + - new static() + - $current - $viewModelHelper + + viewModelHelper]]> - ViewModel + viewModelHelper]]> @@ -1260,9 +1260,9 @@ getCurrent()]]> - getChildren - plugin - render + + + viewModelHelper]]> @@ -1270,32 +1270,32 @@ - $placeholderHelper + - $placeholderHelper($placeholder) - $placeholderHelper($placeholder) + + - captureEnd - captureStart + + - plugin - render + + - plugin + - $port + - string - string + + host]]> @@ -1305,7 +1305,7 @@ - (bool) $useProxy + @@ -1313,7 +1313,7 @@ - $cName + @@ -1325,23 +1325,23 @@ - $config + - FlashMessenger - FlashMessenger - new FlashMessenger() + + + - FlashMessengerFactory + - $flashMessenger + @@ -1351,36 +1351,36 @@ - $config - $configHelper - $controllerPluginManager - $flashMessenger + + + + - get + - $container + - $requestedName + - $this - $this - $this + + + - (bool) $enabled + - is_array($params) - is_bool($options) + + @@ -1389,28 +1389,28 @@ - $params - $reuseMatchedParams + + - $options + - $reuseMatchedParams + - hasRoot + - null|ConfigInterface|ContainerInterface + - ! $events - ! $events + + get('EventManager')]]> @@ -1418,63 +1418,63 @@ get('Translator')]]> - $container - $container + + - ($name is class-string ? T : HelperInterface|callable) + - parent::get($name, $options) + - injectEventManager - injectRenderer - injectTranslator - validatePlugin + + + + initializers]]> initializers]]> - getServiceLocator - getServiceLocator + + - HtmlAttributesSet + - $value + - $storeValue - $value + + - clearChildren - clearOptions - clearVariables + + + - int + options['errorLevel']]]> - $captureTo + - getErrorLevel - getResult - setResult + + + @@ -1483,17 +1483,17 @@ type]]> - false|string + type]]> type]]> - $variables + - $feed + feed instanceof Feed]]> @@ -1501,152 +1501,152 @@ - $captureTo + - ModelInterface - ModelInterface - ModelInterface - ModelInterface - ModelInterface - ModelInterface - ModelInterface - ModelInterface + + + + + + + + - gettype($variables) - is_array($options) + + - array|ArrayAccess|Traversable + - $key + - $value + - $variables[$name] + - (bool) $append - (bool) $terminate - (string) $capture - (string) $name - (string) $name - (string) $name - (string) $name - (string) $template + + + + + + + + - is_object($variables) + - $values + - $value + getFilterChain()->filter($values['result'])]]> - $model + - $values + - __construct - setFilterChain + + - $config + - (array) $nameOrModel + - $resolver + - $type + - $values + - $resolver + - is_string($nameOrModel) + - void + - $jsonpCallback + - $child + - $value + - $nameOrModel - $nameOrModel + + - $childValues - $children - $values + + + - $resolver + - (bool) $mergeUnnamedChildren - (string) $callback + + - $mergeChildren + - ! is_object($nameOrModel) + jsonpCallback]]> - $nameOrModel instanceof Traversable + - gettype($helpers) + __templateResolver->resolve($name, $this)]]> - $values + - string|Resolver + __template]]> @@ -1654,18 +1654,18 @@ __varsCache)]]> - $includeReturn + __template]]> - $value - $value - $variablesAsArray[$key] - $vars[$name] + + + + - string + - new $helpers(new ServiceManager()) + __filterChain->filter($this->__content)]]> @@ -1675,10 +1675,10 @@ __templateResolver]]> - $variables + - $values + resolver($this->__template)]]> @@ -1688,16 +1688,16 @@ __vars]]> - resolve + - $config + - (bool) $renderTrees + - is_object($helpers) + __file]]> @@ -1716,32 +1716,32 @@ - resolve + - (string) $prefix + - is_iterable($map) - is_iterable($map) + + map, $map)]]> - is_string($path) + - static::FAILURE_NOT_FOUND - static::FAILURE_NO_PATHS + + - setUseStreamWrapper + lastLookupFailure]]> @@ -1755,11 +1755,11 @@ useViewStream]]> - is_string($path) + - false - false + + @@ -1768,79 +1768,79 @@ - TemplatePathStack + - (bool) $flag - (bool) $flag - (string) $defaultSuffix + + + - $headers + - addHeaderLine + - setContent + - getHeaders + - $headers + - addHeaderLine - addHeaderLine + + - setContent + - (string) $charset + - getHeaders + - $placeholders - $result + + - containerExists - getContainer + + - $contentPlaceholders + - plugin + - $e + - plugin + - $data - $stat + + - $mode - $offset - $opened_path - $options - $whence + + + + + pos]]> @@ -1848,100 +1848,100 @@ pos]]> - $offset - $offset - $offset + + + - stream_eof - stream_open - stream_read - stream_seek - stream_stat - stream_tell - url_stat + + + + + + + - $mode - $opened_path - $options + + + - break; - break; - break; + + + - $value + - $key - $key - ArrayIterator::class + + + - $return - $return - $spec - $this[$key] - $this[$key] - $value - $value + + + + + + + - (bool) $flag + - View + - $options + - $result + - $events - $request - $response + + + - $oldResult + - $oldResult + - $events + - hasChildren + - ViewEvent - ViewEvent + + - $value - $value - $value - $value + + + + - $name - $name + + - $params[$param] + @@ -1951,15 +1951,15 @@ - addPath + - assertTrue - assertTrue - assertTrue + + + - addPath + varName2]]> @@ -1969,52 +1969,52 @@ - $test - $test - $test - $test + + + + - $test - $test - $test - $test + + + + - $test - $test - $test - $test + + + + - $test - $test - $test - $test + + + + - $test - $test - $test - $test + + + + - $plugin - $plugin + + mvcPluginClass]]> - FlashMessenger + [ 'config' => $config, @@ -2029,61 +2029,61 @@ => new HelperPluginManager($services), ], ])]]> - new FlashMessenger() - new FlashMessenger() - new FlashMessenger() - new FlashMessenger() - new FlashMessenger() - new FlashMessenger() + + + + + + - $displayInfo - $displayInfo - $displayInfo - $displayInfo - $helper - $helper - $helper - $helper - $helperPluginManager - $helperPluginManager - $helperPluginManager - $helperPluginManager + + + + + + + + + + + + - get - get - get - get - render - render - renderCurrent - renderCurrent + + + + + + + + - hasCurrentErrorMessages - hasCurrentInfoMessages - hasCurrentMessages - hasCurrentSuccessMessages - hasErrorMessages - hasInfoMessages - hasMessages - hasSuccessMessages - hasWarningMessages - render - render - renderCurrent - renderCurrent + + + + + + + + + + + + + - $value - $value - $value + + + - gravatar + @@ -2097,34 +2097,34 @@ - $item - $item - $item - $item - $item + + + + + - $order[$key] - $order[$key] - $order[$key] + + + - $item - $item - $item - $item - $item - $key - $key - $key - $link - $link - $order[$key] - $order[$key] - $order[$key] - $value - $value - $value + + + + + + + + + + + + + + + + @@ -2147,16 +2147,16 @@ href]]> - appendNext - appendPrev - bogusMethod - getArrayCopy - getValue - getValue - getValue - getValue - getValue - getValue + + + + + + + + + + @@ -2166,44 +2166,44 @@ - offsetSetHttpEquiv - offsetSetHttpEquiv - offsetSetName - offsetSetName - offsetSetName + + + + + - HtmlFlash + - $key + - $escape($value) - $escape($value) + + - $acl - $acl + + serviceManager->get('Navigation')]]> - $acl - $acl - $role - $role + + + + - $_helper + _helper]]> @@ -2223,148 +2223,148 @@ - $_helper + - $active - $active - $active - $active - $active - $active - $active - $active - $found - $found + + + + + + + + + + - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $actual - $actual - $actual - $actual - $actual - $actual - $actual - $actual[$attrib][$type][$key] - $actual[] - $actual[] - $actual[] - $actual[] - $found - $found - $found - $found - $found - $found - $found - $found - $found - $found - $found - $page - $page - $page - $page - $page - $page - $page + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - addRel - addRel - addRel - addRel - addRel - addRel - addRel - addRel - addRel - addRel - addRev - addRev - getHref - getHref - getHref - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - removeRel - removeRev - setActive - setActive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - $active - $active - $active - $page - $page + + + + + - $_helper + - getHref - getLabel - getLabel + + + - getHref - getLabel - getLabel + + + - $discard - $discard + + @@ -2380,16 +2380,16 @@ - $p - $page + + - getRole - setActive - setActive + + + - $_helper + @@ -2404,17 +2404,17 @@ - $actual - $creationContextValue - $expected + + + - getContainer - getContainer - getContainer + + + - $_helper + errorHandlerMessage]]> @@ -2426,7 +2426,7 @@ ], false)]]> - PsrContainerDecorator + @@ -2444,16 +2444,16 @@ - setBasePath + - $_helper + - plugin + - plugin + nav2;]]> @@ -2474,216 +2474,216 @@ - $all - $paginator + + - null + - $o - $o - $o - $o - $o - $o - $o - $o - $rIterator - $rIterator - $rIterator - $rIterator + + + + + + + + + + + + - new stdClass() - new stdClass() + + - $value - $value + + - $key - $key - $key - $value - $value - $value - $value + + + + + + + message]]> message]]> objectKey]]> objectKey]]> - $value - $value + + - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result + + + + + + + + + + + + + + + - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result + + + + + + + + + + + + + + + - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath + + + + + + + + + + + + + + + + + + + + + + + + + + + + - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath + + + + + + + + + + + + + + + + + + + + + + + + + + + + message]]> message]]> - $key - $key - $key + + + - $key - $key - $value - $value - $value + + + + + - $key - $key - $value - $value - $value + + + + + getVariables()]]> getVariables()]]> - $return - $return - $return - $return - $return - $return - $return - $return - $return + + + + + + + + + - $return - $return - $return - $return - $return - $return - $return - $return - $return + + + + + + + + + - addPath - addPath - addPath - addPath - addPath - addPath - addPath + + + + + + + - addPath - addPath - addPath - addPath - addPath - addPath - addPath + + + + + + + vars()->message]]> @@ -2691,8 +2691,8 @@ - 1337 - new stdClass() + + @@ -2702,7 +2702,7 @@ - $value + @@ -2710,42 +2710,42 @@ getDependencyConfig())]]> - $serviceConfig - $test + + - $router - $serviceConfig - $test - $test - $urlHelper - $urlHelper - $viewHelpers - $viewHelpers + + + + + + + + true])]]> - bootstrap - bootstrap - get - get - setRequestUri + + + + + - Wildcard::class + - $it - $router - $router + + + - true - true + + @@ -2757,9 +2757,6 @@ 'factories' => $factories, ])]]> - - ]]> - @@ -2799,31 +2796,31 @@ ])]]> - $container - $container + + - $container - $container + + - Iterator + - $vars - new stdClass() - new stdClass() + + + - $options - $vars + + - $variables + @@ -2831,11 +2828,11 @@ - $content + - $foo - $return + + @@ -2844,53 +2841,53 @@ renderer->vars()->foo]]> - $errno - $errstr + + - $model - $model - $model - $model - $model - $model - 0 - false - false + + + + + + + + + - $model + - assertNull + - TemplatePathStack::FAILURE_NOT_FOUND - TemplatePathStack::FAILURE_NO_PATHS + + - $listener - $listener - $priority - $priority + + + + - addHeaderLine - addHeaderLine - addHeaderLine + + + - addHeaderLine - addHeaderLine - addHeaderLine + + + @@ -2903,60 +2900,60 @@ get('content-type')->getFieldValue()]]> - $content - $content - $content - $content - $content - $content - $listener - $listener - $priority - $priority + + + + + + + + + + - addHeaderLine - addHeaderLine - addHeaderLine - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue + + + + + + + + + + - addHeaderLine - addHeaderLine - addHeaderLine - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue + + + + + + + + + + - getContent + - $e - $event - $event - $event + + + + - $content - $content - $content - $listener - $listener - $priority - $priority + + + + + + + @@ -2965,7 +2962,7 @@ result->content]]> - null + diff --git a/test/HelperPluginManagerCompatibilityTest.php b/test/HelperPluginManagerCompatibilityTest.php index a5a3dbe8c..979bcab70 100644 --- a/test/HelperPluginManagerCompatibilityTest.php +++ b/test/HelperPluginManagerCompatibilityTest.php @@ -53,7 +53,7 @@ protected function getV2InvalidPluginException(): string } /** - * @psalm-return Generator + * @psalm-return Generator */ public static function aliasProvider(): Generator { @@ -74,6 +74,8 @@ public static function aliasProvider(): Generator continue; } + self::assertIsString($alias); + yield $alias => [$alias, $target]; } }