cakephp · markstory · Jul 18, 2012 · Jul 18, 2012 · Jul 18, 2012
diff --git a/lib/Cake/Cache/CacheEngine.php b/lib/Cake/Cache/CacheEngine.php
@@ -65,7 +65,7 @@ public function init($settings = array()) {
  * Garbage collection
  *
  * Permanently remove all expired and deleted data
- * 
+ *
  * @param integer $expires [optional] An expires timestamp, invalidataing all data before.
  * @return void
  */

diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php
@@ -93,7 +93,7 @@ public function init($settings = array()) {
 
 /**
  * Garbage collection. Permanently remove all expired and deleted data
- * 
+ *
  * @param integer $expires [optional] An expires timestamp, invalidataing all data before.
  * @return boolean True if garbage collection was successful, false on failure
  */

diff --git a/lib/Cake/Console/Command/Task/TemplateTask.php b/lib/Cake/Console/Command/Task/TemplateTask.php
@@ -56,7 +56,7 @@ public function initialize() {
  *
  * Bake themes are directories not named `skel` inside a `Console/Templates` path.
  * They are listed in this order: app -> plugin -> default
- * 
+ *
  * @return array Array of bake themes that are installed.
  */
 	protected function _findThemes() {

diff --git a/lib/Cake/Console/Command/TestShell.php b/lib/Cake/Console/Command/TestShell.php
@@ -335,8 +335,8 @@ public function available() {
  * Find the test case for the passed file. The file could itself be a test.
  *
  * @param string $file
- * @param string $category 
- * @param boolean $throwOnMissingFile 
+ * @param string $category
+ * @param boolean $throwOnMissingFile
  * @access protected
  * @return array(type, case)
  * @throws Exception

diff --git a/lib/Cake/Console/Templates/default/classes/controller.ctp b/lib/Cake/Console/Templates/default/classes/controller.ctp
@@ -49,33 +49,33 @@ class <?php echo $controllerName; ?>Controller extends <?php echo $plugin; ?>App
 
 <?php else:
 
-    if (count($helpers)):
-        echo "/**\n * Helpers\n *\n * @var array\n */\n";
-        echo "\tpublic \$helpers = array(";
-        for ($i = 0, $len = count($helpers); $i < $len; $i++):
-            if ($i != $len - 1):
-                echo "'" . Inflector::camelize($helpers[$i]) . "', ";
-            else:
-                echo "'" . Inflector::camelize($helpers[$i]) . "'";
-            endif;
-        endfor;
-        echo ");\n\n";
-    endif;
+	if (count($helpers)):
+		echo "/**\n * Helpers\n *\n * @var array\n */\n";
+		echo "\tpublic \$helpers = array(";
+		for ($i = 0, $len = count($helpers); $i < $len; $i++):
+			if ($i != $len - 1):
+				echo "'" . Inflector::camelize($helpers[$i]) . "', ";
+			else:
+				echo "'" . Inflector::camelize($helpers[$i]) . "'";
+			endif;
+		endfor;
+		echo ");\n\n";
+	endif;
 
-    if (count($components)):
-        echo "/**\n * Components\n *\n * @var array\n */\n";
-        echo "\tpublic \$components = array(";
-        for ($i = 0, $len = count($components); $i < $len; $i++):
-            if ($i != $len - 1):
-                echo "'" . Inflector::camelize($components[$i]) . "', ";
-            else:
-                echo "'" . Inflector::camelize($components[$i]) . "'";
-            endif;
-        endfor;
-        echo ");\n\n";
-    endif;
+	if (count($components)):
+		echo "/**\n * Components\n *\n * @var array\n */\n";
+		echo "\tpublic \$components = array(";
+		for ($i = 0, $len = count($components); $i < $len; $i++):
+			if ($i != $len - 1):
+				echo "'" . Inflector::camelize($components[$i]) . "', ";
+			else:
+				echo "'" . Inflector::camelize($components[$i]) . "'";
+			endif;
+		endfor;
+		echo ");\n\n";
+	endif;
 
-    echo trim($actions) . "\n";
+	echo trim($actions) . "\n";
 
 endif; ?>
 }
diff --git a/lib/Cake/Console/Templates/default/classes/model.ctp b/lib/Cake/Console/Templates/default/classes/model.ctp
@@ -48,9 +48,9 @@ class <?php echo $name ?> extends <?php echo $plugin; ?>AppModel {
 <?php endif;
 
 if ($useTable && $useTable !== Inflector::tableize($name)):
-    $table = "'$useTable'";
-    echo "/**\n * Use table\n *\n * @var mixed False or table name\n */\n";
-    echo "\tpublic \$useTable = $table;\n\n";
+	$table = "'$useTable'";
+	echo "/**\n * Use table\n *\n * @var mixed False or table name\n */\n";
+	echo "\tpublic \$useTable = $table;\n\n";
 endif;
 
 if ($primaryKey !== 'id'): ?>

diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php
@@ -226,7 +226,7 @@
 	Configure::write('Acl.database', 'default');
 
 /**
- * Uncomment this line and correct your server timezone to fix 
+ * Uncomment this line and correct your server timezone to fix
  * any date & time related errors.
  */
 	//date_default_timezone_set('UTC');
@@ -299,7 +299,7 @@
  * By default File is used, but for improved performance you should use APC.
  *
  * Note: 'default' and other application caches should be configured in app/Config/bootstrap.php.
- *       Please check the comments in boostrap.php for more info on the cache engines available 
+ *       Please check the comments in boostrap.php for more info on the cache engines available
  *       and their setttings.
  */
 $engine = 'File';

diff --git a/lib/Cake/Controller/Component.php b/lib/Cake/Controller/Component.php
@@ -120,7 +120,7 @@ public function startup(Controller $controller) {
 	}
 
 /**
- * Called before the Controller::beforeRender(), and before 
+ * Called before the Controller::beforeRender(), and before
  * the view class is loaded, and before Controller::render()
  *
  * @param Controller $controller Controller with components to beforeRender

diff --git a/lib/Cake/Controller/Component/Acl/IniAcl.php b/lib/Cake/Controller/Component/Acl/IniAcl.php
@@ -143,7 +143,7 @@ public function check($aro, $aco, $action = null) {
 	}
 
 /**
- * Parses an INI file and returns an array that reflects the 
+ * Parses an INI file and returns an array that reflects the
  * INI file's section structure. Double-quote friendly.
  *
  * @param string $filename File

diff --git a/lib/Cake/Controller/Component/Acl/PhpAcl.php b/lib/Cake/Controller/Component/Acl/PhpAcl.php
@@ -18,7 +18,7 @@
  */
 
 /**
- * PhpAcl implements an access control system using a plain PHP configuration file. 
+ * PhpAcl implements an access control system using a plain PHP configuration file.
  * An example file can be found in app/Config/acl.php
  *
  * @package Cake.Controller.Component.Acl
@@ -46,7 +46,7 @@ class PhpAcl extends Object implements AclInterface {
 
 /**
  * Aco Object
- * 
+ *
  * @var PhpAco
  */
 	public $Aco = null;
@@ -65,8 +65,8 @@ public function __construct() {
 
 /**
  * Initialize method
- * 
- * @param AclComponent $Component Component instance 
+ *
+ * @param AclComponent $Component Component instance
  * @return void
  */
 	public function initialize(Component $Component) {
@@ -199,7 +199,7 @@ class PhpAco {
 
 /**
  * map modifiers for ACO paths to their respective PCRE pattern
- * 
+ *
  * @var array
  */
 	public static $modifiers = array(
@@ -263,7 +263,7 @@ public function path($aco) {
 /**
  * allow/deny ARO access to ARO
  *
- * @return void 
+ * @return void
  */
 	public function access($aro, $aco, $action, $type = 'deny') {
 		$aco = $this->resolve($aco);
@@ -315,7 +315,7 @@ public function resolve($aco) {
  *
  * @param array $allow ACO allow rules
  * @param array $deny ACO deny rules
- * @return void 
+ * @return void
  */
 	public function build(array $allow, array $deny = array()) {
 		$stack = array();
@@ -349,7 +349,7 @@ public function build(array $allow, array $deny = array()) {
 class PhpAro {
 
 /**
- * role to resolve to when a provided ARO is not listed in 
+ * role to resolve to when a provided ARO is not listed in
  * the internal tree
  *
  * @var string
@@ -359,12 +359,12 @@ class PhpAro {
 /**
  * map external identifiers. E.g. if
  *
- * array('User' => array('username' => 'jeff', 'role' => 'editor')) 
+ * array('User' => array('username' => 'jeff', 'role' => 'editor'))
  *
- * is passed as an ARO to one of the methods of AclComponent, PhpAcl 
+ * is passed as an ARO to one of the methods of AclComponent, PhpAcl
  * will check if it can be resolved to an User or a Role defined in the
- * configuration file. 
- * 
+ * configuration file.
+ *
  * @var array
  * @see app/Config/acl.php
  */
@@ -375,7 +375,7 @@ class PhpAro {
 
 /**
  * aliases to map
- * 
+ *
  * @var array
  */
 	public $aliases = array();
@@ -400,9 +400,9 @@ public function __construct(array $aro = array(), array $map = array(), array $a
  * From the perspective of the given ARO, walk down the tree and
  * collect all inherited AROs levelwise such that AROs from different
  * branches with equal distance to the requested ARO will be collected at the same
- * index. The resulting array will contain a prioritized list of (list of) roles ordered from 
+ * index. The resulting array will contain a prioritized list of (list of) roles ordered from
  * the most distant AROs to the requested one itself.
- * 
+ *
  * @param string|array $aro An ARO identifier
  * @return array prioritized AROs
  */
@@ -427,7 +427,7 @@ public function roles($aro) {
 
 /**
  * resolve an ARO identifier to an internal ARO string using
- * the internal mapping information. 
+ * the internal mapping information.
  *
  * @param string|array $aro ARO identifier (User.jeff, array('User' => ...), etc)
  * @return string internal aro string (e.g. User/jeff, Role/default)
@@ -529,7 +529,7 @@ public  function addAlias(array $alias) {
  * build an ARO tree structure for internal processing
  *
  * @param array $aros array of AROs as key and their inherited AROs as values
- * @return void 
+ * @return void
  */
 	public function build(array $aros) {
 		$this->_tree = array();

diff --git a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
@@ -68,7 +68,7 @@ class DigestAuthenticate extends BaseAuthenticate {
  * - `realm` The realm authentication is for, Defaults to the servername.
  * - `nonce` A nonce used for authentication.  Defaults to `uniqid()`.
  * - `qop` Defaults to auth, no other values are supported at this time.
- * - `opaque` A string that must be returned unchanged by clients. 
+ * - `opaque` A string that must be returned unchanged by clients.
  *    Defaults to `md5($settings['realm'])`
  *
  * @var array

diff --git a/lib/Cake/Controller/Component/CookieComponent.php b/lib/Cake/Controller/Component/CookieComponent.php
@@ -155,7 +155,7 @@ class CookieComponent extends Component {
 
 /**
  * A reference to the Controller's CakeResponse object
- * 
+ *
  * @var CakeResponse
  */
 	protected $_response = null;

diff --git a/lib/Cake/Controller/Component/SecurityComponent.php b/lib/Cake/Controller/Component/SecurityComponent.php
@@ -23,7 +23,7 @@
 App::uses('Security', 'Utility');
 
 /**
- * The Security Component creates an easy way to integrate tighter security in 
+ * The Security Component creates an easy way to integrate tighter security in
  * your application. It provides methods for various tasks like:
  *
  * - Restricting which HTTP methods your application accepts.

diff --git a/lib/Cake/Controller/Component/SessionComponent.php b/lib/Cake/Controller/Component/SessionComponent.php
@@ -21,8 +21,8 @@
 App::uses('CakeSession', 'Model/Datasource');
 
 /**
- * The CakePHP SessionComponent provides a way to persist client data between 
- * page requests. It acts as a wrapper for the `$_SESSION` as well as providing 
+ * The CakePHP SessionComponent provides a way to persist client data between
+ * page requests. It acts as a wrapper for the `$_SESSION` as well as providing
  * convenience methods for several `$_SESSION` related functions.
  *
  * @package       Cake.Controller.Component

diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
@@ -18,7 +18,7 @@
  */
 
 /**
- * CakePlugin is responsible for loading and unloading plugins. It also can 
+ * CakePlugin is responsible for loading and unloading plugins. It also can
  * retrieve plugin paths and load their bootstrap and routes files.
  *
  * @package       Cake.Core

diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php
@@ -286,7 +286,7 @@ public static function load($key, $config = 'default', $merge = true) {
 /**
  * Dump data currently in Configure into $filename.  The serialization format
  * is decided by the config reader attached as $config.  For example, if the
- * 'default' adapter is a PhpReader, the generated file will be a PHP 
+ * 'default' adapter is a PhpReader, the generated file will be a PHP
  * configuration file loadable by the PhpReader.
  *
  * ## Usage
@@ -303,7 +303,7 @@ public static function load($key, $config = 'default', $merge = true) {
  * @param string $key The identifier to create in the config adapter.
  *   This could be a filename or a cache key depending on the adapter being used.
  * @param string $config The name of the configured adapter to dump data with.
- * @param array $keys The name of the top-level keys you want to dump. 
+ * @param array $keys The name of the top-level keys you want to dump.
  *   This allows you save only some data stored in Configure.
  * @return boolean success
  * @throws ConfigureException if the adapter does not implement a `dump` method.
@@ -381,7 +381,7 @@ public static function clear() {
 	}
 /**
  * Set the error and exception handlers.
- * 
+ *
  * @param array $error The Error handling configuration.
  * @param array $exception The exception handling configuration.
  * @return void

diff --git a/lib/Cake/Event/CakeEvent.php b/lib/Cake/Event/CakeEvent.php
@@ -27,7 +27,7 @@ class CakeEvent {
 
 /**
  * Name of the event
- * 
+ *
  * @var string $name
  */
 	protected $_name = null;

diff --git a/lib/Cake/Event/CakeEventManager.php b/lib/Cake/Event/CakeEventManager.php
@@ -50,7 +50,7 @@ class CakeEventManager {
 	protected $_listeners = array();
 
 /**
- * Internal flag to distinguish a common manager from the sigleton 
+ * Internal flag to distinguish a common manager from the sigleton
  *
  * @var boolean
  */
@@ -64,7 +64,7 @@ class CakeEventManager {
  *
  * If called with a first params, it will be set as the globally available instance
  *
- * @param CakeEventManager $manager 
+ * @param CakeEventManager $manager
  * @return CakeEventManager the global event manager
  */
 	public static function instance($manager = null) {
@@ -80,7 +80,7 @@ public static function instance($manager = null) {
 	}
 
 /**
- * Adds a new listener to an event. Listeners 
+ * Adds a new listener to an event. Listeners
  *
  * @param callback|CakeEventListener $callable PHP valid callback type or instance of CakeEventListener to be called
  * when the event named with $eventKey is triggered. If a CakeEventListener instances is passed, then the `implementedEvents`

diff --git a/lib/Cake/Model/Behavior/ContainableBehavior.php b/lib/Cake/Model/Behavior/ContainableBehavior.php
@@ -20,8 +20,8 @@
  */
 
 /**
- * Behavior to allow for dynamic and atomic manipulation of a Model's associations 
- * used for a find call. Most useful for limiting the amount of associations and 
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations
+ * used for a find call. Most useful for limiting the amount of associations and
  * data returned.
  *
  * @package       Cake.Model.Behavior

diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php
@@ -24,7 +24,7 @@
 /**
  * Manages loaded instances of DataSource objects
  *
- * Provides an interface for loading and enumerating connections defined in 
+ * Provides an interface for loading and enumerating connections defined in
  * app/Config/database.php
  *
  * @package       Cake.Model