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

core: Move initialization for static paths to rssbridge.php

Browse source 
Bridge, Format and Cache are all part of the core logic of RSS-Bridge
and should therefore be initialized centrally
This commit is contained in:
logmanoriginal 2018-11-10 19:42:49 +01:00
parent 697d63bb96
commit 2104fc4d58
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.php
View file

@ -80,10 +80,6 @@ $whitelist_default = array(
try { try {
Bridge::setDir(PATH_LIB_BRIDGES);
Format::setDir(PATH_LIB_FORMATS);
Cache::setDir(PATH_LIB_CACHES);
if(!file_exists(WHITELIST_FILE)) { if(!file_exists(WHITELIST_FILE)) {
$whitelist_selection = $whitelist_default; $whitelist_selection = $whitelist_default;
$whitelist_write = implode("\n", $whitelist_default); $whitelist_write = implode("\n", $whitelist_default);

11
lib/rssbridge.php
View file

@ -35,3 +35,14 @@ require_once PATH_LIB . 'contents.php';
// Vendor // Vendor
require_once PATH_LIB_VENDOR . 'simplehtmldom/simple_html_dom.php'; require_once PATH_LIB_VENDOR . 'simplehtmldom/simple_html_dom.php';
require_once PATH_LIB_VENDOR . 'php-urljoin/src/urljoin.php'; require_once PATH_LIB_VENDOR . 'php-urljoin/src/urljoin.php';
// Initialize static members
try {
Bridge::setDir(PATH_LIB_BRIDGES);
Format::setDir(PATH_LIB_FORMATS);
Cache::setDir(PATH_LIB_CACHES);
} catch(Exception $e) {
error_log($e);
header('Content-type: text/plain', true, 500);
die($e->getMessage());
}

4
tests/BridgeImplementationTest.php
View file

@ -4,9 +4,7 @@ use PHPUnit\Framework\TestCase;
use PHPUnit\Framework\TestResult; use PHPUnit\Framework\TestResult;
use PHPUnit\Framework\AssertionFailedError; use PHPUnit\Framework\AssertionFailedError;
require_once(__DIR__ . '/../lib/rssbridge.php'); require_once __DIR__ . '/../lib/rssbridge.php';
Bridge::setDir(PATH_LIB_BRIDGES);
/** /**
* This class checks bridges for implementation details: * This class checks bridges for implementation details: