LesLibres.org/Rss-Bridge
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[Bridge] Use self:: instead of Bridge:: inside the class

Browse source
This commit is contained in:
logmanoriginal 2018-11-15 19:19:04 +01:00
parent 6f4a8f4d03
commit 4b5372638c
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/Bridge.php
View file

@ -82,7 +82,7 @@ class Bridge {
throw new \InvalidArgumentException('Bridge name invalid!'); throw new \InvalidArgumentException('Bridge name invalid!');
} }
$nameBridge = Bridge::sanitizeBridgeName($nameBridge) . 'Bridge'; $nameBridge = self::sanitizeBridgeName($nameBridge) . 'Bridge';
$pathBridge = self::getWorkingDir() . $nameBridge . '.php'; $pathBridge = self::getWorkingDir() . $nameBridge . '.php';
if(!file_exists($pathBridge)) { if(!file_exists($pathBridge)) {
@ -166,7 +166,7 @@ class Bridge {
* @return bool True if the bridge is whitelisted. * @return bool True if the bridge is whitelisted.
*/ */
public static function isWhitelisted($name){ public static function isWhitelisted($name){
return in_array(Bridge::sanitizeBridgeName($name), Bridge::getWhitelist()); return in_array(self::sanitizeBridgeName($name), self::getWhitelist());
} }
/** /**
@ -191,23 +191,23 @@ class Bridge {
if($firstCall) { if($firstCall) {
// Create initial whitelist or load from disk // Create initial whitelist or load from disk
if (!file_exists(WHITELIST) && !empty(Bridge::$whitelist)) { if (!file_exists(WHITELIST) && !empty(self::$whitelist)) {
file_put_contents(WHITELIST, implode("\n", Bridge::$whitelist)); file_put_contents(WHITELIST, implode("\n", self::$whitelist));
} else { } else {
$contents = trim(file_get_contents(WHITELIST)); $contents = trim(file_get_contents(WHITELIST));
if($contents === '*') { // Whitelist all bridges if($contents === '*') { // Whitelist all bridges
Bridge::$whitelist = Bridge::listBridges(); self::$whitelist = self::listBridges();
} else { } else {
Bridge::$whitelist = array_map('Bridge::sanitizeBridgeName', explode("\n", $contents)); self::$whitelist = array_map('self::sanitizeBridgeName', explode("\n", $contents));
} }
} }
} }
return Bridge::$whitelist; return self::$whitelist;
} }
@ -226,7 +226,7 @@ class Bridge {
* @return void * @return void
*/ */
public static function setWhitelist($default = array()) { public static function setWhitelist($default = array()) {
Bridge::$whitelist = array_map('Bridge::sanitizeBridgeName', $default); self::$whitelist = array_map('self::sanitizeBridgeName', $default);
} }
/** /**
@ -261,9 +261,9 @@ class Bridge {
} }
// The name is valid if a corresponding bridge file is found on disk // The name is valid if a corresponding bridge file is found on disk
if(in_array(strtolower($name), array_map('strtolower', Bridge::listBridges()))) { if(in_array(strtolower($name), array_map('strtolower', self::listBridges()))) {
$index = array_search(strtolower($name), array_map('strtolower', Bridge::listBridges())); $index = array_search(strtolower($name), array_map('strtolower', self::listBridges()));
return Bridge::listBridges()[$index]; return self::listBridges()[$index];
} }
Debug::log('Invalid bridge name specified: "' . $name . '"!'); Debug::log('Invalid bridge name specified: "' . $name . '"!');