bug fix with test for symfony#54321

simbera · simbera · commit c1b826e8545c · 2024-03-19T10:47:47.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -382,7 +382,12 @@ public static function create(string $uri, string $method = 'GET', array $parame
      */
     public static function setFactory(?callable $callable): void
     {
-        self::$requestFactory = $callable;
+        if(null === $callable) {
+            self::$requestFactory = null;
+            return;
+        }
+
+        self::$requestFactory = $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()
+    {
+        $request_factory = new class {
+            public function createRequest(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): Request
+            {
+                return new NewRequest();
+            }
+        };
+
+        Request::setFactory([$request_factory, '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,12 @@ 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`	`+ if(null === $callable) {`
	`386`	`+ self::$requestFactory = null;`
	`387`	`+ return;`
	`388`	`+ }`
	`389`	`+`
	`390`	`+ self::$requestFactory = $callable(...);`
`386`	`391`	`}`
`387`	`392`
`388`	`393`	`/**`