Merge branch '4.4' into 5.1

* 4.4:
  Use ::class keyword when possible

Author: fabpot

Tests/LockTest.php

@@ -258,7 +258,7 @@ public function testNoAutoReleaseWhenNotConfigured()
 
     public function testReleaseThrowsExceptionWhenDeletionFail()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\LockReleasingException');
+        $this->expectException(\Symfony\Component\Lock\Exception\LockReleasingException::class);
         $key = new Key(uniqid(__METHOD__, true));
         $store = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
         $lock = new Lock($key, $store, 10);
@@ -279,7 +279,7 @@ public function testReleaseThrowsExceptionWhenDeletionFail()
 
     public function testReleaseThrowsExceptionIfNotWellDeleted()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\LockReleasingException');
+        $this->expectException(\Symfony\Component\Lock\Exception\LockReleasingException::class);
         $key = new Key(uniqid(__METHOD__, true));
         $store = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
         $lock = new Lock($key, $store, 10);
@@ -300,7 +300,7 @@ public function testReleaseThrowsExceptionIfNotWellDeleted()
 
     public function testReleaseThrowsAndLog()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\LockReleasingException');
+        $this->expectException(\Symfony\Component\Lock\Exception\LockReleasingException::class);
         $key = new Key(uniqid(__METHOD__, true));
         $store = $this->getMockBuilder(PersistingStoreInterface::class)->getMock();
         $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();

Tests/Store/CombinedStoreTest.php

@@ -71,7 +71,7 @@ protected function setUp(): void
 
     public function testSaveThrowsExceptionOnFailure()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\LockConflictedException');
+        $this->expectException(LockConflictedException::class);
         $key = new Key(uniqid(__METHOD__, true));
 
         $this->store1
@@ -166,7 +166,7 @@ public function testSaveAbortWhenStrategyCantBeMet()
 
     public function testputOffExpirationThrowsExceptionOnFailure()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\LockConflictedException');
+        $this->expectException(LockConflictedException::class);
         $key = new Key(uniqid(__METHOD__, true));
         $ttl = random_int(1, 10);
 

Tests/Store/FlockStoreTest.php

@@ -32,7 +32,7 @@ protected function getStore(): PersistingStoreInterface
 
     public function testConstructWhenRepositoryDoesNotExist()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\InvalidArgumentException');
+        $this->expectException(\Symfony\Component\Lock\Exception\InvalidArgumentException::class);
         $this->expectExceptionMessage('The directory "/a/b/c/d/e" is not writable.');
         if (!getenv('USER') || 'root' === getenv('USER')) {
             $this->markTestSkipped('This test will fail if run under superuser');
@@ -43,7 +43,7 @@ public function testConstructWhenRepositoryDoesNotExist()
 
     public function testConstructWhenRepositoryIsNotWriteable()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\InvalidArgumentException');
+        $this->expectException(\Symfony\Component\Lock\Exception\InvalidArgumentException::class);
         $this->expectExceptionMessage('The directory "/" is not writable.');
         if (!getenv('USER') || 'root' === getenv('USER')) {
             $this->markTestSkipped('This test will fail if run under superuser');

Tests/Store/MemcachedStoreTest.php

@@ -63,7 +63,7 @@ public function testAbortAfterExpiration()
 
     public function testInvalidTtl()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\InvalidTtlException');
+        $this->expectException(\Symfony\Component\Lock\Exception\InvalidTtlException::class);
         $store = $this->getStore();
         $store->putOffExpiration(new Key('toto'), 0.1);
     }

Tests/Store/PdoStoreTest.php

@@ -62,14 +62,14 @@ public function testAbortAfterExpiration()
 
     public function testInvalidTtl()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\InvalidTtlException');
+        $this->expectException(\Symfony\Component\Lock\Exception\InvalidTtlException::class);
         $store = $this->getStore();
         $store->putOffExpiration(new Key('toto'), 0.1);
     }
 
     public function testInvalidTtlConstruct()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\InvalidTtlException');
+        $this->expectException(\Symfony\Component\Lock\Exception\InvalidTtlException::class);
 
         return new PdoStore('sqlite:'.self::$dbFile, [], 0.1, 0.1);
     }

Tests/Store/RedisArrayStoreTest.php

@@ -21,7 +21,7 @@ class RedisArrayStoreTest extends AbstractRedisStoreTest
 {
     public static function setUpBeforeClass(): void
     {
-        if (!class_exists('RedisArray')) {
+        if (!class_exists(\RedisArray::class)) {
             self::markTestSkipped('The RedisArray class is required.');
         }
         try {

Tests/Store/RedisClusterStoreTest.php

@@ -21,7 +21,7 @@ class RedisClusterStoreTest extends AbstractRedisStoreTest
 {
     public static function setUpBeforeClass(): void
     {
-        if (!class_exists('RedisCluster')) {
+        if (!class_exists(\RedisCluster::class)) {
             self::markTestSkipped('The RedisCluster class is required.');
         }
         if (!getenv('REDIS_CLUSTER_HOSTS')) {

Tests/Store/RedisStoreTest.php

@@ -43,7 +43,7 @@ protected function getRedisConnection(): object
 
     public function testInvalidTtl()
     {
-        $this->expectException('Symfony\Component\Lock\Exception\InvalidTtlException');
+        $this->expectException(\Symfony\Component\Lock\Exception\InvalidTtlException::class);
         new RedisStore($this->getRedisConnection(), -1);
     }
 }