Fix #4 Compatibility with PHPUnit 5.4

src/EasyMock.php

@@ -30,7 +30,7 @@ protected function easyMock($classname, array $methods = array())
         if ($classname instanceof MockObject) {
             $mock = $classname;
         } else {
-            $mock = $this->createMock($classname);
+            $mock = $this->doCreateMock($classname);
         }
 
         foreach ($methods as $method => $return) {
@@ -58,7 +58,7 @@ protected function easySpy($classname, array $methods = array())
         if ($classname instanceof MockObject) {
             $mock = $classname;
         } else {
-            $mock = $this->createMock($classname);
+            $mock = $this->doCreateMock($classname);
         }
 
         foreach ($methods as $method => $return) {
@@ -86,8 +86,14 @@ private function mockMethod(MockObject $mock, $method, InvocationMatcher $invoca
      * @param string $classname
      * @return MockObject
      */
-    private function createMock($classname)
+    private function doCreateMock($classname)
     {
+        // PHPUnit 5.4 method
+        if (method_exists($this, 'createMock')) {
+            return $this->createMock($classname);
+        }
+
+        // Fallback on the deprecated method
         return $this->getMock(
             $classname,
             array(),

tests/EasyMockTest.php

@@ -4,6 +4,7 @@
 
 use EasyMock\EasyMock;
 use EasyMock\Test\Fixture\ClassFixture;
+use EasyMock\Test\Fixture\ClassWithConstructor;
 use EasyMock\Test\Fixture\CustomException;
 use EasyMock\Test\Fixture\InterfaceFixture;
 
@@ -26,6 +27,16 @@ public function should_mock_objects()
         $this->assertNull($mock->foo());
     }
 
+    /**
+     * @test
+     */
+    public function should_skip_the_constructor()
+    {
+        /** @var ClassWithConstructor $mock */
+        $mock = $this->easyMock('EasyMock\Test\Fixture\ClassWithConstructor');
+        $this->assertFalse($mock->constructorCalled);
+    }
+
     /**
      * @test
      */

tests/Fixture/ClassWithConstructor.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace EasyMock\Test\Fixture;
+
+class ClassWithConstructor
+{
+    public $constructorCalled = false;
+
+    public function __construct()
+    {
+        $this->constructorCalled = true;
+    }
+}