bug #54333 [HttpFoundation] Allow array style callable setting for Request setFactory method (simbera)

derrabus · derrabus · commit ea801202bd6f · 2024-03-19T12:46:53.000+01:00
This PR was squashed before being merged into the 7.0 branch. Discussion ---------- [HttpFoundation] Allow array style callable setting for Request setFactory method | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54321 | License | MIT Allowing to use the array notation for callback for the setFactory static method of the request. Unit test added to confirm bug/fixing the bug. Commits ------- 696add6 [HttpFoundation] Allow array style callable setting for Request setFactory method
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -382,7 +382,7 @@ public static function create(string $uri, string $method = 'GET', array $parame
      */
     public static function setFactory(?callable $callable): void
     {
-        self::$requestFactory = $callable;
+        self::$requestFactory = null === $callable ? null : $callable(...);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -2197,6 +2197,23 @@ public function testFactory()
         Request::setFactory(null);
     }
 
+    public function testFactoryCallable()
+    {
+        $requestFactory = new class {
+            public function createRequest(): Request
+            {
+                return new NewRequest();
+            }
+        };
+
+        Request::setFactory([$requestFactory, 'createRequest']);
+
+        $this->assertEquals('foo', Request::create('/')->getFoo());
+
+        Request::setFactory(null);
+
+    }
+
     /**
      * @dataProvider getLongHostNames
      */

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ public static function create(string $uri, string $method = 'GET', array $parame`
`382`	`382`	`*/`
`383`	`383`	`public static function setFactory(?callable $callable): void`
`384`	`384`	`{`
`385`		`- self::$requestFactory = $callable;`
	`385`	`+ self::$requestFactory = null === $callable ? null : $callable(...);`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`/**`