Move unset to the proper place

cakephp · Aug 13, 2018 · 727aac1 · 727aac1
1 parent cb23bf9
commit 727aac1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Cake/TestSuite/CakeTestCase.php b/lib/Cake/TestSuite/CakeTestCase.php
@@ -84,6 +84,8 @@ public function run(PHPUnit_Framework_TestResult $result = null) {
 		$result = parent::run($result);
 		if (!empty($this->fixtureManager)) {
 			$this->fixtureManager->unload($this);
+			unset($this->fixtureManager);
+			unset($this->fixtures);
 		}
 
 		for ($i = ob_get_level(); $i < $level; ++$i) {
@@ -165,8 +167,6 @@ public function tearDown() {
 			ob_flush();
 		}
 		unset($this->db);
-		unset($this->fixtureManager);
-		unset($this->fixtures);
 		unset($this->_configure);
 		unset($this->_pathRestore);
 	}