Merge branch '2.0'

Author: sebastianbergmann

src/Framework/MockObject/Generator.php

@@ -335,7 +335,7 @@ interface_exists($originalClassName, $callAutoload)) {
             $methods   = $mockedMethods;
 
             foreach ($reflector->getMethods() as $method) {
-                if ($method->isAbstract() || !in_array($method->getName(), $methods)) {
+                if ($method->isAbstract() && !in_array($method->getName(), $methods)) {
                     $methods[] = $method->getName();
                 }
             }

tests/GeneratorTest.php

@@ -57,7 +57,7 @@ public function testGetMockForAbstractClassStubbingAbstractClass()
     /**
      * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
      */
-    public function testGetMockForAbstractClassWithNonexistentMethods()
+    public function testGetMockForAbstractClassWithNonExistentMethods()
     {
         $mock = $this->generator->getMockForAbstractClass(
             'AbstractMockTestClass', array(), '',  true,
@@ -68,6 +68,21 @@ public function testGetMockForAbstractClassWithNonexistentMethods()
         $this->assertTrue(method_exists($mock, 'doSomething'));
     }
 
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassShouldCreateStubsOnlyForAbstractMethodWhenNoMethodsWereInformed()
+    {
+        $mock = $this->generator->getMockForAbstractClass('AbstractMockTestClass');
+
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturn('testing');
+
+        $this->assertEquals('testing', $mock->doSomething());
+        $this->assertEquals(1, $mock->returnAnything());
+    }
+
     /**
      * @dataProvider getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider
      * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
@@ -98,9 +113,27 @@ public static function getMockForAbstractClassExpectsInvalidArgumentExceptionDat
         );
     }
 
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForTrait
+     * @requires PHP 5.4.0
+     */
+    public function testGetMockForTraitWithNonExistentMethodsAndNonAbstractMethods()
+    {
+        $mock = $this->generator->getMockForTrait(
+            'AbstractTrait', array(), '',  true,
+            true, true, array('nonexistentMethod')
+        );
+
+        $this->assertTrue(method_exists($mock, 'nonexistentMethod'));
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+        $this->assertTrue($mock->mockableMethod());
+        $this->assertTrue($mock->anotherMockableMethod());
+    }
+
     /**
      * @dataProvider getMockForTraitExpectsInvalidArgumentExceptionDataprovider
      * @covers PHPUnit_Framework_MockObject_Generator::getMockForTrait
+     * @requires PHP 5.4.0
      * @expectedException PHPUnit_Framework_Exception
      */
     public function testGetMockForTraitExpectingInvalidArgumentException($traitName, $mockClassName)

tests/_files/AbstractMockTestClass.php

@@ -2,4 +2,9 @@
 abstract class AbstractMockTestClass
 {
     abstract public function doSomething();
+
+    public function returnAnything()
+    {
+        return 1;
+    }
 }