Skip to content

Commit 51db56e

Browse files
committed
Remove use of ForwardCompatTrait
1 parent ee1ef1c commit 51db56e

11 files changed

+8
-37
lines changed

Tests/LockTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Psr\Log\LoggerInterface;
16-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1716
use Symfony\Component\Lock\Exception\LockConflictedException;
1817
use Symfony\Component\Lock\Key;
1918
use Symfony\Component\Lock\Lock;
@@ -24,8 +23,6 @@
2423
*/
2524
class LockTest extends TestCase
2625
{
27-
use ForwardCompatTestTrait;
28-
2926
public function testAcquireNoBlocking()
3027
{
3128
$key = new Key(uniqid(__METHOD__, true));

Tests/Store/AbstractRedisStoreTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1514
use Symfony\Component\Lock\Store\RedisStore;
1615

1716
/**
1817
* @author Jérémy Derussé <jeremy@derusse.com>
1918
*/
2019
abstract class AbstractRedisStoreTest extends AbstractStoreTest
2120
{
22-
use ForwardCompatTestTrait;
2321
use ExpiringStoreTestTrait;
2422

2523
/**

Tests/Store/CombinedStoreTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1514
use Symfony\Component\Lock\Exception\LockConflictedException;
1615
use Symfony\Component\Lock\Key;
1716
use Symfony\Component\Lock\Store\CombinedStore;
@@ -25,7 +24,6 @@
2524
*/
2625
class CombinedStoreTest extends AbstractStoreTest
2726
{
28-
use ForwardCompatTestTrait;
2927
use ExpiringStoreTestTrait;
3028

3129
/**
@@ -60,7 +58,7 @@ public function getStore()
6058
/** @var CombinedStore */
6159
private $store;
6260

63-
private function doSetUp()
61+
protected function setUp()
6462
{
6563
$this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();
6664
$this->store1 = $this->getMockBuilder(StoreInterface::class)->getMock();

Tests/Store/FlockStoreTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1514
use Symfony\Component\Lock\Key;
1615
use Symfony\Component\Lock\Store\FlockStore;
1716

@@ -20,7 +19,6 @@
2019
*/
2120
class FlockStoreTest extends AbstractStoreTest
2221
{
23-
use ForwardCompatTestTrait;
2422
use BlockingStoreTestTrait;
2523

2624
/**

Tests/Store/MemcachedStoreTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1514
use Symfony\Component\Lock\Store\MemcachedStore;
1615

1716
/**
@@ -21,10 +20,9 @@
2120
*/
2221
class MemcachedStoreTest extends AbstractStoreTest
2322
{
24-
use ForwardCompatTestTrait;
2523
use ExpiringStoreTestTrait;
2624

27-
private static function doSetUpBeforeClass()
25+
public static function setUpBeforeClass()
2826
{
2927
$memcached = new \Memcached();
3028
$memcached->addServer(getenv('MEMCACHED_HOST'), 11211);

Tests/Store/PredisStoreTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1514

1615
/**
1716
* @author Jérémy Derussé <jeremy@derusse.com>
1817
*/
1918
class PredisStoreTest extends AbstractRedisStoreTest
2019
{
21-
use ForwardCompatTestTrait;
22-
23-
private static function doSetUpBeforeClass()
20+
public static function setUpBeforeClass()
2421
{
2522
$redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
2623
try {

Tests/Store/RedisArrayStoreTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1514

1615
/**
1716
* @author Jérémy Derussé <jeremy@derusse.com>
@@ -20,9 +19,7 @@
2019
*/
2120
class RedisArrayStoreTest extends AbstractRedisStoreTest
2221
{
23-
use ForwardCompatTestTrait;
24-
25-
private static function doSetUpBeforeClass()
22+
public static function setUpBeforeClass()
2623
{
2724
if (!class_exists('RedisArray')) {
2825
self::markTestSkipped('The RedisArray class is required.');

Tests/Store/RedisClusterStoreTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1514

1615
/**
1716
* @author Jérémy Derussé <jeremy@derusse.com>
@@ -20,9 +19,7 @@
2019
*/
2120
class RedisClusterStoreTest extends AbstractRedisStoreTest
2221
{
23-
use ForwardCompatTestTrait;
24-
25-
private static function doSetUpBeforeClass()
22+
public static function setUpBeforeClass()
2623
{
2724
if (!class_exists('RedisCluster')) {
2825
self::markTestSkipped('The RedisCluster class is required.');

Tests/Store/RedisStoreTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1514

1615
/**
1716
* @author Jérémy Derussé <jeremy@derusse.com>
@@ -20,9 +19,7 @@
2019
*/
2120
class RedisStoreTest extends AbstractRedisStoreTest
2221
{
23-
use ForwardCompatTestTrait;
24-
25-
private static function doSetUpBeforeClass()
22+
public static function setUpBeforeClass()
2623
{
2724
if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
2825
$e = error_get_last();

Tests/Strategy/ConsensusStrategyTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,17 @@
1212
namespace Symfony\Component\Lock\Tests\Strategy;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1615
use Symfony\Component\Lock\Strategy\ConsensusStrategy;
1716

1817
/**
1918
* @author Jérémy Derussé <jeremy@derusse.com>
2019
*/
2120
class ConsensusStrategyTest extends TestCase
2221
{
23-
use ForwardCompatTestTrait;
24-
2522
/** @var ConsensusStrategy */
2623
private $strategy;
2724

28-
private function doSetUp()
25+
protected function setUp()
2926
{
3027
$this->strategy = new ConsensusStrategy();
3128
}

Tests/Strategy/UnanimousStrategyTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,17 @@
1212
namespace Symfony\Component\Lock\Tests\Strategy;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1615
use Symfony\Component\Lock\Strategy\UnanimousStrategy;
1716

1817
/**
1918
* @author Jérémy Derussé <jeremy@derusse.com>
2019
*/
2120
class UnanimousStrategyTest extends TestCase
2221
{
23-
use ForwardCompatTestTrait;
24-
2522
/** @var UnanimousStrategy */
2623
private $strategy;
2724

28-
private function doSetUp()
25+
protected function setUp()
2926
{
3027
$this->strategy = new UnanimousStrategy();
3128
}

0 commit comments

Comments
 (0)