diff options
| author |  Alexis Degrugillier <aledeg@users.noreply.github.com>
| 2025-09-05 09:56:46 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-09-05 15:56:46 +0200 |
| commit | 23ba48c71f0d41bbe012d668349f6516dad527b4 (patch) | |
| tree | b5680e834c2b87becdded07e0555227ade9d7629 | |
| parent | 3d85eb19380021031e9d1193919ba516bbc99573 (diff) | |
Change how files are included (#7916)
1. `include`, `include_once`, `require` and `require_once` are expressions not functions, parentheses are not necessary.
2. to move up the directory tree, it's better to use the `dirname` function instead of relying on `/..`.
59 files changed, 98 insertions, 98 deletions
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index d97b18c70..ba343c81e 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -128,7 +128,7 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController { Minz_Error::error(403); } - include_once(LIB_PATH . '/lib_install.php'); + include_once LIB_PATH . '/lib_install.php'; invalidateHttpCache(); @@ -277,7 +277,7 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController { if (self::isGit()) { $res = !self::hasGitUpdate(); } else { - require(UPDATE_FILENAME); + require UPDATE_FILENAME; // @phpstan-ignore function.notFound $res = do_post_update(); } @@ -299,7 +299,7 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController { if (self::isGit()) { $res = self::gitPull(); } else { - require(UPDATE_FILENAME); + require UPDATE_FILENAME; if (Minz_Request::isPost()) { // @phpstan-ignore function.notFound save_info_update(); diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 67a97c45a..17879f3d0 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -288,7 +288,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { $customUserConfigPath = join_path(DATA_PATH, 'config-user.custom.php'); if (file_exists($customUserConfigPath)) { - $customUserConfig = include($customUserConfigPath); + $customUserConfig = include $customUserConfigPath; if (is_array($customUserConfig)) { $userConfig = $customUserConfig; } diff --git a/app/Models/DatabaseDAO.php b/app/Models/DatabaseDAO.php index 0062c23e8..8ec3ce3ca 100644 --- a/app/Models/DatabaseDAO.php +++ b/app/Models/DatabaseDAO.php @@ -21,7 +21,7 @@ class FreshRSS_DatabaseDAO extends Minz_ModelPdo { public const LENGTH_INDEX_UNICODE = 191; public function create(): string { - require_once(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'); + require_once APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'; $db = FreshRSS_Context::systemConf()->db; try { @@ -280,7 +280,7 @@ SQL; $catDAO = FreshRSS_Factory::createCategoryDao(); $catDAO->resetDefaultCategoryName(); - include_once(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'); + include_once APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'; if (!empty($GLOBALS['SQL_UPDATE_MINOR']) && is_string($GLOBALS['SQL_UPDATE_MINOR'])) { $sql = $GLOBALS['SQL_UPDATE_MINOR']; $isMariaDB = false; diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 26f85093e..f85db0f2f 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -177,7 +177,7 @@ class FreshRSS_Feed extends Minz_Model { $attributesOnly = $contents === null && $tmpPath === ''; - require_once(LIB_PATH . '/favicons.php'); + require_once LIB_PATH . '/favicons.php'; if (!$attributesOnly && !isImgMime(is_string($contents) ? $contents : '')) { throw new FreshRSS_UnsupportedImageFormat_Exception(); } @@ -401,7 +401,7 @@ class FreshRSS_Feed extends Minz_Model { } public function faviconPrepare(bool $force = false): void { - require_once(LIB_PATH . '/favicons.php'); + require_once LIB_PATH . '/favicons.php'; if ($this->customFavicon()) { return; } diff --git a/app/Models/Search.php b/app/Models/Search.php index 539fe2a12..e88f745ce 100644 --- a/app/Models/Search.php +++ b/app/Models/Search.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); -require_once(LIB_PATH . '/lib_date.php'); +require_once LIB_PATH . '/lib_date.php'; /** * Contains a search from the search form. diff --git a/app/Models/Share.php b/app/Models/Share.php index 140ca0eca..d7ee3bde7 100644 --- a/app/Models/Share.php +++ b/app/Models/Share.php @@ -40,7 +40,7 @@ class FreshRSS_Share { * @param string $filename the name of the file to load. */ public static function load(string $filename): void { - $shares_from_file = @include($filename); + $shares_from_file = @include $filename; if (!is_array($shares_from_file)) { $shares_from_file = []; } diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php index 4cbfa7412..89f8f2a77 100644 --- a/app/Models/UserDAO.php +++ b/app/Models/UserDAO.php @@ -4,7 +4,7 @@ declare(strict_types=1); class FreshRSS_UserDAO extends Minz_ModelPdo { public function createUser(): bool { - require(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'); + require APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'; try { $sql = $GLOBALS['SQL_CREATE_TABLES']; @@ -31,7 +31,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo { fwrite(STDERR, 'Deleting SQL data for user “' . $this->current_user . "”…\n"); } - require(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'); + require APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'; $sql = $GLOBALS['SQL_DROP_TABLES']; if (!is_string($sql)) { throw new Exception('SQL_DROP_TABLES is not a string!'); diff --git a/app/actualize_script.php b/app/actualize_script.php index d0ca72271..2be2a117a 100755 --- a/app/actualize_script.php +++ b/app/actualize_script.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/../cli/_cli.php'); +require dirname(__DIR__) . '/cli/_cli.php'; session_cache_limiter(''); ob_implicit_flush(false); diff --git a/app/install.php b/app/install.php index 0e408db52..6c7647492 100644 --- a/app/install.php +++ b/app/install.php @@ -7,7 +7,7 @@ if (function_exists('opcache_reset')) { header("Content-Security-Policy: default-src 'self'; frame-ancestors 'none'"); header('Referrer-Policy: same-origin'); -require(LIB_PATH . '/lib_install.php'); +require LIB_PATH . '/lib_install.php'; Minz_Session::init('FreshRSS'); @@ -144,7 +144,7 @@ function saveStep2(): void { $customConfigPath = DATA_PATH . '/config.custom.php'; if (file_exists($customConfigPath)) { - $customConfig = include($customConfigPath); + $customConfig = include $customConfigPath; if (is_array($customConfig)) { $config_array = array_merge($customConfig, $config_array); if (!is_string($config_array['default_user'] ?? null)) { diff --git a/cli/_cli.php b/cli/_cli.php index b4df51dd8..fc7c206f5 100644 --- a/cli/_cli.php +++ b/cli/_cli.php @@ -7,11 +7,11 @@ if (php_sapi_name() !== 'cli') { const EXIT_CODE_ALREADY_EXISTS = 3; -require(__DIR__ . '/../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader -require(LIB_PATH . '/lib_install.php'); -require_once(__DIR__ . '/CliOption.php'); -require_once(__DIR__ . '/CliOptionsParser.php'); +require dirname(__DIR__) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader +require LIB_PATH . '/lib_install.php'; +require_once __DIR__ . '/CliOption.php'; +require_once __DIR__ . '/CliOptionsParser.php'; Minz_Session::init('FreshRSS', true); FreshRSS_Context::initSystem(); diff --git a/cli/actualize-user.php b/cli/actualize-user.php index 29514769b..d5633766f 100755 --- a/cli/actualize-user.php +++ b/cli/actualize-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/check.translation.php b/cli/check.translation.php index 151a6084f..01e90a631 100755 --- a/cli/check.translation.php +++ b/cli/check.translation.php @@ -6,7 +6,7 @@ require_once __DIR__ . '/i18n/I18nCompletionValidator.php'; require_once __DIR__ . '/i18n/I18nData.php'; require_once __DIR__ . '/i18n/I18nFile.php'; require_once __DIR__ . '/i18n/I18nUsageValidator.php'; -require_once __DIR__ . '/../constants.php'; +require_once dirname(__DIR__) . '/constants.php'; $cliOptions = new class extends CliOptionsParser { /** @var array<int,string> $language */ @@ -104,7 +104,7 @@ function embedSvg(string $contents): string { if ($cliOptions->generateReadme) { $supportedFormats = ['txt', 'svg']; - $flagsDir = __DIR__ . '/../docs/i18n/flags'; + $flagsDir = dirname(__DIR__) . '/docs/i18n/flags'; $markdownImgStr = ''; foreach ($percentage as $lang => $value) { @@ -131,7 +131,7 @@ if ($cliOptions->generateReadme) { $template = '<!-- This file is automatically generated by `cli/check.translation.php -g` -->' . "\n"; if ($svg === '') { - $i18nGen = include __DIR__ . "/../app/i18n/$lang/gen.php"; + $i18nGen = include dirname(__DIR__) . "/app/i18n/$lang/gen.php"; if (!is_array($i18nGen) || !is_string($i18nGen['flag'] ?? null)) { echo 'Error: No Unicode flag found for language ' . $lang, PHP_EOL; exit(1); diff --git a/cli/create-user.php b/cli/create-user.php index 0276e80b3..4de0ced1d 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; $cliOptions = new class extends CliOptionsParser { public string $user; diff --git a/cli/db-backup.php b/cli/db-backup.php index 09604a2df..f391c6b41 100755 --- a/cli/db-backup.php +++ b/cli/db-backup.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); $ok = true; diff --git a/cli/db-optimize.php b/cli/db-optimize.php index f6d3884b9..8f37dbca6 100755 --- a/cli/db-optimize.php +++ b/cli/db-optimize.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/db-restore.php b/cli/db-restore.php index 8e4ffcc12..0de624519 100755 --- a/cli/db-restore.php +++ b/cli/db-restore.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/delete-user.php b/cli/delete-user.php index 18efa4253..efb36a0ed 100755 --- a/cli/delete-user.php +++ b/cli/delete-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/do-install.php b/cli/do-install.php index cab4b1462..57a5121d4 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; if (file_exists(DATA_PATH . '/applied_migrations.txt')) { fail('FreshRSS seems to be already installed!' . "\n" . 'Please use `./cli/reconfigure.php` instead.', EXIT_CODE_ALREADY_EXISTS); @@ -99,7 +99,7 @@ $config = [ $customConfigPath = DATA_PATH . '/config.custom.php'; if (file_exists($customConfigPath)) { - $customConfig = include($customConfigPath); + $customConfig = include $customConfigPath; if (is_array($customConfig) && is_array_keys_string($customConfig)) { $config = array_merge($customConfig, $config); } diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php index b78aeff98..48925f1ff 100755 --- a/cli/export-opml-for-user.php +++ b/cli/export-opml-for-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/export-sqlite-for-user.php b/cli/export-sqlite-for-user.php index 98e05da22..01b364b51 100755 --- a/cli/export-sqlite-for-user.php +++ b/cli/export-sqlite-for-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php index e030274d2..ca7de28fe 100755 --- a/cli/export-zip-for-user.php +++ b/cli/export-zip-for-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/import-for-user.php b/cli/import-for-user.php index 17dc9750e..26c69a118 100755 --- a/cli/import-for-user.php +++ b/cli/import-for-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/import-sqlite-for-user.php b/cli/import-sqlite-for-user.php index 2eb3e2965..f671151c2 100755 --- a/cli/import-sqlite-for-user.php +++ b/cli/import-sqlite-for-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; performRequirementCheck(FreshRSS_Context::systemConf()->db['type'] ?? ''); diff --git a/cli/list-users.php b/cli/list-users.php index f9e63f4f6..b4c185e03 100755 --- a/cli/list-users.php +++ b/cli/list-users.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; $users = listUsers(); sort($users); diff --git a/cli/manipulate.translation.php b/cli/manipulate.translation.php index 434fb61a5..db6243cc0 100755 --- a/cli/manipulate.translation.php +++ b/cli/manipulate.translation.php @@ -4,7 +4,7 @@ declare(strict_types=1); require_once __DIR__ . '/_cli.php'; require_once __DIR__ . '/i18n/I18nData.php'; require_once __DIR__ . '/i18n/I18nFile.php'; -require_once __DIR__ . '/../constants.php'; +require_once dirname(__DIR__) . '/constants.php'; $cliOptions = new class extends CliOptionsParser { public string $action; diff --git a/cli/prepare.php b/cli/prepare.php index 1192393f2..3c066b122 100755 --- a/cli/prepare.php +++ b/cli/prepare.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; $dirs = [ '/', diff --git a/cli/reconfigure.php b/cli/reconfigure.php index f2c86a8d4..731dc936d 100755 --- a/cli/reconfigure.php +++ b/cli/reconfigure.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; $cliOptions = new class extends CliOptionsParser { public string $defaultUser; diff --git a/cli/update-user.php b/cli/update-user.php index 7e50503b9..89bdb786a 100755 --- a/cli/update-user.php +++ b/cli/update-user.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; $cliOptions = new class extends CliOptionsParser { public string $user; diff --git a/cli/user-info.php b/cli/user-info.php index 04de8c68d..dca3caefd 100755 --- a/cli/user-info.php +++ b/cli/user-info.php @@ -1,7 +1,7 @@ #!/usr/bin/env php <?php declare(strict_types=1); -require(__DIR__ . '/_cli.php'); +require __DIR__ . '/_cli.php'; const DATA_FORMAT = "%-7s | %-20s | %-5s | %-7s | %-25s | %-15s | %-10s | %-10s | %-10s | %-10s | %-10s | %-10s | %-5s | %-10s\n"; diff --git a/constants.php b/constants.php index 38717a610..265d502cf 100644 --- a/constants.php +++ b/constants.php @@ -41,7 +41,7 @@ if (version_compare(PHP_VERSION, FRESHRSS_MIN_PHP_VERSION, '<')) { if (file_exists(__DIR__ . '/constants.local.php')) { //Include custom / local settings: - include(__DIR__ . '/constants.local.php'); + include __DIR__ . '/constants.local.php'; } defined('FRESHRSS_USERAGENT') or define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')'); @@ -2,4 +2,4 @@ declare(strict_types=1); header('Location: p/', true, 301); -include('index.html'); +include 'index.html'; diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php index 90beb689f..0d6c8b1f3 100644 --- a/lib/Minz/Configuration.php +++ b/lib/Minz/Configuration.php @@ -44,7 +44,7 @@ class Minz_Configuration { * @throws Minz_FileNotExistException if the file does not exist or is invalid. */ public static function load(string $filename): array { - $data = @include($filename); + $data = @include $filename; if (is_array($data) && is_array_keys_string($data)) { return $data; } else { diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php index 3129c2e1e..4d529f1d4 100644 --- a/lib/Minz/Extension.php +++ b/lib/Minz/Extension.php @@ -116,7 +116,7 @@ abstract class Minz_Extension { } ob_start(); - include($filename); + include $filename; return ob_get_clean(); } diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php index 936af82a1..b3a29f9f7 100644 --- a/lib/Minz/ExtensionManager.php +++ b/lib/Minz/ExtensionManager.php @@ -224,7 +224,7 @@ final class Minz_ExtensionManager { $entry_point_filename = $info['path'] . '/' . self::$ext_entry_point; $ext_class_name = $info['entrypoint'] . 'Extension'; - include_once($entry_point_filename); + include_once $entry_point_filename; // Test if the given extension class exists. if (!class_exists($ext_class_name)) { diff --git a/lib/Minz/Migrator.php b/lib/Minz/Migrator.php index c7e8ea15d..94612bfa4 100644 --- a/lib/Minz/Migrator.php +++ b/lib/Minz/Migrator.php @@ -138,7 +138,7 @@ class Minz_Migrator $migration_class = APP_NAME . "_Migration_" . $migration_version; $migration_callback = $migration_class . '::migrate'; - $include_result = @include_once($filepath); + $include_result = @include_once $filepath; if (!$include_result) { Minz_Log::error( "{$filepath} migration file cannot be loaded.", diff --git a/lib/Minz/ModelArray.php b/lib/Minz/ModelArray.php index 89f7f8da4..1aca8470b 100644 --- a/lib/Minz/ModelArray.php +++ b/lib/Minz/ModelArray.php @@ -35,7 +35,7 @@ class Minz_ModelArray { } elseif (($handle = $this->getLock()) === false) { throw new Minz_PermissionDeniedException($this->filename); } else { - $data = include($this->filename); + $data = include $this->filename; $this->releaseLock($handle); if ($data === false) { diff --git a/lib/Minz/Paginator.php b/lib/Minz/Paginator.php index 265b0c2cb..52b170580 100644 --- a/lib/Minz/Paginator.php +++ b/lib/Minz/Paginator.php @@ -55,7 +55,7 @@ class Minz_Paginator { $view = APP_PATH . '/views/helpers/' . $view; if (file_exists($view)) { - include($view); + include $view; } } diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php index b57e90bcf..17290574c 100644 --- a/lib/Minz/Translate.php +++ b/lib/Minz/Translate.php @@ -172,7 +172,7 @@ class Minz_Translate { self::$translates[$key] = []; foreach (self::$lang_files[$key] as $lang_pathname) { - $i18n_array = include($lang_pathname); + $i18n_array = include $lang_pathname; if (!is_array($i18n_array)) { Minz_Log::warning('`' . $lang_pathname . '` does not contain a PHP array'); continue; diff --git a/lib/http-conditional.php b/lib/http-conditional.php index c08f72f75..e56732354 100644 --- a/lib/http-conditional.php +++ b/lib/http-conditional.php @@ -16,7 +16,7 @@ declare(strict_types=1); ```php <?php - require_once('http-conditional.php'); + require_once 'http-conditional.php'; //Date of the last modification of the content (Unix Timestamp format). //Examples: query the database, or last modification of a static file. $dateLastModification = ...; diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 27020960e..b7c3817ee 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -43,17 +43,17 @@ function classAutoloader(string $class): void { $components = explode('_', $class); switch (count($components)) { case 1: - include(APP_PATH . '/' . $components[0] . '.php'); + include APP_PATH . '/' . $components[0] . '.php'; return; case 2: - include(APP_PATH . '/Models/' . $components[1] . '.php'); + include APP_PATH . '/Models/' . $components[1] . '.php'; return; case 3: //Controllers, Exceptions - include(APP_PATH . '/' . $components[2] . 's/' . $components[1] . $components[2] . '.php'); + include APP_PATH . '/' . $components[2] . 's/' . $components[1] . $components[2] . '.php'; return; } } elseif (strpos($class, 'Minz') === 0) { - include(LIB_PATH . '/' . str_replace('_', '/', $class) . '.php'); + include LIB_PATH . '/' . str_replace('_', '/', $class) . '.php'; } elseif (str_starts_with($class, 'SimplePie\\')) { $prefix = 'SimplePie\\'; $base_dir = LIB_PATH . '/simplepie/simplepie/src/'; diff --git a/p/api/fever.php b/p/api/fever.php index 92ddb82b8..01e6d7b61 100644 --- a/p/api/fever.php +++ b/p/api/fever.php @@ -16,8 +16,8 @@ header('X-Content-Type-Options: nosniff'); // ================================================================================================ // BOOTSTRAP FreshRSS -require(__DIR__ . '/../../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__, 2) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader FreshRSS_Context::initSystem(); // check if API is enabled globally @@ -355,7 +355,7 @@ final class FeverAPI return []; } - require_once(LIB_PATH . '/favicons.php'); + require_once LIB_PATH . '/favicons.php'; $favicons = []; $salt = FreshRSS_Context::systemConf()->salt; diff --git a/p/api/greader.php b/p/api/greader.php index 40fb5dc72..88afb3656 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -25,8 +25,8 @@ Server-side API compatible with Google Reader API layer 2 * https://github.com/bazqux/bazqux-api */ -require(__DIR__ . '/../../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__, 2) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader header("Content-Security-Policy: default-src 'none'; frame-ancestors 'none'; sandbox"); header('X-Content-Type-Options: nosniff'); diff --git a/p/api/index.php b/p/api/index.php index def8d4890..1db1273dc 100644 --- a/p/api/index.php +++ b/p/api/index.php @@ -13,8 +13,8 @@ <script src="../scripts/api.js" defer="defer"></script> <script id="jsonVars" type="application/json"> <?php -require(__DIR__ . '/../../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__, 2) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader FreshRSS_Context::initSystem(); echo json_encode([ 'greader' => Minz_Url::display('/api/greader.php', 'php', true), diff --git a/p/api/misc.php b/p/api/misc.php index 7724caa7a..fe75b5be7 100644 --- a/p/api/misc.php +++ b/p/api/misc.php @@ -5,8 +5,8 @@ declare(strict_types=1); * `/api/misc.php/Extension%20name/` or `/api/misc.php?ext=Extension%20name` */ -require(__DIR__ . '/../../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__, 2) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader function badRequest(): never { header('HTTP/1.1 400 Bad Request'); diff --git a/p/api/pshb.php b/p/api/pshb.php index b6cbc5089..37b3fe056 100644 --- a/p/api/pshb.php +++ b/p/api/pshb.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); -require(__DIR__ . '/../../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__, 2) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader const MAX_PAYLOAD = 3_145_728; diff --git a/p/api/query.php b/p/api/query.php index 5d8fb3dec..8aedd8ecf 100644 --- a/p/api/query.php +++ b/p/api/query.php @@ -3,8 +3,8 @@ declare(strict_types=1); header('X-Content-Type-Options: nosniff'); -require(__DIR__ . '/../../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__, 2) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader Minz_Request::init(); @@ -48,7 +48,7 @@ if (!FreshRSS_Context::hasUserConf() || !FreshRSS_Context::userConf()->enabled) usleep(rand(20, 200)); } -require(LIB_PATH . '/http-conditional.php'); +require LIB_PATH . '/http-conditional.php'; $dateLastModification = max( FreshRSS_UserDAO::ctime($user), FreshRSS_UserDAO::mtime($user), @@ -1,7 +1,7 @@ <?php declare(strict_types=1); -require(__DIR__ . '/../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader function get_absolute_filename(string $file_name): string { $core_extension = realpath(CORE_EXTENSIONS_PATH . '/' . $file_name); @@ -103,7 +103,7 @@ if ($mtime === false) { sendNotFoundResponse(); } -require(LIB_PATH . '/http-conditional.php'); +require LIB_PATH . '/http-conditional.php'; if (file_exists(DATA_PATH . '/no-cache.txt') || !httpConditional($mtime, 604800, 2)) { readfile($absolute_filename); @@ -1,9 +1,9 @@ <?php declare(strict_types=1); -require(__DIR__ . '/../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader -require(LIB_PATH . '/favicons.php'); -require(LIB_PATH . '/http-conditional.php'); +require dirname(__DIR__) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader +require LIB_PATH . '/favicons.php'; +require LIB_PATH . '/http-conditional.php'; header("Content-Security-Policy: default-src 'none'; frame-ancestors 'none'; sandbox"); header('X-Content-Type-Options: nosniff'); diff --git a/p/i/index.php b/p/i/index.php index 55846b952..10407e2c1 100644 --- a/p/i/index.php +++ b/p/i/index.php @@ -22,20 +22,20 @@ declare(strict_types=1); # # ***** END LICENSE BLOCK ***** -require(__DIR__ . '/../../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__, 2) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader $migrations_path = APP_PATH . '/migrations'; $applied_migrations_path = DATA_PATH . '/applied_migrations.txt'; if (!file_exists($applied_migrations_path)) { - require(APP_PATH . '/install.php'); + require APP_PATH . '/install.php'; } else { session_cache_limiter(''); Minz_Session::init('FreshRSS'); Minz_Session::_param('keepAlive', 1); //To prevent the PHP session from expiring - require(LIB_PATH . '/http-conditional.php'); + require LIB_PATH . '/http-conditional.php'; $currentUser = Minz_User::name(); $dateLastModification = $currentUser === null ? time() : max( FreshRSS_UserDAO::ctime($currentUser), diff --git a/p/index.php b/p/index.php index 76c43fb59..4a1f385e8 100644 --- a/p/index.php +++ b/p/index.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); -require(__DIR__ . '/../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader FreshRSS_Context::initSystem(); Minz_Request::forward(['c' => 'index', 'a' => 'index'], true); diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php index 8b4c9d2b5..e6efdbe55 100644 --- a/tests/app/Models/SearchTest.php +++ b/tests/app/Models/SearchTest.php @@ -3,7 +3,7 @@ declare(strict_types=1); use PHPUnit\Framework\Attributes\DataProvider; -require_once(LIB_PATH . '/lib_date.php'); +require_once LIB_PATH . '/lib_date.php'; class SearchTest extends PHPUnit\Framework\TestCase { diff --git a/tests/bootstrap.php b/tests/bootstrap.php index f988855e6..6aee8b96f 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -5,5 +5,5 @@ ini_set('display_errors', '1'); const COPY_LOG_TO_SYSLOG = false; -require(__DIR__ . '/../constants.php'); -require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader +require dirname(__DIR__) . '/constants.php'; +require LIB_PATH . '/lib_rss.php'; //Includes class autoloader diff --git a/tests/cli/CliOptionsParserTest.php b/tests/cli/CliOptionsParserTest.php index 6a67fa761..2fe0b7924 100644 --- a/tests/cli/CliOptionsParserTest.php +++ b/tests/cli/CliOptionsParserTest.php @@ -2,8 +2,8 @@ declare(strict_types=1); use PHPUnit\Framework\TestCase; -require_once __DIR__ . '/../../cli/CliOption.php'; -require_once __DIR__ . '/../../cli/CliOptionsParser.php'; +require_once dirname(__DIR__, 2) . '/cli/CliOption.php'; +require_once dirname(__DIR__, 2) . '/cli/CliOptionsParser.php'; final class CliOptionsOptionalTest extends CliOptionsParser { public string $string = ''; diff --git a/tests/cli/cli-parser-test.php b/tests/cli/cli-parser-test.php index 6806d29ce..a6b157474 100755 --- a/tests/cli/cli-parser-test.php +++ b/tests/cli/cli-parser-test.php @@ -2,8 +2,8 @@ <?php declare(strict_types=1); -require(__DIR__ . '/../../vendor/autoload.php'); -require(__DIR__ . '/CliOptionsParserTest.php'); +require dirname(__DIR__, 2) . '/vendor/autoload.php'; +require __DIR__ . '/CliOptionsParserTest.php'; $optionsClass = getenv('CLI_PARSER_TEST_OPTIONS_CLASS'); if (!is_string($optionsClass) || !class_exists($optionsClass)) { diff --git a/tests/cli/i18n/I18nCompletionValidatorTest.php b/tests/cli/i18n/I18nCompletionValidatorTest.php index f66d9e04f..4d62662aa 100644 --- a/tests/cli/i18n/I18nCompletionValidatorTest.php +++ b/tests/cli/i18n/I18nCompletionValidatorTest.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); -require_once __DIR__ . '/../../../cli/i18n/I18nCompletionValidator.php'; -require_once __DIR__ . '/../../../cli/i18n/I18nValue.php'; +require_once dirname(__DIR__, 3) . '/cli/i18n/I18nCompletionValidator.php'; +require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php'; class I18nCompletionValidatorTest extends PHPUnit\Framework\TestCase { /** @var I18nValue&PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/cli/i18n/I18nDataTest.php b/tests/cli/i18n/I18nDataTest.php index afdaacf1e..1f9e257fc 100644 --- a/tests/cli/i18n/I18nDataTest.php +++ b/tests/cli/i18n/I18nDataTest.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); -require_once __DIR__ . '/../../../cli/i18n/I18nData.php'; -require_once __DIR__ . '/../../../cli/i18n/I18nValue.php'; +require_once dirname(__DIR__, 3) . '/cli/i18n/I18nData.php'; +require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php'; class I18nDataTest extends PHPUnit\Framework\TestCase { /** @var array<string,array<string,array<string,I18nValue>>> */ diff --git a/tests/cli/i18n/I18nFileTest.php b/tests/cli/i18n/I18nFileTest.php index 34abdb9a3..b1aca49ea 100644 --- a/tests/cli/i18n/I18nFileTest.php +++ b/tests/cli/i18n/I18nFileTest.php @@ -1,6 +1,6 @@ <?php declare(strict_types=1); -require_once __DIR__ . '/../../../cli/i18n/I18nFile.php'; +require_once dirname(__DIR__, 3) . '/cli/i18n/I18nFile.php'; class I18nFileTest extends PHPUnit\Framework\TestCase { public function test(): void { diff --git a/tests/cli/i18n/I18nUsageValidatorTest.php b/tests/cli/i18n/I18nUsageValidatorTest.php index 5a2268141..0429d1277 100644 --- a/tests/cli/i18n/I18nUsageValidatorTest.php +++ b/tests/cli/i18n/I18nUsageValidatorTest.php @@ -1,7 +1,7 @@ <?php declare(strict_types=1); -require_once __DIR__ . '/../../../cli/i18n/I18nValue.php'; -require_once __DIR__ . '/../../../cli/i18n/I18nUsageValidator.php'; +require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php'; +require_once dirname(__DIR__, 3) . '/cli/i18n/I18nUsageValidator.php'; class I18nUsageValidatorTest extends PHPUnit\Framework\TestCase { diff --git a/tests/cli/i18n/I18nValueTest.php b/tests/cli/i18n/I18nValueTest.php index 85ff00fee..fb1fca804 100644 --- a/tests/cli/i18n/I18nValueTest.php +++ b/tests/cli/i18n/I18nValueTest.php @@ -1,6 +1,6 @@ <?php declare(strict_types=1); -require_once __DIR__ . '/../../../cli/i18n/I18nValue.php'; +require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php'; class I18nValueTest extends PHPUnit\Framework\TestCase { public static function testConstructorWithoutState(): void { |