Make sure CI is green (#535)

Nyholm · web-flow · commit aa9f1275d9b2 · 2022-03-07T14:03:48.000-06:00
* Make sure CI is green

* Remove .travis.yml

* Minor CS

* Fixed a bunch of tests

* Remove scrutinizer
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -8,8 +8,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
-        php: [5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
+        os: [ubuntu-20.04]
+        php: [7.2, 7.3, 7.4, 8.0]
 
     name: League - PHP ${{ matrix.php }} on ${{ matrix.os }}
 
@@ -44,6 +44,3 @@ jobs:
 
       - name: Download Scrutinizer phar
         run: wget https://scrutinizer-ci.com/ocular.phar
-
-      - name: Send Coverage Report to Scrutinizer
-        run: php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
-.idea
-.ruby-version
 composer.lock
 build
 vendor
-Gemfile.lock
-coverage
+.phpunit.result.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -3,8 +3,6 @@
 [![Latest Version](https://img.shields.io/github/release/thephpleague/fractal.svg?style=flat-square)](https://github.com/thephpleague/fractal/releases)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
 ![The PHP League Tests](https://github.com/thephpleague/fractal/workflows/The%20PHP%20League%20Tests/badge.svg)
-[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/thephpleague/fractal.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/fractal/code-structure)
-[![Quality Score](https://img.shields.io/scrutinizer/g/thephpleague/fractal.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/fractal)
 [![Total Downloads](https://img.shields.io/packagist/dt/league/fractal.svg?style=flat-square)](https://packagist.org/packages/league/fractal)
 
 Fractal provides a presentation and transformation layer for complex data output, the like found in
diff --git a/composer.json b/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": {
diff --git a/test/ManagerTest.php b/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();
     }
diff --git a/test/Pagination/DoctrinePaginatorAdapterTest.php b/test/Pagination/DoctrinePaginatorAdapterTest.php
@@ -57,7 +57,7 @@ public function testPaginationAdapter()
         );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
diff --git a/test/Pagination/IlluminatePaginatorAdapterTest.php b/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();
     }
diff --git a/test/Pagination/PagerfantaPaginatorAdapterTest.php b/test/Pagination/PagerfantaPaginatorAdapterTest.php
@@ -55,7 +55,7 @@ public function testPaginationAdapter()
         );
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
diff --git a/test/Pagination/ZendFrameworkPaginatorAdapterTest.php b/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();
     }
diff --git a/test/Resource/CollectionTest.php b/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();
     }
diff --git a/test/ScopeTest.php b/test/ScopeTest.php
@@ -727,7 +727,7 @@ public function fieldsetsWithSideLoadIncludesProvider()
         ];
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
diff --git a/test/Serializer/ArraySerializerTest.php b/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();
     }
diff --git a/test/Serializer/DataArraySerializerTest.php b/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();
     }
diff --git a/test/Serializer/JsonApiSerializerTest.php b/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();
     }
diff --git a/test/TransformerAbstractTest.php b/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();
     }

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public function testParseFieldsets()`
`276`	`276`	`$this->assertSame(null, $manager->getFieldset('inexistent'));`
`277`	`277`	`}`
`278`	`278`
`279`		`- public function tearDown()`
	`279`	`+ public function tearDown(): void`
`280`	`280`	`{`
`281`	`281`	`Mockery::close();`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function testPaginationAdapter()`
`57`	`57`	`);`
`58`	`58`	`}`
`59`	`59`
`60`		`- public function tearDown()`
	`60`	`+ public function tearDown(): void`
`61`	`61`	`{`
`62`	`62`	`Mockery::close();`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function testPaginationAdapter()`
`38`	`38`	`$this->assertSame('http://example.com/foo?page=1', $adapter->getUrl(1));`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function tearDown()`
	`41`	`+ public function tearDown(): void`
`42`	`42`	`{`
`43`	`43`	`Mockery::close();`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function testPaginationAdapter()`
`55`	`55`	`);`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function tearDown()`
	`58`	`+ public function tearDown(): void`
`59`	`59`	`{`
`60`	`60`	`Mockery::close();`
`61`	`61`	`}`