[FrameworkBundle] fix BC-breaking property in WebTestAssertionsTrait

nicolas-grekas · nicolas-grekas · commit 3b50107a0353 · 2019-06-06T08:52:48.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestAssertionsTrait.php
@@ -186,13 +186,19 @@ public static function assertRouteSame($expectedRoute, array $parameters = [], s
         self::assertThat(static::getRequest(), $constraint, $message);
     }
 
-    private static function getClient(): KernelBrowser
+    private static function getClient(KernelBrowser $newClient = null): ?KernelBrowser
     {
-        if (!static::$client instanceof KernelBrowser) {
-            static::fail(\sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient"?', __CLASS__));
+        static $client;
+
+        if (0 < \func_num_args()) {
+            return $client = $newClient;
+        }
+
+        if (!$client instanceof KernelBrowser) {
+            static::fail(\sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
         }
 
-        return static::$client;
+        return $client;
     }
 
     private static function getCrawler(): Crawler
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -23,14 +23,10 @@ abstract class WebTestCase extends KernelTestCase
 {
     use WebTestAssertionsTrait;
 
-    /** @var KernelBrowser|null */
-    protected static $client;
-
     protected function doTearDown(): void
     {
         parent::doTearDown();
-
-        static::$client = null;
+        self::getClient(null);
     }
 
     /**
@@ -56,6 +52,6 @@ protected static function createClient(array $options = [], array $server = [])
 
         $client->setServerParameters($server);
 
-        return static::$client = $client;
+        return self::getClient($client);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php
@@ -277,11 +277,9 @@ private function getTester(KernelBrowser $client): WebTestCase
         return new class($client) extends WebTestCase {
             use WebTestAssertionsTrait;
 
-            protected static $client;
-
             public function __construct(KernelBrowser $client)
             {
-                static::$client = $client;
+                self::getClient($client);
             }
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -186,13 +186,19 @@ public static function assertRouteSame($expectedRoute, array $parameters = [], s`
`186`	`186`	`self::assertThat(static::getRequest(), $constraint, $message);`
`187`	`187`	`}`
`188`	`188`
`189`		`- private static function getClient(): KernelBrowser`
	`189`	`+ private static function getClient(KernelBrowser $newClient = null): ?KernelBrowser`
`190`	`190`	`{`
`191`		`- if (!static::$client instanceof KernelBrowser) {`
`192`		`- static::fail(\sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient"?', __CLASS__));`
	`191`	`+ static $client;`
	`192`	`+`
	`193`	`+ if (0 < \func_num_args()) {`
	`194`	`+ return $client = $newClient;`
	`195`	`+ }`
	`196`	`+`
	`197`	`+ if (!$client instanceof KernelBrowser) {`
	`198`	`+ static::fail(\sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));`
`193`	`199`	`}`
`194`	`200`
`195`		`- return static::$client;`
	`201`	`+ return $client;`
`196`	`202`	`}`
`197`	`203`
`198`	`204`	`private static function getCrawler(): Crawler`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,10 @@ abstract class WebTestCase extends KernelTestCase`
`23`	`23`	`{`
`24`	`24`	`use WebTestAssertionsTrait;`
`25`	`25`
`26`		`- /** @var KernelBrowser\|null */`
`27`		`- protected static $client;`
`28`		`-`
`29`	`26`	`protected function doTearDown(): void`
`30`	`27`	`{`
`31`	`28`	`parent::doTearDown();`
`32`		`-`
`33`		`- static::$client = null;`
	`29`	`+ self::getClient(null);`
`34`	`30`	`}`
`35`	`31`
`36`	`32`	`/**`
`@@ -56,6 +52,6 @@ protected static function createClient(array $options = [], array $server = [])`
`56`	`52`
`57`	`53`	`$client->setServerParameters($server);`
`58`	`54`
`59`		`- return static::$client = $client;`
	`55`	`+ return self::getClient($client);`
`60`	`56`	`}`
`61`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -277,11 +277,9 @@ private function getTester(KernelBrowser $client): WebTestCase`
`277`	`277`	`return new class($client) extends WebTestCase {`
`278`	`278`	`use WebTestAssertionsTrait;`
`279`	`279`
`280`		`- protected static $client;`
`281`		`-`
`282`	`280`	`public function __construct(KernelBrowser $client)`
`283`	`281`	`{`
`284`		`- static::$client = $client;`
	`282`	`+ self::getClient($client);`
`285`	`283`	`}`
`286`	`284`	`};`
`287`	`285`	`}`