Merge branch '6.4' into 7.2

* 6.4:
  fix integration tests
  Check for null parent Nodes in the case of orphaned branches

Author: nicolas-grekas

.github/workflows/integration-tests.yml

@@ -82,16 +82,25 @@ jobs:
           REDIS_MASTER_SET: redis_sentinel
           REDIS_SENTINEL_QUORUM: 1
       redis-primary:
-        image: redis:latest
-        hostname: redis-primary
+        image: bitnami/redis:latest
         ports:
           - 16381:6379
-
+        env:
+          ALLOW_EMPTY_PASSWORD: "yes"
+          REDIS_REPLICATION_MODE: "master"
+        options: >-
+          --name=redis-primary
       redis-replica:
-        image: redis:latest
+        image: bitnami/redis:latest
         ports:
           - 16382:6379
-        command: redis-server --slaveof redis-primary 6379
+        env:
+          ALLOW_EMPTY_PASSWORD: "yes"
+          REDIS_REPLICATION_MODE: "slave"
+          REDIS_MASTER_HOST: redis-primary
+          REDIS_MASTER_PORT_NUMBER: "6379"
+        options: >-
+          --name=redis-replica
       memcached:
         image: memcached:1.6.5
         ports:
@@ -250,7 +259,7 @@ jobs:
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
           REDIS_SENTINEL_HOSTS: 'unreachable-host:26379 localhost:26379 localhost:26379'
           REDIS_SENTINEL_SERVICE: redis_sentinel
-          REDIS_REPLICATION_HOSTS: 'localhost:16381 localhost:16382'
+          REDIS_REPLICATION_HOSTS: 'localhost:16382 localhost:16381'
           MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
           MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
           MESSENGER_SQS_DSN: "sqs://localhost:4566/messages?sslmode=disable&poll_timeout=0.01"

src/Symfony/Component/Cache/Tests/Adapter/PredisRedisReplicationAdapterTest.php

@@ -24,6 +24,6 @@ public static function setUpBeforeClass(): void
             self::markTestSkipped('REDIS_REPLICATION_HOSTS env var is not defined.');
         }
 
-        self::$redis = RedisAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).'][alias]=master', ['class' => \Predis\Client::class, 'prefix' => 'prefix_']);
+        self::$redis = RedisAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).'][role]=master', ['replication' => 'predis', 'class' => \Predis\Client::class, 'prefix' => 'prefix_']);
     }
 }

src/Symfony/Component/Cache/Tests/Adapter/PredisReplicationAdapterTest.php

@@ -19,6 +19,22 @@ class PredisReplicationAdapterTest extends AbstractRedisAdapterTestCase
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        self::$redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379]), ['prefix' => 'prefix_']);
+
+        if (!$hosts = getenv('REDIS_REPLICATION_HOSTS')) {
+            self::markTestSkipped('REDIS_REPLICATION_HOSTS env var is not defined.');
+        }
+
+        $hosts = explode(' ', getenv('REDIS_REPLICATION_HOSTS'));
+        $lastArrayKey = array_key_last($hosts);
+        $hostTable = [];
+        foreach($hosts as $key => $host) {
+            $hostInformation = array_combine(['host', 'port'], explode(':', $host));
+            if($lastArrayKey === $key) {
+                $hostInformation['role'] = 'master';
+            }
+            $hostTable[] = $hostInformation;
+        }
+
+        self::$redis = new \Predis\Client($hostTable, ['replication' => 'predis', 'prefix' => 'prefix_']);
     }
 }

src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareReplicationAdapterTest.php

@@ -411,7 +411,7 @@ public function closest(string $selector): ?self
 
         $domNode = $this->getNode(0);
 
-        while (\XML_ELEMENT_NODE === $domNode->nodeType) {
+        while (null !== $domNode && \XML_ELEMENT_NODE === $domNode->nodeType) {
             $node = $this->createSubCrawler($domNode);
             if ($node->matches($selector)) {
                 return $node;

src/Symfony/Component/Cache/Tests/Adapter/RedisReplicationAdapterTest.php

@@ -1031,6 +1031,29 @@ public function testClosest()
         $this->assertNull($notFound);
     }
 
+    public function testClosestWithOrphanedNode()
+    {
+        $html = <<<'HTML'
+<html lang="en">
+<body>
+    <div id="foo" class="newFoo ok">
+        <div class="lorem1 ko"></div>
+    </div>
+</body>
+</html>
+HTML;
+
+        $crawler = $this->createCrawler($this->getDoctype().$html);
+        $foo = $crawler->filter('#foo');
+
+        $fooNode = $foo->getNode(0);
+
+        $fooNode->parentNode->replaceChild($fooNode->ownerDocument->createElement('ol'), $fooNode);
+
+        $body = $foo->closest('body');
+        $this->assertNull($body);
+    }
+
     public function testOuterHtml()
     {
         $html = <<<'HTML'