diff --git a/lib/Cake/Console/Command/Task/ControllerTask.php b/lib/Cake/Console/Command/Task/ControllerTask.php index da0508e68..728358d66 100644 --- a/lib/Cake/Console/Command/Task/ControllerTask.php +++ b/lib/Cake/Console/Command/Task/ControllerTask.php @@ -452,14 +452,14 @@ class ControllerTask extends BakeTask { return $this->_stop(); } - if (!$enteredController || intval($enteredController) > count($controllers)) { + if (!$enteredController || (int)$enteredController > count($controllers)) { $this->err(__d('cake_console', "The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again.")); $enteredController = ''; } } - if (intval($enteredController) > 0 && intval($enteredController) <= count($controllers)) { - $controllerName = $controllers[intval($enteredController) - 1]; + if ((int)$enteredController > 0 && (int)$enteredController <= count($controllers)) { + $controllerName = $controllers[(int)$enteredController - 1]; } else { $controllerName = Inflector::camelize($enteredController); } diff --git a/lib/Cake/Console/Command/Task/ExtractTask.php b/lib/Cake/Console/Command/Task/ExtractTask.php index d616839cd..be2d0f145 100644 --- a/lib/Cake/Console/Command/Task/ExtractTask.php +++ b/lib/Cake/Console/Command/Task/ExtractTask.php @@ -417,7 +417,7 @@ class ExtractTask extends AppShell { if ($mapCount === count($strings)) { extract(array_combine($map, $strings)); $category = isset($category) ? $category : 6; - $category = intval($category); + $category = (int)$category; $categoryName = $categories[$category]; $domain = isset($domain) ? $domain : 'default'; $details = array( diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php index 4b100c94f..878fcded9 100644 --- a/lib/Cake/Console/Command/Task/ModelTask.php +++ b/lib/Cake/Console/Command/Task/ModelTask.php @@ -176,7 +176,7 @@ class ModelTask extends BakeTask { $prompt = __d('cake_console', 'Make a selection from the choices above'); } $choice = $this->in($prompt, null, $default); - if (intval($choice) > 0 && intval($choice) <= $max) { + if ((int)$choice > 0 && (int)$choice <= $max) { $valid = true; } } @@ -765,7 +765,7 @@ class ModelTask extends BakeTask { if (!empty($showKeys)) { $this->out(__d('cake_console', 'A helpful List of possible keys')); $foreignKey = $this->inOptions($showKeys, __d('cake_console', 'What is the foreignKey?')); - $foreignKey = $showKeys[intval($foreignKey)]; + $foreignKey = $showKeys[(int)$foreignKey]; } if (!isset($foreignKey)) { $foreignKey = $this->in(__d('cake_console', 'What is the foreignKey? Specify your own.'), null, $suggestedForeignKey); @@ -985,14 +985,14 @@ class ModelTask extends BakeTask { return $this->_stop(); } - if (!$enteredModel || intval($enteredModel) > count($this->_modelNames)) { + if (!$enteredModel || (int)$enteredModel > count($this->_modelNames)) { $this->err(__d('cake_console', "The model name you supplied was empty,\n" . "or the number you selected was not an option. Please try again.")); $enteredModel = ''; } } - if (intval($enteredModel) > 0 && intval($enteredModel) <= count($this->_modelNames)) { - return $this->_modelNames[intval($enteredModel) - 1]; + if ((int)$enteredModel > 0 && (int)$enteredModel <= count($this->_modelNames)) { + return $this->_modelNames[(int)$enteredModel - 1]; } return $enteredModel; diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php index f3bcf8dde..b92d10662 100644 --- a/lib/Cake/Console/Command/Task/PluginTask.php +++ b/lib/Cake/Console/Command/Task/PluginTask.php @@ -203,7 +203,7 @@ class PluginTask extends AppShell { } $prompt = __d('cake_console', 'Choose a plugin path from the paths above.'); $choice = $this->in($prompt, null, 1); - if (intval($choice) > 0 && intval($choice) <= $max) { + if ((int)$choice > 0 && (int)$choice <= $max) { $valid = true; } } diff --git a/lib/Cake/Controller/Component/CookieComponent.php b/lib/Cake/Controller/Component/CookieComponent.php index 55a031523..fb5e4c38c 100644 --- a/lib/Cake/Controller/Component/CookieComponent.php +++ b/lib/Cake/Controller/Component/CookieComponent.php @@ -414,7 +414,7 @@ class CookieComponent extends Component { $now = new DateTime(); if (is_int($expires) || is_numeric($expires)) { - return $this->_expires = $now->format('U') + intval($expires); + return $this->_expires = $now->format('U') + (int)$expires; } $now->modify($expires); return $this->_expires = $now->format('U'); diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php index 53144ec6f..960484b40 100644 --- a/lib/Cake/Controller/Component/PaginatorComponent.php +++ b/lib/Cake/Controller/Component/PaginatorComponent.php @@ -179,7 +179,7 @@ class PaginatorComponent extends Component { $extra['type'] = $type; } - if (intval($page) < 1) { + if ((int)$page < 1) { $page = 1; } $page = $options['page'] = (int)$page; diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php index a9225349d..b9c8524fd 100644 --- a/lib/Cake/Model/Datasource/Database/Postgres.php +++ b/lib/Cake/Model/Datasource/Database/Postgres.php @@ -726,7 +726,7 @@ class Postgres extends DboSource { return 36; } if ($limit) { - return intval($limit); + return (int)$limit; } return null; } diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index b005a41bf..3505a49d6 100644 --- a/lib/Cake/Model/Datasource/DboSource.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -3048,7 +3048,7 @@ class DboSource extends DataSource { list($col, $limit) = explode('(', $col); } if ($limit !== null) { - return intval($limit); + return (int)$limit; } return null; } @@ -3089,7 +3089,7 @@ class DboSource extends DataSource { } } } - return intval($length); + return (int)$length; } /** @@ -3456,10 +3456,10 @@ class DboSource extends DataSource { if (is_bool($value)) { return 'boolean'; } - if (is_float($value) && floatval($value) === $value) { + if (is_float($value) && (float)$value === $value) { return 'float'; } - if (is_int($value) && intval($value) === $value) { + if (is_int($value) && (int)$value === $value) { return 'integer'; } if (is_string($value) && strlen($value) > 255) { diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php index 0379e4f4d..e967e7776 100644 --- a/lib/Cake/Test/Case/Utility/DebuggerTest.php +++ b/lib/Cake/Test/Case/Utility/DebuggerTest.php @@ -187,7 +187,7 @@ class DebuggerTest extends CakeTestCase { 'error' => array(), 'code' => array(), '8', '/code', 'file' => array(), 'preg:/[^<]+/', '/file', - 'line' => array(), '' . (intval(__LINE__) - 7), '/line', + 'line' => array(), '' . ((int)__LINE__ - 7), '/line', 'preg:/Undefined variable:\s+foo/', '/error' ); @@ -246,7 +246,7 @@ class DebuggerTest extends CakeTestCase { 'getTimezone()->getName() != date_default_timezone_get() diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php index d24998de5..c6a8c06b2 100644 --- a/lib/Cake/Utility/Hash.php +++ b/lib/Cake/Utility/Hash.php @@ -290,8 +290,8 @@ class Hash { $count = count($path); $last = $count - 1; foreach ($path as $i => $key) { - if (is_numeric($key) && intval($key) > 0 || $key === '0') { - $key = intval($key); + if (is_numeric($key) && (int)$key > 0 || $key === '0') { + $key = (int)$key; } if ($op === 'insert') { if ($i === $last) { diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php index df1b6e804..122160745 100644 --- a/lib/Cake/Utility/Set.php +++ b/lib/Cake/Utility/Set.php @@ -560,7 +560,7 @@ class Set { } foreach ($path as $i => $key) { - if (is_numeric($key) && intval($key) > 0 || $key === '0') { + if (is_numeric($key) && (int)$key > 0 || $key === '0') { if (isset($data[$key])) { $data = $data[$key]; } else { @@ -657,8 +657,8 @@ class Set { } foreach ($path as $i => $key) { - if (is_numeric($key) && intval($key) > 0 || $key === '0') { - $key = intval($key); + if (is_numeric($key) && (int)$key > 0 || $key === '0') { + $key = (int)$key; } if ($i === count($path) - 1) { return (is_array($data) && array_key_exists($key, $data));