Skip to content

Commit edc6bb9

Browse files
Merge branch '5.4' into 6.2
* 5.4: Migrate to `static` data providers using `rector/rector`
2 parents 98a365f + 0ed512b commit edc6bb9

8 files changed

+13
-13
lines changed

Tests/LockTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ public function testExpirationStoreInterface($ttls, $expected)
434434
$this->assertSame($expected, $lock->isExpired());
435435
}
436436

437-
public function provideExpiredDates()
437+
public static function provideExpiredDates()
438438
{
439439
yield [[-0.1], true];
440440
yield [[0.1, -0.1], true];

Tests/Store/DoctrineDbalPostgreSqlStoreTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testInvalidDriver($connOrDsn)
6060
$store->exists(new Key('foo'));
6161
}
6262

63-
public function getInvalidDrivers()
63+
public static function getInvalidDrivers()
6464
{
6565
yield ['sqlite:///tmp/foo.db'];
6666
yield [DriverManager::getConnection(['url' => 'sqlite:///tmp/foo.db'])];

Tests/Store/DoctrineDbalStoreTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function testDsn(string $dsn, string $file = null)
7979
}
8080
}
8181

82-
public function provideDsn()
82+
public static function provideDsn()
8383
{
8484
$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
8585
yield ['sqlite://localhost/'.$dbFile.'1', $dbFile.'1'];
@@ -127,7 +127,7 @@ public function testCreatesTableInTransaction(string $platform)
127127
$store->save($key);
128128
}
129129

130-
public function providePlatforms()
130+
public static function providePlatforms()
131131
{
132132
yield [\Doctrine\DBAL\Platforms\PostgreSQLPlatform::class];
133133
yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];

Tests/Store/MongoDbStoreTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function testConstructionMethods($mongo, array $options)
9494
$this->assertFalse($store->exists($key));
9595
}
9696

97-
public function provideConstructorArgs()
97+
public static function provideConstructorArgs()
9898
{
9999
$client = self::getMongoClient();
100100
yield [$client, ['database' => 'test', 'collection' => 'lock']];
@@ -134,7 +134,7 @@ public function testInvalidConstructionMethods($mongo, array $options)
134134
new MongoDbStore($mongo, $options);
135135
}
136136

137-
public function provideInvalidConstructorArgs()
137+
public static function provideInvalidConstructorArgs()
138138
{
139139
$client = self::getMongoClient();
140140
yield [$client, ['collection' => 'lock']];
@@ -160,7 +160,7 @@ public function testUriCollectionStrip(string $uri, array $options, string $driv
160160
$this->assertSame($driverUri, $uri);
161161
}
162162

163-
public function provideUriCollectionStripArgs()
163+
public static function provideUriCollectionStripArgs()
164164
{
165165
yield ['mongodb://localhost/?collection=lock', ['database' => 'test'], 'mongodb://localhost/'];
166166
yield ['mongodb://localhost/', ['database' => 'test', 'collection' => 'lock'], 'mongodb://localhost/'];

Tests/Store/PdoStoreTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function testDsn(string $dsn, string $file = null)
8989
}
9090
}
9191

92-
public function provideDsn()
92+
public static function provideDsn()
9393
{
9494
$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
9595
yield ['sqlite:'.$dbFile.'2', $dbFile.'2'];

Tests/Store/ZookeeperStoreTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testCreateConnection(string $connectionString)
4242
$this->assertInstanceOf(\Zookeeper::class, ZookeeperStore::createConnection($connectionString));
4343
}
4444

45-
public function provideValidConnectionString(): iterable
45+
public static function provideValidConnectionString(): iterable
4646
{
4747
yield 'single host' => ['zookeeper://localhost:2181'];
4848
yield 'single multiple host' => ['zookeeper://localhost:2181,localhost:2181'];

Tests/Strategy/ConsensusStrategyTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected function setUp(): void
2727
$this->strategy = new ConsensusStrategy();
2828
}
2929

30-
public function provideMetResults()
30+
public static function provideMetResults()
3131
{
3232
// success, failure, total, isMet
3333
yield [3, 0, 3, true];
@@ -49,7 +49,7 @@ public function provideMetResults()
4949
yield [0, 0, 2, false];
5050
}
5151

52-
public function provideIndeterminate()
52+
public static function provideIndeterminate()
5353
{
5454
// success, failure, total, canBeMet
5555
yield [3, 0, 3, true];

Tests/Strategy/UnanimousStrategyTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected function setUp(): void
2727
$this->strategy = new UnanimousStrategy();
2828
}
2929

30-
public function provideMetResults()
30+
public static function provideMetResults()
3131
{
3232
// success, failure, total, isMet
3333
yield [3, 0, 3, true];
@@ -49,7 +49,7 @@ public function provideMetResults()
4949
yield [0, 0, 2, false];
5050
}
5151

52-
public function provideIndeterminate()
52+
public static function provideIndeterminate()
5353
{
5454
// success, failure, total, canBeMet
5555
yield [3, 0, 3, true];

0 commit comments

Comments
 (0)