Removing trailing spaces.

lib/Cake/Cache/Engine/WincacheEngine.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Wincache storage engine for cache. 
+ * Wincache storage engine for cache.
  *
  * Supports wincache 1.1.0 and higher.
  *
@@ -67,7 +67,7 @@ public function write($key, $value, $duration) {
  * Read a key from the cache
  *
  * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if 
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if
  *     there was an error fetching it
  */
 	public function read($key) {
@@ -112,7 +112,7 @@ public function delete($key) {
 	}
 
 /**
- * Delete all keys from the cache.  This will clear every cache value stored 
+ * Delete all keys from the cache.  This will clear every cache value stored
  * in wincache.
  *
  * @param boolean $check

lib/Cake/Configure/IniReader.php

@@ -43,8 +43,8 @@
  * You can combine `.` separated values with sections to create more deeply
  * nested structures.
  *
- * IniReader also manipulates how the special ini values of 
- * 'yes', 'no', 'on', 'off', 'null' are handled. These values will be 
+ * IniReader also manipulates how the special ini values of
+ * 'yes', 'no', 'on', 'off', 'null' are handled. These values will be
  * converted to their boolean equivalents.
  *
  * @package       Cake.Configure

lib/Cake/Console/Command/CommandListShell.php

@@ -76,7 +76,7 @@ public function main() {
 /**
  * Gets the shell command listing.
  *
- * @return array 
+ * @return array
  */
 	protected function _getShellList() {
 		$shellList = array();

lib/Cake/Console/Command/Task/ProjectTask.php

@@ -52,7 +52,7 @@ public function execute() {
 			$prompt = __d('cake_console', "What is the path to the project you want to bake?");
 			$project = $this->in($prompt, null, APP . 'myapp');
 		}
-		
+
 
 		if ($project && !Folder::isAbsolute($project) && isset($_SERVER['PWD'])) {
 			$project = $_SERVER['PWD'] . DS . $project;

lib/Cake/Console/ConsoleErrorHandler.php

@@ -20,7 +20,7 @@
 App::uses('CakeLog', 'Log');
 
 /**
- * Error Handler for Cake console. Does simple printing of the 
+ * Error Handler for Cake console. Does simple printing of the
  * exception that occurred and the stack trace of the error.
  *
  * @package       Cake.Console
@@ -55,7 +55,7 @@ public static function getStderr() {
 	public static function handleException(Exception $exception) {
 		$stderr = self::getStderr();
 		$stderr->write(__d('cake_console', "<error>Error:</error> %s\n%s",
-			$exception->getMessage(), 
+			$exception->getMessage(),
 			$exception->getTraceAsString()
 		));
 	}

lib/Cake/Console/ConsoleInput.php

@@ -17,7 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 /**
- * Object wrapper for interacting with stdin 
+ * Object wrapper for interacting with stdin
  *
  * @package       Cake.Console
  */

lib/Cake/Console/ConsoleInputArgument.php

@@ -85,7 +85,7 @@ public function name() {
  * Generate the help for this argument.
  *
  * @param integer $width The width to make the name of the option.
- * @return string 
+ * @return string
  */
 	public function help($width = 0) {
 		$name = $this->_name;
@@ -141,7 +141,7 @@ public function validChoice($value) {
 		}
 		if (!in_array($value, $this->_choices)) {
 			throw new ConsoleException(
-				__d('cake_console', '"%s" is not a valid value for %s. Please use one of "%s"', 
+				__d('cake_console', '"%s" is not a valid value for %s. Please use one of "%s"',
 				$value, $this->_name, implode(', ', $this->_choices)
 			));
 		}

lib/Cake/Console/ConsoleInputOption.php

@@ -118,7 +118,7 @@ public function short() {
  * Generate the help for this this option.
  *
  * @param integer $width The width to make the name of the option.
- * @return string 
+ * @return string
  */
 	public function help($width = 0) {
 		$default = $short = '';

lib/Cake/Console/ConsoleInputSubcommand.php

@@ -37,7 +37,7 @@ class ConsoleInputSubcommand {
  *
  * @var string
  */
-	protected $_help; 
+	protected $_help;
 
 /**
  * The ConsoleOptionParser for this subcommand.
@@ -51,7 +51,7 @@ class ConsoleInputSubcommand {
  *
  * @param mixed $name The long name of the subcommand, or an array with all the properties.
  * @param string $help The help text for this option
- * @param mixed $parser A parser for this subcommand. Either a ConsoleOptionParser, or an array that can be 
+ * @param mixed $parser A parser for this subcommand. Either a ConsoleOptionParser, or an array that can be
  *   used with ConsoleOptionParser::buildFromArray()
  */
 	public function __construct($name, $help = '', $parser = null) {
@@ -83,7 +83,7 @@ public function name() {
  * Generate the help for this this subcommand.
  *
  * @param integer $width The width to make the name of the subcommand.
- * @return string 
+ * @return string
  */
 	public function help($width = 0) {
 		$name = $this->_name;

lib/Cake/Console/ConsoleOptionParser.php

@@ -232,7 +232,7 @@ public function command($text = null) {
 /**
  * Get or set the description text for shell/task.
  *
- * @param mixed $text The text to set, or null if you want to read. If an array the 
+ * @param mixed $text The text to set, or null if you want to read. If an array the
  *   text will be imploded with "\n"
  * @return mixed If reading, the value of the description. If setting $this will be returned
  */

lib/Cake/Console/ConsoleOutput.php

@@ -18,8 +18,8 @@
 /**
  * Object wrapper for outputting information from a shell application.
  * Can be connected to any stream resource that can be used with fopen()
- * 
- * Can generate colorized output on consoles that support it. There are a few 
+ *
+ * Can generate colorized output on consoles that support it. There are a few
  * built in styles
  *
  * - `error` Error messages.
@@ -141,7 +141,7 @@ class ConsoleOutput {
  *
  * Checks for a pretty console environment. Ansicon allows pretty consoles
  * on windows, and is supported.
- * 
+ *
  * @param string $stream The identifier of the stream to write output to.
  */
 	public function __construct($stream = 'php://stdout') {
@@ -265,7 +265,7 @@ public function styles($style = null, $definition = null) {
 
 /**
  * Get/Set the output type to use.  The output type how formatting tags are treated.
- * 
+ *
  * @param integer $type The output type to use.  Should be one of the class constants.
  * @return mixed Either null or the value if getting.
  */

lib/Cake/Console/HelpFormatter.php

@@ -180,7 +180,7 @@ public function xml($string = true) {
 		$xml = new SimpleXmlElement('<shell></shell>');
 		$xml->addChild('command', $parser->command());
 		$xml->addChild('description', $parser->description());
-		
+
 		$xml->addChild('epilog', $parser->epilog());
 		$subcommands = $xml->addChild('subcommands');
 		foreach ($parser->subcommands() as $command) {

lib/Cake/Console/Shell.php

@@ -353,7 +353,7 @@ public function runCommand($command, $argv) {
 		} catch (ConsoleException $e) {
 			return $this->out($this->OptionParser->help($command));
 		}
-		
+
 		$this->command = $command;
 		if (!empty($this->params['help'])) {
 			return $this->_displayHelp($command);

lib/Cake/Console/TaskCollection.php

@@ -50,7 +50,7 @@ public function __construct(Shell $Shell) {
 /**
  * Loads/constructs a task.  Will return the instance in the collection
  * if it already exists.
- * 
+ *
  * @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.

lib/Cake/Controller/Component/Auth/ActionsAuthorize.php

@@ -12,7 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
- 
+
 App::uses('BaseAuthorize', 'Controller/Component/Auth');
 
 /**

lib/Cake/Controller/Component/Auth/BaseAuthenticate.php

@@ -99,10 +99,10 @@ protected function _findUser($username, $password) {
 	abstract public function authenticate(CakeRequest $request, CakeResponse $response);
 
 /**
- * Allows you to hook into AuthComponent::logout(), 
+ * Allows you to hook into AuthComponent::logout(),
  * and implement specialized logout behaviour.
- * 
- * All attached authentication objects will have this method 
+ *
+ * All attached authentication objects will have this method
  * called when a user logs out.
  *
  * @param array $user The user about to be logged out.

lib/Cake/Controller/Component/Auth/BaseAuthorize.php

@@ -34,7 +34,7 @@ abstract class BaseAuthorize {
  * @var ComponentCollection
  */
 	protected $_Collection;
-	
+
 /**
  * Settings for authorize objects.
  *
@@ -75,7 +75,7 @@ public function __construct(ComponentCollection $collection, $settings = array()
  * Checks user authorization.
  *
  * @param array $user Active user data
- * @param CakeRequest $request 
+ * @param CakeRequest $request
  * @return boolean
  */
 	abstract public function authorize($user, CakeRequest $request);

lib/Cake/Controller/Component/Auth/BasicAuthenticate.php

@@ -24,7 +24,7 @@
  * Auth must support cookies.
  *
  * ### Using Basic auth
- * 
+ *
  * In your controller's components array, add auth + the required settings.
  * {{{
  *	var $components = array(
@@ -76,7 +76,7 @@ public function __construct(ComponentCollection $collection, $settings) {
 	}
 
 /**
- * Authenticate a user using basic HTTP auth.  Will use the configured User model and attempt a 
+ * Authenticate a user using basic HTTP auth.  Will use the configured User model and attempt a
  * login using basic HTTP auth.
  *
  * @param CakeRequest $request The request to authenticate with.
@@ -104,7 +104,7 @@ public function authenticate(CakeRequest $request, CakeResponse $response) {
 	public function getUser($request) {
 		$username = env('PHP_AUTH_USER');
 		$pass = env('PHP_AUTH_PW');
-		
+
 		if (empty($username) || empty($pass)) {
 			return false;
 		}

lib/Cake/Controller/Component/Auth/ControllerAuthorize.php

@@ -57,7 +57,7 @@ public function controller($controller = null) {
  * Checks user authorization using a controller callback.
  *
  * @param array $user Active user data
- * @param CakeRequest $request 
+ * @param CakeRequest $request
  * @return boolean
  */
 	public function authorize($user, CakeRequest $request) {

lib/Cake/Controller/Component/Auth/CrudAuthorize.php

@@ -81,9 +81,9 @@ protected function _setPrefixMappings() {
  */
 	public function authorize($user, CakeRequest $request) {
 		if (!isset($this->settings['actionMap'][$request->params['action']])) {
-			trigger_error(__d('cake_dev', 
+			trigger_error(__d('cake_dev',
 				'CrudAuthorize::authorize() - Attempted access of un-mapped action "%1$s" in controller "%2$s"',
-				$request->action, 
+				$request->action,
 				$request->controller
 				),
 				E_USER_WARNING

lib/Cake/Controller/Component/Auth/DigestAuthenticate.php

@@ -20,14 +20,14 @@
  *
  * Provides Digest HTTP authentication support for AuthComponent.  Unlike most AuthComponent adapters,
  * DigestAuthenticate requires a special password hash that conforms to RFC2617.  You can create this
- * password using `DigestAuthenticate::password()`.  If you wish to use digest authentication alongside other 
+ * password using `DigestAuthenticate::password()`.  If you wish to use digest authentication alongside other
  * authentication methods, its recommended that you store the digest authentication separately.
  *
  * Clients using Digest Authentication  must support cookies.  Since AuthComponent identifies users based
  * on Session contents, clients without support for cookies will not function properly.
  *
  * ### Using Digest auth
- * 
+ *
  * In your controller's components array, add auth + the required settings.
  * {{{
  *	var $components = array(
@@ -47,7 +47,7 @@
  *
  * `$digestPass = DigestAuthenticate::password($username, env('SERVER_NAME'), $password);`
  *
- * Its recommended that you store this digest auth only password separate from password hashes used for other 
+ * Its recommended that you store this digest auth only password separate from password hashes used for other
  * login methods.  For example `User.digest_pass` could be used for a digest password, while `User.password` would
  * store the password hash for use with other methods like Basic or Form.
  *
@@ -101,7 +101,7 @@ public function __construct(ComponentCollection $collection, $settings) {
 		}
 	}
 /**
- * Authenticate a user using Digest HTTP auth.  Will use the configured User model and attempt a 
+ * Authenticate a user using Digest HTTP auth.  Will use the configured User model and attempt a
  * login using Digest HTTP auth.
  *
  * @param CakeRequest $request The request to authenticate with.
@@ -230,7 +230,7 @@ public function generateResponseHash($digest, $password) {
 	}
 
 /**
- * Creates an auth digest password hash to store 
+ * Creates an auth digest password hash to store
  *
  * @param string $username The username to use in the digest hash.
  * @param string $password The unhashed password to make a digest hash for.

lib/Cake/Controller/Component/Auth/FormAuthenticate.php

@@ -38,7 +38,7 @@ class FormAuthenticate extends BaseAuthenticate {
 
 /**
  * Authenticates the identity contained in a request.  Will use the `settings.userModel`, and `settings.fields`
- * to find POST data that is used to find a matching record in the `settings.userModel`.  Will return false if 
+ * to find POST data that is used to find a matching record in the `settings.userModel`.  Will return false if
  * there is no post data, either username or password is missing, of if the scope conditions have not been met.
  *
  * @param CakeRequest $request The request that contains login information.

lib/Cake/Controller/Component/CookieComponent.php

@@ -109,7 +109,7 @@ class CookieComponent extends Component {
 /**
  * HTTP only cookie
  *
- * Set to true to make HTTP only cookies.  Cookies that are HTTP only 
+ * Set to true to make HTTP only cookies.  Cookies that are HTTP only
  * are not accessible in Javascript.
  *
  * @var boolean
@@ -205,7 +205,7 @@ public function write($key, $value = null, $encrypt = true, $expires = null) {
 		}
 		$this->_encrypted = $encrypt;
 		$this->_expire($expires);
-		
+
 		if (!is_array($key)) {
 			$key = array($key => $value);
 		}
@@ -366,7 +366,7 @@ protected function _expire($expires = null) {
  */
 	protected function _write($name, $value) {
 		$this->_setcookie(
-			$this->name . $name, $this->_encrypt($value), 
+			$this->name . $name, $this->_encrypt($value),
 			$this->_expires, $this->path, $this->domain, $this->secure, $this->httpOnly
 		);
 
@@ -384,7 +384,7 @@ protected function _write($name, $value) {
  */
 	protected function _delete($name) {
 		$this->_setcookie(
-			$this->name . $name, '', 
+			$this->name . $name, '',
 			time() - 42000, $this->path, $this->domain, $this->secure, $this->httpOnly
 		);
 	}