diff --git a/compiler/build/scoper.inc.php b/compiler/build/scoper.inc.php index a273e3931d3..49656695508 100644 --- a/compiler/build/scoper.inc.php +++ b/compiler/build/scoper.inc.php @@ -3,12 +3,12 @@ declare(strict_types=1); // this file will need update sometimes: https://github.com/phpstan/phpstan-src/commits/master/compiler/build/scoper.inc.php -// automate in the future, if needed +// automate in the future, if needed - @see https://github.com/rectorphp/rector/pull/2575#issuecomment-571133000 require __DIR__ . '/../vendor/autoload.php'; -use Isolated\Symfony\Component\Finder\Finder; use Nette\Neon\Neon; +use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\SplFileInfo; $stubs = []; diff --git a/packages/NetteToSymfony/src/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector.php b/packages/NetteToSymfony/src/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector.php index 67a944faed2..10d1d37cba0 100644 --- a/packages/NetteToSymfony/src/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector.php +++ b/packages/NetteToSymfony/src/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector.php @@ -77,7 +77,7 @@ PHP */ public function refactor(Node $node): ?Node { - if (! $this->isObjectType($node, Request::class)) { + if (! $this->isObjectType($node->var, Request::class)) { return null; } diff --git a/packages/NetteToSymfony/tests/Rector/ClassMethod/RouterListToControllerAnnotationsRetor/Fixture/with_parameter.php.inc b/packages/NetteToSymfony/tests/Rector/ClassMethod/RouterListToControllerAnnotationsRetor/Fixture/with_parameter.php.inc index 3f14bf4412b..adaf1799f72 100644 --- a/packages/NetteToSymfony/tests/Rector/ClassMethod/RouterListToControllerAnnotationsRetor/Fixture/with_parameter.php.inc +++ b/packages/NetteToSymfony/tests/Rector/ClassMethod/RouterListToControllerAnnotationsRetor/Fixture/with_parameter.php.inc @@ -3,6 +3,7 @@ namespace Rector\NetteToSymfony\Tests\Rector\MethodCall\RouterListToControllerAnnotationsRetor\Fixture; use Nette\Application\IPresenter; +use Nette\Application\IResponse; use Nette\Application\Routers\Route; use Nette\Application\Routers\RouteList; @@ -23,7 +24,7 @@ final class WithParameterSomePresenter implements IPresenter /** * @todo */ - public function run() + public function run(\Nette\Application\Request $request): IResponse { } } @@ -36,6 +37,7 @@ namespace Rector\NetteToSymfony\Tests\Rector\MethodCall\RouterListToControllerAn use Symfony\Component\Routing\Annotation\Route; use Nette\Application\IPresenter; +use Nette\Application\IResponse; use Nette\Application\Routers\RouteList; final class WithParameterRouterFactory @@ -54,7 +56,7 @@ final class WithParameterSomePresenter implements IPresenter * @todo * @Route(path="some-path/{id}") */ - public function run() + public function run(\Nette\Application\Request $request): IResponse { } } diff --git a/packages/NetteToSymfony/tests/Rector/Class_/NetteFormToSymfonyFormRector/Source/NettePresenter.php b/packages/NetteToSymfony/tests/Rector/Class_/NetteFormToSymfonyFormRector/Source/NettePresenter.php index 8ca2d49b8a9..b17b4b9acb3 100644 --- a/packages/NetteToSymfony/tests/Rector/Class_/NetteFormToSymfonyFormRector/Source/NettePresenter.php +++ b/packages/NetteToSymfony/tests/Rector/Class_/NetteFormToSymfonyFormRector/Source/NettePresenter.php @@ -5,8 +5,13 @@ declare(strict_types=1); namespace Rector\NetteToSymfony\Tests\Rector\Class_\NetteFormToSymfonyFormRector\Source; use Nette\Application\IPresenter; +use Nette\Application\IResponse; +use Nette\Application\Request; abstract class NettePresenter implements IPresenter { + public function run(Request $request): IResponse + { + } } diff --git a/packages/NetteToSymfony/tests/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector/Fixture/fixture.php.inc b/packages/NetteToSymfony/tests/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector/Fixture/fixture.php.inc index bce9a7185df..81c727ee91b 100644 --- a/packages/NetteToSymfony/tests/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector/Fixture/fixture.php.inc +++ b/packages/NetteToSymfony/tests/Rector/MethodCall/FromHttpRequestGetHeaderToHeadersGetRector/Fixture/fixture.php.inc @@ -11,7 +11,7 @@ final class SomeController */ private $httpRequest; - public static function someAction(Request $request) + public function someAction(Request $request) { $header = $this->httpRequest->getHeader('x'); } @@ -32,7 +32,7 @@ final class SomeController */ private $httpRequest; - public static function someAction(Request $request) + public function someAction(Request $request) { $header = $request->headers->get('x'); }