Merge branch '6.2' into 6.3

* 6.2:
  CS fix
  Fix test provider

Author: nicolas-grekas

Store/MongoDbStore.php

@@ -187,11 +187,11 @@ private function skimUri(string $uri): string
      *
      * @see http://docs.mongodb.org/manual/tutorial/expire-data/
      *
+     * @return void
+     *
      * @throws UnsupportedException          if options are not supported by the selected server
      * @throws MongoInvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException        for other driver errors (e.g. connection errors)
-     *
-     * @return void
      */
     public function createTtlIndex(int $expireAfterSeconds = 0)
     {
@@ -206,9 +206,9 @@ public function createTtlIndex(int $expireAfterSeconds = 0)
     }
 
     /**
-     * @throws LockExpiredException when save is called on an expired lock
-     *
      * @return void
+     *
+     * @throws LockExpiredException when save is called on an expired lock
      */
     public function save(Key $key)
     {
@@ -231,10 +231,10 @@ public function save(Key $key)
     }
 
     /**
+     * @return void
+     *
      * @throws LockStorageException
      * @throws LockExpiredException
-     *
-     * @return void
      */
     public function putOffExpiration(Key $key, float $ttl)
     {

Tests/Store/CombinedStoreTest.php

@@ -24,6 +24,7 @@
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
+ *
  * @group integration
  */
 class CombinedStoreTest extends AbstractStoreTestCase

Tests/Store/DoctrineDbalPostgreSqlStoreTest.php

@@ -24,6 +24,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension pdo_pgsql
+ *
  * @group integration
  */
 class DoctrineDbalPostgreSqlStoreTest extends AbstractStoreTestCase
@@ -49,6 +50,7 @@ public function getStore(): PersistingStoreInterface
 
     /**
      * @requires extension pdo_sqlite
+     *
      * @dataProvider getInvalidDrivers
      */
     public function testInvalidDriver($connOrDsn)

Tests/Store/MemcachedStoreTest.php

@@ -21,6 +21,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension memcached
+ *
  * @group integration
  */
 class MemcachedStoreTest extends AbstractStoreTestCase

Tests/Store/MongoDbStoreTest.php

@@ -23,6 +23,7 @@
  * @author Joe Bennett <joe@assimtech.com>
  *
  * @requires extension mongodb
+ *
  * @group integration
  */
 class MongoDbStoreTest extends AbstractStoreTestCase

Tests/Store/PostgreSqlStoreTest.php

@@ -21,6 +21,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension pdo_pgsql
+ *
  * @group integration
  */
 class PostgreSqlStoreTest extends AbstractStoreTestCase

Tests/Store/PredisStoreTest.php

@@ -15,6 +15,7 @@
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
+ *
  * @group integration
  */
 class PredisStoreTest extends AbstractRedisStoreTestCase

Tests/Store/RedisArrayStoreTest.php

@@ -17,6 +17,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension redis
+ *
  * @group integration
  */
 class RedisArrayStoreTest extends AbstractRedisStoreTestCase

Tests/Store/RedisClusterStoreTest.php

@@ -17,6 +17,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension redis
+ *
  * @group integration
  */
 class RedisClusterStoreTest extends AbstractRedisStoreTestCase

Tests/Store/RedisStoreTest.php

@@ -19,6 +19,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension redis
+ *
  * @group integration
  */
 class RedisStoreTest extends AbstractRedisStoreTestCase