Commit 7389207

authored

Remove nullable type after calling HeaderBag::has

1 parent c55237a commit 7389207Copy full SHA for 7389207

File tree

+30

-6

lines changed

+30

-6

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -298,5 +298,14 @@ services:`
`298`	`298`
`299`	`299`	`# InputBag::get() type specification`
`300`	`300`	`-`
`301`		`- factory: PHPStan\Type\Symfony\InputBagTypeSpecifyingExtension`
	`301`	`+ factory: PHPStan\Type\Symfony\BagTypeSpecifyingExtension`
`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: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,21 +11,30 @@`
`11`	`11`	`use PHPStan\Reflection\MethodReflection;`
`12`	`12`	`use PHPStan\Type\MethodTypeSpecifyingExtension;`
`13`	`13`	`use PHPStan\Type\NullType;`
`14`		`-use Symfony\Component\HttpFoundation\InputBag;`
`15`	`14`
`16`		`-final class InputBagTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension`
	`15`	`+final class BagTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension`
`17`	`16`	`{`
`18`	`17`
`19`		`- private const INPUT_BAG_CLASS = InputBag::class;`
`20`	`18`	`private const HAS_METHOD_NAME = 'has';`
`21`	`19`	`private const GET_METHOD_NAME = 'get';`
`22`	`20`
`23`	`21`	`/** @var TypeSpecifier */`
`24`	`22`	`private $typeSpecifier;`
`25`	`23`
	`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`	`+`
`26`	`35`	`public function getClass(): string`
`27`	`36`	`{`
`28`		`- return self::INPUT_BAG_CLASS;`
	`37`	`+ return $this->className;`
`29`	`38`	`}`
`30`	`39`
`31`	`40`	`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_get.php');`
	`18`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/header_bag.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: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,12 @@`
`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`	`+`
`7`	`13`	`assertType('string\|null', $bag->get('foo'));`
`8`	`14`	`assertType('string\|null', $bag->get('foo', null));`
`9`	`15`	`assertType('string', $bag->get('foo', 'baz'));`

Comments

(0)