Make tests support phpunit 8

Author: nicolas-grekas

Tests/Store/CombinedStoreTest.php

@@ -11,6 +11,7 @@
 
 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;
@@ -24,6 +25,7 @@
  */
 class CombinedStoreTest extends AbstractStoreTest
 {
+    use ForwardCompatTestTrait;
     use ExpiringStoreTestTrait;
 
     /**
@@ -58,7 +60,7 @@ public function getStore()
     /** @var CombinedStore */
     private $store;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();
         $this->store1 = $this->getMockBuilder(StoreInterface::class)->getMock();

Tests/Store/MemcachedStoreTest.php

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

Tests/Store/PredisStoreTest.php

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

Tests/Store/RedisArrayStoreTest.php

@@ -11,14 +11,18 @@
 
 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
 {
-    public static function setupBeforeClass()
+    use ForwardCompatTestTrait;
+
+    private static function doSetUpBeforeClass()
     {
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');

Tests/Store/RedisClusterStoreTest.php

@@ -11,14 +11,18 @@
 
 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
 {
-    public static function setupBeforeClass()
+    use ForwardCompatTestTrait;
+
+    private static function doSetUpBeforeClass()
     {
         if (!class_exists('RedisCluster')) {
             self::markTestSkipped('The RedisCluster class is required.');

Tests/Store/RedisStoreTest.php

@@ -11,14 +11,18 @@
 
 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
 {
-    public static function setupBeforeClass()
+    use ForwardCompatTestTrait;
+
+    private static function doSetUpBeforeClass()
     {
         if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
             $e = error_get_last();

Tests/Strategy/ConsensusStrategyTest.php

@@ -12,17 +12,20 @@
 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;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->strategy = new ConsensusStrategy();
     }

Tests/Strategy/UnanimousStrategyTest.php

@@ -12,17 +12,20 @@
 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;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->strategy = new UnanimousStrategy();
     }