whitespace coding standards

This commit is contained in:
euromark 2013-07-05 14:15:18 +02:00
parent 06fc8dbfc1
commit c989624f80
15 changed files with 29 additions and 28 deletions

View file

@ -34,9 +34,9 @@ App::uses('FormAuthenticate', 'Controller/Component/Auth');
* For initial password hashing/creation see Security::hash(). Other than how the password is initially hashed, * For initial password hashing/creation see Security::hash(). Other than how the password is initially hashed,
* BlowfishAuthenticate works exactly the same way as FormAuthenticate. * BlowfishAuthenticate works exactly the same way as FormAuthenticate.
* *
* @package Cake.Controller.Component.Auth * @package Cake.Controller.Component.Auth
* @since CakePHP(tm) v 2.3 * @since CakePHP(tm) v 2.3
* @see AuthComponent::$authenticate * @see AuthComponent::$authenticate
*/ */
class BlowfishAuthenticate extends FormAuthenticate { class BlowfishAuthenticate extends FormAuthenticate {

View file

@ -112,7 +112,7 @@ class Object {
* *
* @param string $method Name of the method to call * @param string $method Name of the method to call
* @param array $params Parameter list to use when calling $method * @param array $params Parameter list to use when calling $method
* @return mixed Returns the result of the method call * @return mixed Returns the result of the method call
*/ */
public function dispatchMethod($method, $params = array()) { public function dispatchMethod($method, $params = array()) {
switch (count($params)) { switch (count($params)) {

View file

@ -88,7 +88,7 @@ class ContainableBehavior extends ModelBehavior {
* ))); * )));
* }}} * }}}
* *
* @param Model $Model Model using the behavior * @param Model $Model Model using the behavior
* @param array $query Query parameters as set by cake * @param array $query Query parameters as set by cake
* @return array * @return array
*/ */

View file

