Merge e1c36c7 into ff6f069

mockery · Dec 1, 2017 · 9ad0039 · 9ad0039
2 parents ff6f069 + e1c36c7
commit 9ad0039
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/tests/Mockery/ExpectationTest.php b/tests/Mockery/ExpectationTest.php
@@ -2023,13 +2023,13 @@ public function testCanReturnSelf()
     public function testReturnsTrueIfTrueIsReturnValue()
     {
         $this->mock->shouldReceive("foo")->andReturnTrue();
-        $this->assertSame(true, $this->mock->foo());
+        $this->assertTrue($this->mock->foo());
     }
 
     public function testReturnsFalseIfFalseIsReturnValue()
     {
         $this->mock->shouldReceive("foo")->andReturnFalse();
-        $this->assertSame(false, $this->mock->foo());
+        $this->assertFalse($this->mock->foo());
     }
 
     public function testExpectationCanBeOverridden()

diff --git a/tests/Mockery/MockingNullableMethodsTest.php b/tests/Mockery/MockingNullableMethodsTest.php
@@ -184,7 +184,7 @@ public function it_allows_returning_null_for_nullable_object_return_types()
 
         $double->shouldReceive("nullableClass")->andReturnNull();
 
-        $this->assertEquals(null, $double->nullableClass());
+        $this->assertNull($double->nullableClass());
     }
 
     /** @test */
@@ -194,7 +194,7 @@ public function it_allows_returning_null_for_nullable_string_return_types()
 
         $double->shouldReceive("nullableString")->andReturnNull();
 
-        $this->assertEquals(null, $double->nullableString());
+        $this->assertNull($double->nullableString());
     }
 
     /** @test */
@@ -204,14 +204,14 @@ public function it_allows_returning_null_for_nullable_int_return_types()
 
         $double->shouldReceive("nullableInt")->andReturnNull();
 
-        $this->assertEquals(null, $double->nullableInt());
+        $this->assertNull($double->nullableInt());
     }
 
     /** @test */
     public function it_returns_null_on_calls_to_ignored_methods_of_spies_if_return_type_is_nullable()
     {
         $double = \Mockery::spy(MethodWithNullableReturnType::class);
 
-        $this->assertEquals(null, $double->nullableClass());
+        $this->assertNull($double->nullableClass());
     }
 }
diff --git a/tests/Mockery/MockingParameterAndReturnTypesTest.php b/tests/Mockery/MockingParameterAndReturnTypesTest.php
@@ -56,7 +56,7 @@ public function testMockingBooleanReturnType()
         $mock = mock("test\Mockery\TestWithParameterAndReturnType");
 
         $mock->shouldReceive("returnBoolean");
-        $this->assertSame(false, $mock->returnBoolean());
+        $this->assertFalse($mock->returnBoolean());
     }
 
     public function testMockingArrayReturnType()
@@ -108,7 +108,7 @@ public function testIgnoringMissingReturnsType()
         $this->assertSame('', $mock->returnString());
         $this->assertSame(0, $mock->returnInteger());
         $this->assertSame(0.0, $mock->returnFloat());
-        $this->assertSame(false, $mock->returnBoolean());
+        $this->assertFalse( $mock->returnBoolean());
         $this->assertSame([], $mock->returnArray());
         $this->assertTrue(is_callable($mock->returnCallable()));
         $this->assertInstanceOf("\Generator", $mock->returnGenerator());

diff --git a/tests/Mockery/MockingProtectedMethodsTest.php b/tests/Mockery/MockingProtectedMethodsTest.php
@@ -53,7 +53,7 @@ public function shouldAutomaticallyDeferCallsToProtectedMethodsForRuntimePartial
     public function shouldAutomaticallyIgnoreAbstractProtectedMethods()
     {
         $mock = mock("test\Mockery\TestWithProtectedMethods")->shouldDeferMissing();
-        $this->assertEquals(null, $mock->foo());
+        $this->assertNull($mock->foo());
     }
 
     /** @test */