minor #52602 [HttpClient] Revert "minor #52418 add native argument for the test server working directory" (nicolas-grekas)

fabpot · fabpot · commit 48793f90424c · 2023-11-15T17:55:53.000+01:00
This PR was merged into the 7.0 branch. Discussion ---------- [HttpClient] Revert "minor #52418 add native argument for the test server working directory" | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT This reverts commit fa590af, reversing changes made to 907b683. I completly forgot that we don't want to release a new major for contracts so the code in 7.0 must be in sync with the one in 6.4. /cc `@xabbuh` Commits ------- 1b61e92 Revert "minor #52418 [HttpClient] add native argument for the test server working directory (xabbuh)"
diff --git a/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php b/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php
@@ -18,9 +18,12 @@ class TestHttpServer
 {
     private static array $process = [];
 
-    public static function start(int $port = 8057, string $workingDirectory = null): Process
+    /**
+     * @param string|null $workingDirectory
+     */
+    public static function start(int $port = 8057/* , string $workingDirectory = null */): Process
     {
-        $workingDirectory ??= __DIR__.'/Fixtures/web';
+        $workingDirectory = \func_get_args()[1] ?? __DIR__.'/Fixtures/web';
 
         if (isset(self::$process[$port])) {
             self::$process[$port]->stop();

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,12 @@ class TestHttpServer`
`18`	`18`	`{`
`19`	`19`	`private static array $process = [];`
`20`	`20`
`21`		`- public static function start(int $port = 8057, string $workingDirectory = null): Process`
	`21`	`+ /**`
	`22`	`+ * @param string\|null $workingDirectory`
	`23`	`+ */`
	`24`	`+ public static function start(int $port = 8057/* , string $workingDirectory = null */): Process`
`22`	`25`	`{`
`23`		`- $workingDirectory ??= __DIR__.'/Fixtures/web';`
	`26`	`+ $workingDirectory = \func_get_args()[1] ?? __DIR__.'/Fixtures/web';`
`24`	`27`
`25`	`28`	`if (isset(self::$process[$port])) {`
`26`	`29`	`self::$process[$port]->stop();`