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 /app/Controllers | |
| 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 `/..`.
Diffstat (limited to 'app/Controllers')
| -rw-r--r-- | app/Controllers/updateController.php | 6 | ||||
| -rw-r--r-- | app/Controllers/userController.php | 2 |
2 files changed, 4 insertions, 4 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; } |