[BUGFIX] Fix confval required

linawolf · linawolf · commit a05dd50a2f82 · 2024-05-19T20:03:16.000Z
It was alway defaulting to true if the option was set. Resolves TYPO3-Documentation/render-guides#554 (cherry picked from commit bdb2a94)
diff --git a/packages/guides-restructured-text/src/RestructuredText/Directives/ConfvalDirective.php b/packages/guides-restructured-text/src/RestructuredText/Directives/ConfvalDirective.php
@@ -24,7 +24,6 @@
 use phpDocumentor\Guides\RestructuredText\TextRoles\GenericLinkProvider;
 use Psr\Log\LoggerInterface;
 
-use function boolval;
 use function in_array;
 use function trim;
 
@@ -85,7 +84,7 @@ protected function processSub(
         }
 
         if ($directive->hasOption('required')) {
-            $required = boolval($directive->getOption('required'));
+            $required = $directive->getOption('required')->getValue() === null || (bool) $directive->getOption('required')->toString();
         }
 
         if ($directive->hasOption('default')) {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`use phpDocumentor\Guides\RestructuredText\TextRoles\GenericLinkProvider;`
`25`	`25`	`use Psr\Log\LoggerInterface;`
`26`	`26`
`27`		`-use function boolval;`
`28`	`27`	`use function in_array;`
`29`	`28`	`use function trim;`
`30`	`29`
`@@ -85,7 +84,7 @@ protected function processSub(`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`if ($directive->hasOption('required')) {`
`88`		`- $required = boolval($directive->getOption('required'));`
	`87`	`+ $required = $directive->getOption('required')->getValue() === null \|\| (bool) $directive->getOption('required')->toString();`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`if ($directive->hasOption('default')) {`