pushing up PHPUnit version and dealing with deprecated getMock

malteriesch · Jun 6, 2016 · 05e34de · 05e34de
1 parent 3eb82d3
commit 05e34de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
 
     },
     "require-dev": {
-	"mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "4.1.*"
+	"mockery/mockery": "dev-master",
+        "phpunit/phpunit": "5.*"
     },
     "autoload": {
         "psr-0": { "TestDbAcle": "lib/" },

diff --git a/lib/TestDbAcle/PhpUnit/Mocks/MockablePdo.php b/lib/TestDbAcle/PhpUnit/Mocks/MockablePdo.php
@@ -8,8 +8,11 @@ public function __construct() {
     }
 
     public static function createMock(\PHPUnit_Framework_TestCase $testCase, $methods = array()) {
-        $className = '\TestDbAcle\PhpUnit\Mocks\MockablePdo';
-        $mock = $testCase->getMock($className, $methods, array(), "_Mock_" . uniqid('MockablePdo'));
+        $className = 'TestDbAcle\PhpUnit\Mocks\MockablePdo';
+        $mock = $testCase->getMockBuilder($className)
+            ->setMethods($methods)
+            ->setMockClassName("_Mock_" . uniqid('MockablePdo'))
+            ->getMock();
         return $mock;
     }
 }
diff --git a/tests/TestDbAcle/Db/BasePdoFacadeTestCase.php b/tests/TestDbAcle/Db/BasePdoFacadeTestCase.php
@@ -7,7 +7,10 @@ class  BasePdoFacadeTestCase extends \TestDbAcleTests\TestDbAcle\BaseTestCase
     protected $mockPdo;
 
     protected function createMock($className, $methods = array(), $constructorParameters = array()) {
-        $mock = $this->getMock($className, $methods, $constructorParameters, "_Mock_" . uniqid($className));
+        $mock = $this->getMockBuilder($className)
+            ->setMethods($methods)
+            ->setMockClassName("_Mock_" . uniqid($className))
+            ->getMock();
         return $mock;
     }