Commit 3178f15

committed

Revert "Remove nullable type after calling HeaderBag::has"

This reverts commit 7389207.

1 parent 7389207 commit 3178f15Copy full SHA for 3178f15

File tree

-30

lines changed

-30

lines changed

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -298,14 +298,5 @@ services:`
`298`	`298`
`299`	`299`	`# InputBag::get() type specification`
`300`	`300`	`-`
`301`		`- factory: PHPStan\Type\Symfony\BagTypeSpecifyingExtension`
	`301`	`+ factory: PHPStan\Type\Symfony\InputBagTypeSpecifyingExtension`
`302`	`302`	`tags: [phpstan.typeSpecifier.methodTypeSpecifyingExtension]`
`303`		`- arguments:`
`304`		`- className: Symfony\Component\HttpFoundation\InputBag`
`305`		`-`
`306`		`- # HeaderBag::get() type specification`
`307`		`- -`
`308`		`- factory: PHPStan\Type\Symfony\BagTypeSpecifyingExtension`
`309`		`- tags: [phpstan.typeSpecifier.methodTypeSpecifyingExtension]`
`310`		`- arguments:`
`311`		`- className: Symfony\Component\HttpFoundation\HeaderBag`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,30 +11,21 @@`
`11`	`11`	`use PHPStan\Reflection\MethodReflection;`
`12`	`12`	`use PHPStan\Type\MethodTypeSpecifyingExtension;`
`13`	`13`	`use PHPStan\Type\NullType;`
	`14`	`+use Symfony\Component\HttpFoundation\InputBag;`
`14`	`15`
`15`		`-final class BagTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension`
	`16`	`+final class InputBagTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension`
`16`	`17`	`{`
`17`	`18`
	`19`	`+ private const INPUT_BAG_CLASS = InputBag::class;`
`18`	`20`	`private const HAS_METHOD_NAME = 'has';`
`19`	`21`	`private const GET_METHOD_NAME = 'get';`
`20`	`22`
`21`	`23`	`/** @var TypeSpecifier */`
`22`	`24`	`private $typeSpecifier;`
`23`	`25`
`24`		`- /** @var class-string */`
`25`		`- private $className;`
`26`		`-`
`27`		`- /**`
`28`		`- * @param class-string $className`
`29`		`- */`
`30`		`- public function __construct(string $className)`
`31`		`- {`
`32`		`- $this->className = $className;`
`33`		`- }`
`34`		`-`
`35`	`26`	`public function getClass(): string`
`36`	`27`	`{`
`37`		`- return $this->className;`
	`28`	`+ return self::INPUT_BAG_CLASS;`
`38`	`29`	`}`
`39`	`30`
`40`	`31`	`public function isMethodSupported(MethodReflection $methodReflection, MethodCall $node, TypeSpecifierContext $context): bool`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class ExtensionTest extends TypeInferenceTestCase`
`15`	`15`	`public function dataFileAsserts(): iterable`
`16`	`16`	`{`
`17`	`17`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/envelope_all.php');`
`18`		`- yield from $this->gatherAssertTypes(__DIR__ . '/data/header_bag.php');`
	`18`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/header_bag_get.php');`
`19`	`19`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/response_header_bag_get_cookies.php');`
`20`	`20`
`21`	`21`	`if (class_exists('Symfony\Component\HttpFoundation\InputBag')) {`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,6 @@`
`4`	`4`
`5`	`5`	`$bag = new \Symfony\Component\HttpFoundation\HeaderBag(['foo' => ['bar']]);`
`6`	`6`
`7`		`-if ($bag->has('bar')) {`
`8`		`- assertType('string', $bag->get('bar'));`
`9`		`-} else {`
`10`		`- assertType('null', $bag->get('bar'));`
`11`		`-}`
`12`		`-`
`13`	`7`	`assertType('string\|null', $bag->get('foo'));`
`14`	`8`	`assertType('string\|null', $bag->get('foo', null));`
`15`	`9`	`assertType('string', $bag->get('foo', 'baz'));`

Comments

(0)