adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code standards formatting

Browse source
This commit is contained in:
Kyle Robinson Young 2011-12-15 22:52:07 -08:00
parent f1b566b88e
commit 51f9837db4
58 changed files with 220 additions and 213 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Console/Command/ApiShell.php
View file

@ -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);
}

6
lib/Cake/Console/Command/Task/ProjectTask.php
View file

@ -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;

8
lib/Cake/Controller/Component/AclComponent.php
View file

@ -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')
)))
);
}

6
lib/Cake/Controller/Controller.php
View file

@ -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;
}

2
lib/Cake/Core/App.php
View file

@ -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) {

6
lib/Cake/I18n/I18n.php
View file

@ -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;

2
lib/Cake/I18n/Multibyte.php
View file

@ -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);

4
lib/Cake/Model/Behavior/ContainableBehavior.php
View file

@ -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;

38
lib/Cake/Model/Behavior/TranslateBehavior.php
View file

@ -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])) {

8
lib/Cake/Model/Behavior/TreeBehavior.php
View file

@ -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--;

6
lib/Cake/Model/Datasource/Database/Postgres.php
View file

@ -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':

2
lib/Cake/Model/Datasource/Database/Sqlite.php
View file

@ -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;
}

2
lib/Cake/Model/Datasource/Database/Sqlserver.php
View file

@ -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]);
}

2
lib/Cake/Model/Datasource/DboSource.php
View file

@ -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;
}

2
lib/Cake/Model/Model.php
View file

@ -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')
*

2
lib/Cake/Network/CakeResponse.php
View file

@ -372,7 +372,7 @@ class CakeResponse {
$this->_headers['Content-Length'] = $offset + strlen($this->_body);
}
}
}
}
/**
* Sends a header to the client.

4
lib/Cake/Network/CakeSocket.php
View file

@ -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)) {

10
lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
View file

@ -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

6
lib/Cake/Test/Case/Console/Command/AclShellTest.php
View file

@ -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();
}

8
lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
View file

@ -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"#';

4
lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
View file

@ -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',

2
lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
View file

@ -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';

4
lib/Cake/Test/Case/Console/ShellTest.php
View file

@ -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);

2
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
View file

@ -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',

12
lib/Cake/Test/Case/Controller/ScaffoldTest.php
View file

@ -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;
}
}
/**

10
lib/Cake/Test/Case/Core/AppTest.php
View file

@ -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'));
}
}
}

4
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
View file

@ -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);

2
lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
View file

@ -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);

2
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
View file

@ -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(

8
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
View file

@ -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);
}

2
lib/Cake/Test/Case/Model/DbAclTest.php
View file

@ -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);
}

8
lib/Cake/Test/Case/Model/ModelWriteTest.php
View file

@ -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'

8
lib/Cake/Test/Case/Model/models.php
View file

@ -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';
}
/**

18
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View file

@ -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);
}
}

4
lib/Cake/Test/Case/Utility/FileTest.php
View file

@ -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();
}

2
lib/Cake/Test/Case/Utility/ValidationTest.php
View file

@ -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'));

2
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
View file

@ -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.

4
lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
View file

@ -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);
}

12
lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
View file

@ -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);
}
/**

6
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
View file

@ -58,9 +58,9 @@ class TextHelperTest extends CakeTestCase {
$text3 = '<b>&copy; 2005-2007, Cake Software Foundation, Inc.</b><br />written by Alexander Wegener';
$text4 = '<img src="mypic.jpg"> This image tag is not XHTML conform!<br><hr/><b>But the following image tag should be conform <img src="mypic.jpg" alt="Me, myself and I" /></b><br />Great, or?';
$text5 = '0<b>1<i>2<span class="myclass">3</span>4<u>5</u>6</i>7</b>8<b>9</b>0';
$text6 = '<p><strong>Extra dates have been announced for this year\'s tour.</strong></p><p>Tickets for the new shows in</p>';
$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 = '<p><strong>Extra dates have been announced for this year\'s tour.</strong></p><p>Tickets for the new shows in</p>';
$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...');

4
lib/Cake/Test/Fixture/CounterCachePostFixture.php
View file

@ -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),
);
);
}

4
lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php
View file

@ -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),
);
);
}

56
lib/Cake/Test/Fixture/GroupUpdateAllFixture.php
View file

@ -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
),
);
}

63
lib/Cake/Test/Fixture/ProductUpdateAllFixture.php
View file

@ -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
),
);
}

2
lib/Cake/Test/test_app/View/Pages/home.ctp
View file

@ -49,7 +49,7 @@ App::uses('Debugger', 'Utility');
<p>
<?php
$filePresent = null;
if (file_exists(APP . 'Config' . DS.'database.php')):
if (file_exists(APP . 'Config' . DS . 'database.php')):
echo '<span class="notice success">';
echo __d('cake_dev', 'Your database configuration file is present.');
$filePresent = true;

2
lib/Cake/TestSuite/CakeTestRunner.php
View file

@ -74,7 +74,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
}
}
return $result;
}
}
/**
* Get the fixture manager class specified or use the default one.

2
lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
View file

@ -137,7 +137,7 @@ class CakeHtmlReporter extends CakeBaseReporter {
echo "</div>\n";
echo '<div style="padding:0 0 5px;">';
echo '<p><strong>Time:</strong> ' . $result->time() . ' seconds</p>';
echo '<p><strong>Peak memory:</strong> ' . number_format(memory_get_peak_usage()) . ' bytes</p>';
echo '<p><strong>Peak memory:</strong> ' . number_format(memory_get_peak_usage()) . ' bytes</p>';
echo $this->_paintLinks();
echo '</div>';
if (isset($this->params['codeCoverage']) && $this->params['codeCoverage']) {

2
lib/Cake/TestSuite/Reporter/CakeTextReporter.php
View file

@ -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();

2
lib/Cake/Utility/File.php
View file

@ -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;
}

4
lib/Cake/Utility/Set.php
View file

@ -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;

2
lib/Cake/Utility/String.php
View file

@ -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;
}

2
lib/Cake/Utility/Validation.php
View file

@ -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);

2
lib/Cake/View/Helper/CacheHelper.php
View file

@ -298,7 +298,7 @@ class CacheHelper extends AppHelper {
$this->loadHelpers();
extract($this->viewVars, EXTR_SKIP);
?>';
$content = preg_replace("/(<\\?xml)/", "<?php echo '$1';?>",$content);
$content = preg_replace("/(<\\?xml)/", "<?php echo '$1';?>", $content);
$file .= $content;
return cache('views' . DS . $cache, $file, $timestamp);
}

2
lib/Cake/View/Helper/HtmlHelper.php
View file

@ -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);

2
lib/Cake/View/Helper/TextHelper.php
View file

@ -294,7 +294,7 @@ class TextHelper extends AppHelper {
if ($html) {
foreach ($openTags as $tag) {
$truncate .= '</'.$tag.'>';
$truncate .= '</' . $tag . '>';
}
}

8
lib/Cake/View/Helper/TimeHelper.php
View file

@ -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;

8
lib/Cake/View/Scaffolds/view.ctp
View file

@ -45,10 +45,10 @@ foreach ($scaffoldFields as $_field) {
<h3><?php echo __d('cake', 'Actions'); ?></h3>
<ul>
<?php
echo "\t\t<li>" .$this->Html->link(__d('cake', 'Edit %s', $singularHumanName), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " </li>\n";
echo "\t\t<li>" .$this->Html->link(__d('cake', 'Delete %s', $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __d('cake', 'Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " </li>\n";
echo "\t\t<li>" .$this->Html->link(__d('cake', 'List %s', $pluralHumanName), array('action' => 'index')). " </li>\n";
echo "\t\t<li>" .$this->Html->link(__d('cake', 'New %s', $singularHumanName), array('action' => 'add')). " </li>\n";
echo "\t\t<li>" . $this->Html->link(__d('cake', 'Edit %s', $singularHumanName), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])) . " </li>\n";
echo "\t\t<li>" . $this->Html->link(__d('cake', 'Delete %s', $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __d('cake', 'Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey] . '?') . " </li>\n";
echo "\t\t<li>" . $this->Html->link(__d('cake', 'List %s', $pluralHumanName), array('action' => 'index')) . " </li>\n";
echo "\t\t<li>" . $this->Html->link(__d('cake', 'New %s', $singularHumanName), array('action' => 'add')) . " </li>\n";
$done = array();
foreach ($associations as $_type => $_data) {

22
lib/Cake/bootstrap.php
View file

@ -46,52 +46,52 @@ if (!defined('WEBROOT_DIR')) {
* Path to the application's directory.
*/
if (!defined('APP')) {
define('APP', ROOT.DS.APP_DIR.DS);
define('APP', ROOT . DS . APP_DIR.DS);
}
/**
* Path to the application's libs directory.
*/
define('APPLIBS', APP.'Lib'.DS);
define('APPLIBS', APP . 'Lib' . DS);
/**
* Path to the public CSS directory.
*/
define('CSS', WWW_ROOT.'css'.DS);
define('CSS', WWW_ROOT . 'css' . DS);
/**
* Path to the public JavaScript directory.
*/
define('JS', WWW_ROOT.'js'.DS);
define('JS', WWW_ROOT . 'js' . DS);
/**
* Path to the public images directory.
*/
define('IMAGES', WWW_ROOT.'img'.DS);
define('IMAGES', WWW_ROOT . 'img' . DS);
/**
* Path to the tests directory.
*/
if (!defined('TESTS')) {
define('TESTS', APP.'Test'.DS);
define('TESTS', APP . 'Test' . DS);
}
/**
* Path to the temporary files directory.
*/
if (!defined('TMP')) {
define('TMP', APP.'tmp'.DS);
define('TMP', APP . 'tmp' . DS);
}
/**
* Path to the logs directory.
*/
define('LOGS', TMP.'logs'.DS);
define('LOGS', TMP . 'logs' . DS);
/**
* Path to the cache files directory. It can be shared between hosts in a multi-server setup.
*/
define('CACHE', TMP.'cache'.DS);
define('CACHE', TMP . 'cache' . DS);
/**
* Path to the vendors directory.
@ -143,13 +143,13 @@ Configure::bootstrap(isset($boot) ? $boot : true);
if (!defined('FULL_BASE_URL')) {
$s = null;
if (env('HTTPS')) {
$s ='s';
$s = 's';
}
$httpHost = env('HTTP_HOST');
if (isset($httpHost)) {
define('FULL_BASE_URL', 'http'.$s.'://'.$httpHost);
define('FULL_BASE_URL', 'http' . $s . '://' . $httpHost);
}
unset($httpHost, $s);
}