From 51f9837db4a1a23676c9d26d6aa835998ff44da4 Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Thu, 15 Dec 2011 22:52:07 -0800 Subject: [PATCH 1/2] Code standards formatting --- lib/Cake/Console/Command/ApiShell.php | 4 +- lib/Cake/Console/Command/Task/ProjectTask.php | 6 +- .../Controller/Component/AclComponent.php | 8 +-- lib/Cake/Controller/Controller.php | 6 +- lib/Cake/Core/App.php | 2 +- lib/Cake/I18n/I18n.php | 6 +- lib/Cake/I18n/Multibyte.php | 2 +- .../Model/Behavior/ContainableBehavior.php | 4 +- lib/Cake/Model/Behavior/TranslateBehavior.php | 38 +++++------ lib/Cake/Model/Behavior/TreeBehavior.php | 8 +-- .../Model/Datasource/Database/Postgres.php | 6 +- lib/Cake/Model/Datasource/Database/Sqlite.php | 2 +- .../Model/Datasource/Database/Sqlserver.php | 2 +- lib/Cake/Model/Datasource/DboSource.php | 2 +- lib/Cake/Model/Model.php | 2 +- lib/Cake/Network/CakeResponse.php | 2 +- lib/Cake/Network/CakeSocket.php | 4 +- .../Case/Cache/Engine/MemcacheEngineTest.php | 10 +-- .../Case/Console/Command/AclShellTest.php | 6 +- .../Console/Command/Task/ExtractTaskTest.php | 8 +-- .../Console/Command/Task/ModelTaskTest.php | 4 +- .../Console/Command/Task/ProjectTaskTest.php | 2 +- lib/Cake/Test/Case/Console/ShellTest.php | 4 +- .../Component/AuthComponentTest.php | 2 +- .../Test/Case/Controller/ScaffoldTest.php | 12 ++-- lib/Cake/Test/Case/Core/AppTest.php | 10 +-- .../Behavior/ContainableBehaviorTest.php | 4 +- .../Model/Behavior/TranslateBehaviorTest.php | 2 +- .../Model/Datasource/Database/MysqlTest.php | 2 +- .../Datasource/Database/PostgresTest.php | 8 +-- lib/Cake/Test/Case/Model/DbAclTest.php | 2 +- lib/Cake/Test/Case/Model/ModelWriteTest.php | 8 +-- lib/Cake/Test/Case/Model/models.php | 8 +-- .../Test/Case/Network/Email/CakeEmailTest.php | 18 +++--- lib/Cake/Test/Case/Utility/FileTest.php | 4 +- lib/Cake/Test/Case/Utility/ValidationTest.php | 2 +- .../Test/Case/View/Helper/CacheHelperTest.php | 2 +- .../Test/Case/View/Helper/HtmlHelperTest.php | 4 +- .../Case/View/Helper/NumberHelperTest.php | 12 ++-- .../Test/Case/View/Helper/TextHelperTest.php | 6 +- .../Test/Fixture/CounterCachePostFixture.php | 4 +- ...rCachePostNonstandardPrimaryKeyFixture.php | 4 +- .../Test/Fixture/GroupUpdateAllFixture.php | 56 +++++++++-------- .../Test/Fixture/ProductUpdateAllFixture.php | 63 ++++++++++--------- lib/Cake/Test/test_app/View/Pages/home.ctp | 2 +- lib/Cake/TestSuite/CakeTestRunner.php | 2 +- .../TestSuite/Reporter/CakeHtmlReporter.php | 2 +- .../TestSuite/Reporter/CakeTextReporter.php | 2 +- lib/Cake/Utility/File.php | 2 +- lib/Cake/Utility/Set.php | 4 +- lib/Cake/Utility/String.php | 2 +- lib/Cake/Utility/Validation.php | 2 +- lib/Cake/View/Helper/CacheHelper.php | 2 +- lib/Cake/View/Helper/HtmlHelper.php | 2 +- lib/Cake/View/Helper/TextHelper.php | 2 +- lib/Cake/View/Helper/TimeHelper.php | 8 +-- lib/Cake/View/Scaffolds/view.ctp | 8 +-- lib/Cake/bootstrap.php | 22 +++---- 58 files changed, 220 insertions(+), 213 deletions(-) diff --git a/lib/Cake/Console/Command/ApiShell.php b/lib/Cake/Console/Command/ApiShell.php index 7018c03bc..18c44b09e 100644 --- a/lib/Cake/Console/Command/ApiShell.php +++ b/lib/Cake/Console/Command/ApiShell.php @@ -101,7 +101,7 @@ class ApiShell extends AppShell { $this->_stop(); } $method = $parsed[$this->params['method']]; - $this->out($class .'::'.$method['method'] . $method['parameters']); + $this->out($class . '::' . $method['method'] . $method['parameters']); $this->hr(); $this->out($method['comment'], true); } else { @@ -127,7 +127,7 @@ class ApiShell extends AppShell { if (isset($methods[--$number])) { $method = $parsed[$methods[$number]]; $this->hr(); - $this->out($class .'::'.$method['method'] . $method['parameters']); + $this->out($class . '::' . $method['method'] . $method['parameters']); $this->hr(); $this->out($method['comment'], true); } diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php index 17c87be43..f6e30b2d3 100644 --- a/lib/Cake/Console/Command/Task/ProjectTask.php +++ b/lib/Cake/Console/Command/Task/ProjectTask.php @@ -269,7 +269,7 @@ class ProjectTask extends AppShell { $contents = $File->read(); if (preg_match('/([\s]*Configure::write\(\'Security.salt\',[\s\'A-z0-9]*\);)/', $contents, $match)) { $string = Security::generateAuthKey(); - $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.salt\', \''.$string.'\');', $contents); + $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.salt\', \'' . $string . '\');', $contents); if ($File->write($result)) { return true; } @@ -290,7 +290,7 @@ class ProjectTask extends AppShell { if (preg_match('/([\s]*Configure::write\(\'Security.cipherSeed\',[\s\'A-z0-9]*\);)/', $contents, $match)) { App::uses('Security', 'Utility'); $string = substr(bin2hex(Security::generateAuthKey()), 0, 30); - $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.cipherSeed\', \''.$string.'\');', $contents); + $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.cipherSeed\', \'' . $string . '\');', $contents); if ($File->write($result)) { return true; } @@ -357,7 +357,7 @@ class ProjectTask extends AppShell { $File = new File($path . 'core.php'); $contents = $File->read(); if (preg_match('%(\s*[/]*Configure::write\(\'Routing.prefixes\',[\s\'a-z,\)\(]*\);)%', $contents, $match)) { - $result = str_replace($match[0], "\n" . 'Configure::write(\'Routing.prefixes\', array(\''.$name.'\'));', $contents); + $result = str_replace($match[0], "\n" . 'Configure::write(\'Routing.prefixes\', array(\'' . $name . '\'));', $contents); if ($File->write($result)) { Configure::write('Routing.prefixes', array($name)); return true; diff --git a/lib/Cake/Controller/Component/AclComponent.php b/lib/Cake/Controller/Component/AclComponent.php index 631c6d30c..a5e1cdd93 100644 --- a/lib/Cake/Controller/Component/AclComponent.php +++ b/lib/Cake/Controller/Component/AclComponent.php @@ -488,11 +488,11 @@ class DbAcl extends Object implements AclInterface { } return array( - 'aro' => Set::extract($obj, 'Aro.0.'.$this->Aro->alias.'.id'), - 'aco' => Set::extract($obj, 'Aco.0.'.$this->Aco->alias.'.id'), + 'aro' => Set::extract($obj, 'Aro.0.' . $this->Aro->alias . '.id'), + 'aco' => Set::extract($obj, 'Aco.0.' . $this->Aco->alias . '.id'), 'link' => $this->Aro->Permission->find('all', array('conditions' => array( - $this->Aro->Permission->alias . '.aro_id' => Set::extract($obj, 'Aro.0.'.$this->Aro->alias.'.id'), - $this->Aro->Permission->alias . '.aco_id' => Set::extract($obj, 'Aco.0.'.$this->Aco->alias.'.id') + $this->Aro->Permission->alias . '.aro_id' => Set::extract($obj, 'Aro.0.' . $this->Aro->alias . '.id'), + $this->Aro->Permission->alias . '.aco_id' => Set::extract($obj, 'Aco.0.' . $this->Aco->alias . '.id') ))) ); } diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index ef3472c54..b32e2ba24 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -981,7 +981,7 @@ class Controller extends Object { $arrayOp = is_array($op); foreach ($data as $model => $fields) { foreach ($fields as $field => $value) { - $key = $model.'.'.$field; + $key = $model . '.' . $field; $fieldOp = $op; if ($arrayOp) { if (array_key_exists($key, $op)) { @@ -998,9 +998,9 @@ class Controller extends Object { $fieldOp = strtoupper(trim($fieldOp)); if ($fieldOp === 'LIKE') { $key = $key.' LIKE'; - $value = '%'.$value.'%'; + $value = '%' . $value . '%'; } elseif ($fieldOp && $fieldOp != '=') { - $key = $key.' '.$fieldOp; + $key = $key.' ' . $fieldOp; } $cond[$key] = $value; } diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index f55fc400a..ba55143a3 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -656,7 +656,7 @@ class App { } App::uses($extends, $extendType); if ($plugin && in_array($originalType, array('controller', 'model'))) { - App::uses($plugin . $extends, $plugin . '.' .$type); + App::uses($plugin . $extends, $plugin . '.' . $type); } } if ($plugin) { diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php index 1c7af9959..f2f6af97b 100644 --- a/lib/Cake/I18n/I18n.php +++ b/lib/Cake/I18n/I18n.php @@ -164,7 +164,7 @@ class I18n { } if ($_this->category == 'LC_TIME') { - return $_this->_translateTime($singular,$domain); + return $_this->_translateTime($singular, $domain); } if (!isset($count)) { @@ -466,7 +466,7 @@ class I18n { } while (!feof($file)); fclose($file); $merge[""] = $header; - return $this->_domains[$domain][$this->_lang][$this->category] = array_merge($merge ,$translations); + return $this->_domains[$domain][$this->_lang][$this->category] = array_merge($merge, $translations); } /** @@ -486,7 +486,7 @@ class I18n { if (empty($line) || $line[0] === $comment) { continue; } - $parts = preg_split("/[[:space:]]+/",$line); + $parts = preg_split("/[[:space:]]+/", $line); if ($parts[0] === 'comment_char') { $comment = $parts[1]; continue; diff --git a/lib/Cake/I18n/Multibyte.php b/lib/Cake/I18n/Multibyte.php index bc581b506..7116e29aa 100644 --- a/lib/Cake/I18n/Multibyte.php +++ b/lib/Cake/I18n/Multibyte.php @@ -893,7 +893,7 @@ class Multibyte { * @param string $haystack The string being checked. * @param string $needle The string being found. * @return integer The number of times the $needle substring occurs in the $haystack string. - */ + */ public static function substrCount($haystack, $needle) { $count = 0; $haystack = Multibyte::utf8($haystack); diff --git a/lib/Cake/Model/Behavior/ContainableBehavior.php b/lib/Cake/Model/Behavior/ContainableBehavior.php index 46f75eb70..5dbffcda7 100644 --- a/lib/Cake/Model/Behavior/ContainableBehavior.php +++ b/lib/Cake/Model/Behavior/ContainableBehavior.php @@ -308,10 +308,10 @@ class ContainableBehavior extends ModelBehavior { $val = preg_split('/\s*,\s*/', substr(substr($key, 1), 0, -1)); } elseif (preg_match('/ASC|DESC$/', $key)) { $option = 'order'; - $val = $Model->{$name}->alias.'.'.$key; + $val = $Model->{$name}->alias . '.' . $key; } elseif (preg_match('/[ =!]/', $key)) { $option = 'conditions'; - $val = $Model->{$name}->alias.'.'.$key; + $val = $Model->{$name}->alias . '.' . $key; } $children[$option] = is_array($val) ? $val : array($val); $newChildren = null; diff --git a/lib/Cake/Model/Behavior/TranslateBehavior.php b/lib/Cake/Model/Behavior/TranslateBehavior.php index 15161b141..165ed8065 100644 --- a/lib/Cake/Model/Behavior/TranslateBehavior.php +++ b/lib/Cake/Model/Behavior/TranslateBehavior.php @@ -103,8 +103,8 @@ class TranslateBehavior extends ModelBehavior { $joinTable->tablePrefix = $tablePrefix; $joinTable->table = $RuntimeModel->table; - if (is_string($query['fields']) && 'COUNT(*) AS '.$db->name('count') == $query['fields']) { - $query['fields'] = 'COUNT(DISTINCT('.$db->name($model->alias . '.' . $model->primaryKey) . ')) ' . $db->alias . 'count'; + if (is_string($query['fields']) && 'COUNT(*) AS ' . $db->name('count') == $query['fields']) { + $query['fields'] = 'COUNT(DISTINCT(' . $db->name($model->alias . '.' . $model->primaryKey) . ')) ' . $db->alias . 'count'; $query['joins'][] = array( 'type' => 'INNER', 'alias' => $RuntimeModel->alias, @@ -126,7 +126,7 @@ class TranslateBehavior extends ModelBehavior { foreach ($fields as $key => $value) { $field = (is_numeric($key)) ? $value : $key; - if (in_array($model->alias.'.*', $query['fields']) || in_array($model->alias.'.'.$field, $query['fields']) || in_array($field, $query['fields'])) { + if (in_array($model->alias.'.*', $query['fields']) || in_array($model->alias.'.' . $field, $query['fields']) || in_array($field, $query['fields'])) { $addFields[] = $field; } } @@ -137,7 +137,7 @@ class TranslateBehavior extends ModelBehavior { foreach ($addFields as $_f => $field) { $aliasField = is_numeric($_f) ? $field : $_f; - foreach (array($aliasField, $model->alias.'.'.$aliasField) as $_field) { + foreach (array($aliasField, $model->alias . '.' . $aliasField) as $_field) { $key = array_search($_field, (array)$query['fields']); if ($key !== false) { @@ -147,36 +147,36 @@ class TranslateBehavior extends ModelBehavior { if (is_array($locale)) { foreach ($locale as $_locale) { - $model->virtualFields['i18n_'.$field.'_'.$_locale] = 'I18n__'.$field.'__'.$_locale.'.content'; + $model->virtualFields['i18n_' . $field . '_' . $_locale] = 'I18n__' . $field . '__' . $_locale . '.content'; if (!empty($query['fields'])) { - $query['fields'][] = 'i18n_'.$field.'_'.$_locale; + $query['fields'][] = 'i18n_' . $field . '_' . $_locale; } $query['joins'][] = array( 'type' => 'LEFT', - 'alias' => 'I18n__'.$field.'__'.$_locale, + 'alias' => 'I18n__' . $field . '__' . $_locale, 'table' => $joinTable, 'conditions' => array( $model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}__{$_locale}.foreign_key"), - 'I18n__'.$field.'__'.$_locale.'.model' => $model->name, - 'I18n__'.$field.'__'.$_locale.'.'.$RuntimeModel->displayField => $aliasField, - 'I18n__'.$field.'__'.$_locale.'.locale' => $_locale + 'I18n__' . $field . '__' . $_locale . '.model' => $model->name, + 'I18n__' . $field . '__' . $_locale . '.' . $RuntimeModel->displayField => $aliasField, + 'I18n__' . $field . '__' . $_locale . '.locale' => $_locale ) ); } } else { - $model->virtualFields['i18n_'.$field] = 'I18n__'.$field.'.content'; + $model->virtualFields['i18n_' . $field] = 'I18n__' . $field . '.content'; if (!empty($query['fields'])) { - $query['fields'][] = 'i18n_'.$field; + $query['fields'][] = 'i18n_' . $field; } $query['joins'][] = array( 'type' => 'INNER', - 'alias' => 'I18n__'.$field, + 'alias' => 'I18n__' . $field, 'table' => $joinTable, 'conditions' => array( $model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}.foreign_key"), - 'I18n__'.$field.'.model' => $model->name, - 'I18n__'.$field.'.'.$RuntimeModel->displayField => $aliasField, - 'I18n__'.$field.'.locale' => $locale + 'I18n__' . $field . '.model' => $model->name, + 'I18n__' . $field . '.' . $RuntimeModel->displayField => $aliasField, + 'I18n__' . $field . '.locale' => $locale ) ); } @@ -211,11 +211,11 @@ class TranslateBehavior extends ModelBehavior { if (is_array($locale)) { foreach ($locale as $_locale) { - if (!isset($row[$model->alias][$aliasField]) && !empty($row[$model->alias]['i18n_'.$field.'_'.$_locale])) { - $row[$model->alias][$aliasField] = $row[$model->alias]['i18n_'.$field.'_'.$_locale]; + if (!isset($row[$model->alias][$aliasField]) && !empty($row[$model->alias]['i18n_' . $field . '_' . $_locale])) { + $row[$model->alias][$aliasField] = $row[$model->alias]['i18n_' . $field . '_' . $_locale]; $row[$model->alias]['locale'] = $_locale; } - unset($row[$model->alias]['i18n_'.$field.'_'.$_locale]); + unset($row[$model->alias]['i18n_' . $field . '_' . $_locale]); } if (!isset($row[$model->alias][$aliasField])) { diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php index 621bf69b2..ff14fc98d 100644 --- a/lib/Cake/Model/Behavior/TreeBehavior.php +++ b/lib/Cake/Model/Behavior/TreeBehavior.php @@ -163,8 +163,8 @@ class TreeBehavior extends ModelBehavior { $this->_addToWhitelist($Model, $parent); } else { $values = $Model->find('first', array( - 'conditions' => array($scope,$Model->escapeField() => $Model->id), - 'fields' => array($Model->primaryKey, $parent, $left, $right ), 'recursive' => $recursive) + 'conditions' => array($scope, $Model->escapeField() => $Model->id), + 'fields' => array($Model->primaryKey, $parent, $left, $right), 'recursive' => $recursive) ); if ($values === false) { @@ -503,7 +503,7 @@ class TreeBehavior extends ModelBehavior { extract($this->settings[$Model->alias]); list($node) = array_values($Model->find('first', array( 'conditions' => array($scope, $Model->escapeField() => $id), - 'fields' => array($Model->primaryKey, $left, $right, $parent ), 'recursive' => $recursive + 'fields' => array($Model->primaryKey, $left, $right, $parent), 'recursive' => $recursive ))); if ($node[$parent]) { list($parentNode) = array_values($Model->find('first', array( @@ -527,7 +527,7 @@ class TreeBehavior extends ModelBehavior { } $edge = $this->_getMax($Model, $scope, $right, $recursive); $this->_sync($Model, $edge - $previousNode[$left] +1, '+', 'BETWEEN ' . $previousNode[$left] . ' AND ' . $previousNode[$right]); - $this->_sync($Model, $node[$left] - $previousNode[$left], '-', 'BETWEEN ' .$node[$left] . ' AND ' . $node[$right]); + $this->_sync($Model, $node[$left] - $previousNode[$left], '-', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right]); $this->_sync($Model, $edge - $previousNode[$left] - ($node[$right] - $node[$left]), '-', '> ' . $edge); if (is_int($number)) { $number--; diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php index ae3fe8945..bf60819d6 100644 --- a/lib/Cake/Model/Datasource/Database/Postgres.php +++ b/lib/Cake/Model/Datasource/Database/Postgres.php @@ -412,7 +412,7 @@ class Postgres extends DboSource { $match[1] = $this->name($match[1]); } } - return '(' . $prepend .$match[1] . ')'; + return '(' . $prepend . $match[1] . ')'; } /** @@ -480,13 +480,13 @@ class Postgres extends DboSource { case 'add': foreach ($column as $field => $col) { $col['name'] = $field; - $colList[] = 'ADD COLUMN '.$this->buildColumn($col); + $colList[] = 'ADD COLUMN ' . $this->buildColumn($col); } break; case 'drop': foreach ($column as $field => $col) { $col['name'] = $field; - $colList[] = 'DROP COLUMN '.$this->name($field); + $colList[] = 'DROP COLUMN ' . $this->name($field); } break; case 'change': diff --git a/lib/Cake/Model/Datasource/Database/Sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php index e8e2e836b..35f77385d 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlite.php +++ b/lib/Cake/Model/Datasource/Database/Sqlite.php @@ -238,7 +238,7 @@ class Sqlite extends DboSource { if (is_array($real)) { $col = $real['name']; if (isset($real['limit'])) { - $col .= '('.$real['limit'].')'; + $col .= '(' . $real['limit'] . ')'; } return $col; } diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php index ff39122b2..9e60c1622 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlserver.php +++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php @@ -302,7 +302,7 @@ class Sqlserver extends DboSource { $fieldAlias = $this->name($alias . '__' . $fields[$i]); } else { $build = explode('.', $fields[$i]); - $this->_fieldMappings[$build[0] . '__' .$build[1]] = $fields[$i]; + $this->_fieldMappings[$build[0] . '__' . $build[1]] = $fields[$i]; $fieldName = $this->name($build[0] . '.' . $build[1]); $fieldAlias = $this->name(preg_replace("/^\[(.+)\]$/", "$1", $build[0]) . '__' . $build[1]); } diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index f6f153081..ca47d200f 100644 --- a/lib/Cake/Model/Datasource/DboSource.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -787,7 +787,7 @@ class DboSource extends DataSource { } return $data; } - $cacheKey = crc32($this->startQuote.$data.$this->endQuote); + $cacheKey = crc32($this->startQuote . $data . $this->endQuote); if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) { return $return; } diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index 57c5d9430..3fdc303cf 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -2417,7 +2417,7 @@ class Model extends Object { * Queries the datasource and returns a result set array. * * Also used to perform notation finds, where the first argument is type of find operation to perform - * (all / first / count / neighbors / list / threaded ), + * (all / first / count / neighbors / list / threaded), * second parameter options for finding ( indexed array, including: 'conditions', 'limit', * 'recursive', 'page', 'fields', 'offset', 'order') * diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php index 1168cb4ef..be9ce5ae8 100644 --- a/lib/Cake/Network/CakeResponse.php +++ b/lib/Cake/Network/CakeResponse.php @@ -372,7 +372,7 @@ class CakeResponse { $this->_headers['Content-Length'] = $offset + strlen($this->_body); } } - } + } /** * Sends a header to the client. diff --git a/lib/Cake/Network/CakeSocket.php b/lib/Cake/Network/CakeSocket.php index 1f7a4c4d9..eb4e34a7e 100644 --- a/lib/Cake/Network/CakeSocket.php +++ b/lib/Cake/Network/CakeSocket.php @@ -106,9 +106,9 @@ class CakeSocket { } if ($this->config['persistent'] == true) { - $this->connection = @pfsockopen($scheme.$this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']); + $this->connection = @pfsockopen($scheme . $this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']); } else { - $this->connection = @fsockopen($scheme.$this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']); + $this->connection = @fsockopen($scheme . $this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']); } if (!empty($errNum) || !empty($errStr)) { diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php index 71fbb5d1c..42a24c60a 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php @@ -169,11 +169,11 @@ class MemcacheEngineTest extends CakeTestCase { * * @return void */ - function testParseServerStringUnix() { - $Memcache =& new TestMemcacheEngine(); - $result = $Memcache->parseServerString('unix:///path/to/memcached.sock'); - $this->assertEquals($result, array('unix:///path/to/memcached.sock', 0)); - } + function testParseServerStringUnix() { + $Memcache =& new TestMemcacheEngine(); + $result = $Memcache->parseServerString('unix:///path/to/memcached.sock'); + $this->assertEquals($result, array('unix:///path/to/memcached.sock', 0)); + } /** * testReadAndWriteCache method diff --git a/lib/Cake/Test/Case/Console/Command/AclShellTest.php b/lib/Cake/Test/Case/Console/Command/AclShellTest.php index 6eff3fe73..689eaaaf0 100644 --- a/lib/Cake/Test/Case/Console/Command/AclShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/AclShellTest.php @@ -289,9 +289,9 @@ class AclShellTest extends CakeTestCase { $first = $node[0]['Aro']['id']; $second = $node[1]['Aro']['id']; $last = $node[2]['Aro']['id']; - $this->Task->expects($this->at(2))->method('out')->with('['.$last.'] ROOT'); - $this->Task->expects($this->at(3))->method('out')->with(' ['.$second.'] admins'); - $this->Task->expects($this->at(4))->method('out')->with(' ['.$first.'] Elrond'); + $this->Task->expects($this->at(2))->method('out')->with('[' . $last . '] ROOT'); + $this->Task->expects($this->at(3))->method('out')->with(' [' . $second . '] admins'); + $this->Task->expects($this->at(4))->method('out')->with(' [' . $first . '] Elrond'); $this->Task->getPath(); } diff --git a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php index b8273b8b7..15e0254ee 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php @@ -329,10 +329,10 @@ class ExtractTaskTest extends CakeTestCase { $this->Task->execute(); $result = file_get_contents($this->path . DS . 'test_plugin.pot'); - $pattern = preg_quote('#Plugin' . DS. 'TestPlugin' . DS. 'Model' . DS. 'TestPluginPost.php:validation for field title#', '\\'); + $pattern = preg_quote('#Plugin' . DS . 'TestPlugin' . DS . 'Model' . DS . 'TestPluginPost.php:validation for field title#', '\\'); $this->assertRegExp($pattern, $result); - $pattern = preg_quote('#Plugin' . DS. 'TestPlugin' . DS. 'Model' . DS. 'TestPluginPost.php:validation for field body#', '\\'); + $pattern = preg_quote('#Plugin' . DS . 'TestPlugin' . DS . 'Model' . DS . 'TestPluginPost.php:validation for field body#', '\\'); $this->assertRegExp($pattern, $result); $pattern = '#msgid "Post title is required"#'; @@ -369,10 +369,10 @@ class ExtractTaskTest extends CakeTestCase { $this->Task->execute(); $result = file_get_contents($this->path . DS . 'test_plugin.pot'); - $pattern = preg_quote('#Model' . DS. 'TestPluginPost.php:validation for field title#', '\\'); + $pattern = preg_quote('#Model' . DS . 'TestPluginPost.php:validation for field title#', '\\'); $this->assertRegExp($pattern, $result); - $pattern = preg_quote('#Model' . DS. 'TestPluginPost.php:validation for field body#', '\\'); + $pattern = preg_quote('#Model' . DS . 'TestPluginPost.php:validation for field body#', '\\'); $this->assertRegExp($pattern, $result); $pattern = '#msgid "Post title is required"#'; diff --git a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php index 224526c56..0fa3ba081 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php @@ -948,7 +948,7 @@ STRINGEND; * * @return void */ - public function testExecuteIntoAllOddTables() { + public function testExecuteIntoAllOddTables() { $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); $this->Task = $this->getMock('ModelTask', @@ -1003,7 +1003,7 @@ STRINGEND; * * @return void */ - public function testExecuteIntoBakeOddTables() { + public function testExecuteIntoBakeOddTables() { $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); $this->Task = $this->getMock('ModelTask', diff --git a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php index 04ffbf420..a18e8c23a 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php @@ -301,7 +301,7 @@ class ProjectTaskTest extends CakeTestCase { * @return void */ public function testExecute() { - $this->Task->params['skel'] = CAKE . 'Console' . DS. 'Templates' . DS . 'skel'; + $this->Task->params['skel'] = CAKE . 'Console' . DS . 'Templates' . DS . 'skel'; $this->Task->params['working'] = TMP . 'tests' . DS; $path = $this->Task->path . 'bake_test_app'; diff --git a/lib/Cake/Test/Case/Console/ShellTest.php b/lib/Cake/Test/Case/Console/ShellTest.php index c6cef822c..b51cdeb37 100644 --- a/lib/Cake/Test/Case/Console/ShellTest.php +++ b/lib/Cake/Test/Case/Console/ShellTest.php @@ -380,8 +380,8 @@ class ShellTest extends CakeTestCase { $bar = '---------------------------------------------------------------'; $this->Shell->stdout->expects($this->at(0))->method('write')->with('', 0); - $this->Shell->stdout->expects($this->at(1))->method('write')->with($bar, 1); - $this->Shell->stdout->expects($this->at(2))->method('write')->with('', 0); + $this->Shell->stdout->expects($this->at(1))->method('write')->with($bar, 1); + $this->Shell->stdout->expects($this->at(2))->method('write')->with('', 0); $this->Shell->stdout->expects($this->at(3))->method('write')->with("", true); $this->Shell->stdout->expects($this->at(4))->method('write')->with($bar, 1); diff --git a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php index f5637402b..71ae1aad2 100644 --- a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php @@ -817,7 +817,7 @@ class AuthComponentTest extends CakeTestCase { $expected = Router::normalize('posts/view/1'); $this->assertEquals($expected, $this->Auth->Session->read('Auth.redirect')); - // QueryString parameters + // QueryString parameters $_back = $_GET; $_GET = array( 'print' => 'true', diff --git a/lib/Cake/Test/Case/Controller/ScaffoldTest.php b/lib/Cake/Test/Case/Controller/ScaffoldTest.php index c96885597..585041bb7 100644 --- a/lib/Cake/Test/Case/Controller/ScaffoldTest.php +++ b/lib/Cake/Test/Case/Controller/ScaffoldTest.php @@ -90,18 +90,18 @@ class TestScaffoldMock extends Scaffold { * * @param unknown_type $params */ - function _scaffold(CakeRequest $request) { - $this->_params = $request; - } + function _scaffold(CakeRequest $request) { + $this->_params = $request; + } /** * Get Params from the Controller. * * @return unknown */ - function getParams() { - return $this->_params; - } + function getParams() { + return $this->_params; + } } /** diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php index 50f64005d..de6b4fe8b 100644 --- a/lib/Cake/Test/Case/Core/AppTest.php +++ b/lib/Cake/Test/Case/Core/AppTest.php @@ -731,13 +731,13 @@ class AppTest extends CakeTestCase { $this->assertEquals($text, 'This is a file with dot in file name'); ob_start(); - $result = App::import('Vendor', 'TestHello', array('file' => 'Test'.DS.'hello.php')); + $result = App::import('Vendor', 'TestHello', array('file' => 'Test' . DS . 'hello.php')); $text = ob_get_clean(); $this->assertTrue($result); $this->assertEquals($text, 'This is the hello.php file in Test directory'); ob_start(); - $result = App::import('Vendor', 'MyTest', array('file' => 'Test'.DS.'MyTest.php')); + $result = App::import('Vendor', 'MyTest', array('file' => 'Test' . DS . 'MyTest.php')); $text = ob_get_clean(); $this->assertTrue($result); $this->assertEquals($text, 'This is the MyTest.php file'); @@ -804,13 +804,13 @@ class AppTest extends CakeTestCase { * * @return void */ - public function testPluginLibClasses() { - App::build(array( + public function testPluginLibClasses() { + App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) ), App::RESET); CakePlugin::loadAll(); $this->assertFalse(class_exists('TestPluginOtherLibrary', false)); App::uses('TestPluginOtherLibrary', 'TestPlugin.Lib'); $this->assertTrue(class_exists('TestPluginOtherLibrary')); - } + } } diff --git a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php index 0567b19fb..3d62813f7 100644 --- a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php @@ -3600,8 +3600,8 @@ class ContainableBehaviorTest extends CakeTestCase { * @return void */ public function testLazyLoad() { - // Local set up - $this->User = ClassRegistry::init('User'); + // Local set up + $this->User = ClassRegistry::init('User'); $this->User->bindModel(array( 'hasMany' => array('Article', 'ArticleFeatured', 'Comment') ), false); diff --git a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php index 4907d5f3b..8c342a5e4 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php @@ -766,7 +766,7 @@ class TranslateBehaviorTest extends CakeTestCase { 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', - 'updated' => '2007-03-17 01:18:31' + 'updated' => '2007-03-17 01:18:31' ) ); $this->assertEquals($expected, $result); diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php index 478961fed..53c42f9da 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php @@ -3177,7 +3177,7 @@ class MysqlTest extends CakeTestCase { ); $conditions = array('comment_count >' => 2); - $query = 'SELECT ' . join(',',$this->Dbo->fields($Article, null, array('id', 'comment_count'))) . + $query = 'SELECT ' . join(',', $this->Dbo->fields($Article, null, array('id', 'comment_count'))) . ' FROM ' . $this->Dbo->fullTableName($Article) . ' Article ' . $this->Dbo->conditions($conditions, true, true, $Article); $result = $this->Dbo->fetchAll($query); $expected = array(array( diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php index d1b486eea..0b60aa1c8 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php @@ -285,10 +285,10 @@ class PostgresTest extends CakeTestCase { $result = $this->Dbo->fields($this->model, null, array('*', 'PostgresClientTestModel.*')); $expected = array_merge($fields, array( '"PostgresClientTestModel"."id" AS "PostgresClientTestModel__id"', - '"PostgresClientTestModel"."name" AS "PostgresClientTestModel__name"', - '"PostgresClientTestModel"."email" AS "PostgresClientTestModel__email"', - '"PostgresClientTestModel"."created" AS "PostgresClientTestModel__created"', - '"PostgresClientTestModel"."updated" AS "PostgresClientTestModel__updated"')); + '"PostgresClientTestModel"."name" AS "PostgresClientTestModel__name"', + '"PostgresClientTestModel"."email" AS "PostgresClientTestModel__email"', + '"PostgresClientTestModel"."created" AS "PostgresClientTestModel__created"', + '"PostgresClientTestModel"."updated" AS "PostgresClientTestModel__updated"')); $this->assertEquals($expected, $result); } diff --git a/lib/Cake/Test/Case/Model/DbAclTest.php b/lib/Cake/Test/Case/Model/DbAclTest.php index edde6b82d..7884cf4bd 100644 --- a/lib/Cake/Test/Case/Model/DbAclTest.php +++ b/lib/Cake/Test/Case/Model/DbAclTest.php @@ -355,7 +355,7 @@ class AclNodeTest extends CakeTestCase { $result = $Aco->find('all'); $expected = array( array('DbAcoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'Application', 'lft' => '1', 'rght' => '4'), 'DbAroTest' => array()), - array('DbAcoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'Pages', 'lft' => '2', 'rght' => '3', ), 'DbAroTest' => array()) + array('DbAcoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'Pages', 'lft' => '2', 'rght' => '3'), 'DbAroTest' => array()) ); $this->assertEquals($expected, $result); } diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php index 6f6b928a2..cb37bbdd2 100644 --- a/lib/Cake/Test/Case/Model/ModelWriteTest.php +++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php @@ -5412,7 +5412,7 @@ class ModelWriteTest extends BaseModelTest { * * @return void */ - function testUpdateAllWithoutForeignKey() { + public function testUpdateAllWithoutForeignKey() { $this->skipIf(!$this->db instanceof Mysql, 'Currently, there is no way of doing joins in an update statement in postgresql'); $this->loadFixtures('ProductUpdateAll', 'GroupUpdateAll'); @@ -5420,12 +5420,12 @@ class ModelWriteTest extends BaseModelTest { $conditions = array('Group.name' => 'group one'); - $ProductUpdateAll->bindModel(array('belongsTo' => array( + $ProductUpdateAll->bindModel(array('belongsTo' => array( 'Group' => array('className' => 'GroupUpdateAll') ))); - $ProductUpdateAll->belongsTo = array( - 'Group' => array( + $ProductUpdateAll->belongsTo = array( + 'Group' => array( 'className' => 'GroupUpdateAll', 'foreignKey' => false, 'conditions' => 'ProductUpdateAll.groupcode = Group.code' diff --git a/lib/Cake/Test/Case/Model/models.php b/lib/Cake/Test/Case/Model/models.php index 8f4ef61b2..bfa493de1 100644 --- a/lib/Cake/Test/Case/Model/models.php +++ b/lib/Cake/Test/Case/Model/models.php @@ -3131,7 +3131,7 @@ class CounterCachePost extends CakeTestModel { class CounterCacheUserNonstandardPrimaryKey extends CakeTestModel { public $name = 'CounterCacheUserNonstandardPrimaryKey'; public $alias = 'User'; - public $primaryKey = 'uid'; + public $primaryKey = 'uid'; public $hasMany = array('Post' => array( 'className' => 'CounterCachePostNonstandardPrimaryKey', @@ -3142,7 +3142,7 @@ class CounterCacheUserNonstandardPrimaryKey extends CakeTestModel { class CounterCachePostNonstandardPrimaryKey extends CakeTestModel { public $name = 'CounterCachePostNonstandardPrimaryKey'; public $alias = 'Post'; - public $primaryKey = 'pid'; + public $primaryKey = 'pid'; public $belongsTo = array('User' => array( 'className' => 'CounterCacheUserNonstandardPrimaryKey', @@ -4473,8 +4473,8 @@ class MysqlTestModel extends Model { class PrefixTestModel extends CakeTestModel { } class PrefixTestUseTableModel extends CakeTestModel { - public $name = 'PrefixTest'; - public $useTable = 'prefix_tests'; + public $name = 'PrefixTest'; + public $useTable = 'prefix_tests'; } /** diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php index 310feab78..ee5a1d415 100644 --- a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php +++ b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php @@ -402,19 +402,19 @@ class CakeEmailTest extends CakeTestCase { */ public function testSubjectJapanese() { $this->skipIf(!function_exists('mb_convert_encoding')); - mb_internal_encoding('UTF-8'); + mb_internal_encoding('UTF-8'); - $this->CakeEmail->headerCharset = 'ISO-2022-JP'; + $this->CakeEmail->headerCharset = 'ISO-2022-JP'; $this->CakeEmail->subject('日本語のSubjectにも対応するよ'); - $expected = '=?ISO-2022-JP?B?GyRCRnxLXDhsJE4bKEJTdWJqZWN0GyRCJEskYkJQMX4kOSRrJGgbKEI=?='; + $expected = '=?ISO-2022-JP?B?GyRCRnxLXDhsJE4bKEJTdWJqZWN0GyRCJEskYkJQMX4kOSRrJGgbKEI=?='; $this->assertSame($this->CakeEmail->subject(), $expected); $this->CakeEmail->subject('長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？'); - $expected = "=?ISO-2022-JP?B?GyRCRDkkJEQ5JCREOSQkGyhCU3ViamVjdBskQiROPmw5ZyRPGyhCZm9s?=\r\n" - ." =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n" - ." =?ISO-2022-JP?B?GyRCJCYkSiRrJHMkQCRtJCYhKRsoQg==?="; + $expected = "=?ISO-2022-JP?B?GyRCRDkkJEQ5JCREOSQkGyhCU3ViamVjdBskQiROPmw5ZyRPGyhCZm9s?=\r\n" + ." =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n" + ." =?ISO-2022-JP?B?GyRCJCYkSiRrJHMkQCRtJCYhKRsoQg==?="; $this->assertSame($this->CakeEmail->subject(), $expected); - } + } /** @@ -1355,8 +1355,8 @@ class CakeEmailTest extends CakeTestCase { $this->CakeEmail->headerCharset = 'ISO-2022-JP'; $result = $this->CakeEmail->encode('長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？'); $expected = "=?ISO-2022-JP?B?GyRCRDkkJEQ5JCREOSQkGyhCU3ViamVjdBskQiROPmw5ZyRPGyhCZm9s?=\r\n" - . " =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n" - . " =?ISO-2022-JP?B?GyRCJCYkSiRrJHMkQCRtJCYhKRsoQg==?="; + . " =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n" + . " =?ISO-2022-JP?B?GyRCJCYkSiRrJHMkQCRtJCYhKRsoQg==?="; $this->assertSame($expected, $result); } } diff --git a/lib/Cake/Test/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php index aedaafda6..e21061f80 100644 --- a/lib/Cake/Test/Case/Utility/FileTest.php +++ b/lib/Cake/Test/Case/Utility/FileTest.php @@ -226,7 +226,7 @@ class FileTest extends CakeTestCase { * @return void */ public function testCreate() { - $tmpFile = TMP.'tests'.DS.'cakephp.file.test.tmp'; + $tmpFile = TMP.'tests' . DS . 'cakephp.file.test.tmp'; $File = new File($tmpFile, true, 0777); $this->assertTrue($File->exists()); } @@ -387,7 +387,7 @@ class FileTest extends CakeTestCase { $r = $TmpFile->append($fragment); $this->assertTrue($r); $this->assertTrue(file_exists($tmpFile)); - $data = $data.$fragment; + $data = $data . $fragment; $this->assertEquals($data, file_get_contents($tmpFile)); $TmpFile->close(); } diff --git a/lib/Cake/Test/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php index 0d73c9694..b843e593c 100644 --- a/lib/Cake/Test/Case/Utility/ValidationTest.php +++ b/lib/Cake/Test/Case/Utility/ValidationTest.php @@ -2099,7 +2099,7 @@ class ValidationTest extends CakeTestCase { * * @return void */ - function testDatetime() { + function testDatetime() { $this->assertTrue(Validation::datetime('27-12-2006 01:00', 'dmy')); $this->assertTrue(Validation::datetime('27-12-2006 01:00', array('dmy'))); $this->assertFalse(Validation::datetime('27-12-2006 1:00', 'dmy')); diff --git a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php index 7fa6cd4b6..0e32e2207 100644 --- a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php @@ -535,7 +535,7 @@ class CacheHelperTest extends CakeTestCase { $filename = CACHE . 'views' . DS . 'cache_cachetest_cache_name.php'; $this->assertTrue(file_exists($filename)); @unlink($filename); - } + } /** * test that afterRender checks the conditions correctly. diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php index c3608ce93..70a98f421 100644 --- a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php @@ -573,7 +573,7 @@ class HtmlHelperTest extends CakeTestCase { Configure::write('debug', 2); Configure::write('Asset.timestamp', true); - touch(WWW_ROOT . 'js' . DS. '__cake_js_test.js'); + touch(WWW_ROOT . 'js' . DS . '__cake_js_test.js'); $timestamp = substr(strtotime('now'), 0, 8); $result = $this->Html->script('__cake_js_test', array('inline' => true, 'once' => false)); @@ -583,7 +583,7 @@ class HtmlHelperTest extends CakeTestCase { Configure::write('Asset.timestamp', 'force'); $result = $this->Html->script('__cake_js_test', array('inline' => true, 'once' => false)); $this->assertRegExp('/__cake_js_test.js\?' . $timestamp . '[0-9]{2}"/', $result, 'Timestamp value not found %s'); - unlink(WWW_ROOT . 'js' . DS. '__cake_js_test.js'); + unlink(WWW_ROOT . 'js' . DS . '__cake_js_test.js'); Configure::write('Asset.timestamp', false); } diff --git a/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php b/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php index 07069d506..0e7a9a9a4 100644 --- a/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php @@ -118,15 +118,15 @@ class NumberHelperTest extends CakeTestCase { $result = $this->Number->currency(1000.45, NULL, array('after' => 'øre', 'before' => 'Kr. ', 'decimals' => ',', 'thousands' => '.')); $expected = 'Kr. 1.000,45'; - $this->assertEquals($expected,$result); + $this->assertEquals($expected, $result); $result = $this->Number->currency(0.5, 'USD'); $expected = '50c'; - $this->assertEquals($expected,$result); + $this->assertEquals($expected, $result); $result = $this->Number->currency(0.5, NULL, array('after' => 'øre')); $expected = '50øre'; - $this->assertEquals($expected,$result); + $this->assertEquals($expected, $result); $result = $this->Number->currency(1, null, array('wholeSymbol' => '$ ')); $expected = '$ 1.00'; @@ -174,16 +174,16 @@ class NumberHelperTest extends CakeTestCase { $this->Number->addFormat('NOK', array('before' => 'Kr. ')); $result = $this->Number->currency(1000, 'NOK'); $expected = 'Kr. 1,000.00'; - $this->assertEquals($expected,$result); + $this->assertEquals($expected, $result); $this->Number->addFormat('Other', array('before' => '$$ ', 'after' => 'c!')); $result = $this->Number->currency(0.22, 'Other'); $expected = '22c!'; - $this->assertEquals($expected,$result); + $this->assertEquals($expected, $result); $result = $this->Number->currency(-10, 'Other'); $expected = '($$ 10.00)'; - $this->assertEquals($expected,$result); + $this->assertEquals($expected, $result); } /** diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php index 36e91f454..a10a211dc 100644 --- a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php @@ -58,9 +58,9 @@ class TextHelperTest extends CakeTestCase { $text3 = '© 2005-2007, Cake Software Foundation, Inc.
written by Alexander Wegener'; $text4 = ' This image tag is not XHTML conform!
But the following image tag should be conform Me, myself and I
Great, or?'; $text5 = '01234567890'; - $text6 = '

Extra dates have been announced for this year\'s tour.

Tickets for the new shows in

'; - $text7 = 'El moño está en el lugar correcto. Eso fue lo que dijo la niña, ¿habrá dicho la verdad?'; - $text8 = 'Vive la R'.chr(195).chr(169).'publique de France'; + $text6 = '

Extra dates have been announced for this year\'s tour.

Tickets for the new shows in

'; + $text7 = 'El moño está en el lugar correcto. Eso fue lo que dijo la niña, ¿habrá dicho la verdad?'; + $text8 = 'Vive la R'.chr(195).chr(169).'publique de France'; $text9 = 'НОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыь'; $this->assertSame($this->Text->truncate($text1, 15), 'The quick br...'); diff --git a/lib/Cake/Test/Fixture/CounterCachePostFixture.php b/lib/Cake/Test/Fixture/CounterCachePostFixture.php index dd7b92f1c..c2459d91f 100644 --- a/lib/Cake/Test/Fixture/CounterCachePostFixture.php +++ b/lib/Cake/Test/Fixture/CounterCachePostFixture.php @@ -33,9 +33,9 @@ class CounterCachePostFixture extends CakeTestFixture { 'published' => array('type' => 'boolean', 'null' => false, 'default' => 0) ); - public $records = array( + public $records = array( array('id' => 1, 'title' => 'Rock and Roll', 'user_id' => 66, 'published' => false), array('id' => 2, 'title' => 'Music', 'user_id' => 66, 'published' => true), array('id' => 3, 'title' => 'Food', 'user_id' => 301, 'published' => true), - ); + ); } diff --git a/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php b/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php index b4b4f3f21..baee67fe2 100644 --- a/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php +++ b/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php @@ -32,9 +32,9 @@ class CounterCachePostNonstandardPrimaryKeyFixture extends CakeTestFixture { 'uid' => array('type' => 'integer', 'null' => true), ); - public $records = array( + public $records = array( array('pid' => 1, 'title' => 'Rock and Roll', 'uid' => 66), array('pid' => 2, 'title' => 'Music', 'uid' => 66), array('pid' => 3, 'title' => 'Food', 'uid' => 301), - ); + ); } diff --git a/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php index 30fc34866..c8d17117f 100644 --- a/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php +++ b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php @@ -23,31 +23,35 @@ * @package Cake.Test.Fixture */ class GroupUpdateAllFixture extends CakeTestFixture { - public $name = 'GroupUpdateAll'; - public $table = 'group_update_all'; + public $name = 'GroupUpdateAll'; + public $table = 'group_update_all'; - public $fields = array( - 'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'), - 'name' => array('type' => 'string', 'null' => false, 'length' => 29), - 'code' => array('type' => 'integer', 'null' => false, 'length' => 4), - 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)) - ); - public $records = array( - array( - 'id' => 1, - 'name' => 'group one', - 'code' => 120), - array( - 'id' => 2, - 'name' => 'group two', - 'code' => 125), - array( - 'id' => 3, - 'name' => 'group three', - 'code' => 130), - array( - 'id' => 4, - 'name' => 'group four', - 'code' => 135) - ); + public $fields = array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'), + 'name' => array('type' => 'string', 'null' => false, 'length' => 29), + 'code' => array('type' => 'integer', 'null' => false, 'length' => 4), + 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)) + ); + public $records = array( + array( + 'id' => 1, + 'name' => 'group one', + 'code' => 120 + ), + array( + 'id' => 2, + 'name' => 'group two', + 'code' => 125 + ), + array( + 'id' => 3, + 'name' => 'group three', + 'code' => 130 + ), + array( + 'id' => 4, + 'name' => 'group four', + 'code' => 135 + ), + ); } diff --git a/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php index 5aebb80f0..4e3c078a2 100644 --- a/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php +++ b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php @@ -26,34 +26,37 @@ class ProductUpdateAllFixture extends CakeTestFixture { public $name = 'ProductUpdateAll'; public $table = 'product_update_all'; - public $fields = array( - 'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'), - 'name' => array('type' => 'string', 'null' => false, 'length' => 29), - 'groupcode' => array('type' => 'integer', 'null' => false, 'length' => 4), - 'group_id' => array('type' => 'integer', 'null' => false, 'length' => 8), - 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)) - ); - public $records = array( - array( - 'id' => 1, - 'name' => 'product one', - 'groupcode' => 120, - 'group_id' => 1 - ), - array( - 'id' => 2, - 'name' => 'product two', - 'groupcode' => 120, - 'group_id' => 1), - array( - 'id' => 3, - 'name' => 'product three', - 'groupcode' => 125, - 'group_id' => 2), - array( - 'id' => 4, - 'name' => 'product four', - 'groupcode' => 135, - 'group_id' => 4) - ); + public $fields = array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'), + 'name' => array('type' => 'string', 'null' => false, 'length' => 29), + 'groupcode' => array('type' => 'integer', 'null' => false, 'length' => 4), + 'group_id' => array('type' => 'integer', 'null' => false, 'length' => 8), + 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)) + ); + public $records = array( + array( + 'id' => 1, + 'name' => 'product one', + 'groupcode' => 120, + 'group_id' => 1 + ), + array( + 'id' => 2, + 'name' => 'product two', + 'groupcode' => 120, + 'group_id' => 1 + ), + array( + 'id' => 3, + 'name' => 'product three', + 'groupcode' => 125, + 'group_id' => 2 + ), + array( + 'id' => 4, + 'name' => 'product four', + 'groupcode' => 135, + 'group_id' => 4 + ), + ); } diff --git a/lib/Cake/Test/test_app/View/Pages/home.ctp b/lib/Cake/Test/test_app/View/Pages/home.ctp index a765a8878..9d84a57b9 100644 --- a/lib/Cake/Test/test_app/View/Pages/home.ctp +++ b/lib/Cake/Test/test_app/View/Pages/home.ctp @@ -49,7 +49,7 @@ App::uses('Debugger', 'Utility');

'; echo __d('cake_dev', 'Your database configuration file is present.'); $filePresent = true; diff --git a/lib/Cake/TestSuite/CakeTestRunner.php b/lib/Cake/TestSuite/CakeTestRunner.php index 7c8b2c27f..f4eb51495 100644 --- a/lib/Cake/TestSuite/CakeTestRunner.php +++ b/lib/Cake/TestSuite/CakeTestRunner.php @@ -74,7 +74,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner { } } return $result; - } + } /** * Get the fixture manager class specified or use the default one. diff --git a/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php index 16bb9d760..a2ce54a8b 100644 --- a/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php +++ b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php @@ -137,7 +137,7 @@ class CakeHtmlReporter extends CakeBaseReporter { echo "\n"; echo '

'; echo '

Time: ' . $result->time() . ' seconds

'; - echo '

Peak memory: ' . number_format(memory_get_peak_usage()) . ' bytes

'; + echo '

Peak memory: ' . number_format(memory_get_peak_usage()) . ' bytes

'; echo $this->_paintLinks(); echo '
'; if (isset($this->params['codeCoverage']) && $this->params['codeCoverage']) { diff --git a/lib/Cake/TestSuite/Reporter/CakeTextReporter.php b/lib/Cake/TestSuite/Reporter/CakeTextReporter.php index 543b9f014..d8dbce046 100644 --- a/lib/Cake/TestSuite/Reporter/CakeTextReporter.php +++ b/lib/Cake/TestSuite/Reporter/CakeTextReporter.php @@ -84,7 +84,7 @@ class CakeTextReporter extends CakeBaseReporter { ', Exceptions: ' . $result->errorCount() . "\n"; echo 'Time: ' . $result->time() . " seconds\n"; - echo 'Peak memory: ' . number_format(memory_get_peak_usage()) . " bytes\n"; + echo 'Peak memory: ' . number_format(memory_get_peak_usage()) . " bytes\n"; if (isset($this->params['codeCoverage']) && $this->params['codeCoverage']) { $coverage = $result->getCodeCoverage()->getSummary(); diff --git a/lib/Cake/Utility/File.php b/lib/Cake/Utility/File.php index 46b9225a0..3cb0219c6 100644 --- a/lib/Cake/Utility/File.php +++ b/lib/Cake/Utility/File.php @@ -333,7 +333,7 @@ class File { $this->info(); } if (isset($this->info['extension'])) { - return basename($this->name, '.'.$this->info['extension']); + return basename($this->name, '.' . $this->info['extension']); } elseif ($this->name) { return $this->name; } diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php index e53a9b37f..8f7729b94 100644 --- a/lib/Cake/Utility/Set.php +++ b/lib/Cake/Utility/Set.php @@ -529,7 +529,7 @@ class Set { } continue; } - list(,$key,$op,$expected) = $match; + list(, $key, $op, $expected) = $match; if (!isset($data[$key])) { return false; } @@ -630,7 +630,7 @@ class Set { $pattern = substr($key, 1, -1); foreach ($data as $j => $val) { - if (preg_match('/^'.$pattern.'/s', $j) !== 0) { + if (preg_match('/^' . $pattern . '/s', $j) !== 0) { $tmpPath = array_slice($path, $i + 1); if (empty($tmpPath)) { $tmp[$j] = $val; diff --git a/lib/Cake/Utility/String.php b/lib/Cake/Utility/String.php index f9c51c396..4b2a524b3 100644 --- a/lib/Cake/Utility/String.php +++ b/lib/Cake/Utility/String.php @@ -247,7 +247,7 @@ class String { } if (!isset($options['format']) && isset($options['before'])) { - $str = str_replace($options['escape'].$options['before'], $options['before'], $str); + $str = str_replace($options['escape'] . $options['before'], $options['before'], $str); } return ($options['clean']) ? String::cleanInsert($str, $options) : $str; } diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php index 26dea7bc3..3c7ee5831 100644 --- a/lib/Cake/Utility/Validation.php +++ b/lib/Cake/Utility/Validation.php @@ -382,7 +382,7 @@ class Validation { if (is_null($places)) { $regex = '/^[-+]?[0-9]*\\.{1}[0-9]+(?:[eE][-+]?[0-9]+)?$/'; } else { - $regex = '/^[-+]?[0-9]*\\.{1}[0-9]{'.$places.'}$/'; + $regex = '/^[-+]?[0-9]*\\.{1}[0-9]{' . $places . '}$/'; } } return self::_check($check, $regex); diff --git a/lib/Cake/View/Helper/CacheHelper.php b/lib/Cake/View/Helper/CacheHelper.php index 642a52df9..2f2e4a8a9 100644 --- a/lib/Cake/View/Helper/CacheHelper.php +++ b/lib/Cake/View/Helper/CacheHelper.php @@ -298,7 +298,7 @@ class CacheHelper extends AppHelper { $this->loadHelpers(); extract($this->viewVars, EXTR_SKIP); ?>'; - $content = preg_replace("/(<\\?xml)/", "",$content); + $content = preg_replace("/(<\\?xml)/", "", $content); $file .= $content; return cache('views' . DS . $cache, $file, $timestamp); } diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php index 7e9ae0779..835151ad3 100644 --- a/lib/Cake/View/Helper/HtmlHelper.php +++ b/lib/Cake/View/Helper/HtmlHelper.php @@ -605,7 +605,7 @@ class HtmlHelper extends AppHelper { } $out = array(); foreach ($data as $key=> $value) { - $out[] = $key.':'.$value.';'; + $out[] = $key . ':' . $value . ';'; } if ($oneline) { return join(' ', $out); diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php index ee35d594d..ee11b037b 100644 --- a/lib/Cake/View/Helper/TextHelper.php +++ b/lib/Cake/View/Helper/TextHelper.php @@ -294,7 +294,7 @@ class TextHelper extends AppHelper { if ($html) { foreach ($openTags as $tag) { - $truncate .= ''; + $truncate .= ''; } } diff --git a/lib/Cake/View/Helper/TimeHelper.php b/lib/Cake/View/Helper/TimeHelper.php index 729f3436e..95dc61dff 100644 --- a/lib/Cake/View/Helper/TimeHelper.php +++ b/lib/Cake/View/Helper/TimeHelper.php @@ -132,7 +132,7 @@ class TimeHelper extends AppHelper { case 'p': case 'P': $default = array('am' => 0, 'pm' => 1); - $meridiem = $default[date('a',$this->__time)]; + $meridiem = $default[date('a', $this->__time)]; $format = __dc('cake', 'am_pm', 5); if (is_array($format)) { $meridiem = $format[$meridiem]; @@ -142,7 +142,7 @@ class TimeHelper extends AppHelper { case 'r': $complete = __dc('cake', 't_fmt_ampm', 5); if ($complete != 't_fmt_ampm') { - return str_replace('%p',$this->_translateSpecifier(array('%p', 'p')),$complete); + return str_replace('%p', $this->_translateSpecifier(array('%p', 'p')), $complete); } break; case 'R': @@ -344,7 +344,7 @@ class TimeHelper extends AppHelper { */ public function isThisMonth($dateString, $userOffset = null) { $date = $this->fromString($dateString); - return date('m Y',$date) == date('m Y', time()); + return date('m Y', $date) == date('m Y', time()); } /** @@ -671,7 +671,7 @@ class TimeHelper extends AppHelper { } $date = $this->fromString($dateString, $userOffset); - $interval = $this->fromString('-'.$timeInterval); + $interval = $this->fromString('-' . $timeInterval); if ($date >= $interval && $date <= time()) { return true; diff --git a/lib/Cake/View/Scaffolds/view.ctp b/lib/Cake/View/Scaffolds/view.ctp index 9e36fffd4..7ad263587 100644 --- a/lib/Cake/View/Scaffolds/view.ctp +++ b/lib/Cake/View/Scaffolds/view.ctp @@ -45,10 +45,10 @@ foreach ($scaffoldFields as $_field) {