mirror/RSS-Bridge.rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-08-04 01:55:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor: use static values for cache scope

Browse source 
This fixes a future problem when code is placed under a namespace because `get_class($bridge)` will then return e.g. `RssBridge\Bridge\TwitterBridge` instead of the the current value `TwitterBridge`.

Also a bit refactoring of `Configuration.php`.
This commit is contained in:
Dag 2022-08-02 15:03:54 +02:00 • committed by GitHub
parent a0a0d5235b
commit ecb486794b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

15
caches/MemcachedCache.php
View file

@ -15,22 +15,23 @@ class MemcachedCache implements CacheInterface
returnServerError('"memcached" extension not loaded. Please check "php.ini"');
}
$host = Configuration::getConfig(get_called_class(), 'host');
$port = Configuration::getConfig(get_called_class(), 'port');
$section = 'MemcachedCache';
$host = Configuration::getConfig($section, 'host');
$port = Configuration::getConfig($section, 'port');
if (empty($host) && empty($port)) {
returnServerError('Configuration for ' . get_called_class() . ' missing. Please check your ' . FILE_CONFIG);
returnServerError('Configuration for ' . $section . ' missing. Please check your ' . FILE_CONFIG);
} elseif (empty($host)) {
returnServerError('"host" param is not set for ' . get_called_class() . '. Please check your ' . FILE_CONFIG);
returnServerError('"host" param is not set for ' . $section . '. Please check your ' . FILE_CONFIG);
} elseif (empty($port)) {
returnServerError('"port" param is not set for ' . get_called_class() . '. Please check your ' . FILE_CONFIG);
returnServerError('"port" param is not set for ' . $section . '. Please check your ' . FILE_CONFIG);
} elseif (!ctype_digit($port)) {
returnServerError('"port" param is invalid for ' . get_called_class() . '. Please check your ' . FILE_CONFIG);
returnServerError('"port" param is invalid for ' . $section . '. Please check your ' . FILE_CONFIG);
}
$port = intval($port);
if ($port < 1 || $port > 65535) {
returnServerError('"port" param is invalid for ' . get_called_class() . '. Please check your ' . FILE_CONFIG);
returnServerError('"port" param is invalid for ' . $section . '. Please check your ' . FILE_CONFIG);
}
$conn = new Memcached();

7
caches/SQLiteCache.php
View file

@ -24,16 +24,17 @@ class SQLiteCache implements CacheInterface
);
}
$file = Configuration::getConfig(get_called_class(), 'file');
$section = 'SQLiteCache';
$file = Configuration::getConfig($section, 'file');
if (empty($file)) {
$message = sprintf('Configuration for %s missing. Please check your %s', get_called_class(), FILE_CONFIG);
$message = sprintf('Configuration for %s missing. Please check your %s', $section, FILE_CONFIG);
print render('error.html.php', ['message' => $message]);
exit;
}
if (dirname($file) == '.') {
$file = PATH_CACHE . $file;
} elseif (!is_dir(dirname($file))) {
$message = sprintf('Invalid configuration for %s. Please check your %s', get_called_class(), FILE_CONFIG);
$message = sprintf('Invalid configuration for %s. Please check your %s', $section, FILE_CONFIG);
print render('error.html.php', ['message' => $message]);
exit;
}