bit
/
taskman_config
25
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Making PHPStan happy
Publish PHP Package / docker (push) Successful in 6s Details

This commit is contained in:
Pavel Shevaev 2025-05-07 17:51:09 +03:00
parent c378131c18
commit 9ed9a4f7d9
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cache.inc.php
View File

@ -461,8 +461,8 @@ function _config_merge_update_results(ConfigUpdateResult $result, array $results
$result->fast_jsons = $total_fast_jsons; $result->fast_jsons = $total_fast_jsons;
} }
function _config_update_cache_entry(ConfigGlobals $globals, $base_dir, string $file, string $cache_file, function _config_update_cache_entry(ConfigGlobals $globals, $base_dir, string $file,
?int &$parser_type = null) : ConfigCacheEntry string $cache_file, ?int &$parser_type = null) : ConfigCacheEntry
{ {
list($conf_id, $conf_strid) = config_ensure_header($base_dir, $file); list($conf_id, $conf_strid) = config_ensure_header($base_dir, $file);
if(!$conf_id) if(!$conf_id)

16
config.inc.php
View File

@ -315,18 +315,18 @@ class ConfigManager
{ {
$fs_cache_map = $this->getFileMap(); $fs_cache_map = $this->getFileMap();
if($req->mode === ConfigUpdateMode::Force) if($req->mode == ConfigUpdateMode::Force)
{ {
//let's rebuild the file map //let's rebuild the file map
$fs_cache_map->init($req->files->getAllFiles()); $fs_cache_map->init($req->files->getAllFiles());
config_log("File map init: ".$fs_cache_map->count()); 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()); 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)); 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) 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) private function _updateFileMap(ConfigUpdateRequest $req, ConfigDirFiles $affected_conf_files, array $added_files, array $removed_files)
@ -368,11 +370,11 @@ class ConfigManager
$affected_files = null; $affected_files = null;
if($req->mode === ConfigUpdateMode::Force) if($req->mode == ConfigUpdateMode::Force)
{ {
$affected_files = new ConfigDirFiles($req->files->getMap()); $affected_files = new ConfigDirFiles($req->files->getMap());
} }
else if($req->mode === ConfigUpdateMode::DetectChanged) else if($req->mode == ConfigUpdateMode::DetectChanged)
{ {
$affected_files = ConfigDirFiles::makeFor($this); $affected_files = ConfigDirFiles::makeFor($this);
@ -401,7 +403,7 @@ class ConfigManager
$affected_files->addFile($dep, unique: true); $affected_files->addFile($dep, unique: true);
} }
} }
else if($req->mode === ConfigUpdateMode::Selected) else if($req->mode == ConfigUpdateMode::Selected)
{ {
$affected_files = ConfigDirFiles::makeFor($this); $affected_files = ConfigDirFiles::makeFor($this);
@ -413,6 +415,8 @@ class ConfigManager
$affected_files->addFile($dep, unique: true); $affected_files->addFile($dep, unique: true);
} }
} }
else
throw new Exception("Bad mode");
return $affected_files; return $affected_files;
} }