Skip to content
Permalink
Browse files

Use (int) cast instead of intval() function for performance reasons a…

…nd to unify it.
  • Loading branch information...
dereuromark committed Sep 10, 2014
1 parent 58bf005 commit e77f96d8b731f7b70ac85158371ce57633e2f0b7
@@ -452,14 +452,14 @@ public function getName($useDbConfig = null) {
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);
}
@@ -417,7 +417,7 @@ protected function _parse($functionName, $map) {
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(
@@ -176,7 +176,7 @@ public function inOptions($options, $prompt = null, $default = null) {
$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 @@ public function doMoreAssociations(Model $model, $associations) {
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 @@ public function getName($useDbConfig = null) {
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;
@@ -203,7 +203,7 @@ public function findPath($pathOptions) {
}
$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;
}
}
@@ -414,7 +414,7 @@ protected function _expire($expires = null) {
$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');
@@ -179,7 +179,7 @@ public function paginate($object = null, $scope = array(), $whitelist = array())
$extra['type'] = $type;
}
if (intval($page) < 1) {
if ((int)$page < 1) {
$page = 1;
}
$page = $options['page'] = (int)$page;
@@ -726,7 +726,7 @@ public function length($real) {
return 36;
}
if ($limit) {
return intval($limit);
return (int)$limit;
}
return null;
}
@@ -3048,7 +3048,7 @@ public function length($real) {
list($col, $limit) = explode('(', $col);
}
if ($limit !== null) {
return intval($limit);
return (int)$limit;
}
return null;
}
@@ -3089,7 +3089,7 @@ public function length($real) {
}
}
}
return intval($length);
return (int)$length;
}
/**
@@ -3456,10 +3456,10 @@ public function introspectType($value) {
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) {
@@ -187,7 +187,7 @@ public function testChangeOutputFormats() {
'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 @@ public function testAddFormat() {
'<error',
'<code', '8', '/code',
'<file', 'preg:/[^<]+/', '/file',
'<line', '' . (intval(__LINE__) - 7), '/line',
'<line', '' . ((int)__LINE__ - 7), '/line',
'preg:/Undefined variable:\s+foo/',
'/error'
);
@@ -321,7 +321,7 @@ public static function fromString($dateString, $timezone = null) {
}
if (is_int($dateString) || is_numeric($dateString)) {
$date = intval($dateString);
$date = (int)$dateString;
} elseif (
$dateString instanceof DateTime &&
$dateString->getTimezone()->getName() != date_default_timezone_get()
@@ -290,8 +290,8 @@ protected static function _simpleOp($op, $data, $path, $values = null) {
$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) {
@@ -560,7 +560,7 @@ public static function classicExtract($data, $path = null) {
}
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 @@ public static function check($data, $path = null) {
}
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));

0 comments on commit e77f96d

Please sign in to comment.
You can’t perform that action at this time.