Skip to content

Fixed #456 + Fixed ambiguous $badPracticeOmeter counter #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Geolim4 merged 2 commits into from
May 12, 2017
Merged

Fixed #456 + Fixed ambiguous $badPracticeOmeter counter #457

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
836db3c
Fixed #456 // Bug of Exception workflow in cacheManager introduced in v6
Geolim4 May 12, 2017
8a77cd0
Fixed ambiguous `$badPracticeOmeter` counter
Geolim4 May 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/phpFastCache/CacheManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ class CacheManager
* @param array $config
* @return ExtendedCacheItemPoolInterface
* @throws phpFastCacheDriverCheckException
* @throws phpFastCacheInvalidConfigurationException
*/
public static function getInstance($driver = 'auto', array $config = [])
{
Expand All @@ -197,21 +198,31 @@ public static function getInstance($driver = 'auto', array $config = [])
self::$instances[ $instance ] = new $class($config);
self::$instances[ $instance ]->setEventManager(EventManager::getInstance());
}catch(phpFastCacheDriverCheckException $e){
$fallback = self::standardizeDriverName($config['fallback']);
if($fallback && $fallback !== $driver){
$class = self::getNamespacePath() . $fallback . '\Driver';
self::$instances[ $instance ] = new $class($config);
self::$instances[ $instance ]->setEventManager(EventManager::getInstance());
trigger_error(sprintf('The "%s" driver is unavailable at the moment, the fallback driver "%s" has been used instead.', $driver, $fallback), E_USER_WARNING);
if($config['fallback']){
try{
$fallback = self::standardizeDriverName($config['fallback']);
if($fallback !== $driver){
$class = self::getNamespacePath() . $fallback . '\Driver';
self::$instances[ $instance ] = new $class($config);
self::$instances[ $instance ]->setEventManager(EventManager::getInstance());
trigger_error(sprintf('The "%s" driver is unavailable at the moment, the fallback driver "%s" has been used instead.', $driver, $fallback), E_USER_WARNING);
}else{
throw new phpFastCacheInvalidConfigurationException('The fallback driver cannot be the same than the default driver', 0, $e);
}
}catch (phpFastCacheInvalidArgumentException $e){
throw new phpFastCacheInvalidConfigurationException('Invalid fallback driver configuration', 0, $e);
}
}else{
throw new phpFastCacheDriverCheckException($e->getMessage(), $e->getCode(), $e);
}
}
} else if(++$badPracticeOmeter[$driver] >= 5){
} else if($badPracticeOmeter[$driver] >= 5){
trigger_error('[' . $driver . '] Calling many times CacheManager::getInstance() for already instanced drivers is a bad practice and have a significant impact on performances.
See https://github.com/PHPSocialNetwork/phpfastcache/wiki/[V5]-Why-calling-getInstance%28%29-each-time-is-a-bad-practice-%3F');
}

$badPracticeOmeter[$driver]++;

return self::$instances[ $instance ];
}

Expand Down