Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-php…

…unit

app/config/core.php

@@ -157,6 +157,11 @@
 
 /**
  * The name of CakePHP's session cookie.
+ *
+ * Note the guidelines for Session names states: "The session name references
+ * the session id in cookies and URLs. It should contain only alphanumeric
+ * characters."
+ * @link http://php.net/session_name
  */
 	Configure::write('Session.cookie', 'CAKEPHP');
 
@@ -183,8 +188,8 @@
  * Valid values:
  *
  * 'high'	Session timeout in 'Session.timeout' x 10
- * 'medium'	Session timeout in 'Session.timeout' x 100
- * 'low'		Session timeout in 'Session.timeout' x 300
+ * 'medium'	Session timeout in 'Session.timeout' x 5040
+ * 'low'		Session timeout in 'Session.timeout' x 2628000
  *
  * CakePHP session IDs are also regenerated between requests if
  * 'Security.level' is set to 'high'.

app/webroot/test.php

@@ -4,16 +4,16 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @link          http://book.cakephp.org/view/1196/Testing
  * @package       cake
- * @subpackage    cake.cake.tests.libs
+ * @subpackage    cake.app.webroot
  * @since         CakePHP(tm) v 1.2.0.4433
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */

cake/console/cake.php

@@ -432,7 +432,7 @@ public function getInput($prompt, $options = null, $default = null) {
 			$printOptions = '(' . implode('/', $options) . ')';
 		}
 
