diff --git a/lib/Cake/Console/Command/SchemaShell.php b/lib/Cake/Console/Command/SchemaShell.php
index e60d8e734..6f77220d8 100644
--- a/lib/Cake/Console/Command/SchemaShell.php
+++ b/lib/Cake/Console/Command/SchemaShell.php
@@ -334,8 +334,7 @@ class SchemaShell extends AppShell {
$this->out("\n" . __d('cake_console', 'The following table(s) will be dropped.'));
$this->out(array_keys($drop));
- if (
- !empty($this->params['yes']) ||
+ if (!empty($this->params['yes']) ||
$this->in(__d('cake_console', 'Are you sure you want to drop the table(s)?'), array('y', 'n'), 'n') === 'y'
) {
$this->out(__d('cake_console', 'Dropping table(s).'));
@@ -345,8 +344,7 @@ class SchemaShell extends AppShell {
$this->out("\n" . __d('cake_console', 'The following table(s) will be created.'));
$this->out(array_keys($create));
- if (
- !empty($this->params['yes']) ||
+ if (!empty($this->params['yes']) ||
$this->in(__d('cake_console', 'Are you sure you want to create the table(s)?'), array('y', 'n'), 'y') === 'y'
) {
$this->out(__d('cake_console', 'Creating table(s).'));
@@ -399,8 +397,7 @@ class SchemaShell extends AppShell {
$this->out("\n" . __d('cake_console', 'The following statements will run.'));
$this->out(array_map('trim', $contents));
- if (
- !empty($this->params['yes']) ||
+ if (!empty($this->params['yes']) ||
$this->in(__d('cake_console', 'Are you sure you want to alter the tables?'), array('y', 'n'), 'n') === 'y'
) {
$this->out();
diff --git a/lib/Cake/Console/Command/Task/FixtureTask.php b/lib/Cake/Console/Command/Task/FixtureTask.php
index 099fe9516..65404fb1c 100644
--- a/lib/Cake/Console/Command/Task/FixtureTask.php
+++ b/lib/Cake/Console/Command/Task/FixtureTask.php
@@ -242,8 +242,8 @@ class FixtureTask extends BakeTask {
$this->_Schema = new CakeSchema();
$data = $this->_Schema->read(array('models' => false, 'connection' => $this->connection));
if (!isset($data['tables'][$useTable])) {
- $this->error('Could not find your selected table ' . $useTable);
- return false;
+ $this->err("Warning: Could not find the '${useTable}' table for ${model}.");
+ return;
}
$tableInfo = $data['tables'][$useTable];
diff --git a/lib/Cake/Console/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php
index 859c5ff79..ae3be34cc 100644
--- a/lib/Cake/Console/ConsoleOptionParser.php
+++ b/lib/Cake/Console/ConsoleOptionParser.php
@@ -521,8 +521,7 @@ class ConsoleOptionParser {
* @return string Generated help.
*/
public function help($subcommand = null, $format = 'text', $width = 72) {
- if (
- isset($this->_subcommands[$subcommand]) &&
+ if (isset($this->_subcommands[$subcommand]) &&
$this->_subcommands[$subcommand]->parser() instanceof self
) {
$subparser = $this->_subcommands[$subcommand]->parser();
diff --git a/lib/Cake/Console/ConsoleOutput.php b/lib/Cake/Console/ConsoleOutput.php
index 2b5176887..32abf7123 100644
--- a/lib/Cake/Console/ConsoleOutput.php
+++ b/lib/Cake/Console/ConsoleOutput.php
@@ -161,8 +161,7 @@ class ConsoleOutput {
public function __construct($stream = 'php://stdout') {
$this->_output = fopen($stream, 'w');
- if (
- (DS === '\\' && !(bool)env('ANSICON')) ||
+ if ((DS === '\\' && !(bool)env('ANSICON')) ||
(function_exists('posix_isatty') && !posix_isatty($this->_output))
) {
$this->_outputAs = self::PLAIN;
diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php
index 82a322fec..1b0d1c43a 100644
--- a/lib/Cake/Controller/Component/PaginatorComponent.php
+++ b/lib/Cake/Controller/Component/PaginatorComponent.php
@@ -240,8 +240,7 @@ class PaginatorComponent extends Component {
throw new NotFoundException();
}
- if (
- !in_array('Paginator', $this->Controller->helpers) &&
+ if (!in_array('Paginator', $this->Controller->helpers) &&
!array_key_exists('Paginator', $this->Controller->helpers)
) {
$this->Controller->helpers[] = 'Paginator';
diff --git a/lib/Cake/Controller/Component/SecurityComponent.php b/lib/Cake/Controller/Component/SecurityComponent.php
index 2f673c2b4..68255eb2e 100644
--- a/lib/Cake/Controller/Component/SecurityComponent.php
+++ b/lib/Cake/Controller/Component/SecurityComponent.php
@@ -415,8 +415,7 @@ class SecurityComponent extends Component {
if ($this->Session->check('_Token')) {
$tData = $this->Session->read('_Token');
- if (
- !empty($tData['allowedControllers']) &&
+ if (!empty($tData['allowedControllers']) &&
!in_array($this->request->params['controller'], $tData['allowedControllers']) ||
!empty($tData['allowedActions']) &&
!in_array($this->request->params['action'], $tData['allowedActions'])
diff --git a/lib/Cake/Core/Object.php b/lib/Cake/Core/Object.php
index 82de65fee..1c7543750 100644
--- a/lib/Cake/Core/Object.php
+++ b/lib/Cake/Core/Object.php
@@ -197,8 +197,7 @@ class Object {
protected function _mergeVars($properties, $class, $normalize = true) {
$classProperties = get_class_vars($class);
foreach ($properties as $var) {
- if (
- isset($classProperties[$var]) &&
+ if (isset($classProperties[$var]) &&
!empty($classProperties[$var]) &&
is_array($this->{$var}) &&
$this->{$var} != $classProperties[$var]
diff --git a/lib/Cake/Error/ExceptionRenderer.php b/lib/Cake/Error/ExceptionRenderer.php
index 3da88679e..04190eba5 100644
--- a/lib/Cake/Error/ExceptionRenderer.php
+++ b/lib/Cake/Error/ExceptionRenderer.php
@@ -153,9 +153,20 @@ class ExceptionRenderer {
try {
$controller = new CakeErrorController($request, $response);
$controller->startupProcess();
+ $startup = true;
} catch (Exception $e) {
- if (!empty($controller) && $controller->Components->enabled('RequestHandler')) {
+ $startup = false;
+ }
+ // Retry RequestHandler, as another aspect of startupProcess()
+ // could have failed. Ignore any exceptions out of startup, as
+ // there could be userland input data parsers.
+ if ($startup === false &&
+ !empty($controller) &&
+ $controller->Components->enabled('RequestHandler')
+ ) {
+ try {
$controller->RequestHandler->startup($controller);
+ } catch (Exception $e) {
}
}
}
diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php
index 7e7fd537c..38bce42a2 100644
--- a/lib/Cake/I18n/I18n.php
+++ b/lib/Cake/I18n/I18n.php
@@ -316,6 +316,8 @@ class I18n {
* @param string $header Type
* @param int $n Number
* @return int plural match
+ * @link http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html
+ * @link https://developer.mozilla.org/en-US/docs/Mozilla/Localization/Localization_and_Plurals#List_of_Plural_Rules
*/
protected function _pluralGuess($header, $n) {
if (!is_string($header) || $header === "nplurals=1;plural=0;" || !isset($header[0])) {
@@ -356,7 +358,15 @@ class I18n {
}
} elseif (strpos($header, "plurals=5")) {
return $n == 1 ? 0 : ($n == 2 ? 1 : ($n >= 3 && $n <= 6 ? 2 : ($n >= 7 && $n <= 10 ? 3 : 4)));
+ } elseif (strpos($header, "plurals=6")) {
+ return $n == 0 ? 0 :
+ ($n == 1 ? 1 :
+ ($n == 2 ? 2 :
+ ($n % 100 >= 3 && $n % 100 <= 10 ? 3 :
+ ($n % 100 >= 11 ? 4 : 5))));
}
+
+ return 0;
}
/**
diff --git a/lib/Cake/Log/Engine/ConsoleLog.php b/lib/Cake/Log/Engine/ConsoleLog.php
index 807b02777..e76172957 100644
--- a/lib/Cake/Log/Engine/ConsoleLog.php
+++ b/lib/Cake/Log/Engine/ConsoleLog.php
@@ -48,8 +48,7 @@ class ConsoleLog extends BaseLog {
*/
public function __construct($config = array()) {
parent::__construct($config);
- if (
- (DS === '\\' && !(bool)env('ANSICON')) ||
+ if ((DS === '\\' && !(bool)env('ANSICON')) ||
(function_exists('posix_isatty') && !posix_isatty($this->_output))
) {
$outputAs = ConsoleOutput::PLAIN;
diff --git a/lib/Cake/Model/AclNode.php b/lib/Cake/Model/AclNode.php
index d77666bba..ab73f7b1d 100644
--- a/lib/Cake/Model/AclNode.php
+++ b/lib/Cake/Model/AclNode.php
@@ -116,8 +116,7 @@ class AclNode extends Model {
$result = $db->read($this, $queryData, -1);
$path = array_values($path);
- if (
- !isset($result[0][$type]) ||
+ if (!isset($result[0][$type]) ||
(!empty($path) && $result[0][$type]['alias'] != $path[count($path) - 1]) ||
(empty($path) && $result[0][$type]['alias'] != $start)
) {
diff --git a/lib/Cake/Model/Behavior/TranslateBehavior.php b/lib/Cake/Model/Behavior/TranslateBehavior.php
index c464bf0b2..1b0be00ab 100644
--- a/lib/Cake/Model/Behavior/TranslateBehavior.php
+++ b/lib/Cake/Model/Behavior/TranslateBehavior.php
@@ -157,8 +157,7 @@ class TranslateBehavior extends ModelBehavior {
);
foreach ($fields as $key => $value) {
$field = (is_numeric($key)) ? $value : $key;
- if (
- $isAllFields ||
+ if ($isAllFields ||
in_array($Model->alias . '.' . $field, $query['fields']) ||
in_array($field, $query['fields'])
) {
diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php
index 30521d66a..fc4379aec 100644
--- a/lib/Cake/Model/Behavior/TreeBehavior.php
+++ b/lib/Cake/Model/Behavior/TreeBehavior.php
@@ -494,8 +494,8 @@ class TreeBehavior extends ModelBehavior {
$item = $result[0];
$results = $Model->find('all', array(
'conditions' => array($scope, $Model->escapeField($left) . ' <=' => $item[$left], $Model->escapeField($right) . ' >=' => $item[$right]),
- 'fields' => $fields, 'order' => array($Model->escapeField($left) => 'asc'),
- 'order' => false,
+ 'fields' => $fields,
+ 'order' => array($Model->escapeField($left) => 'asc'),
'recursive' => $recursive
));
return $results;
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
index 2b2fc30bd..c18f3318a 100644
--- a/lib/Cake/Model/Datasource/DboSource.php
+++ b/lib/Cake/Model/Datasource/DboSource.php
@@ -834,9 +834,7 @@ class DboSource extends DataSource {
$matches[1] . '(' . $this->name($matches[2]) . ')'
);
}
- if (
- preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/i', $data, $matches
- )) {
+ if (preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/i', $data, $matches)) {
return $this->cacheMethod(
__FUNCTION__, $cacheKey,
preg_replace(
@@ -1337,8 +1335,7 @@ class DboSource extends DataSource {
$assocResultSet = array();
$prefetched = false;
- if (
- ($type === 'hasOne' || $type === 'belongsTo') &&
+ if (($type === 'hasOne' || $type === 'belongsTo') &&
isset($row[$LinkModel->alias], $joined[$Model->alias]) &&
in_array($LinkModel->alias, $joined[$Model->alias])
) {
@@ -1361,8 +1358,7 @@ class DboSource extends DataSource {
foreach ($LinkModel->{$type1} as $assoc1 => $assocData1) {
$DeepModel = $LinkModel->{$assoc1};
- if (
- $type1 === 'belongsTo' ||
+ if ($type1 === 'belongsTo' ||
($type === 'belongsTo' && $DeepModel->alias === $modelAlias) ||
($DeepModel->alias !== $modelAlias)
) {
@@ -1618,8 +1614,7 @@ class DboSource extends DataSource {
$assocFields = $this->fields($Model, null, "{$Model->alias}.{$Model->primaryKey}");
$passedFields = $queryData['fields'];
- if (
- count($passedFields) > 1 ||
+ if (count($passedFields) > 1 ||
(strpos($passedFields[0], $assocFields[0]) === false && !preg_match('/^[a-z]+\(/i', $passedFields[0]))
) {
$queryData['fields'] = array_merge($passedFields, $assocFields);
diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
index 70302b7a8..dee55cffd 100644
--- a/lib/Cake/Model/Model.php
+++ b/lib/Cake/Model/Model.php
@@ -1312,8 +1312,7 @@ class Model extends Object implements CakeEventListener {
return null;
}
- if (
- isset($data['hour']) &&
+ if (isset($data['hour']) &&
isset($data['meridian']) &&
!empty($data['hour']) &&
$data['hour'] != 12 &&
diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php
index ca50ae47c..5ce0d359c 100644
--- a/lib/Cake/Network/CakeRequest.php
+++ b/lib/Cake/Network/CakeRequest.php
@@ -162,8 +162,7 @@ class CakeRequest implements ArrayAccess {
protected function _processPost() {
if ($_POST) {
$this->data = $_POST;
- } elseif (
- ($this->is('put') || $this->is('delete')) &&
+ } elseif (($this->is('put') || $this->is('delete')) &&
strpos(env('CONTENT_TYPE'), 'application/x-www-form-urlencoded') === 0
) {
$data = $this->_readInput();
@@ -261,8 +260,7 @@ class CakeRequest implements ArrayAccess {
}
$endsWithIndex = '/webroot/index.php';
$endsWithLength = strlen($endsWithIndex);
- if (
- strlen($uri) >= $endsWithLength &&
+ if (strlen($uri) >= $endsWithLength &&
substr($uri, -$endsWithLength) === $endsWithIndex
) {
$uri = '/';
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
index ae071080b..d5e10c657 100644
--- a/lib/Cake/Network/CakeResponse.php
+++ b/lib/Cake/Network/CakeResponse.php
@@ -464,8 +464,7 @@ class CakeResponse {
);
$charset = false;
- if (
- $this->_charset &&
+ if ($this->_charset &&
(strpos($this->_contentType, 'text/') === 0 || in_array($this->_contentType, $whitelist))
) {
$charset = true;
diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php
index 61dc597b3..ca7f8a97c 100644
--- a/lib/Cake/Network/Email/CakeEmail.php
+++ b/lib/Cake/Network/Email/CakeEmail.php
@@ -1481,8 +1481,7 @@ class CakeEmail {
$msg[] = '--' . $boundary;
$msg[] = 'Content-Type: ' . $fileInfo['mimetype'];
$msg[] = 'Content-Transfer-Encoding: base64';
- if (
- !isset($fileInfo['contentDisposition']) ||
+ if (!isset($fileInfo['contentDisposition']) ||
$fileInfo['contentDisposition']
) {
$msg[] = 'Content-Disposition: attachment; filename="' . $filename . '"';
diff --git a/lib/Cake/Network/Http/HttpSocket.php b/lib/Cake/Network/Http/HttpSocket.php
index 4e1f7e94a..3b4882989 100644
--- a/lib/Cake/Network/Http/HttpSocket.php
+++ b/lib/Cake/Network/Http/HttpSocket.php
@@ -312,8 +312,7 @@ class HttpSocket extends CakeSocket {
if (isset($this->request['uri']['port'])) {
$port = $this->request['uri']['port'];
}
- if (
- ($scheme === 'http' && $port != 80) ||
+ if (($scheme === 'http' && $port != 80) ||
($scheme === 'https' && $port != 443) ||
($port != 80 && $port != 443)
) {
diff --git a/lib/Cake/Routing/Route/CakeRoute.php b/lib/Cake/Routing/Route/CakeRoute.php
index 4354dd8d5..080e3c72f 100644
--- a/lib/Cake/Routing/Route/CakeRoute.php
+++ b/lib/Cake/Routing/Route/CakeRoute.php
@@ -448,8 +448,7 @@ class CakeRoute {
}
// pull out named params if named params are greedy or a rule exists.
- if (
- ($greedyNamed || isset($allowedNamedParams[$key])) &&
+ if (($greedyNamed || isset($allowedNamedParams[$key])) &&
($value !== false && $value !== null) &&
(!in_array($key, $prefixes))
) {
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
index 2602c0639..6766f9895 100644
--- a/lib/Cake/Routing/Router.php
+++ b/lib/Cake/Routing/Router.php
@@ -227,8 +227,7 @@ class Router {
* @throws RouterException
*/
protected static function _validateRouteClass($routeClass) {
- if (
- $routeClass !== 'CakeRoute' &&
+ if ($routeClass !== 'CakeRoute' &&
(!class_exists($routeClass) || !is_subclass_of($routeClass, 'CakeRoute'))
) {
throw new RouterException(__d('cake_dev', 'Route class not found, or route class is not a subclass of CakeRoute'));
diff --git a/lib/Cake/Test/Case/I18n/I18nTest.php b/lib/Cake/Test/Case/I18n/I18nTest.php
index 7e7af0aff..12c3ac2df 100644
--- a/lib/Cake/Test/Case/I18n/I18nTest.php
+++ b/lib/Cake/Test/Case/I18n/I18nTest.php
@@ -1512,6 +1512,127 @@ class I18nTest extends CakeTestCase {
$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
}
+/**
+ * testMoRulesFifteen method
+ *
+ * @return void
+ */
+ public function testMoRulesFifteen() {
+ Configure::write('Config.language', 'rule_15_mo');
+ $this->assertRulesFifteen();
+ }
+
+/**
+ * testPoRulesFifteen method
+ *
+ * @return void
+ */
+ public function testPoRulesFifteen() {
+ Configure::write('Config.language', 'rule_15_po');
+ $this->assertRulesFifteen();
+ }
+
+/**
+ * Assertions for plural rules fifteen
+ *
+ * @return void
+ */
+ public function assertRulesFifteen() {
+ $singular = $this->_singular();
+ $this->assertEquals('Plural Rule 15 (translated)', $singular);
+
+ $plurals = $this->_plural(111);
+ $this->assertTrue(in_array('0 is 0 (translated)', $plurals));
+ $this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+ $this->assertTrue(in_array('2 is 2 (translated)', $plurals));
+ $this->assertTrue(in_array('3 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('4 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('5 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('6 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('7 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('8 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('9 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('10 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('11 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('12 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('13 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('14 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('15 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('16 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('17 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('18 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('19 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('20 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('31 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('42 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('53 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('64 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('75 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('86 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('97 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('98 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('99 ends with 11-99 (translated)', $plurals));
+ $this->assertTrue(in_array('100 everything else (translated)', $plurals));
+ $this->assertTrue(in_array('101 everything else (translated)', $plurals));
+ $this->assertTrue(in_array('102 everything else (translated)', $plurals));
+ $this->assertTrue(in_array('103 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('104 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('105 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('106 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('107 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('108 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('109 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('110 ends with 03-10 (translated)', $plurals));
+ $this->assertTrue(in_array('111 ends with 11-99 (translated)', $plurals));
+
+ $coreSingular = $this->_singularFromCore();
+ $this->assertEquals('Plural Rule 15 (from core translated)', $coreSingular);
+
+ $corePlurals = $this->_pluralFromCore(111);
+ $this->assertTrue(in_array('0 is 0 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('2 is 2 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('3 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('4 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('5 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('6 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('7 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('8 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('9 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('10 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('11 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('12 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('13 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('14 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('15 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('16 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('17 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('18 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('19 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('20 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('31 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('42 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('53 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('64 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('75 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('86 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('97 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('98 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('99 ends with 11-99 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('100 everything else (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('101 everything else (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('102 everything else (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('103 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('104 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('105 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('106 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('107 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('108 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('109 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('110 ends with 03-10 (from core translated)', $corePlurals));
+ $this->assertTrue(in_array('111 ends with 11-99 (from core translated)', $corePlurals));
+ }
+
/**
* testSetLanguageWithSession method
*
@@ -1964,11 +2085,12 @@ class I18nTest extends CakeTestCase {
/**
* Plural method
*
+ * @param int $upTo For numbers upto (default to 25)
* @return void
*/
- protected function _plural() {
+ protected function _plural($upTo = 25) {
$plurals = array();
- for ($number = 0; $number <= 25; $number++) {
+ for ($number = 0; $number <= $upTo; $number++) {
$plurals[] = sprintf(__n('%d = 1', '%d = 0 or > 1', (float)$number), (float)$number);
}
return $plurals;
@@ -1987,11 +2109,12 @@ class I18nTest extends CakeTestCase {
/**
* pluralFromCore method
*
+ * @param int $upTo For numbers upto (default to 25)
* @return void
*/
- protected function _pluralFromCore() {
+ protected function _pluralFromCore($upTo = 25) {
$plurals = array();
- for ($number = 0; $number <= 25; $number++) {
+ for ($number = 0; $number <= $upTo; $number++) {
$plurals[] = sprintf(__n('%d = 1 (from core)', '%d = 0 or > 1 (from core)', (float)$number), (float)$number);
}
return $plurals;
diff --git a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
index 3a53976d0..c9a06b7fc 100644
--- a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
+++ b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
@@ -139,8 +139,7 @@ class ConsoleLogTest extends CakeTestCase {
TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsole',
));
- if (
- (DS === '\\' && !(bool)env('ANSICON')) ||
+ if ((DS === '\\' && !(bool)env('ANSICON')) ||
(function_exists('posix_isatty') && !posix_isatty(null))
) {
$expected = ConsoleOutput::PLAIN;
diff --git a/lib/Cake/Test/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php
index 52ad6ee7b..501ff7047 100644
--- a/lib/Cake/Test/Case/Utility/FileTest.php
+++ b/lib/Cake/Test/Case/Utility/FileTest.php
@@ -81,8 +81,7 @@ class FileTest extends CakeTestCase {
'filesize' => filesize($file),
'mime' => 'text/plain'
);
- if (
- !function_exists('finfo_open') &&
+ if (!function_exists('finfo_open') &&
(!function_exists('mime_content_type') ||
function_exists('mime_content_type') &&
mime_content_type($this->File->pwd()) === false)
diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php
index 1239aa2cb..f600ae757 100644
--- a/lib/Cake/Test/Case/Utility/InflectorTest.php
+++ b/lib/Cake/Test/Case/Utility/InflectorTest.php
@@ -186,6 +186,10 @@ class InflectorTest extends CakeTestCase {
* @return void
*/
public function testInflectingPlurals() {
+ $this->assertEquals(Inflector::pluralize('axman'), 'axmen');
+ $this->assertEquals(Inflector::pluralize('man'), 'men');
+ $this->assertEquals(Inflector::pluralize('woman'), 'women');
+ $this->assertEquals(Inflector::pluralize('human'), 'humans');
$this->assertEquals(Inflector::pluralize('categoria'), 'categorias');
$this->assertEquals(Inflector::pluralize('house'), 'houses');
$this->assertEquals(Inflector::pluralize('powerhouse'), 'powerhouses');
diff --git a/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..54ae1eeb2
Binary files /dev/null and b/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/core.mo differ
diff --git a/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..aa402fe9d
Binary files /dev/null and b/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/default.mo differ
diff --git a/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..1f8d1fe9c
--- /dev/null
+++ b/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/core.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2014-12-06 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Language-Team: CakePHP I18N & I10N Team \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Poedit-Language: Six Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 15 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d is 0 (from core translated)"
+msgstr[1] "%d is 1 (from core translated)"
+msgstr[2] "%d is 2 (from core translated)"
+msgstr[3] "%d ends with 03-10 (from core translated)"
+msgstr[4] "%d ends with 11-99 (from core translated)"
+msgstr[5] "%d everything else (from core translated)"
+
diff --git a/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..3a2998804
--- /dev/null
+++ b/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/default.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2014-12-06 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Language-Team: CakePHP I18N & I10N Team \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Poedit-Language: Six Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 15 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d is 0 (translated)"
+msgstr[1] "%d is 1 (translated)"
+msgstr[2] "%d is 2 (translated)"
+msgstr[3] "%d ends with 03-10 (translated)"
+msgstr[4] "%d ends with 11-99 (translated)"
+msgstr[5] "%d everything else (translated)"
+
diff --git a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
index 329eef27f..a09ed21e2 100644
--- a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
+++ b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
@@ -287,17 +287,25 @@ class CakeTestFixture {
$fields = array_unique($fields);
$default = array_fill_keys($fields, null);
foreach ($this->records as $record) {
- $merge = array_values(array_merge($default, $record));
+ $mergeData = array_merge($default, $record);
+ $merge = array_values($mergeData);
if (count($fields) !== count($merge)) {
- throw new CakeException('Fixture invalid: Count of fields does not match count of values in ' . get_class($this));
+
+ $mergeFields = array_diff_key(array_keys($mergeData), $fields);
+
+ $message = 'Fixture invalid: Count of fields does not match count of values in ' . get_class($this) . "\n";
+ foreach ($mergeFields as $field) {
+ $message .= "The field '" . $field . "' is in the data fixture but not in the schema." . "\n";
+ }
+
+ throw new CakeException($message);
}
$values[] = $merge;
}
$nested = $db->useNestedTransactions;
$db->useNestedTransactions = false;
$result = $db->insertMulti($this->table, $fields, $values);
- if (
- $this->primaryKey &&
+ if ($this->primaryKey &&
isset($this->fields[$this->primaryKey]['type']) &&
in_array($this->fields[$this->primaryKey]['type'], array('integer', 'biginteger'))
) {
diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php
index d2fad5dff..af2a06a6f 100644
--- a/lib/Cake/Utility/CakeTime.php
+++ b/lib/Cake/Utility/CakeTime.php
@@ -322,8 +322,7 @@ class CakeTime {
if (is_int($dateString) || is_numeric($dateString)) {
$date = (int)$dateString;
- } elseif (
- $dateString instanceof DateTime &&
+ } elseif ($dateString instanceof DateTime &&
$dateString->getTimezone()->getName() != date_default_timezone_get()
) {
$clone = clone $dateString;
diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php
index 141dfd410..c46391263 100644
--- a/lib/Cake/Utility/Hash.php
+++ b/lib/Cake/Utility/Hash.php
@@ -230,8 +230,7 @@ class Hash {
if (!preg_match($val, $prop)) {
return false;
}
- } elseif (
- ($op === '=' && $prop != $val) ||
+ } elseif (($op === '=' && $prop != $val) ||
($op === '!=' && $prop == $val) ||
($op === '>' && $prop <= $val) ||
($op === '<' && $prop >= $val) ||
diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php
index 74c005e10..a8ca02dfd 100644
--- a/lib/Cake/Utility/Inflector.php
+++ b/lib/Cake/Utility/Inflector.php
@@ -44,7 +44,7 @@ class Inflector {
'/sis$/i' => 'ses',
'/([ti])um$/i' => '\1a',
'/(p)erson$/i' => '\1eople',
- '/(m)an$/i' => '\1en',
+ '/(? '\1en',
'/(c)hild$/i' => '\1hildren',
'/(buffal|tomat)o$/i' => '\1\2oes',
'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
diff --git a/lib/Cake/Utility/ObjectCollection.php b/lib/Cake/Utility/ObjectCollection.php
index a65f6db93..4bbb1a3ea 100644
--- a/lib/Cake/Utility/ObjectCollection.php
+++ b/lib/Cake/Utility/ObjectCollection.php
@@ -129,8 +129,7 @@ abstract class ObjectCollection {
if ($options['collectReturn'] === true) {
$collected[] = $result;
}
- if (
- $options['break'] && ($result === $options['breakOn'] ||
+ if ($options['break'] && ($result === $options['breakOn'] ||
(is_array($options['breakOn']) && in_array($result, $options['breakOn'], true)))
) {
return $result;
diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php
index e4fc03cf4..e91299e73 100644
--- a/lib/Cake/View/Helper.php
+++ b/lib/Cake/View/Helper.php
@@ -320,8 +320,7 @@ class Helper extends Object {
if (!empty($options['pathPrefix']) && $path[0] !== '/') {
$path = $options['pathPrefix'] . $path;
}
- if (
- !empty($options['ext']) &&
+ if (!empty($options['ext']) &&
strpos($path, '?') === false &&
substr($path, -strlen($options['ext'])) !== $options['ext']
) {
@@ -543,8 +542,7 @@ class Helper extends Object {
$lastPart = isset($parts[$count - 1]) ? $parts[$count - 1] : null;
// Either 'body' or 'date.month' type inputs.
- if (
- ($count === 1 && $this->_modelScope && !$setScope) ||
+ if (($count === 1 && $this->_modelScope && !$setScope) ||
(
$count === 2 &&
in_array($lastPart, $this->_fieldSuffixes) &&
@@ -556,8 +554,7 @@ class Helper extends Object {
}
// 0.name, 0.created.month style inputs. Excludes inputs with the modelScope in them.
- if (
- $count >= 2 &&
+ if ($count >= 2 &&
is_numeric($parts[0]) &&
!is_numeric($parts[1]) &&
$this->_modelScope &&
diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
index fc07c582d..849a76d1e 100644
--- a/lib/Cake/View/Helper/FormHelper.php
+++ b/lib/Cake/View/Helper/FormHelper.php
@@ -534,8 +534,7 @@ class FormHelper extends AppHelper {
}
$out .= $this->submit($submit, $submitOptions);
}
- if (
- $this->requestType !== 'get' &&
+ if ($this->requestType !== 'get' &&
isset($this->request['_Token']) &&
!empty($this->request['_Token'])
) {
@@ -1201,8 +1200,7 @@ class FormHelper extends AppHelper {
if ($fieldKey === $primaryKey) {
$options['type'] = 'hidden';
}
- if (
- $options['type'] === 'number' &&
+ if ($options['type'] === 'number' &&
!isset($options['step'])
) {
if ($type === 'decimal') {
@@ -1321,8 +1319,7 @@ class FormHelper extends AppHelper {
} elseif (is_array($div)) {
$divOptions = array_merge($divOptions, $div);
}
- if (
- $this->_extractOption('required', $options) !== false &&
+ if ($this->_extractOption('required', $options) !== false &&
$this->_introspectModel($this->model(), 'validates', $this->field())
) {
$divOptions = $this->addClass($divOptions, 'required');
@@ -1365,8 +1362,7 @@ class FormHelper extends AppHelper {
$idKey = null;
if ($options['type'] === 'date' || $options['type'] === 'datetime') {
$firstInput = 'M';
- if (
- array_key_exists('dateFormat', $options) &&
+ if (array_key_exists('dateFormat', $options) &&
($options['dateFormat'] === null || $options['dateFormat'] === 'NONE')
) {
$firstInput = 'H';
@@ -1447,8 +1443,7 @@ class FormHelper extends AppHelper {
$value = current($this->value($valueOptions));
$output = '';
- if (
- (!isset($options['checked']) && !empty($value) && $value == $options['value']) ||
+ if ((!isset($options['checked']) && !empty($value) && $value == $options['value']) ||
!empty($options['checked'])
) {
$options['checked'] = 'checked';
@@ -2090,8 +2085,7 @@ class FormHelper extends AppHelper {
$hasOptions = (count($options) > 0 || $showEmpty);
// Secure the field if there are options, or its a multi select.
// Single selects with no options don't submit, but multiselects do.
- if (
- (!isset($secure) || $secure) &&
+ if ((!isset($secure) || $secure) &&
empty($attributes['disabled']) &&
(!empty($attributes['multiple']) || $hasOptions)
) {
@@ -2765,8 +2759,7 @@ class FormHelper extends AppHelper {
if ($name !== null) {
$isNumeric = is_numeric($name);
- if (
- (!$selectedIsArray && !$selectedIsEmpty && (string)$attributes['value'] == (string)$name) ||
+ if ((!$selectedIsArray && !$selectedIsEmpty && (string)$attributes['value'] == (string)$name) ||
($selectedIsArray && in_array((string)$name, $attributes['value'], !$isNumeric))
) {
if ($attributes['style'] === 'checkbox') {
@@ -2786,8 +2779,7 @@ class FormHelper extends AppHelper {
$disabledIsNumeric = is_numeric($name);
}
}
- if (
- $hasDisabled &&
+ if ($hasDisabled &&
$disabledIsArray &&
in_array((string)$name, $attributes['disabled'], !$disabledIsNumeric)
) {
@@ -2906,8 +2898,7 @@ class FormHelper extends AppHelper {
if ($min > $max) {
list($min, $max) = array($max, $min);
}
- if (
- !empty($options['value']) &&
+ if (!empty($options['value']) &&
(int)$options['value'] < $min &&
(int)$options['value'] > 0
) {