diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2024-12-27 12:12:49 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-12-27 12:12:49 +0100 |
| commit | b1d24fbdb7d1cc948c946295035dad6df550fb7e (patch) | |
| tree | 7b4365a04097a779659474fbb9281a9661512522 /lib/Minz/Configuration.php | |
| parent | 897e4a3f4a273d50c28157edb67612b2d7fa2e6f (diff) | |
PHPStan 2.0 (#7131)
* PHPStan 2.0
fix https://github.com/FreshRSS/FreshRSS/issues/6989
https://github.com/phpstan/phpstan/releases/tag/2.0.0
https://github.com/phpstan/phpstan/blob/2.0.x/UPGRADING.md
* More
* More
* Done
* fix i18n CLI
* Restore a PHPStan Next test
For work towards PHPStan Level 10
* 4 more on Level 10
* fix getTagsForEntry
* API at Level 10
* More Level 10
* Finish Minz at Level 10
* Finish CLI at Level 10
* Finish Controllers at Level 10
* More Level 10
* More
* Pass bleedingEdge
* Clean PHPStan options and add TODOs
* Level 10 for main config
* More
* Consitency array vs. list
* Sanitize themes get_infos
* Simplify TagDAO->getTagsForEntries()
* Finish reportAnyTypeWideningInVarTag
* Prepare checkBenevolentUnionTypes and checkImplicitMixed
* Fixes
* Refix
* Another fix
* Casing of __METHOD__ constant
Diffstat (limited to 'lib/Minz/Configuration.php')
| -rw-r--r-- | lib/Minz/Configuration.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php index b2742e249..b56268b4a 100644 --- a/lib/Minz/Configuration.php +++ b/lib/Minz/Configuration.php @@ -45,7 +45,7 @@ class Minz_Configuration { */ public static function load(string $filename): array { $data = @include($filename); - if (is_array($data)) { + if (is_array($data) && is_array_keys_string($data)) { return $data; } else { throw new Minz_FileNotExistException($filename); @@ -117,9 +117,10 @@ class Minz_Configuration { } try { - $this->data = array_replace_recursive( + $overloaded = array_replace_recursive( $this->data, self::load($this->config_filename) ); + $this->data = array_filter($overloaded, 'is_string', ARRAY_FILTER_USE_KEY); } catch (Minz_FileNotExistException $e) { if ($this->default_filename == null) { throw $e; |