fix IntegrationTestCase

Config/bootstrap.php

@@ -250,17 +250,19 @@ function safenl($str) {
 	return $str;
 }
 
-/**
- * Convenience function to check on "empty()"
- *
- * @param mixed $var
- * @return bool Result
- */
-function isEmpty($var = null) {
-	if (empty($var)) {
-		return true;
+if (!function_exists('isEmpty')) {
+	/**
+	 * Convenience function to check on "empty()"
+	 *
+	 * @param mixed $var
+	 * @return bool Result
+	 */
+	function isEmpty($var = null) {
+		if (empty($var)) {
+			return true;
+		}
+		return false;
 	}
-	return false;
 }
 
 /**

TestSuite/IntegrationTestCase.php

@@ -204,7 +204,10 @@ abstract class IntegrationTestCase extends MyControllerTestCase {
 		if ((float)Configure::version() >= 2.7) {
 			CakeSession::clear(false);
 		} else {
-			$_SESSION = null;
+			$keys = array_keys((array)CakeSession::read());
+			foreach ($keys as $key) {
+				CakeSession::delete($key);
+			}
 		}
 	}