Make InputBag generic

Author: ondrejmirtes

composer.json

@@ -15,7 +15,7 @@
   "require": {
     "php": "^7.1 || ^8.0",
     "ext-simplexml": "*",
-    "phpstan/phpstan": "^0.12.86"
+    "phpstan/phpstan": "^0.12.97"
   },
   "conflict": {
     "symfony/framework-bundle": "<3.0"

extension.neon

@@ -4,6 +4,9 @@ parameters:
 	exceptions:
 		uncheckedExceptionClasses:
 			- 'Symfony\Component\Console\Exception\InvalidArgumentException'
+	featureToggles:
+		skipCheckGenericClasses:
+			- Symfony\Component\HttpFoundation\InputBag
 	symfony:
 		container_xml_path: null
 		constant_hassers: true
@@ -22,7 +25,9 @@ parameters:
 		- stubs/Symfony/Component/Form/FormView.stub
 		- stubs/Symfony/Component/HttpFoundation/Cookie.stub
 		- stubs/Symfony/Component/HttpFoundation/HeaderBag.stub
+		- stubs/Symfony/Component/HttpFoundation/InputBag.stub
 		- stubs/Symfony/Component/HttpFoundation/ParameterBag.stub
+		- stubs/Symfony/Component/HttpFoundation/Request.stub
 		- stubs/Symfony/Component/HttpFoundation/Session.stub
 		- stubs/Symfony/Component/Process/Process.stub
 		- stubs/Symfony/Component/PropertyAccess/PropertyPathInterface.stub

stubs/Symfony/Component/HttpFoundation/InputBag.stub

@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\HttpFoundation;
+
+/**
+ * @template TValue of string|int|float|bool
+ */
+final class InputBag extends ParameterBag
+{
+
+	/**
+	 * @param TValue|null $default
+	 * @return TValue|null
+	 */
+	public function get(string $key, $default = null)
+	{
+
+	}
+
+}

stubs/Symfony/Component/HttpFoundation/Request.stub

@@ -0,0 +1,29 @@
+<?php
+
+namespace Symfony\Component\HttpFoundation;
+
+class Request
+{
+
+	/**
+	 * Request body parameters ($_POST).
+	 *
+	 * @var InputBag<string|int|float|bool>
+	 */
+	public $request;
+
+	/**
+	 * Query string parameters ($_GET).
+	 *
+	 * @var InputBag<string>
+	 */
+	public $query;
+
+	/**
+	 * Cookies ($_COOKIE).
+	 *
+	 * @var InputBag<string>
+	 */
+	public $cookies;
+
+}

tests/Type/Symfony/ExtensionTest.php

@@ -44,6 +44,7 @@ public function dataFileAsserts(): iterable
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/serializer.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/denormalizer.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/input_bag_from_request.php');
 	}
 
 	/**

tests/Type/Symfony/data/input_bag_from_request.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace InputBag;
+
+use Symfony\Component\HttpFoundation\Request;
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	public function doFoo(Request $request): void
+	{
+		assertType('bool|float|int|string|null', $request->request->get('foo'));
+		assertType('string|null', $request->query->get('foo'));
+		assertType('string|null', $request->cookies->get('foo'));
+
+		assertType('bool|float|int|string', $request->request->get('foo', 'foo'));
+		assertType('string', $request->query->get('foo', 'foo'));
+		assertType('string', $request->cookies->get('foo', 'foo'));
+	}
+
+}