diff --git a/composer.json b/composer.json index 95a7a8fa..843c20c6 100644 --- 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 index b45c2438..ba62bebc 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -13,7 +13,7 @@ - + diff --git a/test/ScopeFactoryTest.php b/test/ScopeFactoryTest.php index c40c7bac..d9a6ba33 100644 --- a/test/ScopeFactoryTest.php +++ b/test/ScopeFactoryTest.php @@ -69,7 +69,7 @@ private function createSut() */ private function createManager() { - return $this->getMock('League\\Fractal\\Manager'); + return $this->getMockBuilder('League\\Fractal\\Manager')->getMock(); } /** @@ -77,6 +77,6 @@ private function createManager() */ 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 index a4c9cf84..56429e8a 100755 --- 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, [])); } /**