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/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php index 8960e7589..0f55b3108 100644 --- a/lib/Cake/Console/ConsoleOptionParser.php +++ b/lib/Cake/Console/ConsoleOptionParser.php @@ -510,8 +510,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 820cf43ab..2a2b41dd6 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/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 5ae7b4855..b82ed26cd 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/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index eb3211a1a..545c1d358 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( @@ -1313,8 +1311,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]) ) { @@ -1337,8 +1334,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) ) { @@ -1589,8 +1585,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 f3faad97b..25f7c3813 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -1293,8 +1293,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 1cd0f0a96..32c0f2dd8 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 bd5890e61..4c84b5a66 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 09e8b0c30..3416c45b7 100644 --- a/lib/Cake/Network/Http/HttpSocket.php +++ b/lib/Cake/Network/Http/HttpSocket.php @@ -311,8 +311,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 53fc5e354..a3bf0bf68 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 f5768ebbd..5e843ef93 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/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/TestSuite/Fixture/CakeTestFixture.php b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php index 329eef27f..5bf624d6e 100644 --- a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php +++ b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php @@ -296,8 +296,7 @@ class CakeTestFixture { $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 6e76351ad..f798c0f0f 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 73f4a4c69..242c4a9f7 100644 --- a/lib/Cake/Utility/Hash.php +++ b/lib/Cake/Utility/Hash.php @@ -220,8 +220,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/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 852c2653d..f147b1f8f 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']) ) { @@ -1199,8 +1198,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') { @@ -1318,8 +1316,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'); @@ -1362,8 +1359,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'; @@ -1444,8 +1440,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'; @@ -2086,8 +2081,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) ) { @@ -2761,8 +2755,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') { @@ -2782,8 +2775,7 @@ class FormHelper extends AppHelper { $disabledIsNumeric = is_numeric($name); } } - if ( - $hasDisabled && + if ($hasDisabled && $disabledIsArray && in_array((string)$name, $attributes['disabled'], !$disabledIsNumeric) ) { @@ -2902,8 +2894,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 ) {