Merge pull request #1023 from phpDocumentor/backport/1.x/pr-1022

[1.x] [BUGFIX] Fix confval default overrriding type

Author: phpdoc-bot

packages/guides-restructured-text/src/RestructuredText/Directives/ConfvalDirective.php

@@ -89,7 +89,7 @@ protected function processSub(
         }
 
         if ($directive->hasOption('default')) {
-            $type = $this->inlineParser->parse($directive->getOption('default')->toString(), $blockContext);
+            $default = $this->inlineParser->parse($directive->getOption('default')->toString(), $blockContext);
         }
 
         $noindex = $directive->hasOption('noindex');

tests/Integration/tests/confval/confval-name/expected/another.html

@@ -6,8 +6,9 @@ <h1>Confval directive</h1>
         <code class="sig-name descname"><span class="pre">demo</span></code></dt>
     <dd>
         <div class="line-block">
-             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
+             <div class="line"><strong>Type:</strong>  <code class="php">string</code></div>
              <div class="line"><strong>Required:</strong> true</div>
+             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
             <div class="line"><strong>Custom Info:</strong> <strong>custom</strong></div>
 
             </div>

tests/Integration/tests/confval/confval-name/expected/index.html

@@ -6,8 +6,9 @@ <h1>Confval directive</h1>
         <code class="sig-name descname"><span class="pre">demo</span></code></dt>
     <dd>
         <div class="line-block">
-             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
+             <div class="line"><strong>Type:</strong>  <code class="php">string</code></div>
              <div class="line"><strong>Required:</strong> true</div>
+             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
             <div class="line"><strong>Custom Info:</strong> <strong>custom</strong></div>
 
             </div>

tests/Integration/tests/confval/confval-no-title/expected/index.html

@@ -6,8 +6,9 @@ <h1>Confval directive</h1>
         <code class="sig-name descname"><span class="pre"></span></code></dt>
     <dd>
         <div class="line-block">
-             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
+             <div class="line"><strong>Type:</strong>  <code class="php">string</code></div>
              <div class="line"><strong>Required:</strong> true</div>
+             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
             <div class="line"><strong>Custom Info:</strong> <strong>custom</strong></div>
 
             </div>

tests/Integration/tests/confval/confval-noindex/expected/another.html

@@ -6,8 +6,9 @@ <h1>Confval directive</h1>
         <code class="sig-name descname"><span class="pre">demo</span></code></dt>
     <dd>
         <div class="line-block">
-             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
+             <div class="line"><strong>Type:</strong>  <code class="php">string</code></div>
              <div class="line"><strong>Required:</strong> true</div>
+             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
             <div class="line"><strong>Custom Info:</strong> <strong>custom</strong></div>
 
             </div>

tests/Integration/tests/confval/confval-noindex/expected/index.html

@@ -6,8 +6,9 @@ <h1>Confval directive</h1>
         <code class="sig-name descname"><span class="pre">demo</span></code></dt>
     <dd>
         <div class="line-block">
-             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
+             <div class="line"><strong>Type:</strong>  <code class="php">string</code></div>
              <div class="line"><strong>Required:</strong> true</div>
+             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
             <div class="line"><strong>Custom Info:</strong> <strong>custom</strong></div>
 
             </div>

tests/Integration/tests/confval/confval-warning/expected/another.html

@@ -7,8 +7,9 @@ <h1>Confval directive</h1>
         <code class="sig-name descname"><span class="pre">demo</span></code></dt>
     <dd>
         <div class="line-block">
-             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
+             <div class="line"><strong>Type:</strong>  <code class="php">string</code></div>
              <div class="line"><strong>Required:</strong> true</div>
+             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
             <div class="line"><strong>Custom Info:</strong> <strong>custom</strong></div>
 
             </div>

tests/Integration/tests/confval/confval-warning/expected/index.html

@@ -6,8 +6,9 @@ <h1>Confval directive</h1>
         <code class="sig-name descname"><span class="pre">demo</span></code></dt>
     <dd>
         <div class="line-block">
-             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
+             <div class="line"><strong>Type:</strong>  <code class="php">string</code></div>
              <div class="line"><strong>Required:</strong> true</div>
+             <div class="line"><strong>Type:</strong>  <code>&quot;Hello World&quot;</code></div>
             <div class="line"><strong>Custom Info:</strong> <strong>custom</strong></div>
 
             </div>