Merge pull request #26 from peter-gribanov/phpunit_namespace

Use phpunit/phpunit 4.8.36 for easy to migrate to latest stable PHPUnit
gpslab · Nov 7, 2019 · 66efe91 · 66efe91
2 parents d0d54f2 + cbd1046
commit 66efe91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "twig/twig": "^1.12|^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.8",
+    "phpunit/phpunit": "^4.8.36",
     "scrutinizer/ocular": "~1.3",
     "php-coveralls/php-coveralls": "^1.0",
     "friendsofphp/php-cs-fixer": "~2.2",

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -10,12 +10,15 @@
 
 namespace GpsLab\Bundle\PaginationBundle\Tests;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+class TestCase extends BaseTestCase
 {
     /**
      * @param string $class_name
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit_Framework_MockObject_MockObject|MockObject
      */
     protected function getMockNoConstructor($class_name)
     {
@@ -28,9 +31,8 @@ protected function getMockNoConstructor($class_name)
 
     /**
      * @param string $class_name
-     * @param array  $methods
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit_Framework_MockObject_MockObject|MockObject
      */
     protected function getMockAbstract($class_name, array $methods)
     {