Merge branch '5.4' into 6.2

* 5.4:
  [FrameworkBundle] Improve error message in MicroKernelTrait when using deprecated configureRoutes(RouteCollectionBuilder) with symfony/routing >= 6.0
  Add warning about Symfony 5.2 changing pcntl_async_signals
  [Tests] Fix static calls and Mock var annotation
  [FrameworkBundle] Fix checkboxes check assertions
  [Notifier][WebProfilerBundle] Ignore messages whose `getNotification` returns `null`
  [HttpClient] Fix over-encoding of URL parts to match browser's behavior
  Fix Psalm job
  [HttpClient] Fix data collector
  [Tests] Migrate tests to static data providers
  [Semaphore] Fix test
  Fix: Split and clean up tests
  Remove unused data provider
  add Sender to the list of bypassed headers

Author: nicolas-grekas

Tests/Store/MongoDbStoreFactoryTest.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Lock\Tests\Store;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Lock\Store\MongoDbStore;
+use Symfony\Component\Lock\Store\StoreFactory;
+
+/**
+ * @author Alexandre Daubois <alex.daubois@gmail.com>
+ *
+ * @requires extension mongo
+ */
+class MongoDbStoreFactoryTest extends TestCase
+{
+    public function testCreateMongoDbCollectionStore()
+    {
+        $store = StoreFactory::createStore($this->createMock(\MongoDB\Collection::class));
+
+        $this->assertInstanceOf(MongoDbStore::class, $store);
+    }
+
+    public function testCreateMongoDbCollectionStoreAsDsn()
+    {
+        $store = StoreFactory::createStore('mongodb://localhost/test?collection=lock');
+
+        $this->assertInstanceOf(MongoDbStore::class, $store);
+    }
+}

Tests/Store/RedisProxyStoreFactoryTest.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Lock\Tests\Store;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Traits\RedisProxy;
+use Symfony\Component\Lock\Store\RedisStore;
+use Symfony\Component\Lock\Store\StoreFactory;
+
+/**
+ * @author Alexandre Daubois <alex.daubois@gmail.com>
+ */
+class RedisProxyStoreFactoryTest extends TestCase
+{
+    public function testCreateStore()
+    {
+        if (!class_exists(RedisProxy::class)) {
+            $this->markTestSkipped();
+        }
+
+        $store = StoreFactory::createStore($this->createMock(RedisProxy::class));
+
+        $this->assertInstanceOf(RedisStore::class, $store);
+    }
+}

Tests/Store/StoreFactoryTest.php

@@ -20,13 +20,11 @@
 use Symfony\Component\Lock\Store\FlockStore;
 use Symfony\Component\Lock\Store\InMemoryStore;
 use Symfony\Component\Lock\Store\MemcachedStore;
-use Symfony\Component\Lock\Store\MongoDbStore;
 use Symfony\Component\Lock\Store\PdoStore;
 use Symfony\Component\Lock\Store\PostgreSqlStore;
 use Symfony\Component\Lock\Store\RedisStore;
 use Symfony\Component\Lock\Store\SemaphoreStore;
 use Symfony\Component\Lock\Store\StoreFactory;
-use Symfony\Component\Lock\Store\ZookeeperStore;
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
@@ -43,7 +41,7 @@ public function testCreateStore($connection, string $expectedStoreClass)
         $this->assertInstanceOf($expectedStoreClass, $store);
     }
 
-    public function validConnections()
+    public static function validConnections(): \Generator
     {
         if (class_exists(\Redis::class)) {
             yield [new \Redis(), RedisStore::class];
@@ -52,15 +50,6 @@ public function validConnections()
         if (class_exists(\Memcached::class)) {
             yield [new \Memcached(), MemcachedStore::class];
         }
-        if (class_exists(\MongoDB\Collection::class)) {
-            yield [$this->createMock(\MongoDB\Collection::class), MongoDbStore::class];
-            yield ['mongodb://localhost/test?collection=lock', MongoDbStore::class];
-        }
-        if (class_exists(\Zookeeper::class)) {
-            yield [$this->createMock(\Zookeeper::class), ZookeeperStore::class];
-            yield ['zookeeper://localhost:2181', ZookeeperStore::class];
-            yield ['zookeeper://localhost01,localhost02:2181', ZookeeperStore::class];
-        }
         if (\extension_loaded('sysvsem')) {
             yield ['semaphore', SemaphoreStore::class];
         }

Tests/Store/ZookeeperStoreFactoryTest.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Lock\Tests\Store;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Lock\Store\StoreFactory;
+use Symfony\Component\Lock\Store\ZookeeperStore;
+
+/**
+ * @author Alexandre Daubois <alex.daubois@gmail.com>
+ *
+ * @requires extension zookeeper
+ */
+class ZookeeperStoreFactoryTest extends TestCase
+{
+    public function testCreateZooKeeperStore()
+    {
+        $store = StoreFactory::createStore($this->createMock(\Zookeeper::class));
+
+        $this->assertInstanceOf(ZookeeperStore::class, $store);
+    }
+
+    public function testCreateZooKeeperStoreAsDsn()
+    {
+        $store = StoreFactory::createStore('zookeeper://localhost:2181');
+
+        $this->assertInstanceOf(ZookeeperStore::class, $store);
+    }
+
+    public function testCreateZooKeeperStoreWithMultipleHosts()
+    {
+        $store = StoreFactory::createStore('zookeeper://localhost01,localhost02:2181');
+
+        $this->assertInstanceOf(ZookeeperStore::class, $store);
+    }
+}