Skip to content

Commit

Permalink
Merge pull request #53 from laminas/renovate/lock-file-maintenance
Browse files Browse the repository at this point in the history
Update Psalm to ^5.4, minor type improvements, bump dev dependencies
  • Loading branch information
Ocramius authored Dec 20, 2022
2 parents f892a8d + dbd8932 commit 122b2e7
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 85 deletions.
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
"laminas/laminas-stdlib": "^3.10.1"
},
"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.20",
"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",
Expand Down
161 changes: 86 additions & 75 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.1.0@4defa177c89397c5e14737a80fe4896584130674">
<files psalm-version="5.3.0@b6faa3e96b8eb50ec71384c53799b8a107236bb6">
<file src="src/Adapter/Service/CallbackFactory.php">
<DeprecatedInterface occurrences="1">
<code>CallbackFactory</code>
Expand Down Expand Up @@ -66,6 +66,9 @@
<MissingConstructor occurrences="1">
<code>$creationOptions</code>
</MissingConstructor>
<MoreSpecificImplementedParamType occurrences="1">
<code>$options</code>
</MoreSpecificImplementedParamType>
<ParamNameMismatch occurrences="1">
<code>$container</code>
</ParamNameMismatch>
Expand Down Expand Up @@ -206,6 +209,9 @@
<DeprecatedInterface occurrences="1">
<code>ScrollingStylePluginManagerFactory</code>
</DeprecatedInterface>
<MoreSpecificImplementedParamType occurrences="1">
<code>$options</code>
</MoreSpecificImplementedParamType>
<ParamNameMismatch occurrences="1">
<code>$container</code>
</ParamNameMismatch>
Expand Down
1 change: 0 additions & 1 deletion src/AdapterPluginManagerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class AdapterPluginManagerFactory implements FactoryInterface
*/
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
/** @psalm-var ServiceManagerConfiguration $options */
$options = ! is_array($options) ? [] : $options;
$pluginManager = new AdapterPluginManager($container, $options);

Expand Down
1 change: 0 additions & 1 deletion src/ScrollingStylePluginManagerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class ScrollingStylePluginManagerFactory implements FactoryInterface
*/
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
{
/** @psalm-var ServiceManagerConfiguration $options */
$options = ! is_array($options) ? [] : $options;
return new ScrollingStylePluginManager($container, $options);
}
Expand Down

0 comments on commit 122b2e7

Please sign in to comment.