Merge pull request #744 from davedevelopment/fix-risky-tests

Fixes all risky tests
mockery · Jun 22, 2017 · c90a172 · c90a172
2 parents 08cbaaa + 8ef0905
commit c90a172
Show file tree

Hide file tree

Showing 16 changed files with 356 additions and 582 deletions.
diff --git a/library/Mockery.php b/library/Mockery.php
@@ -159,9 +159,11 @@ public static function close()
             return;
         }
 
-        self::$_container->mockery_teardown();
-        self::$_container->mockery_close();
+        $container = self::$_container;
         self::$_container = null;
+
+        $container->mockery_teardown();
+        $container->mockery_close();
     }
 
     /**

diff --git a/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php b/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php
@@ -70,7 +70,7 @@ protected function purgeMockeryContainer()
     {
         if ($this->mockeryOpen) {
             // post conditions wasn't called, so test probably failed
-            Mockery::getContainer()->mockery_teardown();
+            Mockery::close();
         }
     }
 }