Commit 55ea0c7
committed
[BUGFIX] Do not let a detached <project> break the configuration
Two defects in the previous commit of this branch, both found by review and
both reproduced before fixing.
Detaching <project> can leave an empty root element behind, and
`XmlUtils::convertDomElementToArray()` returns null rather than an empty array
for one. `assert(is_array($rootConfig))` then fails for any `guides.xml` that
holds nothing but a project — which the `version-from-guides-xml` fixtures are.
It stays invisible under the default and the CI php.ini, both of which run with
`zend.assertions=-1`, where the following write to `$rootConfig['project']`
auto-vivifies null; with `zend.assertions=1` those two data sets fail.
`getElementsByTagName('project')` searches the whole subtree, and the schema
lets an `<extension>` carry arbitrary child elements. A nested `<project>` was
therefore read as the project configuration and removed from that extension,
while the real one at root level was dropped. Look at direct children only.
The new `version-from-guides-xml-nested-project` fixture covers the second
defect and fails against the previous state. The first one is only observable
with assertions enabled, and the existing fixtures already cover it there.
Assisted-by: claude-code:claude-opus-5
Agent-Session: https://claude.ai/code/session_015QXXkquh2eQNBiTYA39Wss
Signed-off-by: Sebastian Mendel <sebastian.mendel@netresearch.de>1 parent 555a67e commit 55ea0c7
4 files changed
Lines changed: 54 additions & 3 deletions
File tree
- packages/guides-cli/src/Config
- tests/Integration/tests/meta/version-from-guides-xml-nested-project
- expected
- input
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
50 | | - | |
| 49 | + | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
| 74 | + | |
| 75 | + | |
74 | 76 | | |
75 | | - | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
76 | 80 | | |
77 | 81 | | |
78 | 82 | | |
| |||
95 | 99 | | |
96 | 100 | | |
97 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
98 | 120 | | |
99 | 121 | | |
100 | 122 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
Lines changed: 17 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
0 commit comments