Fixed a bunch of tests

.github/workflows/run-tests.yml

@@ -9,9 +9,9 @@ jobs:
  fail-fast: true
  matrix:
  os: [ubuntu-20.04]
- php: [5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
+ php: [7.2, 7.3, 7.4, 8.0]
 
- name: "League - PHP ${{ matrix.php }} on ${{ matrix.os }}"
+ name: League - PHP ${{ matrix.php }} on ${{ matrix.os }}
 
  steps:
 

composer.json

@@ -21,15 +21,15 @@
  "sort-packages": true
  },
  "require": {
- "php": ">=7.0"
+ "php": ">=7.2"
  },
  "require-dev": {
  "doctrine/orm": "^2.5",
  "illuminate/contracts": "~5.0",
- "mockery/mockery": "~0.9",
+ "mockery/mockery": "^1.3",
  "pagerfanta/pagerfanta": "~1.0.0",
- "phpunit/phpunit": "^4.8.35 || ^7.5",
- "squizlabs/php_codesniffer": "~1.5|~2.0|~3.4",
+ "phpunit/phpunit": "^8.5",
+ "squizlabs/php_codesniffer": "~3.4",
  "zendframework/zend-paginator": "~2.3"
  },
  "suggest": {

test/ManagerTest.php

@@ -276,7 +276,7 @@ public function testParseFieldsets()
  $this->assertSame(null, $manager->getFieldset('inexistent'));
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/Pagination/DoctrinePaginatorAdapterTest.php

@@ -57,7 +57,7 @@ public function testPaginationAdapter()
  );
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/Pagination/IlluminatePaginatorAdapterTest.php

@@ -38,7 +38,7 @@ public function testPaginationAdapter()
  $this->assertSame('http://example.com/foo?page=1', $adapter->getUrl(1));
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/Pagination/PagerfantaPaginatorAdapterTest.php

@@ -55,7 +55,7 @@ public function testPaginationAdapter()
  );
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/Pagination/ZendFrameworkPaginatorAdapterTest.php

@@ -46,7 +46,7 @@ public function testPaginationAdapter()
  $this->assertSame('http://example.com/foo?page=3', $adapter->getUrl(3));
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/Resource/CollectionTest.php

@@ -118,7 +118,7 @@ public function testGetResourceKey()
  $this->assertSame('foo', $collection->getResourceKey());
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/ScopeTest.php

@@ -727,7 +727,7 @@ public function fieldsetsWithSideLoadIncludesProvider()
  ];
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/Serializer/ArraySerializerTest.php

@@ -331,7 +331,7 @@ public function testSerializingCollectionResourceWithoutName()
  $this->assertSame($expectedJson, $scope->toJson());
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/Serializer/DataArraySerializerTest.php

@@ -355,7 +355,7 @@ public function testSerializingNullResource()
  $this->assertSame($expected, $scope->toArray());
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/Serializer/JsonApiSerializerTest.php

@@ -15,7 +15,7 @@ class JsonApiSerializerTest extends TestCase
 {
  private $manager;
 
- public function setUp()
+ public function setUp(): void
  {
  $this->manager = new Manager();
  $this->manager->setSerializer(new JsonApiSerializer());
@@ -2794,7 +2794,7 @@ public function serializingWithFieldsetsProvider()
  ];
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  Mockery::close();
  }

test/TransformerAbstractTest.php

@@ -369,7 +369,7 @@ public function testCollection()
  $this->assertInstanceOf('League\Fractal\Resource\Collection', $collection);
  }
 
- public function tearDown()
+ public function tearDown(): void
  {
  m::close();
  }