Fix race condition in laravel config parsing

Author: AJenbo

docs/CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- **Config return type inference.** `config('database.default')`, `Config::get('app.name')`, and `$repository->get('mail.from')` now infer their return type from the project's `config/*.php` files. Scalar values resolve to their base type (`string`, `int`, `bool`), `env()` defaults resolve through their fallback argument, and nested arrays resolve to array shapes with typed keys. Framework default configs from `vendor/laravel/framework/config/` are scanned as a fallback when the project does not override them. Parsed config trees are cached and invalidated when config files change. Contributed by @calebdw.
+- **Config return type inference.** `config('database.default')`, `Config::get('app.name')`, and `$repository->get('mail.from')` now infer their return type from the project's `config/*.php` files. Scalar values resolve to their base type (`string`, `int`, `bool`), `env()` defaults resolve through their fallback argument, and nested arrays resolve to array shapes with typed keys. Framework default configs from `vendor/laravel/framework/config/` fill in any keys the project's own config file leaves unset, so a partially published `config/app.php` still resolves the framework defaults it does not override. Parsed config trees are cached and invalidated when config files change. Contributed by @calebdw.
 - **Semantic token modes.** `.phpantom.toml` now supports `[semantic_tokens] mode = "contextual" | "full" | "off"`. The default `contextual` mode emits only context-sensitive highlighting that complements editor syntax grammars, while `full` keeps the previous broad semantic-token stream and `off` disables semantic tokens. Contributed by @calebdw.
 - **`@phpstan-ignore` identifiers are highlighted and completed.** PHPStan ignore comments now highlight the `@phpstan-ignore` tag and each listed error identifier in both docblocks and ordinary `//` comments. Identifier completion works inside the comma-separated ignore list, using PHPStan diagnostic codes already seen in the current file while staying out of per-code parenthesized reasons. Contributed by @calebdw.
 - **Parent member override completion.** Typing a method name after `function` in a class body (for example `protected function get`) now suggests public and protected methods from parent classes and interfaces that can still be overridden or implemented, inserting a full signature snippet. The same flow suggests parent properties after `$` (for example `protected $tit`) and parent constants after `const`. Snippets insert `#[\Override]` above methods on PHP 8.3+, properties on PHP 8.5+, and constants on PHP 8.6+ (from `composer.json` / `config.platform.php`). Private members and ones already defined on the class are omitted. Contributed by @calebdw.

src/virtual_members/laravel/config_values.rs

@@ -232,6 +232,27 @@ impl ConfigNode {
             ConfigNode::Array(_) => None,
         }
     }
+
+    /// Fill in keys present in `defaults` but absent here, recursing into
+    /// nested arrays.  Keys already present keep their higher-precedence
+    /// value, so a project config file wins over the framework defaults it
+    /// only partially overrides.  A leaf on either side is authoritative: an
+    /// existing leaf is never replaced by a default array, and a default leaf
+    /// never merges into an existing array.
+    fn merge_defaults(&mut self, defaults: ConfigNode) {
+        let ConfigNode::Array(target) = self else {
+            return;
+        };
+        let ConfigNode::Array(source) = defaults else {
+            return;
+        };
+        for (key, default_child) in source {
+            match target.iter_mut().find(|(k, _)| *k == key) {
+                Some((_, existing)) => existing.merge_defaults(default_child),
+                None => target.push((key, default_child)),
+            }
+        }
+    }
 }
 
 /// Parse a `config/*.php` file's returned array into an owned [`ConfigNode`].
@@ -478,8 +499,16 @@ impl Backend {
     fn enumerate_config_trees(&self) -> Vec<(String, ConfigNode)> {
         use crate::virtual_members::laravel::laravel_config_prefix_from_uri;
 
-        let mut trees = Vec::new();
-        let mut seen_prefixes = std::collections::HashSet::new();
+        // Lower-precedence sources only fill keys the higher-precedence tree
+        // for the same prefix leaves unset, so a project `config/app.php` that
+        // publishes just a handful of keys still inherits the framework
+        // defaults for everything it does not override.
+        let mut trees: Vec<(String, ConfigNode)> = Vec::new();
+        let mut merge =
+            |prefix: String, tree: ConfigNode| match trees.iter_mut().find(|(p, _)| *p == prefix) {
+                Some((_, existing)) => existing.merge_defaults(tree),
+                None => trees.push((prefix, tree)),
+            };
 
         // 1. Project config files take highest precedence.
         let snapshot = self.user_file_symbol_maps();
@@ -491,21 +520,16 @@ impl Backend {
                 continue;
             };
             if let Some(tree) = parse_config_tree(&content) {
-                seen_prefixes.insert(prefix.clone());
-                trees.push((prefix, tree));
+                merge(prefix, tree);
             }
         }
 
         // 2. Package config files from service providers.
         for res in &self.laravel_provider_resources.read().config_files {
-            if seen_prefixes.contains(&res.namespace) {
-                continue;
-            }
             if let Ok(content) = std::fs::read_to_string(&res.path)
                 && let Some(tree) = parse_config_tree(&content)
             {
-                seen_prefixes.insert(res.namespace.clone());
-                trees.push((res.namespace.clone(), tree));
+                merge(res.namespace.clone(), tree);
             }
         }
 
@@ -523,14 +547,10 @@ impl Backend {
                     let Some(stem) = path.file_stem().and_then(|s| s.to_str()) else {
                         continue;
                     };
-                    let prefix = stem.to_string();
-                    if seen_prefixes.contains(&prefix) {
-                        continue;
-                    }
                     if let Ok(content) = std::fs::read_to_string(&path)
                         && let Some(tree) = parse_config_tree(&content)
                     {
-                        trees.push((prefix, tree));
+                        merge(stem.to_string(), tree);
                     }
                 }
             }