Skip to content

Commit b7e7d34

Browse files
committed
Fixed a bunch of tests
1 parent 4fc34b0 commit b7e7d34

13 files changed

+18
-18
lines changed

.github/workflows/run-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-20.04]
12-
php: [5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
12+
php: [7.2, 7.3, 7.4, 8.0]
1313

14-
name: "League - PHP ${{ matrix.php }} on ${{ matrix.os }}"
14+
name: League - PHP ${{ matrix.php }} on ${{ matrix.os }}
1515

1616
steps:
1717

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
"sort-packages": true
2222
},
2323
"require": {
24-
"php": ">=7.0"
24+
"php": ">=7.2"
2525
},
2626
"require-dev": {
2727
"doctrine/orm": "^2.5",
2828
"illuminate/contracts": "~5.0",
29-
"mockery/mockery": "~0.9",
29+
"mockery/mockery": "^1.3",
3030
"pagerfanta/pagerfanta": "~1.0.0",
31-
"phpunit/phpunit": "^4.8.35 || ^7.5",
32-
"squizlabs/php_codesniffer": "~1.5|~2.0|~3.4",
31+
"phpunit/phpunit": "^8.5",
32+
"squizlabs/php_codesniffer": "~3.4",
3333
"zendframework/zend-paginator": "~2.3"
3434
},
3535
"suggest": {

test/ManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public function testParseFieldsets()
276276
$this->assertSame(null, $manager->getFieldset('inexistent'));
277277
}
278278

279-
public function tearDown()
279+
public function tearDown(): void
280280
{
281281
Mockery::close();
282282
}

test/Pagination/DoctrinePaginatorAdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function testPaginationAdapter()
5757
);
5858
}
5959

60-
public function tearDown()
60+
public function tearDown(): void
6161
{
6262
Mockery::close();
6363
}

test/Pagination/IlluminatePaginatorAdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testPaginationAdapter()
3838
$this->assertSame('http://example.com/foo?page=1', $adapter->getUrl(1));
3939
}
4040

41-
public function tearDown()
41+
public function tearDown(): void
4242
{
4343
Mockery::close();
4444
}

test/Pagination/PagerfantaPaginatorAdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function testPaginationAdapter()
5555
);
5656
}
5757

58-
public function tearDown()
58+
public function tearDown(): void
5959
{
6060
Mockery::close();
6161
}

test/Pagination/ZendFrameworkPaginatorAdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testPaginationAdapter()
4646
$this->assertSame('http://example.com/foo?page=3', $adapter->getUrl(3));
4747
}
4848

49-
public function tearDown()
49+
public function tearDown(): void
5050
{
5151
Mockery::close();
5252
}

test/Resource/CollectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function testGetResourceKey()
118118
$this->assertSame('foo', $collection->getResourceKey());
119119
}
120120

121-
public function tearDown()
121+
public function tearDown(): void
122122
{
123123
Mockery::close();
124124
}

test/ScopeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ public function fieldsetsWithSideLoadIncludesProvider()
727727
];
728728
}
729729

730-
public function tearDown()
730+
public function tearDown(): void
731731
{
732732
Mockery::close();
733733
}

test/Serializer/ArraySerializerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public function testSerializingCollectionResourceWithoutName()
331331
$this->assertSame($expectedJson, $scope->toJson());
332332
}
333333

334-
public function tearDown()
334+
public function tearDown(): void
335335
{
336336
Mockery::close();
337337
}

0 commit comments

Comments
 (0)