Merge pull request cakephp#1400 from dereuromark/master

Coding standards whitespace

Author: markstory

lib/Cake/Console/Shell.php

@@ -542,7 +542,7 @@ public function wrapText($text, $options = array()) {
  *
  * There are 3 built-in output level. Shell::QUIET, Shell::NORMAL, Shell::VERBOSE.
  * The verbose and quiet output levels, map to the `verbose` and `quiet` output switches
- * present in  most shells. Using Shell::QUIET for a message means it will always display.
+ * present in most shells. Using Shell::QUIET for a message means it will always display.
  * While using Shell::VERBOSE means it will only display when verbose output is toggled.
  *
  * @param string|array $message A string or a an array of strings to output

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

@@ -18,7 +18,7 @@
  */
 ?>
 <div class="<?php echo $pluralVar; ?> view">
-<h2><?php echo "<?php  echo __('{$singularHumanName}'); ?>"; ?></h2>
+<h2><?php echo "<?php echo __('{$singularHumanName}'); ?>"; ?></h2>
 	<dl>
 <?php
 foreach ($fields as $field) {

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

@@ -28,15 +28,15 @@
  * 	)
  * }}}
  *
- * When  configuring BlowfishAuthenticate you can pass in settings to which fields, model and additional conditions
+ * When configuring BlowfishAuthenticate you can pass in settings to which fields, model and additional conditions
  * are used. See FormAuthenticate::$settings for more information.
  *
  * For initial password hashing/creation see Security::hash(). Other than how the password is initially hashed,
  * BlowfishAuthenticate works exactly the same way as FormAuthenticate.
  *
- * @package	Cake.Controller.Component.Auth
- * @since	CakePHP(tm) v 2.3
- * @see		AuthComponent::$authenticate
+ * @package Cake.Controller.Component.Auth
+ * @since CakePHP(tm) v 2.3
+ * @see AuthComponent::$authenticate
  */
 class BlowfishAuthenticate extends FormAuthenticate {
 

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

@@ -24,7 +24,7 @@
  * 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
+ * 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

lib/Cake/Controller/Component/CookieComponent.php

@@ -62,7 +62,7 @@ class CookieComponent extends Component {
  * $this->Cookie->path = '/';
  *
  * The path on the server in which the cookie will be available on.
- * If  public $cookiePath is set to '/foo/', the cookie will only be available
+ * If public $cookiePath is set to '/foo/', the cookie will only be available
  * within the /foo/ directory and all sub-directories such as /foo/bar/ of domain.
  * The default value is the entire domain.
  *

lib/Cake/Core/Object.php

@@ -110,9 +110,9 @@ public function requestAction($url, $extra = array()) {
  * Calls a method on this object with the given parameters. Provides an OO wrapper
  * for `call_user_func_array`
  *
- * @param string $method  Name of the method to call
- * @param array $params  Parameter list to use when calling $method
- * @return mixed  Returns the result of the method call
+ * @param string $method Name of the method to call
+ * @param array $params Parameter list to use when calling $method
+ * @return mixed Returns the result of the method call
  */
 	public function dispatchMethod($method, $params = array()) {
 		switch (count($params)) {

lib/Cake/Error/ErrorHandler.php

@@ -32,7 +32,7 @@
  *
  * ### Uncaught exceptions
  *
- * When debug < 1 a CakeException will render 404 or  500 errors. If an uncaught exception is thrown
+ * When debug < 1 a CakeException will render 404 or 500 errors. If an uncaught exception is thrown
  * and it is a type that ErrorHandler does not know about it will be treated as a 500 error.
  *
  * ### Implementing application specific exception handling

lib/Cake/Error/ExceptionRenderer.php

@@ -30,7 +30,7 @@
  * Exception Renderer.
  *
  * Captures and handles all unhandled exceptions. Displays helpful framework errors when debug > 1.
- * When debug < 1 a CakeException will render 404 or  500 errors. If an uncaught exception is thrown
+ * When debug < 1 a CakeException will render 404 or 500 errors. If an uncaught exception is thrown
  * and it is a type that ExceptionHandler does not know about it will be treated as a 500 error.
  *
  * ### Implementing application specific exception rendering

lib/Cake/Model/Behavior/ContainableBehavior.php

@@ -88,7 +88,7 @@ public function setup(Model $Model, $settings = array()) {
  * )));
  * }}}
  *
- * @param Model $Model	Model using the behavior
+ * @param Model $Model Model using the behavior
  * @param array $query Query parameters as set by cake
  * @return array
  */

lib/Cake/Model/Behavior/TreeBehavior.php

@@ -105,7 +105,7 @@ public function afterSave(Model $Model, $created) {
 /**
  * Runs before a find() operation
  *
- * @param Model $Model	Model using the behavior
+ * @param Model $Model Model using the behavior
  * @param array $query Query parameters as set by cake
  * @return array
  */