Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

lib/Cake/Console/ShellDispatcher.php

@@ -201,20 +201,21 @@ public function dispatch() {
  *
  * @param string $shell Optionally the name of a plugin
  * @return mixed An object
- * @throws MissingShellFileException when errors are encountered.
+ * @throws MissingShellException when errors are encountered.
  */
 	protected function _getShell($shell) {
 		list($plugin, $shell) = pluginSplit($shell, true);
 
-
 		$class = Inflector::camelize($shell) . 'Shell';
 
 		App::uses('Shell', 'Console');
 		App::uses('AppShell', 'Console');
 		App::uses($class, $plugin . 'Console/Command');
 
 		if (!class_exists($class)) {
-			throw new MissingShellFileException(array('shell' => $shell));
+			throw new MissingShellException(array(
+				'class' => $class
+			));
 		}
 		$Shell = new $class();
 		return $Shell;

lib/Cake/Console/TaskCollection.php

@@ -54,7 +54,7 @@ public function __construct(Shell $Shell) {
  * @param string $task Task name to load
  * @param array $settings Settings for the task.
  * @return Task A task object, Either the existing loaded task or a new one.
- * @throws MissingTaskFileException, MissingTaskClassException when the task could not be found
+ * @throws MissingTaskException when the task could not be found
  */
 	public function load($task, $settings = array()) {
 		list($plugin, $name) = pluginSplit($task, true);
@@ -66,7 +66,9 @@ public function load($task, $settings = array()) {
 		App::uses($taskClass, $plugin . 'Console/Command/Task');
 		if (!class_exists($taskClass)) {
 			if (!class_exists($taskClass)) {
-				throw new MissingTaskClassException($taskClass);
+				throw new MissingTaskException(array(
+					'class' => $taskClass
+				));
 			}
 		}
 

lib/Cake/Console/Templates/default/actions/controller_actions.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.template.objects
+ * @package       Cake.Console.Templates.default.actions
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/default/classes/controller.ctp

@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Console.Templates.default.actions
+ * @package       Cake.Console.Templates.default.classes
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/default/classes/fixture.ctp

@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Console.Templates.default.actions
+ * @package       Cake.Console.Templates.default.classes
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/default/classes/model.ctp

@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Console.Templates.default.actions
+ * @package       Cake.Console.Templates.default.classes
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/default/classes/test.ctp

@@ -13,7 +13,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Console.Templates.default.actions
+ * @package       Cake.Console.Templates.default.classes
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/default/views/form.ctp

@@ -11,7 +11,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.templates.views
+ * @package       Cake.Console.Templates.default.views
  * @since         CakePHP(tm) v 1.2.0.5234
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/default/views/index.ctp

@@ -11,7 +11,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.templates.views
+ * @package       Cake.Console.Templates.default.views
  * @since         CakePHP(tm) v 1.2.0.5234
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/default/views/view.ctp

@@ -11,7 +11,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.console.libs.templates.views
+ * @package       Cake.Console.Templates.default.views
  * @since         CakePHP(tm) v 1.2.0.5234
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/skel/Controller/AppController.php

@@ -28,7 +28,7 @@
  * Add your application-wide methods in the class below, your controllers
  * will inherit them.
  *
- * @package       Cake.Console.Templates.skel.Controller
+ * @package       app.Controller
  */
 class AppController extends Controller {
 }

lib/Cake/Console/Templates/skel/Controller/PagesController.php

@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Console.Templates.skel.Controller
+ * @package       app.Controller
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -24,7 +24,7 @@
  *
  * Override this controller by placing a copy in controllers directory of an application
  *
- * @package       Cake.Console.Templates.skel.Controller
+ * @package       app.Controller
  */
 class PagesController extends AppController {
 

lib/Cake/Console/Templates/skel/Model/AppModel.php

@@ -28,7 +28,7 @@
  * Add your application-wide methods in the class below, your models
  * will inherit them.
  *
- * @package       Cake.Console.Templates.skel.Model
+ * @package       app.Model
  */
 class AppModel extends Model {
 }

lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp

@@ -11,7 +11,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.html
+ * @package       app.View.Emails.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp

@@ -11,7 +11,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.text
+ * @package       app.View.Emails.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php

@@ -15,6 +15,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       app.View.Helper
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -27,7 +28,7 @@
  * Add your application-wide methods in the class below, your helpers
  * will inherit them.
  *
- * @package       Cake.Console.Templates.skel.View.Helper
+ * @package       app.View.Helper
  */
 class AppHelper extends Helper {
 }

lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp

@@ -11,7 +11,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts
+ * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Controller/ComponentCollection.php

@@ -73,7 +73,7 @@ public function getController() {
  * @param string $component Component name to load
  * @param array $settings Settings for the component.
  * @return Component A component object, Either the existing loaded component or a new one.
- * @throws MissingComponentFileException, MissingComponentClassException when the component could not be found
+ * @throws MissingComponentException when the component could not be found
  */
 	public function load($component, $settings = array()) {
 		if (is_array($settings) && isset($settings['className'])) {
@@ -90,8 +90,7 @@ public function load($component, $settings = array()) {
 		$componentClass = $name . 'Component';
 		App::uses($componentClass, $plugin . 'Controller/Component');
 		if (!class_exists($componentClass)) {
-			throw new MissingComponentClassException(array(
-				'file' => Inflector::underscore($componentClass) . '.php',
+			throw new MissingComponentException(array(
 				'class' => $componentClass
 			));
 		}

lib/Cake/Error/exceptions.php

@@ -241,37 +241,23 @@ public function __construct($message, $code = 404, Exception $previous = null) {
 }
 
 /**
- * Used when a Component file cannot be found.
+ * Used when a component cannot be found.
  *
  * @package       Cake.Error
  */
-class MissingComponentFileException extends CakeException {
-	protected $_messageTemplate = 'Component file  "%s" is missing.';
+class MissingComponentException extends CakeException {
+	protected $_messageTemplate = 'Component class %s could not be found.';
 }
 
 /**
- * Used when a Component class cannot be found.
+ * Used when a behavior cannot be found.
  *
  * @package       Cake.Error
  */
-class MissingComponentClassException extends CakeException {
-	protected $_messageTemplate = 'Component class "%s" is missing.';
+class MissingBehaviorException extends CakeException {
+	protected $_messageTemplate = 'Behavior class %s could not be found.';
 }
 
-/**
- * Used when a Behavior file cannot be found.
- *
- * @package       Cake.Error
- */
-class MissingBehaviorFileException extends CakeException { }
-
-/**
- * Used when a Behavior class cannot be found.
- *
- * @package       Cake.Error
- */
-class MissingBehaviorClassException extends CakeException { }
-
 /**
  * Used when a view file cannot be found.
  *
@@ -291,24 +277,14 @@ class MissingLayoutException extends CakeException {
 }
 
 /**
- * Used when a helper file cannot be found.
+ * Used when a helper cannot be found.
  *
  * @package       Cake.Error
  */
-class MissingHelperFileException extends CakeException {
-	protected $_messageTemplate = 'Helper file "%s" is missing.';
+class MissingHelperException extends CakeException {
+	protected $_messageTemplate = 'Helper class %s could not be found.';
 }
 
-/**
- * Used when a helper class cannot be found.
- *
- * @package       Cake.Error
- */
-class MissingHelperClassException extends CakeException {
-	protected $_messageTemplate = 'Helper class "%s" is missing.';
-}
-
-
 /**
  * Runtime Exceptions for ConnectionManager
  *
@@ -328,21 +304,12 @@ class MissingConnectionException extends CakeException {
 }
 
 /**
- * Used when a Task file cannot be found.
- *
- * @package       Cake.Error
- */
-class MissingTaskFileException extends CakeException {
-	protected $_messageTemplate = 'Task file "%s" is missing.';
-}
-
-/**
- * Used when a Task class cannot be found.
+ * Used when a Task cannot be found.
  *
  * @package       Cake.Error
  */
-class MissingTaskClassException extends CakeException {
-	protected $_messageTemplate = 'Task class "%s" is missing.';
+class MissingTaskException extends CakeException {
+	protected $_messageTemplate = 'Task class %s could not be found.';
 }
 
 /**
@@ -355,21 +322,12 @@ class MissingShellMethodException extends CakeException {
 }
 
 /**
- * Used when a shell class cannot be found.
- *
- * @package       Cake.Error
- */
-class MissingShellClassException extends CakeException {
-	protected $_messageTemplate = "Shell class %s could not be loaded.";
-}
-
-/**
- * Used when a shell file cannot be found.
+ * Used when a shell cannot be found.
  *
  * @package       Cake.Error
  */
-class MissingShellFileException extends CakeException {
-	protected $_messageTemplate = "Shell file %s could not be loaded.";
+class MissingShellException extends CakeException {
+	protected $_messageTemplate = 'Shell class %s could not be found.';
 }
 
 /**
@@ -382,12 +340,12 @@ class MissingDatasourceConfigException extends CakeException {
 }
 
 /**
- * Exception class to be thrown when a datasource is not found
+ * Used when a datasource cannot be found.
  *
  * @package       Cake.Error
  */
-class MissingDatasourceFileException extends CakeException {
-	protected $_messageTemplate = 'Datasource "%s" was not found.';
+class MissingDatasourceException extends CakeException {
+	protected $_messageTemplate = 'Datasource class %s could not be found.';
 }
 
 /**

lib/Cake/Model/AclNode.php

@@ -41,7 +41,7 @@ class AclNode extends AppModel {
  *
  * @var array
  */
-	public $actsAs = array('Tree' => array('nested'));
+	public $actsAs = array('Tree' => array('type' => 'nested'));
 
 /**
  * Constructor

lib/Cake/Model/Behavior/AclBehavior.php

@@ -36,17 +36,18 @@ class AclBehavior extends ModelBehavior {
 	protected $_typeMaps = array('requester' => 'Aro', 'controlled' => 'Aco', 'both' => array('Aro', 'Aco'));
 
 /**
- * Sets up the configuation for the model, and loads ACL models if they haven't been already
+ * Sets up the configuration for the model, and loads ACL models if they haven't been already
  *
  * @param Model $model
  * @param array $config
  * @return void
  */
 	public function setup($model, $config = array()) {
-		if (is_string($config)) {
-			$config = array('type' => $config);
+		if (isset($config[0])) {
+			$config['type'] = $config[0];
+			unset($config[0]);
 		}
-		$this->settings[$model->name] = array_merge(array('type' => 'controlled'), (array)$config);
+		$this->settings[$model->name] = array_merge(array('type' => 'controlled'), $config);
 		$this->settings[$model->name]['type'] = strtolower($this->settings[$model->name]['type']);
 
 		$types = $this->_typeMaps[$this->settings[$model->name]['type']];

lib/Cake/Model/Behavior/ContainableBehavior.php

@@ -64,9 +64,6 @@ public function setup($Model, $settings = array()) {
 		if (!isset($this->settings[$Model->alias])) {
 			$this->settings[$Model->alias] = array('recursive' => true, 'notices' => true, 'autoFields' => true);
 		}
-		if (!is_array($settings)) {
-			$settings = array();
-		}
 		$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], $settings);
 	}