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

Refactors Model::_clearCache

Browse source 
- don't use mixed keys in $assoc array
- removes unnecessary strtolower on Inflector::underscore result
- return early
This commit is contained in:
Schlaefer 2013-09-28 10:16:23 +02:00
parent 99ec97bd19
commit be61a5023f
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/Cake/Model/Model.php
View file

@ -3499,28 +3499,23 @@ class Model extends Object implements CakeEventListener {
* @return boolean true on delete
*/
protected function _clearCache($type = null) {
if ($type === null) {
if (Configure::read('Cache.check') === true) {
$pluralized = Inflector::pluralize($this->alias);
$assoc[$this->alias] = strtolower($pluralized);
$assoc[] = strtolower(Inflector::underscore($pluralized));
foreach ($this->_associations as $association) {
foreach ($this->$association as $associatedClass) {
$className = $associatedClass['className'];
if (!isset($assoc[$className])) {
$pluralized = Inflector::pluralize($className);
$assoc[$className] = strtolower($pluralized);
$assoc[] = strtolower(Inflector::underscore($pluralized));
}
}
}
$assoc = array_unique($assoc);
clearCache($assoc);
return true;
}
} else {
//Will use for query cache deleting
if ($type !== null || Configure::read('Cache.check') !== true) {
return;
}
$assoc[] = strtolower(Inflector::pluralize($this->alias));
$assoc[] = Inflector::underscore(Inflector::pluralize($this->alias));
foreach ($this->_associations as $association) {
foreach ($this->$association as $className) {
$pluralized = strtolower(Inflector::pluralize($className['className']));
if (!in_array($pluralized, $assoc)) {
$assoc[] = $pluralized;
$assoc[] = Inflector::underscore(Inflector::pluralize($className['className']));
}
}
}
$assoc = array_unique($assoc);
clearCache($assoc);
return true;
}
/**