Skip to content

Commit e27ea15

Browse files
Merge branch '5.4' into 6.2
* 5.4: Migrate to `static` data providers using `rector/rector`
2 parents d1347f0 + 3c2942a commit e27ea15

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

Tests/Caster/CasterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testFilter($filter, $expectedDiff, $listedProperties = null)
4646
$this->assertSame($expectedDiff, array_diff_assoc(self::$referenceArray, $filteredArray));
4747
}
4848

49-
public function provideFilter()
49+
public static function provideFilter()
5050
{
5151
return [
5252
[

Tests/Caster/DateCasterTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testCastDateTime($time, $timezone, $xDate, $xTimestamp, $xInfos)
9090
$this->assertDumpMatchesFormat($xDump, $cast["\0~\0date"]);
9191
}
9292

93-
public function provideDateTimes()
93+
public static function provideDateTimes()
9494
{
9595
return [
9696
['2017-04-30 00:00:00.000000', 'Europe/Zurich', '2017-04-30 00:00:00.0 Europe/Zurich (+02:00)', 1493503200, 'Sunday, April 30, 2017%Afrom now%ADST On'],
@@ -210,7 +210,7 @@ public function testCastInterval($intervalSpec, $ms, $invert, $xInterval, $xSeco
210210
$this->assertDumpMatchesFormat($xDump, $cast["\0~\0interval"]);
211211
}
212212

213-
public function provideIntervals()
213+
public static function provideIntervals()
214214
{
215215
return [
216216
['PT0S', 0, 0, '0s', '0s'],
@@ -309,7 +309,7 @@ public function testCastTimeZone($timezone, $xTimezone, $xRegion)
309309
$this->assertDumpMatchesFormat($xDump, $cast["\0~\0timezone"]);
310310
}
311311

312-
public function provideTimeZones()
312+
public static function provideTimeZones()
313313
{
314314
$xRegion = \extension_loaded('intl') ? '%s' : '';
315315

@@ -386,7 +386,7 @@ public function testCastPeriod($start, $interval, $end, $options, $xPeriod, $xDa
386386
$this->assertDumpMatchesFormat($xDump, $cast["\0~\0period"]);
387387
}
388388

389-
public function providePeriods()
389+
public static function providePeriods()
390390
{
391391
$periods = [
392392
['2017-01-01', 'P1D', '2017-01-03', 0, 'every + 1d, from [2017-01-01 00:00:00.0 to 2017-01-03 00:00:00.0[', '1) 2017-01-01%a2) 2017-01-02'],

Tests/Caster/SplCasterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class SplCasterTest extends TestCase
2121
{
2222
use VarDumperTestTrait;
2323

24-
public function getCastFileInfoTests()
24+
public static function getCastFileInfoTests()
2525
{
2626
return [
2727
[__FILE__, <<<'EOTXT'
@@ -135,7 +135,7 @@ public function testCastSplDoublyLinkedList($modeValue, $modeDump)
135135
$this->assertDumpMatchesFormat($dump, $var);
136136
}
137137

138-
public function provideCastSplDoublyLinkedList()
138+
public static function provideCastSplDoublyLinkedList()
139139
{
140140
return [
141141
[\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'],

Tests/Caster/XmlReaderCasterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testNodes($seek, $expectedDump)
6464
$this->assertDumpMatchesFormat($expectedDump, $this->reader);
6565
}
6666

67-
public function provideNodes()
67+
public static function provideNodes()
6868
{
6969
return [
7070
[0, <<<'EODUMP'

Tests/Command/Descriptor/CliDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testDescribe(array $context, string $expectedOutput, bool $decor
5454
$this->assertStringMatchesFormat(trim($expectedOutput), str_replace(\PHP_EOL, "\n", trim($output->fetch())));
5555
}
5656

57-
public function provideContext()
57+
public static function provideContext()
5858
{
5959
yield 'source' => [
6060
[

Tests/Command/Descriptor/HtmlDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testDescribe(array $context, string $expectedOutput)
6363
$this->assertStringMatchesFormat(trim($expectedOutput), trim(preg_replace('@<style>.*</style><script>.*</script>@s', '', $output->fetch())));
6464
}
6565

66-
public function provideContext()
66+
public static function provideContext()
6767
{
6868
yield 'source' => [
6969
[

Tests/Command/ServerDumpCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testComplete(array $input, array $expectedSuggestions)
2828
$this->assertSame($expectedSuggestions, $tester->complete($input));
2929
}
3030

31-
public function provideCompletionSuggestions()
31+
public static function provideCompletionSuggestions()
3232
{
3333
yield 'option --format' => [
3434
['--format', ''],

Tests/Dumper/CliDumperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function testDumpWithCommaFlagsAndExceptionCodeExcerpt()
157157
, $dump);
158158
}
159159

160-
public function provideDumpWithCommaFlagTests()
160+
public static function provideDumpWithCommaFlagTests()
161161
{
162162
$expected = <<<'EOTXT'
163163
array:3 [
@@ -398,7 +398,7 @@ public function testIncompleteClass()
398398
);
399399
}
400400

401-
public function provideDumpArrayWithColor()
401+
public static function provideDumpArrayWithColor()
402402
{
403403
yield [
404404
['foo' => 'bar'],

Tests/Dumper/HtmlDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public function testDumpString($var, $needle)
180180
$this->assertStringContainsString($needle, $out);
181181
}
182182

183-
public function varToDumpProvider()
183+
public static function varToDumpProvider()
184184
{
185185
return [
186186
[['dummy' => new ImgStub('dummy', 'img/png', '100em')], '<img src="data:img/png;base64,ZHVtbXk=" />'],

0 commit comments

Comments
 (0)