Merge pull request #43 from facile-it/feature/phpunit65

Support PHPUnit 6.5

Author: xzhayon

composer.json

@@ -48,15 +48,16 @@
   "require": {
     "php": ">=7.0",
     "phpcollection/phpcollection": "^0.5",
-    "psr/container": "^1.0",
-    "phpunit/phpunit-mock-objects": "^4.0"
+    "phpunit/phpunit-mock-objects": "^5.0",
+    "psr/container": "^1.0"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.3",
     "mockery/mockery": "^0.9.9",
     "phake/phake": "^3.0",
     "phpspec/prophecy": "^1.7",
-    "phpunit/phpunit": "^6.0"
+    "phpunit/phpunit": "^6.0",
+    "sebastian/diff": "^2.0"
   },
   "suggest": {
     "phpspec/prophecy": "To allow loading of ProphecyPlugin",

src/Moka.php

@@ -14,8 +14,8 @@
 use Moka\Proxy\ProxyTrait;
 use Moka\Strategy\MockingStrategyInterface;
 use Phake_IMock as PhakeMock;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Prophecy\Prophecy\ObjectProphecy;
 use Prophecy\Prophet;
 

src/Plugin/PHPUnit/PHPUnitMockingStrategy.php

@@ -6,21 +6,21 @@
 use Moka\Exception\MissingDependencyException;
 use Moka\Strategy\AbstractMockingStrategy;
 use Moka\Stub\MethodStub;
-use PHPUnit_Framework_MockObject_Generator as MockGenerator;
-use PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount as AnyInvokedCountMatcher;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\Generator;
+use PHPUnit\Framework\MockObject\Matcher\AnyInvokedCount;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class PHPUnitMockingStrategy
  * @package Moka\Strategy
  */
 class PHPUnitMockingStrategy extends AbstractMockingStrategy
 {
-    const CLASS_NAME = MockGenerator::class;
+    const CLASS_NAME = Generator::class;
     const PACKAGE_NAME = 'phpunit/phpunit-mock-objects';
 
     /**
-     * @var MockGenerator
+     * @var Generator
      */
     private $generator;
 
@@ -33,16 +33,17 @@ public function __construct()
     {
         self::checkDependencies(self::CLASS_NAME, self::PACKAGE_NAME);
 
-        $this->generator = new MockGenerator();
+        $this->generator = new Generator();
         $this->setMockType(MockObject::class);
     }
 
     /**
      * @param string $fqcn
      * @return MockObject
      *
-     * @throws \InvalidArgumentException
-     * @throws \PHPUnit_Framework_MockObject_RuntimeException
+     * @throws \PHPUnit\Framework\Exception
+     * @throws \PHPUnit\Framework\MockObject\RuntimeException
+     * @throws \ReflectionException
      */
     protected function doBuild(string $fqcn)
     {
@@ -58,14 +59,15 @@ protected function doBuild(string $fqcn)
     /**
      * @param MockObject $mock
      * @param MethodStub $stub
-     * @return void
+     *
+     * @throws \PHPUnit\Framework\MockObject\RuntimeException
      */
     protected function doDecorateWithMethod($mock, MethodStub $stub)
     {
         $methodName = $stub->getName();
         $methodValue = $stub->getValue();
 
-        $partial = $mock->expects(new AnyInvokedCountMatcher())->method($methodName);
+        $partial = $mock->expects(new AnyInvokedCount())->method($methodName);
         $methodValue instanceof \Throwable
             ? $partial->willThrowException($methodValue)
             : $partial->willReturn($methodValue);

src/Plugin/PHPUnit/moka.php

@@ -5,7 +5,7 @@
 
 use Moka\Moka;
 use Moka\Proxy\ProxyInterface;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @param string $fqcnOrAlias

tests/Builder/ProxyBuilderTest.php

@@ -7,8 +7,8 @@
 use Moka\Plugin\PHPUnit\PHPUnitMockingStrategy;
 use Moka\Proxy\ProxyInterface;
 use Moka\Strategy\MockingStrategyInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class ProxyBuilderTest extends TestCase
 {
@@ -77,7 +77,6 @@ protected function setUp()
 
         $this->mockingStrategy = new PHPUnitMockingStrategy();
 
-
         $this->proxyBuilder = new ProxyBuilder($this->mockingStrategy);
     }
 }

tests/Generator/ProxyGeneratorTest.php

@@ -7,8 +7,8 @@
 use Moka\Proxy\ProxyInterface;
 use Moka\Strategy\MockingStrategyInterface;
 use Moka\Tests\FooTestClass;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class ProxyGeneratorTest extends TestCase
 {

tests/Generator/Template/FakeTemplateTest.php

@@ -4,8 +4,8 @@
 namespace Tests\Generator\Template;
 
 use Moka\Exception\InvalidArgumentException;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class FakeTemplateTest extends TestCase
 {

tests/Proxy/ProxyTraitTest.php

@@ -6,8 +6,8 @@
 use Moka\Proxy\ProxyInterface;
 use Moka\Strategy\MockingStrategyInterface;
 use Moka\Tests\FooTestClass;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class ProxyTraitTest extends TestCase
 {
@@ -56,7 +56,7 @@ public function testStub()
         $this->proxy->__moka_setMockingStrategy($this->mockingStrategy);
 
         $this->proxy->stub([
-            'getInt' => 1138
+            'getInt' => 1138,
         ]);
     }
 
@@ -110,7 +110,7 @@ public function testGetSuccess()
             ->method('call');
 
         $this->proxy->stub([
-            '$property' => true
+            '$property' => true,
         ]);
 
         $this->proxy->property;