Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix data set after PHPStan recent updates #41

Merged
merged 2 commits into from
Nov 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
- "8.0"
- "8.1"
dependencies:
- "lowest"
- "highest"

steps:
Expand Down
32 changes: 16 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,26 @@
],
"require": {
"php": "~8.0.0 || ~8.1.0",
"phpstan/phpstan": "^1.7.3"
"phpstan/phpstan": "^1.9.2"
},
"require-dev": {
"laminas/laminas-cache": "^3.1.3",
"laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
"laminas/laminas-filter": "^2.14.0",
"laminas/laminas-form": "^3.1.1",
"laminas/laminas-hydrator": "^4.3.1",
"laminas/laminas-i18n": "^2.15.0",
"laminas/laminas-inputfilter": "^2.13.0",
"laminas/laminas-log": "^2.15.1",
"laminas/laminas-mail": "^2.16.0",
"laminas/laminas-mvc": "^3.3.3",
"laminas/laminas-paginator": "^2.12.2",
"laminas/laminas-validator": "^2.17.0",
"laminas/laminas-cache": "^3.8.0",
"laminas/laminas-cache-storage-adapter-memory": "^2.2.0",
"laminas/laminas-filter": "^2.28.1",
"laminas/laminas-form": "^3.7.0",
"laminas/laminas-hydrator": "^4.8.0",
"laminas/laminas-i18n": "^2.19.0",
"laminas/laminas-inputfilter": "^2.22.1",
"laminas/laminas-log": "^2.16.0",
"laminas/laminas-mail": "^2.20.0",
"laminas/laminas-mvc": "^3.5.0",
"laminas/laminas-paginator": "^2.15.1",
"laminas/laminas-validator": "^2.28.0",
"malukenho/mcbumpface": "^1.1.5",
"phpstan/phpstan-deprecation-rules": "^1.0.0",
"phpstan/phpstan-phpunit": "^1.1.1",
"phpunit/phpunit": "^9.5.20",
"slam/php-cs-fixer-extensions": "^v3.1.0",
"phpstan/phpstan-phpunit": "^1.2.2",
"phpunit/phpunit": "^9.5.26",
"slam/php-cs-fixer-extensions": "^v3.2.1",
"slam/php-debug-r": "^v1.7.0"
},
"conflict": {
Expand Down
4 changes: 2 additions & 2 deletions src/UnmappedAliasServiceLocatorProxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ public function has($id)
* @param string $name
* @param null|array<mixed> $options
*
* @throws ShouldNotHappenException
*
* @return mixed|void
*
* @throws ShouldNotHappenException
*/
public function build($name, ?array $options = null)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"message": "Method LaminasPhpStan\\Tests\\LaminasIntegration\\data\\pluginMethodDynamicReturn::getDynamicTypeFromStringVariable() should return Laminas\\View\\Helper\\AbstractHelper but returns mixed.",
"line": 30,
"ignorable": true
}
]
2 changes: 1 addition & 1 deletion tests/LaminasIntegration/data/routePluginMethod-0.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"message": "The service \"foobar123\" was not configured in Laminas\\Router\\RoutePluginManager nor the class \"foobar123\" exists.",
"line": 23,
"line": 27,
"ignorable": true
}
]
2 changes: 1 addition & 1 deletion tests/LaminasIntegration/data/routePluginMethod-2.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"message": "Call to an undefined method Laminas\\Router\\RouteInterface::foobar456().",
"line": 26,
"line": 30,
"ignorable": true
}
]
4 changes: 4 additions & 0 deletions tests/LaminasIntegration/data/routePluginMethod.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
use Laminas\Router\RouteInterface;
use Laminas\Router\RoutePluginManager;
use Laminas\ServiceManager\ServiceManager;
use LaminasPhpStan\TestAsset\Route66;

final class routePluginMethod
{
/**
* @var RoutePluginManager<Route66>
*/
private RoutePluginManager $routePluginManager;

public function __construct(ServiceManager $serviceManager)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"message": "The service \"foobar\" was not configured in Laminas\\View\\HelperPluginManager nor the class \"foobar\" exists.",
"line": 22,
"line": 26,
"ignorable": true
}
]
4 changes: 4 additions & 0 deletions tests/LaminasIntegration/data/viewHelperPluginMethod.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
namespace LaminasPhpStan\Tests\LaminasIntegration\data;

use Laminas\ServiceManager\ServiceManager;
use Laminas\View\Helper\HelperInterface;
use Laminas\View\HelperPluginManager;
use LaminasPhpStan\TestAsset\CustomViewHelperPlugin;

final class viewHelperPluginMethod
{
/**
* @var HelperPluginManager<HelperInterface>
*/
private HelperPluginManager $viewHelperManager;

public function __construct(ServiceManager $serviceManager)
Expand Down
1 change: 1 addition & 0 deletions tests/Rules/Laminas/PluginManagerGetMethodCallRuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

/**
* @covers \LaminasPhpStan\Rules\Laminas\ServiceManagerGetMethodCallRule
*
* @extends RuleTestCase<ServiceManagerGetMethodCallRule>
*/
final class PluginManagerGetMethodCallRuleTest extends RuleTestCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
/**
* @covers \LaminasPhpStan\Rules\Laminas\ServiceManagerGetMethodCallRule
* @covers \LaminasPhpStan\UnmappedAliasServiceLocatorProxy
*
* @extends RuleTestCase<ServiceManagerGetMethodCallRule>
*/
final class ServiceManagerGetMethodCallRuleTest extends RuleTestCase
Expand Down