Merge branch 'limit-to-5.7.6'

mockery · Aug 7, 2017 · b99c29c · b99c29c
2 parents 05311bc + 4389144
commit b99c29c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,7 @@
 * Fix Mockery not setting properties on overloaded instance mocks
 * BC BREAK - Fix Mockery not trying default expectations if there is any concrete expectation
 * BC BREAK - Mockery's PHPUnit integration will mark a test as risky if it
-  thinks one it's exceptions has been swallowed. Use `$e->dismiss()` to dismiss.
+  thinks one it's exceptions has been swallowed in PHPUnit > 5.7.6. Use `$e->dismiss()` to dismiss.
 
 
 ## 0.9.4 (XXXX-XX-XX)

diff --git a/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php b/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php
@@ -54,6 +54,10 @@ protected function addMockeryExpectationsToAssertionCount()
 
     protected function checkMockeryExceptions()
     {
+        if (!method_exists($this, "markAsRisky")) {
+            return;
+        }
+
         foreach (Mockery::getContainer()->mockery_thrownExceptions() as $e) {
             if (!$e->dismissed()) {
                 $this->markAsRisky('Mockery found an exception that appears to have been swallowed: '.$e->getMessage());

diff --git a/tests/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationTest.php b/tests/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegrationTest.php
@@ -13,12 +13,17 @@ class BaseClassStub
 
     function finish() {
         $this->checkMockeryExceptions();
-    } 
+    }
+
+    function markAsRisky() {}
 };
 
 class MockeryPHPUnitIntegrationTest extends MockeryTestCase
 {
-    /** @test */
+    /** 
+     * @test 
+     * @requires PHPUnit 5.7.6
+     */
     public function it_marks_a_passing_test_as_risky_if_we_threw_exceptions()
     {
         $mock = mock();
@@ -34,7 +39,10 @@ public function it_marks_a_passing_test_as_risky_if_we_threw_exceptions()
         $test->shouldHaveReceived()->markAsRisky(m::type("string"));
     }
 
-    /** @test */
+    /** 
+     * @test
+     * @requires PHPUnit 5.7.6
+     */
     public function the_user_can_manually_dismiss_an_exception_to_avoid_the_risky_test()
     {
         $mock = mock();