Skip to content

Commit

Permalink
add support for Laravel 5.8
Browse files Browse the repository at this point in the history
  • Loading branch information
freekmurze committed Feb 27, 2019
1 parent 514663b commit 8ff6e66
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 16 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,3 @@ before_script:

script:
- vendor/bin/phpunit --testdox --coverage-text --coverage-clover=coverage.clover

after_script:
- php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to `laravel-fractal` will be documented in this file

## 5.4.4 - 2019-02-27

- drop support for PHP 7.0
- add support for Laravel 5.8

## 5.4.3 - 2019-01-16

- improve singleton definition
Expand Down
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@
}
],
"require": {
"php" : "^7.0",
"illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0",
"illuminate/support": "~5.5.0|~5.6.0|~5.7.0",
"php" : "^7.1",
"illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
"illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
"spatie/fractalistic": "^2.5"
},
"require-dev": {
"orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0",
"phpunit/phpunit": "^6.2|^7.0",
"scrutinizer/ocular": "^1.5"
"orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0|~3.8.0",
"phpunit/phpunit": "^6.2|^7.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/ClosureDefaultSerializerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class ClosureDefaultSerializerTest extends TestCase
{
public function setUp($defaultSerializer = '', $defaultPaginator = '')
public function setUp($defaultSerializer = '', $defaultPaginator = ''): void
{
parent::setUp(function () {
return new ArraySerializer();
Expand Down
2 changes: 1 addition & 1 deletion tests/ConfigPaginatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class ConfigPaginatorTest extends TestCase
{
public function setUp($defaultSerializer = '', $defaultPaginator = '')
public function setUp($defaultSerializer = '', $defaultPaginator = ''): void
{
parent::setUp('', TestPaginator::class);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ConfigSerializerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class ConfigSerializerTest extends TestCase
{
public function setUp($defaultSerializer = '', $defaultPaginator = '')
public function setUp($defaultSerializer = '', $defaultPaginator = ''): void
{
parent::setUp(ArraySerializer::class);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/FractalInstanceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class FractalInstanceTest extends TestCase
{
public function setUp($defaultSerializer = '', $defaultPaginator = '')
public function setUp($defaultSerializer = '', $defaultPaginator = ''): void
{
parent::setUp(ArraySerializer::class);

Expand Down
2 changes: 1 addition & 1 deletion tests/JsonApiSerializerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class JsonApiSerializerTest extends TestCase
{
public function setUp($defaultSerializer = '', $defaultPaginator = '')
public function setUp($defaultSerializer = '', $defaultPaginator = ''): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/ResponseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class ResponseTest extends TestCase
/** @var \Spatie\Fractal\Fractal */
protected $fractal;

public function setUp($defaultSerializer = '', $defaultPaginator = '')
public function setUp($defaultSerializer = '', $defaultPaginator = ''): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ abstract class TestCase extends Orchestra
/** @var string|\League\Fractal\Pagination\PaginatorInterface */
protected $defaultPaginator;

public function setUp($defaultSerializer = '', $defaultPaginator = '')
public function setUp($defaultSerializer = '', $defaultPaginator = ''): void
{
$this->defaultSerializer = $defaultSerializer;
$this->defaultPaginator = $defaultPaginator;
Expand Down

0 comments on commit 8ff6e66

Please sign in to comment.