@ -105,7 +105,7 @@ class TreeBehavior extends ModelBehavior {
/** /**
* Runs before a find() operation * 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 * @param array $query Query parameters as set by cake
* @return array * @return array
*/ */

View file

@ -328,7 +328,7 @@ class Postgres extends DboSource {
* @param string|Model $table A string or model class representing the table to be truncated * @param string|Model $table A string or model class representing the table to be truncated
* @param boolean $reset true for resetting the sequence, false to leave it as is. * @param boolean $reset true for resetting the sequence, false to leave it as is.
* and if 1, sequences are not modified * and if 1, sequences are not modified
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable. * @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
*/ */
public function truncate($table, $reset = false) { public function truncate($table, $reset = false) {
$table = $this->fullTableName($table, false, false); $table = $this->fullTableName($table, false, false);

View file

@ -227,7 +227,7 @@ class Sqlite extends DboSource {
* primary key, where applicable. * primary key, where applicable.
* *
* @param string|Model $table A string or model class representing the table to be truncated * @param string|Model $table A string or model class representing the table to be truncated
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable. * @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
*/ */
public function truncate($table) { public function truncate($table) {
$this->_execute('DELETE FROM sqlite_sequence where name=' . $this->startQuote . $this->fullTableName($table, false, false) . $this->endQuote); $this->_execute('DELETE FROM sqlite_sequence where name=' . $this->startQuote . $this->fullTableName($table, false, false) . $this->endQuote);

View file

@ -2031,7 +2031,7 @@ class DboSource extends DataSource {
* primary key, where applicable. * primary key, where applicable.
* *
* @param Model|string $table A string or model class representing the table to be truncated * @param Model|string $table A string or model class representing the table to be truncated
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable. * @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
*/ */
public function truncate($table) { public function truncate($table) {
return $this->execute('TRUNCATE TABLE ' . $this->fullTableName($table)); return $this->execute('TRUNCATE TABLE ' . $this->fullTableName($table));

View file

@ -73,7 +73,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* If no TestResult object is passed a new one will be created. * If no TestResult object is passed a new one will be created.
* This method is run for each test method in this class * This method is run for each test method in this class
* *
* @param PHPUnit_Framework_TestResult $result * @param PHPUnit_Framework_TestResult $result
* @return PHPUnit_Framework_TestResult * @return PHPUnit_Framework_TestResult
* @throws InvalidArgumentException * @throws InvalidArgumentException
*/ */

View file

@ -372,7 +372,8 @@ class CakeHtmlReporter extends CakeBaseReporter {
/** /**
* A test suite started. * A test suite started.
* *
* @param PHPUnit_Framework_TestSuite $suite * @param PHPUnit_Framework_TestSuite $suite
* @return void
*/ */
public function startTestSuite(PHPUnit_Framework_TestSuite $suite) { public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
if (!$this->_headerSent) { if (!$this->_headerSent) {

View file

@ -371,7 +371,7 @@ class CakeNumber {
/** /**
* Getter/setter for default currency * Getter/setter for default currency
* *
* @param string $currency Default currency string used by currency() if $currency argument is not provided * @param string $currency Default currency string used by currency() if $currency argument is not provided
* @return string Currency * @return string Currency
*/ */
public static function defaultCurrency($currency = null) { public static function defaultCurrency($currency = null) {

View file

@ -203,8 +203,8 @@ class ClassRegistry {
/** /**
* Add $object to the registry, associating it with the name $key. * Add $object to the registry, associating it with the name $key.
* *
* @param string $key Key for the object in registry * @param string $key Key for the object in registry
* @param object $object Object to store * @param object $object Object to store
* @return boolean True if the object was written, false if $key already exists * @return boolean True if the object was written, false if $key already exists
*/ */
public static function addObject($key, $object) { public static function addObject($key, $object) {
@ -220,7 +220,7 @@ class ClassRegistry {
/** /**
* Remove object which corresponds to given key. * Remove object which corresponds to given key.
* *
* @param string $key Key of object to remove from registry * @param string $key Key of object to remove from registry
* @return void * @return void
*/ */
public static function removeObject($key) { public static function removeObject($key) {

View file

@ -247,7 +247,7 @@ class Helper extends Object {
* an array of url parameters. Using an array for URLs will allow you to leverage * an array of url parameters. Using an array for URLs will allow you to leverage
* the reverse routing features of CakePHP. * the reverse routing features of CakePHP.
* @param boolean $full If true, the full base URL will be prepended to the result * @param boolean $full If true, the full base URL will be prepended to the result
* @return string Full translated URL with base path. * @return string Full translated URL with base path.
* @link http://book.cakephp.org/2.0/en/views/helpers.html * @link http://book.cakephp.org/2.0/en/views/helpers.html
*/ */
public function url($url = null, $full = false) { public function url($url = null, $full = false) {

View file

@ -649,14 +649,14 @@ class FormHelper extends AppHelper {
* *
* ### Options: * ### Options:
* *
* - `escape` bool Whether or not to html escape the contents of the error. * - `escape` bool - Whether or not to html escape the contents of the error.
* - `wrap` mixed Whether or not the error message should be wrapped in a div. If a * - `wrap` mixed - Whether or not the error message should be wrapped in a div. If a
* string, will be used as the HTML tag to use. * string, will be used as the HTML tag to use.
* - `class` string The classname for the error message * - `class` string - The classname for the error message
* *
* @param string $field A field name, like "Modelname.fieldname" * @param string $field A field name, like "Modelname.fieldname"
* @param string|array $text Error message as string or array of messages. * @param string|array $text Error message as string or array of messages.
* If array contains `attributes` key it will be used as options for error container * If array contains `attributes` key it will be used as options for error container
* @param array $options Rendering options for <div /> wrapper tag * @param array $options Rendering options for <div /> wrapper tag
* @return string If there are errors this method returns an error message, otherwise null. * @return string If there are errors this method returns an error message, otherwise null.
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::error * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::error

View file

@ -76,7 +76,7 @@ class NumberHelper extends AppHelper {
/** /**
* @see CakeNumber::precision() * @see CakeNumber::precision()
* *
* @param float $number A floating point number. * @param float $number A floating point number.
* @param integer $precision The precision of the returned number. * @param integer $precision The precision of the returned number.
* @return float Formatted float. * @return float Formatted float.
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::precision * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::precision

View file

@ -233,7 +233,7 @@ if (!function_exists('pr')) {
* Print_r convenience function, which prints out <PRE> tags around * Print_r convenience function, which prints out <PRE> tags around
* the output of given array. Similar to debug(). * the output of given array. Similar to debug().
* *
* @see debug() * @see debug()
* @param array $var Variable to print out * @param array $var Variable to print out
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#pr * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#pr
*/ */
@ -281,7 +281,7 @@ if (!function_exists('env')) {
* IIS, or SCRIPT_NAME in CGI mode). Also exposes some additional custom * IIS, or SCRIPT_NAME in CGI mode). Also exposes some additional custom
* environment information. * environment information.
* *
* @param string $key Environment variable name. * @param string $key Environment variable name.
* @return string Environment variable setting. * @return string Environment variable setting.
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#env * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#env
*/ */
@ -382,11 +382,11 @@ if (!function_exists('cache')) {
/** /**
* Reads/writes temporary data to cache files or session. * Reads/writes temporary data to cache files or session.
* *
* @param string $path File path within /tmp to save the file. * @param string $path File path within /tmp to save the file.
* @param mixed $data The data to save to the temporary file. * @param mixed $data The data to save to the temporary file.
* @param mixed $expires A valid strtotime string when the data expires. * @param mixed $expires A valid strtotime string when the data expires.
* @param string $target The target of the cached data; either 'cache' or 'public'. * @param string $target The target of the cached data; either 'cache' or 'public'.
* @return mixed The contents of the temporary file. * @return mixed The contents of the temporary file.
* @deprecated Please use Cache::write() instead * @deprecated Please use Cache::write() instead
*/ */
function cache($path, $data = null, $expires = '+1 day', $target = 'cache') { function cache($path, $data = null, $expires = '+1 day', $target = 'cache') {