[BUGFIX] Allow escaped version

symfony is trying to normalize the xml input using some logic. However in our case we want to fetch the raw value for version. But this is not possible. therefor an escape system is added by adding `'`.
phpDocumentor · Sep 4, 2024 · 95a4e82 · 95a4e82
1 parent 075539c
commit 95a4e82
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/packages/guides/src/DependencyInjection/GuidesExtension.php b/packages/guides/src/DependencyInjection/GuidesExtension.php
@@ -59,7 +59,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->arrayNode('project')
                     ->children()
                         ->scalarNode('title')->end()
-                        ->scalarNode('version')
+                        ->node('version', 'scalar')
                             ->beforeNormalization()
                             ->always(
                                 // We need to revert the phpize call in XmlUtils. Version is always a string!
@@ -68,12 +68,33 @@ static function ($value) {
                                         return var_export($value, true);
                                     }
 
+                                    if (is_string($value)) {
+                                        return trim($value, "'");
+                                    }
+
+                                    return $value;
+                                },
+                            )
+                            ->end()
+                        ->end()
+                        ->node('release', 'scalar')
+                            ->beforeNormalization()
+                            ->always(
+                            // We need to revert the phpize call in XmlUtils. Version is always a string!
+                                static function ($value) {
+                                    if (!is_int($value) && !is_string($value)) {
+                                        return var_export($value, true);
+                                    }
+
+                                    if (is_string($value)) {
+                                        return trim($value, "'");
+                                    }
+
                                     return $value;
                                 },
                             )
                             ->end()
                         ->end()
-                        ->scalarNode('release')->end()
                         ->scalarNode('copyright')->end()
                     ->end()
                 ->end()

diff --git a/tests/Integration/tests/configuration/config-project/expected/index.html b/tests/Integration/tests/configuration/config-project/expected/index.html
@@ -10,7 +10,7 @@ <h1>Document Title</h1>
         <dd>Title</dd>
                                 <dt>version:</dt>
 
-        <dd>12.4</dd>
+        <dd>12.4.0</dd>
                                 <dt>release:</dt>
 
         <dd>12.4.9-dev</dd>

diff --git a/tests/Integration/tests/configuration/config-project/input/guides.xml b/tests/Integration/tests/configuration/config-project/input/guides.xml
@@ -5,7 +5,7 @@
 >
     <project
             title="Title"
-            version="12.4"
+            version="12.4.0"
             release="12.4.9-dev"
             copyright="since 1998 phpDocumentor Team and Contributors"
     />

diff --git a/tests/Integration/tests/meta/version-from-guides-xml/input/guides.xml b/tests/Integration/tests/meta/version-from-guides-xml/input/guides.xml
@@ -6,7 +6,7 @@
 >
     <project
             title="Render guides"
-            version="3.0"
+            version="'3.0'"
             release="3.0.0"
     />
 </guides>