Commit 710cc63

committed

Fix tests

1 parent 2313443 commit 710cc63Copy full SHA for 710cc63

File tree

+20

-22

lines changed

+20

-22

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@`
`38`	`38`	`"phpstan/phpstan-strict-rules": "^0.12",`
`39`	`39`	`"slevomat/coding-standard": "^4.5.2",`
`40`	`40`	`"phpstan/phpstan-phpunit": "^0.12",`
`41`		`- "symfony/framework-bundle": "^3.0 \|\| ^4.0",`
	`41`	`+ "symfony/framework-bundle": "^4.0",`
`42`	`42`	`"squizlabs/php_codesniffer": "^3.3.2",`
`43`		`- "symfony/serializer": "^3.0 \|\| ^4.0",`
	`43`	`+ "symfony/serializer": "^4.0",`
`44`	`44`	`"symfony/messenger": "^4.2",`
`45`		`- "symfony/console": "^3.0 \|\| ^4.0",`
`46`		`- "symfony/http-foundation": "^3.0 \|\| ^4.0"`
	`45`	`+ "symfony/console": "^4.0",`
	`46`	`+ "symfony/http-foundation": "^4.0"`
`47`	`47`	`},`
`48`	`48`	`"conflict": {`
`49`	`49`	`"symfony/framework-bundle": "<3.0"`

Lines changed: 0 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,21 +32,6 @@ public function testGetPrivateService(): void`
`32`	`32`	`);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function testGetPrivateServiceInAbstractController(): void`
`36`		`- {`
`37`		`- $this->analyse(`
`38`		`- [`
`39`		`- __DIR__ . '/ExampleAbstractController.php',`
`40`		`- ],`
`41`		`- [`
`42`		`- [`
`43`		`- 'Service "private" is private.',`
`44`		`- 12,`
`45`		`- ],`
`46`		`- ]`
`47`		`- );`
`48`		`- }`
`49`		`-`
`50`	`35`	`public function testGetPrivateServiceInLegacyServiceSubscriber(): void`
`51`	`36`	`{`
`52`	`37`	`if (!interface_exists('Symfony\\Component\\DependencyInjection\\ServiceSubscriberInterface')) {`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use PHPStan\Symfony\XmlServiceMapFactory;`
`8`	`8`	`use PHPStan\Testing\RuleTestCase;`
`9`	`9`	`use PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension;`
	`10`	`+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;`
`10`	`11`	`use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
`11`	`12`
`12`	`13`	`/**`
`@@ -27,6 +28,7 @@ protected function getMethodTypeSpecifyingExtensions(): array`
`27`	`28`	`{`
`28`	`29`	`return [`
`29`	`30`	`new ServiceTypeSpecifyingExtension(Controller::class, new Standard()),`
	`31`	`+ new ServiceTypeSpecifyingExtension(AbstractController::class, new Standard()),`
`30`	`32`	`];`
`31`	`33`	`}`
`32`	`34`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public function testExtensionNeon(): void`
`30`	`30`	`], $parameters['symfony']);`
`31`	`31`
`32`	`32`	`self::assertCount(6, $container->getServicesByTag('phpstan.rules.rule'));`
`33`		`- self::assertCount(15, $container->getServicesByTag('phpstan.broker.dynamicMethodReturnTypeExtension'));`
`34`		`- self::assertCount(6, $container->getServicesByTag('phpstan.typeSpecifier.methodTypeSpecifyingExtension'));`
	`33`	`+ self::assertCount(16, $container->getServicesByTag('phpstan.broker.dynamicMethodReturnTypeExtension'));`
	`34`	`+ self::assertCount(7, $container->getServicesByTag('phpstan.typeSpecifier.methodTypeSpecifyingExtension'));`
`35`	`35`	`self::assertInstanceOf(ServiceMap::class, $container->getByType(ServiceMap::class));`
`36`	`36`	`}`
`37`	`37`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,10 @@`
`5`	`5`	`use PHPStan\Rules\Rule;`
`6`	`6`	`use PHPStan\Testing\RuleTestCase;`
`7`	`7`	`use PHPStan\Type\MethodTypeSpecifyingExtension;`
	`8`	`+use ReflectionMethod;`
	`9`	`+use Symfony\Component\HttpFoundation\Request;`
`8`	`10`	`use Symfony\Component\HttpFoundation\Session\SessionInterface;`
	`11`	`+use function strpos;`
`9`	`12`
`10`	`13`	`/**`
`11`	`14`	`* @extends RuleTestCase<VariableTypeReportingRule>`
`@@ -28,9 +31,17 @@ protected function getMethodTypeSpecifyingExtensions(): array`
`28`	`31`
`29`	`32`	`public function testGetSession(): void`
`30`	`33`	`{`
	`34`	`+ $ref = new ReflectionMethod(Request::class, 'getSession');`
	`35`	`+ $doc = (string) $ref->getDocComment();`
	`36`	`+`
	`37`	`+ $checkedTypeString = SessionInterface::class;`
	`38`	`+ if (strpos($doc, '@return SessionInterface\|null') !== false) {`
	`39`	`+ $checkedTypeString .= '\|null';`
	`40`	`+ }`
	`41`	`+`
`31`	`42`	`$this->analyse([__DIR__ . '/request_get_session.php'], [`
`32`	`43`	`[`
`33`		`- 'Variable $session1 is: ' . SessionInterface::class . '\|null',`
	`44`	`+ 'Variable $session1 is: ' . $checkedTypeString,`
`34`	`45`	`7,`
`35`	`46`	`],`
`36`	`47`	`[`

Comments

(0)