From 9ed9a4f7d9a603303c87822cde34a6df911c05c1 Mon Sep 17 00:00:00 2001 From: Pavel Shevaev Date: Wed, 7 May 2025 17:51:09 +0300 Subject: [PATCH] Making PHPStan happy --- cache.inc.php | 4 ++-- config.inc.php | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cache.inc.php b/cache.inc.php index 144863a..fea08f8 100644 --- a/cache.inc.php +++ b/cache.inc.php @@ -461,8 +461,8 @@ function _config_merge_update_results(ConfigUpdateResult $result, array $results $result->fast_jsons = $total_fast_jsons; } -function _config_update_cache_entry(ConfigGlobals $globals, $base_dir, string $file, string $cache_file, - ?int &$parser_type = null) : ConfigCacheEntry +function _config_update_cache_entry(ConfigGlobals $globals, $base_dir, string $file, + string $cache_file, ?int &$parser_type = null) : ConfigCacheEntry { list($conf_id, $conf_strid) = config_ensure_header($base_dir, $file); if(!$conf_id) diff --git a/config.inc.php b/config.inc.php index b1dd52f..5f6086b 100644 --- a/config.inc.php +++ b/config.inc.php @@ -315,18 +315,18 @@ class ConfigManager { $fs_cache_map = $this->getFileMap(); - if($req->mode === ConfigUpdateMode::Force) + if($req->mode == ConfigUpdateMode::Force) { //let's rebuild the file map $fs_cache_map->init($req->files->getAllFiles()); config_log("File map init: ".$fs_cache_map->count()); } - else if($req->mode === ConfigUpdateMode::DetectChanged) + else if($req->mode == ConfigUpdateMode::DetectChanged) { list($added_files, $removed_files) = $fs_cache_map->compare($req->files->getAllFiles()); config_log("File map compare, added: ".count($added_files).", removed: ".count($removed_files)); } - else if($req->mode === ConfigUpdateMode::Selected) + else if($req->mode == ConfigUpdateMode::Selected) { if($req->file_changes != null) { @@ -339,6 +339,8 @@ class ConfigManager } } } + else + throw new Exception("Bad mode"); } private function _updateFileMap(ConfigUpdateRequest $req, ConfigDirFiles $affected_conf_files, array $added_files, array $removed_files) @@ -368,11 +370,11 @@ class ConfigManager $affected_files = null; - if($req->mode === ConfigUpdateMode::Force) + if($req->mode == ConfigUpdateMode::Force) { $affected_files = new ConfigDirFiles($req->files->getMap()); } - else if($req->mode === ConfigUpdateMode::DetectChanged) + else if($req->mode == ConfigUpdateMode::DetectChanged) { $affected_files = ConfigDirFiles::makeFor($this); @@ -401,7 +403,7 @@ class ConfigManager $affected_files->addFile($dep, unique: true); } } - else if($req->mode === ConfigUpdateMode::Selected) + else if($req->mode == ConfigUpdateMode::Selected) { $affected_files = ConfigDirFiles::makeFor($this); @@ -413,6 +415,8 @@ class ConfigManager $affected_files->addFile($dep, unique: true); } } + else + throw new Exception("Bad mode"); return $affected_files; }