Skip to content

Commit be612cd

Browse files
SpacePossumsebastianbergmann
authored andcommitted
bump to PHP 7.1
1 parent 99703b2 commit be612cd

12 files changed

+22
-13
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 7.0
54
- 7.1
65
- 7.2
76
- master

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^7.0"
18+
"php": "^7.1"
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "^6.2",

src/Differ.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
*/
1919
final class Differ
2020
{
21-
const OLD = 0;
22-
const ADDED = 1;
23-
const REMOVED = 2;
24-
const DIFF_LINE_END_WARNING = 3;
25-
const NO_LINE_END_EOF_WARNING = 4;
21+
public const OLD = 0;
22+
public const ADDED = 1;
23+
public const REMOVED = 2;
24+
public const DIFF_LINE_END_WARNING = 3;
25+
public const NO_LINE_END_EOF_WARNING = 4;
2626

2727
/**
2828
* @var DiffOutputBuilderInterface

src/Line.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
final class Line
1414
{
15-
const ADDED = 1;
16-
const REMOVED = 2;
17-
const UNCHANGED = 3;
15+
public const ADDED = 1;
16+
public const REMOVED = 2;
17+
public const UNCHANGED = 3;
1818

1919
/**
2020
* @var int

tests/DifferTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ protected function setUp()
3737
* @param array $expected
3838
* @param string|array $from
3939
* @param string|array $to
40+
*
4041
* @dataProvider arrayProvider
4142
*/
4243
public function testArrayRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsImplementation(array $expected, $from, $to)
@@ -48,6 +49,7 @@ public function testArrayRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsI
4849
* @param string $expected
4950
* @param string $from
5051
* @param string $to
52+
*
5153
* @dataProvider textProvider
5254
*/
5355
public function testTextRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsImplementation(string $expected, string $from, string $to)
@@ -59,6 +61,7 @@ public function testTextRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsIm
5961
* @param array $expected
6062
* @param string|array $from
6163
* @param string|array $to
64+
*
6265
* @dataProvider arrayProvider
6366
*/
6467
public function testArrayRepresentationOfDiffCanBeRenderedUsingMemoryEfficientLcsImplementation(array $expected, $from, $to)
@@ -70,6 +73,7 @@ public function testArrayRepresentationOfDiffCanBeRenderedUsingMemoryEfficientLc
7073
* @param string $expected
7174
* @param string $from
7275
* @param string $to
76+
*
7377
* @dataProvider textProvider
7478
*/
7579
public function testTextRepresentationOfDiffCanBeRenderedUsingMemoryEfficientLcsImplementation(string $expected, string $from, string $to)
@@ -344,6 +348,7 @@ public function testDiffInvalidToType()
344348
/**
345349
* @param array $expected
346350
* @param string $input
351+
*
347352
* @dataProvider provideSplitStringByLinesCases
348353
*/
349354
public function testSplitStringByLines(array $expected, string $input)

tests/LongestCommonSubsequenceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected function setUp()
4343
/**
4444
* @return LongestCommonSubsequenceCalculator
4545
*/
46-
abstract protected function createImplementation();
46+
abstract protected function createImplementation(): LongestCommonSubsequenceCalculator;
4747

4848
protected function tearDown()
4949
{

tests/MemoryEfficientImplementationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
final class MemoryEfficientImplementationTest extends LongestCommonSubsequenceTest
1717
{
18-
protected function createImplementation()
18+
protected function createImplementation(): LongestCommonSubsequenceCalculator
1919
{
2020
return new MemoryEfficientLongestCommonSubsequenceCalculator;
2121
}

tests/Output/AbstractChunkOutputBuilderTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ final class AbstractChunkOutputBuilderTest extends TestCase
2727
* @param string $from
2828
* @param string $to
2929
* @param int $lineThreshold
30+
*
3031
* @dataProvider provideGetCommonChunks
3132
*/
3233
public function testGetCommonChunks(array $expected, string $from, string $to, int $lineThreshold = 5)

tests/Output/DiffOnlyOutputBuilderTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ final class DiffOnlyOutputBuilderTest extends TestCase
2626
* @param string $from
2727
* @param string $to
2828
* @param string $header
29+
*
2930
* @dataProvider textForNoNonDiffLinesProvider
3031
*/
3132
public function testDiffDoNotShowNonDiffLines(string $expected, string $from, string $to, string $header = '')

tests/Output/UnifiedDiffOutputBuilderTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ final class UnifiedDiffOutputBuilderTest extends TestCase
2727
* @param string $from
2828
* @param string $to
2929
* @param string $header
30+
*
3031
* @dataProvider headerProvider
3132
*/
3233
public function testCustomHeaderCanBeUsed(string $expected, string $from, string $to, string $header)
@@ -73,6 +74,7 @@ public function headerProvider(): array
7374
* @param string $expected
7475
* @param string $from
7576
* @param string $to
77+
*
7678
* @dataProvider provideDiffWithLineNumbers
7779
*/
7880
public function testDiffWithLineNumbers($expected, $from, $to)

0 commit comments

Comments
 (0)