Merge branch '3.4' into 4.3

* 3.4:
  Fix tests
  Fix deprecated phpunit annotation

Author: nicolas-grekas

Tests/LockTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\Lock;
@@ -23,6 +24,8 @@
  */
 class LockTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testAcquireNoBlocking()
     {
         $key = new Key(uniqid(__METHOD__, true));
@@ -184,11 +187,9 @@ public function testNoAutoReleaseWhenNotConfigured()
         unset($lock);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Lock\Exception\LockReleasingException
-     */
     public function testReleaseThrowsExceptionWhenDeletionFail()
     {
+        $this->expectException('Symfony\Component\Lock\Exception\LockReleasingException');
         $key = new Key(uniqid(__METHOD__, true));
         $store = $this->getMockBuilder(StoreInterface::class)->getMock();
         $lock = new Lock($key, $store, 10);
@@ -207,11 +208,9 @@ public function testReleaseThrowsExceptionWhenDeletionFail()
         $lock->release();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Lock\Exception\LockReleasingException
-     */
     public function testReleaseThrowsExceptionIfNotWellDeleted()
     {
+        $this->expectException('Symfony\Component\Lock\Exception\LockReleasingException');
         $key = new Key(uniqid(__METHOD__, true));
         $store = $this->getMockBuilder(StoreInterface::class)->getMock();
         $lock = new Lock($key, $store, 10);
@@ -230,11 +229,9 @@ public function testReleaseThrowsExceptionIfNotWellDeleted()
         $lock->release();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Lock\Exception\LockReleasingException
-     */
     public function testReleaseThrowsAndLog()
     {
+        $this->expectException('Symfony\Component\Lock\Exception\LockReleasingException');
         $key = new Key(uniqid(__METHOD__, true));
         $store = $this->getMockBuilder(StoreInterface::class)->getMock();
         $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();

Tests/Store/CombinedStoreTest.php

@@ -69,11 +69,9 @@ private function doSetUp()
         $this->store = new CombinedStore([$this->store1, $this->store2], $this->strategy);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Lock\Exception\LockConflictedException
-     */
     public function testSaveThrowsExceptionOnFailure()
     {
+        $this->expectException('Symfony\Component\Lock\Exception\LockConflictedException');
         $key = new Key(uniqid(__METHOD__, true));
 
         $this->store1
@@ -166,11 +164,9 @@ public function testSaveAbortWhenStrategyCantBeMet()
         }
     }
 
-    /**
-     * @expectedException \Symfony\Component\Lock\Exception\LockConflictedException
-     */
     public function testputOffExpirationThrowsExceptionOnFailure()
     {
+        $this->expectException('Symfony\Component\Lock\Exception\LockConflictedException');
         $key = new Key(uniqid(__METHOD__, true));
         $ttl = random_int(1, 10);
 

Tests/Store/ExpiringStoreTestTrait.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Exception\LockExpiredException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\StoreInterface;
@@ -57,11 +58,10 @@ public function testExpiration()
 
     /**
      * Tests the store thrown exception when TTL expires.
-     *
-     * @expectedException \Symfony\Component\Lock\Exception\LockExpiredException
      */
     public function testAbortAfterExpiration()
     {
+        $this->expectException('\Symfony\Component\Lock\Exception\LockExpiredException');
         $key = new Key(uniqid(__METHOD__, true));
 
         /** @var StoreInterface $store */

Tests/Store/FlockStoreTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\Store\FlockStore;
 
@@ -19,6 +20,7 @@
  */
 class FlockStoreTest extends AbstractStoreTest
 {
+    use ForwardCompatTestTrait;
     use BlockingStoreTestTrait;
 
     /**
@@ -29,25 +31,21 @@ protected function getStore()
         return new FlockStore();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Lock\Exception\InvalidArgumentException
-     * @expectedExceptionMessage The directory "/a/b/c/d/e" is not writable.
-     */
     public function testConstructWhenRepositoryDoesNotExist()
     {
+        $this->expectException('Symfony\Component\Lock\Exception\InvalidArgumentException');
+        $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');
         }
 
         new FlockStore('/a/b/c/d/e');
     }
 
-    /**
-     * @expectedException \Symfony\Component\Lock\Exception\InvalidArgumentException
-     * @expectedExceptionMessage The directory "/" is not writable.
-     */
     public function testConstructWhenRepositoryIsNotWriteable()
     {
+        $this->expectException('Symfony\Component\Lock\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The directory "/" is not writable.');
         if (!getenv('USER') || 'root' === getenv('USER')) {
             $this->markTestSkipped('This test will fail if run under superuser');
         }