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

refactor methods to avoid else block on returning early

Browse source
This commit is contained in:
euromark 2013-08-12 19:06:34 +02:00
parent 7c856e6ab7
commit f3018cc532
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Cache/Cache.php
View file

@ -538,9 +538,8 @@ class Cache {
}
if (isset(self::$_groups[$group])) {
return array($group => self::$_groups[$group]);
} else {
throw new CacheException(__d('cake_dev', 'Invalid cache group %s', $group));
}
throw new CacheException(__d('cake_dev', 'Invalid cache group %s', $group));
}
}

5
lib/Cake/Console/Command/SchemaShell.php
View file

@ -235,10 +235,9 @@ class SchemaShell extends AppShell {
if ($File->write($contents)) {
$this->out(__d('cake_console', 'SQL dump file created in %s', $File->pwd()));
return $this->_stop();
} else {
$this->err(__d('cake_console', 'SQL dump could not be created'));
return $this->_stop();
}
$this->err(__d('cake_console', 'SQL dump could not be created'));
return $this->_stop();
}
$this->out($contents);
return $contents;

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

@ -789,10 +789,9 @@ class TreeBehavior extends ModelBehavior {
if ($node[$right] == $node[$left] + 1) {
if ($delete) {
return $Model->delete($id);
} else {
$Model->id = $id;
return $Model->saveField($parent, null);
}
$Model->id = $id;
return $Model->saveField($parent, null);
} elseif ($node[$parent]) {
list($parentNode) = array_values($Model->find('first', array(
'conditions' => array($scope, $Model->escapeField() => $node[$parent]),

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

@ -556,9 +556,8 @@ class HtmlHelper extends AppHelper {
if (empty($options['block'])) {
return $out;
} else {
$this->_View->append($options['block'], $out);
}
$this->_View->append($options['block'], $out);
}
/**
@ -593,9 +592,8 @@ class HtmlHelper extends AppHelper {
if (empty($options['block'])) {
return $out;
} else {
$this->_View->append($options['block'], $out);
}
$this->_View->append($options['block'], $out);
}
/**