Fixing AuthComponent tests

src/Controller/Component/AuthComponent.php

@@ -105,10 +105,9 @@ class AuthComponent extends Component {
  *   request is made with an invalid or expired session.
  *
  * - `flash` - Settings to use when Auth needs to do a flash message with
- *   SessionComponent::setFlash(). Available keys are:
+ *   Session::flash(). Available keys are:
  *
- *   - `element` - The element to use, defaults to 'default'.
- *   - `key` - The key to use, defaults to 'auth'
+ *   - `key` - The message domain to use for flashes generated by this component, defaults to 'auth'.
  *   - `params` - The array of additional params to use, defaults to []
  *
  * - `loginAction` - A URL (defined as a string or array) to the controller action
@@ -208,18 +207,18 @@ class AuthComponent extends Component {
 	public $response;
 
 /**
- * Method list for bound controller.
+ * Instance of the Session object
  *
- * @var array
+ * @return void
  */
-	protected $_methods = array();
+	public $session;
 
 /**
- * Instance of the Session object
+ * Method list for bound controller.
  *
- * @return void
+ * @var array
  */
-	protected $_session;
+	protected $_methods = array();
 
 /**
  * Initializes AuthComponent for use in the controller.
@@ -232,7 +231,7 @@ public function initialize(Event $event) {
 		$this->request = $controller->request;
 		$this->response = $controller->response;
 		$this->_methods = $controller->methods;
-		$this->_session = $controller->request->session();
+		$this->session = $controller->request->session();
 
 		if (Configure::read('debug')) {
 			Debugger::checkSecurityKeys();
@@ -331,17 +330,17 @@ protected function _unauthenticated(Controller $controller) {
 
 		if ($this->_isLoginAction($controller)) {
 			if (empty($controller->request->data) &&
-				!$this->_session->check('Auth.redirect') &&
+				!$this->session->check('Auth.redirect') &&
 				$this->request->env('HTTP_REFERER')
 			) {
-				$this->_session->write('Auth.redirect', $controller->referer(null, true));
+				$this->session->write('Auth.redirect', $controller->referer(null, true));
 			}
 			return;
 		}
 
 		if (!$controller->request->is('ajax')) {
 			$this->flash($this->_config['authError']);
-			$this->_session->write('Auth.redirect', $controller->request->here(false));
+			$this->session->write('Auth.redirect', $controller->request->here(false));
 			return $controller->redirect($this->_config['loginAction']);
 		}
 
@@ -583,8 +582,8 @@ public function login($user = null) {
 			$user = $this->identify($this->request, $this->response);
 		}
 		if ($user) {
-			$this->_session->renew();
-			$this->_session->write($this->_sessionKey, $user);
+			$this->session->renew();
+			$this->session->write($this->sessionKey, $user);
 		}
 		return (bool)$this->user();
 	}
@@ -610,9 +609,9 @@ public function logout() {
 		foreach ($this->_authenticateObjects as $auth) {
 			$auth->logout($user);
 		}
-		$this->_session->delete($this->sessionKey);
-		$this->_session->delete('Auth.redirect');
-		$this->_session->renew();
+		$this->session->delete($this->sessionKey);
+		$this->session->delete('Auth.redirect');
+		$this->session->renew();
 		return Router::normalize($this->_config['logoutRedirect']);
 	}
 
@@ -630,8 +629,8 @@ public function logout() {
 	public function user($key = null) {
 		if (!empty($this->_user)) {
 			$user = $this->_user;
-		} elseif ($this->_sessionKey && $this->_session->check($this->sessionKey)) {
-			$user = $this->_session->read($this->_sessionKey);
+		} elseif ($this->sessionKey && $this->session->check($this->sessionKey)) {
+			$user = $this->session->read($this->sessionKey);
 		} else {
 			return null;
 		}
@@ -650,7 +649,7 @@ public function user($key = null) {
 	protected function _getUser() {
 		$user = $this->user();
 		if ($user) {
-			$this->_session->delete('Auth.redirect');
+			$this->session->delete('Auth.redirect');
 			return true;
 		}
 
@@ -689,10 +688,10 @@ protected function _getUser() {
 	public function redirectUrl($url = null) {
 		if ($url !== null) {
 			$redir = $url;
-			$this->_session->write('Auth.redirect', $redir);
-		} elseif ($this->_session->check('Auth.redirect')) {
-			$redir = $this->_session->read('Auth.redirect');
-			$this->_session->delete('Auth.redirect');
+			$this->session->write('Auth.redirect', $redir);
+		} elseif ($this->session->check('Auth.redirect')) {
+			$redir = $this->session->read('Auth.redirect');
+			$this->session->delete('Auth.redirect');
 
 			if (Router::normalize($redir) === Router::normalize($this->_config['loginAction'])) {
 				$redir = $this->_config['loginRedirect'];
@@ -770,17 +769,13 @@ public function constructAuthenticate() {
  * @param string $message The message to set.
  * @return void
  */
-	public function flash($message) {
+	public function flash($message, $type = 'error') {
 		if ($message === false) {
 			return;
 		}
 		$flashConfig = $this->_config['flash'];
-		$this->_session->setFlash(
-			$message,
-			$flashConfig['element'],
-			$flashConfig['params'],
-			$flashConfig['key']
-		);
+		$key = $flashConfig['key'];
+		$this->session->flash($message, 'error', $flashConfig['params'] + compact('key'));
 	}
 
 }

src/Network/Request.php

@@ -440,10 +440,17 @@ protected function _processFileData(&$post, $path, $data, $field) {
 /**
  * Returns the instance of the Session object for this request
  *
+ * If a session obkect is passed as first argument it will be set as
+ * the session to use for this request
+ *
+ * @param \Cake\Network\Session $session the session object to use
  * @return \Cake\Network\Session
  */
-	public function session() {
-		return $this->_session;
+	public function session(Session $session = null) {
+		if ($session === null) {
+			return $this->_session;
+		}
+		return $this->_session = $session;
 	}
 
 /**

src/Network/Session.php

@@ -486,7 +486,9 @@ public function clear() {
  * @return bool
  */
 	protected function _hasSession() {
-		return !ini_get('session.use_cookies') || isset($_COOKIE[session_name()]);
+		return !ini_get('session.use_cookies')
+			|| isset($_COOKIE[session_name()])
+			|| php_sapi_name() === 'cli';
 	}
 
 /**
@@ -495,7 +497,7 @@ protected function _hasSession() {
  * @return void
  */
 	public function renew() {
-		if (!$this->_hasSession()) {
+		if (!$this->_hasSession() ||  php_sapi_name() === 'cli') {
 			return;
 		}