Merge branch '3.4' into 4.3

* 3.4:
  Remove use of ForwardCompatTrait
  Remove deprecated methods assertArraySubset

Author: nicolas-grekas

Tests/LockTest.php

@@ -13,7 +13,6 @@
 
 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;
@@ -24,8 +23,6 @@
  */
 class LockTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testAcquireNoBlocking()
     {
         $key = new Key(uniqid(__METHOD__, true));

Tests/Store/CombinedStoreTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\Store\CombinedStore;
@@ -25,7 +24,6 @@
  */
 class CombinedStoreTest extends AbstractStoreTest
 {
-    use ForwardCompatTestTrait;
     use ExpiringStoreTestTrait;
 
     /**
@@ -60,7 +58,7 @@ public function getStore()
     /** @var CombinedStore */
     private $store;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();
         $this->store1 = $this->getMockBuilder(StoreInterface::class)->getMock();

Tests/Store/FlockStoreTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\Store\FlockStore;
 
@@ -20,7 +19,6 @@
  */
 class FlockStoreTest extends AbstractStoreTest
 {
-    use ForwardCompatTestTrait;
     use BlockingStoreTestTrait;
 
     /**

Tests/Store/MemcachedStoreTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Store\MemcachedStore;
 
 /**
@@ -21,10 +20,9 @@
  */
 class MemcachedStoreTest extends AbstractStoreTest
 {
-    use ForwardCompatTestTrait;
     use ExpiringStoreTestTrait;
 
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         $memcached = new \Memcached();
         $memcached->addServer(getenv('MEMCACHED_HOST'), 11211);

Tests/Store/PredisStoreTest.php

@@ -11,16 +11,12 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
-
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
 class PredisStoreTest extends AbstractRedisStoreTest
 {
-    use ForwardCompatTestTrait;
-
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
         try {

Tests/Store/RedisArrayStoreTest.php

@@ -11,18 +11,14 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
-
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension redis
  */
 class RedisArrayStoreTest extends AbstractRedisStoreTest
 {
-    use ForwardCompatTestTrait;
-
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');

Tests/Store/RedisClusterStoreTest.php

@@ -11,18 +11,14 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
-
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension redis
  */
 class RedisClusterStoreTest extends AbstractRedisStoreTest
 {
-    use ForwardCompatTestTrait;
-
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         if (!class_exists('RedisCluster')) {
             self::markTestSkipped('The RedisCluster class is required.');

Tests/Store/RedisStoreTest.php

@@ -11,18 +11,14 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
-
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension redis
  */
 class RedisStoreTest extends AbstractRedisStoreTest
 {
-    use ForwardCompatTestTrait;
-
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
             $e = error_get_last();

Tests/Strategy/ConsensusStrategyTest.php

@@ -12,20 +12,17 @@
 namespace Symfony\Component\Lock\Tests\Strategy;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Strategy\ConsensusStrategy;
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
 class ConsensusStrategyTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /** @var ConsensusStrategy */
     private $strategy;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->strategy = new ConsensusStrategy();
     }

Tests/Strategy/UnanimousStrategyTest.php

@@ -12,20 +12,17 @@
 namespace Symfony\Component\Lock\Tests\Strategy;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Strategy\UnanimousStrategy;
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
 class UnanimousStrategyTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /** @var UnanimousStrategy */
     private $strategy;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->strategy = new UnanimousStrategy();
     }