-		if ($default == null) {
+		if ($default === null) {
 			$this->stdout($prompt . " $printOptions \n" . '> ', false);
 		} else {
 			$this->stdout($prompt . " $printOptions \n" . "[$default] > ", false);

cake/console/libs/shell.php

@@ -551,13 +551,13 @@ protected function _modelName($name) {
 	}
 
 /**
- * Creates the proper singular model key for associations
+ * Creates the proper underscored model key for associations
  *
- * @param string $name Controller class name
+ * @param string $name Model class name
  * @return string Singular model key
  */
 	protected function _modelKey($name) {
-		return Inflector::underscore(Inflector::singularize($name)) . '_id';
+		return Inflector::underscore($name) . '_id';
 	}
 
 /**

cake/console/libs/tasks/controller.php

@@ -57,7 +57,7 @@ public function initialize() {
  */
 	public function execute() {
 		if (empty($this->args)) {
-			$this->_interactive();
+			return $this->_interactive();
 		}
 
 		if (isset($this->args[0])) {
@@ -175,7 +175,7 @@ protected function _interactive() {
 				);
 			}
 		} else {
-			list($wannaBakeCrud, $wannaBakeCrud) = $this->_askAboutMethods();
+			list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
 		}
 
 		if (strtolower($wannaBakeCrud) == 'y') {
@@ -186,6 +186,7 @@ protected function _interactive() {
 			$actions .= $this->bakeActions($controllerName, $admin, strtolower($wannaUseSession) == 'y');
 		}
 
+		$baked = false;
 		if ($this->interactive === true) {
 			$this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components);
 			$looksGood = $this->in(__('Look okay?'), array('y','n'), 'y');
@@ -202,6 +203,7 @@ protected function _interactive() {
 				$this->bakeTest($controllerName);
 			}
 		}
+		return $baked;
 	}
 
 /**
@@ -282,7 +284,7 @@ public function bakeActions($controllerName, $admin = null, $wannaUseSession = t
 		$controllerPath = $this->_controllerPath($controllerName);
 		$pluralName = $this->_pluralName($currentModelName);
 		$singularName = Inflector::variable($currentModelName);
-		$singularHumanName = $this->_singularHumanName($currentModelName);
+		$singularHumanName = $this->_singularHumanName($controllerName);
 		$pluralHumanName = $this->_pluralName($controllerName);
 
 		$this->Template->set(compact('admin', 'controllerPath', 'pluralName', 'singularName', 'singularHumanName',

cake/console/libs/tasks/template.php

@@ -54,7 +54,7 @@ public function initialize() {
 	protected function _findThemes() {
 		$paths = App::path('shells');
 		$core = array_pop($paths);
-		$core = str_replace('libs' . DS, '', $core);
+		$core = preg_replace('#libs' . DS . '$#', '', $core);
 		$paths[] = $core;
 		$Folder =& new Folder($core . 'templates' . DS . 'default');
 		$contents = $Folder->read();

cake/console/libs/tasks/test.php

@@ -94,14 +94,12 @@ protected function _interactive($type = null) {
 		$this->out(sprintf(__('Path: %s'), $this->path));
 		$this->hr();
 
-		$selection = null;
 		if ($type) {
 			$type = Inflector::camelize($type);
 			if (!in_array($type, $this->classTypes)) {
-				unset($type);
+				$this->error(sprintf('Incorrect type provided.  Please choose one of %s', implode(', ', $this->classTypes)));
 			}
-		}
-		if (!$type) {
+		} else {
 			$type = $this->getObjectType();
 		}
 		$className = $this->getClassName($type);

cake/console/libs/tasks/view.php

@@ -195,6 +195,7 @@ public function all() {
 					$actions = $this->_methodsToBake();
 				}
 				$this->bakeActions($actions, $vars);
+				$actions = null;
 			}
 		}
 	}
@@ -290,7 +291,7 @@ private function __loadController() {
 			$primaryKey = $modelObj->primaryKey;
 			$displayField = $modelObj->displayField;
 			$singularVar = Inflector::variable($modelClass);
-			$singularHumanName = $this->_singularHumanName($modelClass);
+			$singularHumanName = $this->_singularHumanName($this->controllerName);
 			$schema = $modelObj->schema(true);
 			$fields = array_keys($schema);
 			$associations = $this->__associations($modelObj);

cake/console/libs/testsuite.php

@@ -6,14 +6,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.4433

cake/console/templates/skel/webroot/test.php

@@ -4,14 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
  * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
  * @since         CakePHP(tm) v 1.2.0.4433

cake/libs/cake_session.php

@@ -130,6 +130,14 @@ class CakeSession extends Object {
  */
 	public $host = null;
 
+/**
+ * Session timeout multiplier factor
+ *
+ * @var ineteger
+ * @access public
+ */
+	var $timeout = null;
+
 /**
  * Constructor.
  *
@@ -455,20 +463,20 @@ function __initSession() {
 
 		switch ($this->security) {
 			case 'high':
-				$this->cookieLifeTime = 0;
+				$this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins();
 				if ($iniSet) {
 					ini_set('session.referer_check', $this->host);
 				}
 			break;
 			case 'medium':
-				$this->cookieLifeTime = 7 * 86400;
+				$this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins();
 				if ($iniSet) {
 					ini_set('session.referer_check', $this->host);
 				}
 			break;
 			case 'low':
 			default:
-				$this->cookieLifeTime = 788940000;
+				$this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins();
 			break;
 		}
 
@@ -591,15 +599,14 @@ protected function _checkValid() {
 			if ((Configure::read('Session.checkAgent') === false || $this->_userAgent == $this->read('Config.userAgent')) && $this->time <= $this->read('Config.time')) {
 				$time = $this->read('Config.time');
 				$this->write('Config.time', $this->sessionTime);
-
 				if (Configure::read('Security.level') === 'high') {
 					$check = $this->read('Config.timeout');
-					$check = $check - 1;
+					$check -= 1;
 					$this->write('Config.timeout', $check);
 
 					if (time() > ($time - (Security::inactiveMins() * Configure::read('Session.timeout')) + 2) || $check < 1) {
 						$this->renew();
-						$this->write('Config.timeout', 10);
+						$this->write('Config.timeout', Security::inactiveMins());
 					}
 				}
 				$this->valid = true;
@@ -611,7 +618,7 @@ protected function _checkValid() {
 		} else {
 			$this->write('Config.userAgent', $this->_userAgent);
 			$this->write('Config.time', $this->sessionTime);
-			$this->write('Config.timeout', 10);
+			$this->write('Config.timeout', Security::inactiveMins());
 			$this->valid = true;
 			$this->__setError(1, 'Session is valid');
 		}
@@ -738,21 +745,7 @@ function __read($id) {
  * @access private
  */
 	function __write($id, $data) {
-		switch (Configure::read('Security.level')) {
-			case 'medium':
-				$factor = 100;
-			break;
-			case 'low':
-				$factor = 300;
-			break;
-			case 'high':
-			default:
-				$factor = 10;
-			break;
-		}
-
-		$expires = time() + Configure::read('Session.timeout') * $factor;
-
+		$expires = time() + Configure::read('Session.timeout') * Security::inactiveMins();
 		$model =& ClassRegistry::getObject('Session');
 		$return = $model->save(compact('id', 'data', 'expires'));
 		return $return;

cake/libs/controller/component.php

@@ -22,7 +22,7 @@
  *
  * @package       cake
  * @subpackage    cake.cake.libs.controller
- * @link          http://book.cakephp.org/view/62/Components
+ * @link          http://book.cakephp.org/view/993/Components
  */
 class Component extends Object {
 

cake/libs/controller/components/request_handler.php

@@ -258,8 +258,9 @@ public function startup(&$controller) {
  *
  * @param object $controller A reference to the controller
  * @param mixed $url A string or array containing the redirect location
+ * @param mixed HTTP Status for redirect
  */
-	public function beforeRedirect(&$controller, $url) {
+	public function beforeRedirect(&$controller, $url, $status = null) {
 		if (!$this->isAjax()) {
 			return;
 		}
@@ -269,6 +270,12 @@ public function beforeRedirect(&$controller, $url) {
 		if (is_array($url)) {
 			$url = Router::url($url + array('base' => false));
 		}
+		if (!empty($status)) {
+			$statusCode = $controller->httpCodes($status);
+			$code = key($statusCode);
+			$msg = $statusCode[$code];
+			$controller->header("HTTP/1.1 {$code} {$msg}");
+		}
 		echo $this->requestAction($url, array('return'));
 		$this->_stop();
 	}

cake/libs/controller/components/security.php

@@ -109,7 +109,6 @@ class SecurityComponent extends Object {
 
 /**
  * An associative array of usernames/passwords used for HTTP-authenticated logins.
- * If using digest authentication, passwords should be MD5-hashed.
  *
  * @var array
  * @access public

cake/libs/controller/scaffold.php

@@ -390,7 +390,7 @@ function __scaffoldDelete($params = array()) {
 
 			if ($this->ScaffoldModel->delete($id)) {
 				$message = __(
-					sprintf('The %1$s with id: %2$d has been deleted.', Inflector::humanize($this->modelClass), $id),
+					sprintf('The %1$s with id: %2$d has been deleted.', Inflector::humanize($this->modelClass), $id)
 				);
 				if ($this->_validSession) {
 					$this->controller->Session->setFlash($message);

cake/libs/file.php

@@ -186,7 +186,7 @@ public function read($bytes = false, $mode = 'rb', $force = false) {
 		if ($bytes === false) {
 			$this->close();
 		}
-		return $data;
+		return trim($data);
 	}
 
 /**

cake/libs/folder.php

@@ -66,7 +66,7 @@ class Folder {
  * @var array
  * @access private
  */
-	private $__errors = false;
+	private $__errors = array();
 
 /**
  * Holds array of complete directory paths.
@@ -678,11 +678,14 @@ public function move($options) {
 			$to = $options;
 			$options = (array)$options;
 		}
-		$options = array_merge(array('to' => $to, 'from' => $this->path, 'mode' => $this->mode, 'skip' => array()), $options);
+		$options = array_merge(
+			array('to' => $to, 'from' => $this->path, 'mode' => $this->mode, 'skip' => array()), 
+			$options
+		);
 
 		if ($this->copy($options)) {
 			if ($this->delete($options['from'])) {
-				return $this->cd($options['to']);
+				return (bool)$this->cd($options['to']);
 			}
 		}
 		return false;

cake/libs/l10n.php

@@ -172,6 +172,7 @@ class L10n {
 								/* Urdu */ 'urd' => 'ur',
 								/* Venda */ 'ven' => 've',
 								/* Vietnamese */ 'vie' => 'vi',
+								/* Welsh */ 'cym' => 'cy',
 								/* Xhosa */ 'xho' => 'xh',
 								/* Yiddish */ 'yid' => 'yi',
 								/* Zulu */ 'zul' => 'zu');
@@ -315,6 +316,7 @@ class L10n {
 										'ur' => array('language' => 'Urdu', 'locale' => 'urd', 'localeFallback' => 'urd', 'charset' => 'utf-8', 'direction' => 'rtl'),
 										've' => array('language' => 'Venda', 'locale' => 'ven', 'localeFallback' => 'ven', 'charset' => 'utf-8', 'direction' => 'ltr'),
 										'vi' => array('language' => 'Vietnamese', 'locale' => 'vie', 'localeFallback' => 'vie', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'cy' => array('language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8', 'direction' => 'ltr'),
 										'xh' => array('language' => 'Xhosa', 'locale' => 'xho', 'localeFallback' => 'xho', 'charset' => 'utf-8', 'direction' => 'ltr'),
 										'yi' => array('language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr'),
 										'zh' => array('language' => 'Chinese', 'locale' => 'chi', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),

cake/libs/model/datasources/dbo/dbo_mysql.php

@@ -726,8 +726,8 @@ function resultSet(&$results) {
 		$j = 0;
 
 		while ($j < $numFields) {
-			$column = mysql_fetch_field($results,$j);
-			if (!empty($column->table)) {
+			$column = mysql_fetch_field($results, $j);
+			if (!empty($column->table) && strpos($column->name, '__') === false) {
 				$this->map[$index++] = array($column->table, $column->name);
 			} else {
 				$this->map[$index++] = array(0, $column->name);

cake/libs/model/model.php

@@ -1263,7 +1263,7 @@ function save($data = null, $validate = true, $fieldList = array()) {
 			}
 		}
 
-		if (isset($this->data[$this->alias][$this->primaryKey]) && empty($this->data[$this->alias][$this->primaryKey])) {
+		if (empty($this->data[$this->alias][$this->primaryKey])) {
 			unset($this->data[$this->alias][$this->primaryKey]);
 		}
 		$fields = $values = array();