From d05e49797c843809ef525b824e115ec8da32cb4f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 2 Sep 2019 16:45:56 +0200
Subject: [PATCH] [4.3] Cleanup tests

---
 src/Symfony/Component/BrowserKit/HttpBrowser.php  |  4 +---
 .../HttpKernel/Tests/Fixtures/KernelForTest.php   |  2 +-
 .../Component/HttpKernel/Tests/KernelTest.php     |  7 ++-----
 .../Tests/Transport/RedisExt/ConnectionTest.php   | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/BrowserKit/HttpBrowser.php b/src/Symfony/Component/BrowserKit/HttpBrowser.php
index 7492e58907..fe40911552 100644
--- a/src/Symfony/Component/BrowserKit/HttpBrowser.php
+++ b/src/Symfony/Component/BrowserKit/HttpBrowser.php
@@ -23,8 +23,6 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
  * to make real HTTP requests.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
  */
 class HttpBrowser extends AbstractBrowser
 {
@@ -32,7 +30,7 @@ class HttpBrowser extends AbstractBrowser
 
     public function __construct(HttpClientInterface $client = null, History $history = null, CookieJar $cookieJar = null)
     {
-        if (!class_exists(HttpClient::class)) {
+        if (!$client && !class_exists(HttpClient::class)) {
             throw new \LogicException(sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__));
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
index 8c35712815..7b870250cc 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
@@ -35,7 +35,7 @@ class KernelForTest extends Kernel
         return $this->booted;
     }
 
-    public function getProjectDir()
+    public function getProjectDir(): string
     {
         return __DIR__;
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index b4319c0b4d..26bf7d8aff 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -654,7 +654,7 @@ EOF;
      *
      * @return Kernel
      */
-    protected function getKernel(array $methods = [], array $bundles = [], $debug = false)
+    protected function getKernel(array $methods = [], array $bundles = [], bool $debug = false): Kernel
     {
         $methods[] = 'registerBundles';
 
@@ -668,9 +668,6 @@ EOF;
             ->method('registerBundles')
             ->willReturn($bundles)
         ;
-        $p = new \ReflectionProperty($kernel, 'rootDir');
-        $p->setAccessible(true);
-        $p->setValue($kernel, __DIR__.'/Fixtures');
 
         return $kernel;
     }
@@ -689,7 +686,7 @@ class TestKernel implements HttpKernelInterface
     {
     }
 
-    public function getProjectDir()
+    public function getProjectDir(): string
     {
         return __DIR__.'/Fixtures';
     }
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
index 066b4c1788..e2622a1b86 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
@@ -20,6 +20,21 @@ use Symfony\Component\Messenger\Transport\RedisExt\Connection;
  */
 class ConnectionTest extends TestCase
 {
+    public static function setUpBeforeClass()
+    {
+        $redis = Connection::fromDsn('redis://localhost/queue');
+
+        try {
+            $redis->get();
+        } catch (TransportException $e) {
+            if (0 === strpos($e->getMessage(), 'ERR unknown command \'X')) {
+                self::markTestSkipped('Redis server >= 5 is required');
+            }
+
+            throw $e;
+        }
+    }
+
     public function testFromInvalidDsn()
     {
         $this->expectException(\InvalidArgumentException::class);