Merge pull request #481 from ramsey/phpunit-upgrade

Allow use of newer PHPUnit on newer versions of PHP
thephpleague · May 10, 2019 · 4e553da · 4e553da
2 parents c08a0f6 + 88aa071
commit 4e553da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "illuminate/contracts": "~5.0",
         "mockery/mockery": "~0.9",
         "pagerfanta/pagerfanta": "~1.0.0",
-        "phpunit/phpunit": "^4.8.35",
+        "phpunit/phpunit": "^4.8.35 || ^7.5",
         "squizlabs/php_codesniffer": "~1.5",
         "zendframework/zend-paginator": "~2.3"
     },

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,7 +13,7 @@
     <logging>
         <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

diff --git a/test/ScopeFactoryTest.php b/test/ScopeFactoryTest.php
@@ -69,14 +69,14 @@ private function createSut()
      */
     private function createManager()
     {
-        return $this->getMock('League\\Fractal\\Manager');
+        return $this->getMockBuilder('League\\Fractal\\Manager')->getMock();
     }
 
     /**
      * @return ResourceInterface
      */
     private function createResource()
     {
-        return $this->getMock('League\\Fractal\\Resource\\ResourceInterface');
+        return $this->getMockBuilder('League\\Fractal\\Resource\\ResourceInterface')->getMock();
     }
 }
diff --git a/test/TransformerAbstractTest.php b/test/TransformerAbstractTest.php
@@ -300,7 +300,8 @@ public function testParamBagIsProvidedForIncludes()
 
         $transformer->setAvailableIncludes(['book']);
         $scope = new Scope($manager, new Item([], $transformer));
-        $included = $transformer->processIncludedResources($scope, []);
+
+        $this->assertFalse($transformer->processIncludedResources($scope, []));
     }
 
     /**