Skip to content

Commit 2aa4998

Browse files
authored
Fix data set after PHPStan recent updates (#41)
1 parent 5b1eabe commit 2aa4998

11 files changed

+38
-22
lines changed

.github/workflows/integrate.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
- "8.0"
4646
- "8.1"
4747
dependencies:
48-
- "lowest"
4948
- "highest"
5049

5150
steps:

composer.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@
1919
],
2020
"require": {
2121
"php": "~8.0.0 || ~8.1.0",
22-
"phpstan/phpstan": "^1.7.3"
22+
"phpstan/phpstan": "^1.9.2"
2323
},
2424
"require-dev": {
25-
"laminas/laminas-cache": "^3.1.3",
26-
"laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
27-
"laminas/laminas-filter": "^2.14.0",
28-
"laminas/laminas-form": "^3.1.1",
29-
"laminas/laminas-hydrator": "^4.3.1",
30-
"laminas/laminas-i18n": "^2.15.0",
31-
"laminas/laminas-inputfilter": "^2.13.0",
32-
"laminas/laminas-log": "^2.15.1",
33-
"laminas/laminas-mail": "^2.16.0",
34-
"laminas/laminas-mvc": "^3.3.3",
35-
"laminas/laminas-paginator": "^2.12.2",
36-
"laminas/laminas-validator": "^2.17.0",
25+
"laminas/laminas-cache": "^3.8.0",
26+
"laminas/laminas-cache-storage-adapter-memory": "^2.2.0",
27+
"laminas/laminas-filter": "^2.28.1",
28+
"laminas/laminas-form": "^3.7.0",
29+
"laminas/laminas-hydrator": "^4.8.0",
30+
"laminas/laminas-i18n": "^2.19.0",
31+
"laminas/laminas-inputfilter": "^2.22.1",
32+
"laminas/laminas-log": "^2.16.0",
33+
"laminas/laminas-mail": "^2.20.0",
34+
"laminas/laminas-mvc": "^3.5.0",
35+
"laminas/laminas-paginator": "^2.15.1",
36+
"laminas/laminas-validator": "^2.28.0",
3737
"malukenho/mcbumpface": "^1.1.5",
3838
"phpstan/phpstan-deprecation-rules": "^1.0.0",
39-
"phpstan/phpstan-phpunit": "^1.1.1",
40-
"phpunit/phpunit": "^9.5.20",
41-
"slam/php-cs-fixer-extensions": "^v3.1.0",
39+
"phpstan/phpstan-phpunit": "^1.2.2",
40+
"phpunit/phpunit": "^9.5.26",
41+
"slam/php-cs-fixer-extensions": "^v3.2.1",
4242
"slam/php-debug-r": "^v1.7.0"
4343
},
4444
"conflict": {

src/UnmappedAliasServiceLocatorProxy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public function has($id)
5353
* @param string $name
5454
* @param null|array<mixed> $options
5555
*
56-
* @throws ShouldNotHappenException
57-
*
5856
* @return mixed|void
57+
*
58+
* @throws ShouldNotHappenException
5959
*/
6060
public function build($name, ?array $options = null)
6161
{
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[
2+
{
3+
"message": "Method LaminasPhpStan\\Tests\\LaminasIntegration\\data\\pluginMethodDynamicReturn::getDynamicTypeFromStringVariable() should return Laminas\\View\\Helper\\AbstractHelper but returns mixed.",
4+
"line": 30,
5+
"ignorable": true
6+
}
7+
]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"message": "The service \"foobar123\" was not configured in Laminas\\Router\\RoutePluginManager nor the class \"foobar123\" exists.",
4-
"line": 23,
4+
"line": 27,
55
"ignorable": true
66
}
77
]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"message": "Call to an undefined method Laminas\\Router\\RouteInterface::foobar456().",
4-
"line": 26,
4+
"line": 30,
55
"ignorable": true
66
}
77
]

tests/LaminasIntegration/data/routePluginMethod.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
use Laminas\Router\RouteInterface;
88
use Laminas\Router\RoutePluginManager;
99
use Laminas\ServiceManager\ServiceManager;
10+
use LaminasPhpStan\TestAsset\Route66;
1011

1112
final class routePluginMethod
1213
{
14+
/**
15+
* @var RoutePluginManager<Route66>
16+
*/
1317
private RoutePluginManager $routePluginManager;
1418

1519
public function __construct(ServiceManager $serviceManager)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"message": "The service \"foobar\" was not configured in Laminas\\View\\HelperPluginManager nor the class \"foobar\" exists.",
4-
"line": 22,
4+
"line": 26,
55
"ignorable": true
66
}
77
]

tests/LaminasIntegration/data/viewHelperPluginMethod.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
namespace LaminasPhpStan\Tests\LaminasIntegration\data;
66

77
use Laminas\ServiceManager\ServiceManager;
8+
use Laminas\View\Helper\HelperInterface;
89
use Laminas\View\HelperPluginManager;
910
use LaminasPhpStan\TestAsset\CustomViewHelperPlugin;
1011

1112
final class viewHelperPluginMethod
1213
{
14+
/**
15+
* @var HelperPluginManager<HelperInterface>
16+
*/
1317
private HelperPluginManager $viewHelperManager;
1418

1519
public function __construct(ServiceManager $serviceManager)

tests/Rules/Laminas/PluginManagerGetMethodCallRuleTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
/**
1313
* @covers \LaminasPhpStan\Rules\Laminas\ServiceManagerGetMethodCallRule
14+
*
1415
* @extends RuleTestCase<ServiceManagerGetMethodCallRule>
1516
*/
1617
final class PluginManagerGetMethodCallRuleTest extends RuleTestCase

0 commit comments

Comments
 (0)