Merge pull request #687 from davedevelopment/issue-686

Forces the return value to null
mockery · Jan 30, 2017 · 2d61ad4 · 2d61ad4
2 parents 3c90be8 + 02d5a81
commit 2d61ad4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/library/Mockery/Expectation.php b/library/Mockery/Expectation.php
@@ -538,7 +538,7 @@ public function andReturnUndefined()
      */
     public function andReturnNull()
     {
-        return $this;
+        return $this->andReturn(null);
     }
 
     public function andReturnFalse()

diff --git a/tests/Mockery/Fixtures/MethodWithNullableReturnType.php b/tests/Mockery/Fixtures/MethodWithNullableReturnType.php
@@ -54,4 +54,14 @@ public function nullableClass() : ?MethodWithNullableReturnType
     {
         return null;
     }
+
+    public function nullableInt() : ?int
+    {
+        return null;
+    }
+
+    public function nullableString() : ?string
+    {
+        return null;
+    }
 }
diff --git a/tests/Mockery/MockingNullableMethodsTest.php b/tests/Mockery/MockingNullableMethodsTest.php
@@ -181,4 +181,34 @@ public function itShouldAllowNullableClassToBeNull()
         $mock->shouldReceive('nullableClass')->andReturn(null);
         $mock->nullableClass();
     }
+
+    /** @test */
+    public function it_allows_returning_null_for_nullable_object_return_types()
+    {
+        $double= \Mockery::mock(MethodWithNullableReturnType::class);
+
+        $double->shouldReceive("nullableClass")->andReturnNull();
+
+        $this->assertEquals(null, $double->nullableClass());
+    }
+
+    /** @test */
+    public function it_allows_returning_null_for_nullable_string_return_types()
+    {
+        $double= \Mockery::mock(MethodWithNullableReturnType::class);
+
+        $double->shouldReceive("nullableString")->andReturnNull();
+
+        $this->assertEquals(null, $double->nullableString());
+    }
+
+    /** @test */
+    public function it_allows_returning_null_for_nullable_int_return_types()
+    {
+        $double= \Mockery::mock(MethodWithNullableReturnType::class);
+
+        $double->shouldReceive("nullableInt")->andReturnNull();
+
+        $this->assertEquals(null, $double->nullableInt());
+    }
 }