N°8772 - compilation of choices values

application/utils.inc.php

@@ -1900,6 +1900,12 @@ SQL;
 		return $response;
 	}
 
+	public static function QuoteForPHP(string $sValue): string
+	{
+		$sEscaped = str_replace(['\\', "'"], ['\\\\', "\\'"], $sValue);
+		return "'$sEscaped'";
+	}
+
 	/**
 	 * Get a standard list of character sets
 	 *

sources/PropertyTree/AbstractProperty.php

@@ -78,10 +78,4 @@ abstract class AbstractProperty
 
 		return null;
 	}
-
-	public function QuoteForPHP(string $sValue): string
-	{
-		$sEscaped = str_replace(['\\', "'"], ['\\\\', "\\'"], $sValue);
-		return "'$sEscaped'";
-	}
 }

sources/PropertyTree/Property.php

@@ -63,11 +63,19 @@ class Property extends AbstractProperty
 		foreach ($this->oValueType->GetInputValues() as $sInputName => $sValue) {
 			$this->GenerateInputs($sInputName, $sValue, $sPrerequisiteExpressions, $sInputs);
 		}
-		$sLabel = $this->QuoteForPHP($this->sLabel);
+
+		$sLabel = utils::QuoteForPHP($this->sLabel);
+		$aOptions = [
+			'label' => $sLabel,
+		];
+		$aOptions += $this->oValueType->GetFormBlockOptions();
+		$sOptions = '';
+		foreach ($aOptions as $sOption => $sValue) {
+			$sOptions .= "\t\t\t".utils::QuoteForPHP($sOption)." => $sValue,\n";
+		}
 		return <<<PHP
 		{$sPrerequisiteExpressions}\$this->Add('$this->sId', '$sFormBlockClass', [
-			'label' => $sLabel,
+$sOptions\t\t]){$sInputs};
-		]){$sInputs};
 
 PHP;
 	}
@@ -109,7 +117,7 @@ PHP;
 				default => throw new PropertyTreeException("Node: {$this->sId}, unsupported expression for input type: $sInputName"),
 			};
 
-			$sExpression = $this->QuoteForPHP($sExpression);
+			$sExpression = utils::QuoteForPHP($sExpression);
 			$sPrerequisiteExpressions = <<<PHP
 \$this->Add('{$this->sId}_{$sInputName}_expression', '$sExpressionClass', [
 			'expression' => $sExpression,
@@ -120,7 +128,7 @@ PHP;
 
 			$sInputs .= "\n			->InputDependsOn('$sInputName', '{$this->sId}_{$sInputName}_expression', 'result')";
 		} else {
-			$sInputs .= "\n			->SetInputValue('$sInputName', ".$this->QuoteForPHP($sValue).")";
+			$sInputs .= "\n			->SetInputValue('$sInputName', ".utils::QuoteForPHP($sValue).")";
 		}
 	}
 }

sources/PropertyTree/ValueType/AbstractValueType.php

@@ -22,6 +22,7 @@ abstract class AbstractValueType
 	protected array $aInputs = [];
 	protected array $aOutputs = [];
 	protected array $aInputValues = [];
+	protected array $aFormBlockOptionsForPHP = [];
 
 	public function InitFromDomNode(DesignElement $oDomNode): void
 	{
@@ -40,6 +41,11 @@ abstract class AbstractValueType
 		}
 	}
 
+	public function GetFormBlockOptions(): array
+	{
+		return $this->aFormBlockOptionsForPHP;
+	}
+
 	public function GetInputValues(): array
 	{
 		return $this->aInputValues;

sources/PropertyTree/ValueType/ValueTypeChoice.php

@@ -7,8 +7,9 @@
 
 namespace Combodo\iTop\PropertyTree\ValueType;
 
+use Combodo\iTop\DesignElement;
 use Combodo\iTop\Forms\Block\Base\ChoiceFormBlock;
-use Combodo\iTop\Forms\Block\Base\FormBlock;
+use utils;
 
 /**
  * @since 3.3.0
@@ -19,4 +20,23 @@ class ValueTypeChoice extends AbstractValueType
 	{
 		return ChoiceFormBlock::class;
 	}
+
+	public function InitFromDomNode(DesignElement $oDomNode): void
+	{
+		parent::InitFromDomNode($oDomNode);
+
+		$sChoices = "[\n";
+		foreach ($oDomNode->GetNodes('values/value') as $oValueNode) {
+			/** @var DesignElement $oValueNode */
+			$sValue = utils::QuoteForPHP($oValueNode->GetAttribute('id'));
+			$sLabel = utils::QuoteForPHP($oValueNode->GetChildText('label'));
+			$sChoices .= <<<PHP
+				\Dict::S($sLabel) => $sValue,
+
+PHP;
+		}
+		$sChoices .= "\t\t\t]";
+
+		$this->aFormBlockOptionsForPHP['choices'] = $sChoices;
+	}
 }

tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php

@@ -15,6 +15,7 @@ use ParseError;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use ReflectionMethod;
 use SetupUtils;
+use Symfony\Component\ErrorHandler\Error\FatalError;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 use const DEBUG_BACKTRACE_IGNORE_ARGS;

tests/php-unit-tests/unitary-tests/sources/Forms/Compiler/FormsCompilerTest.php

@@ -116,6 +116,14 @@ PHP,
 		<node id="choice_property" xsi:type="Combodo-Property">
 			<label>UI:Choice</label>
             <value-type xsi:type="Combodo-ValueTypeChoice">
+              <values>
+                <value id="value_a">
+                  <label>Label A</label>
+                </value>
+                <value id="value_b">
+                  <label>Label B</label>
+                </value>
+              </values>
             </value-type>
         </node>
 		<node id="class_property" xsi:type="Combodo-Property">
@@ -172,6 +180,10 @@ class FormFor__AllValueTypesTest extends Combodo\iTop\Forms\Block\Base\FormBlock
 
 		\$this->Add('choice_property', 'Combodo\iTop\Forms\Block\Base\ChoiceFormBlock', [
 			'label' => 'UI:Choice',
+			'choices' => [
+				\Dict::S('Label A') => 'value_a',
+				\Dict::S('Label B') => 'value_b',
+			],
 		]);
 
 		\$this->Add('class_property', 'Combodo\iTop\Forms\Block\Base\TextFormBlock', [