diff --git a/data/.compilation-symlinks b/data/.compilation-symlinks new file mode 100644 index 000000000..e69de29bb diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 969584829..c51ca7dbd 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -486,7 +486,7 @@ return array( 'Combodo\\iTop\\Forms\\Block\\Base\\DateFormBlock' => $baseDir . '/sources/Forms/Block/Base/DateFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Base\\DateTimeFormBlock' => $baseDir . '/sources/Forms/Block/Base/DateTimeFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Base\\FormBlock' => $baseDir . '/sources/Forms/Block/Base/FormBlock.php', - 'Combodo\\iTop\\Forms\\Block\\Base\\IntegerFormBlock' => $baseDir . '/sources/Forms/Block/Base/IntegerFormBlock.php', + 'Combodo\\iTop\\Forms\\Block\\Base\\NumberFormBlock' => $baseDir . '/sources/Forms/Block/Base/NumberFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Base\\TextAreaFormBlock' => $baseDir . '/sources/Forms/Block/Base/TextAreaFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Base\\TextFormBlock' => $baseDir . '/sources/Forms/Block/Base/TextFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\DataModel\\AttributeChoiceFormBlock' => $baseDir . '/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php', @@ -494,7 +494,7 @@ return array( 'Combodo\\iTop\\Forms\\Block\\DataModel\\OqlFormBlock' => $baseDir . '/sources/Forms/Block/DataModel/OqlFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Expression\\AbstractExpressionFormBlock' => $baseDir . '/sources/Forms/Block/Expression/AbstractExpressionFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Expression\\BooleanExpressionFormBlock' => $baseDir . '/sources/Forms/Block/Expression/BooleanExpressionFormBlock.php', - 'Combodo\\iTop\\Forms\\Block\\Expression\\IntegerExpressionFormBlock' => $baseDir . '/sources/Forms/Block/Expression/IntegerExpressionFormBlock.php', + 'Combodo\\iTop\\Forms\\Block\\Expression\\NumberExpressionFormBlock' => $baseDir . '/sources/Forms/Block/Expression/NumberExpressionFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\FormBlockException' => $baseDir . '/sources/Forms/Block/FormBlockException.php', 'Combodo\\iTop\\Forms\\FormBuilder\\DependencyHandler' => $baseDir . '/sources/Forms/FormBuilder/DependencyHandler.php', 'Combodo\\iTop\\Forms\\FormBuilder\\DependencyMap' => $baseDir . '/sources/Forms/FormBuilder/DependencyMap.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index f311fe0a6..06022ea88 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -867,7 +867,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Forms\\Block\\Base\\DateFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/DateFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Base\\DateTimeFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/DateTimeFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Base\\FormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/FormBlock.php', - 'Combodo\\iTop\\Forms\\Block\\Base\\IntegerFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/IntegerFormBlock.php', + 'Combodo\\iTop\\Forms\\Block\\Base\\NumberFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/NumberFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Base\\TextAreaFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/TextAreaFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Base\\TextFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/TextFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\DataModel\\AttributeChoiceFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php', @@ -875,7 +875,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Forms\\Block\\DataModel\\OqlFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/DataModel/OqlFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Expression\\AbstractExpressionFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Expression/AbstractExpressionFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\Expression\\BooleanExpressionFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Expression/BooleanExpressionFormBlock.php', - 'Combodo\\iTop\\Forms\\Block\\Expression\\IntegerExpressionFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Expression/IntegerExpressionFormBlock.php', + 'Combodo\\iTop\\Forms\\Block\\Expression\\NumberExpressionFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Expression/NumberExpressionFormBlock.php', 'Combodo\\iTop\\Forms\\Block\\FormBlockException' => __DIR__ . '/../..' . '/sources/Forms/Block/FormBlockException.php', 'Combodo\\iTop\\Forms\\FormBuilder\\DependencyHandler' => __DIR__ . '/../..' . '/sources/Forms/FormBuilder/DependencyHandler.php', 'Combodo\\iTop\\Forms\\FormBuilder\\DependencyMap' => __DIR__ . '/../..' . '/sources/Forms/FormBuilder/DependencyMap.php', diff --git a/sources/Forms/Block/Base/IntegerFormBlock.php b/sources/Forms/Block/Base/IntegerFormBlock.php deleted file mode 100644 index 5aa04146a..000000000 --- a/sources/Forms/Block/Base/IntegerFormBlock.php +++ /dev/null @@ -1,25 +0,0 @@ -AddOutput(self::OUTPUT_NUMBER, NumberIOFormat::class); + } +} diff --git a/sources/Forms/Block/Base/TextFormBlock.php b/sources/Forms/Block/Base/TextFormBlock.php index f90957fc6..6ee1a3f0e 100644 --- a/sources/Forms/Block/Base/TextFormBlock.php +++ b/sources/Forms/Block/Base/TextFormBlock.php @@ -8,6 +8,8 @@ namespace Combodo\iTop\Forms\Block\Base; use Combodo\iTop\Forms\Block\AbstractTypeFormBlock; +use Combodo\iTop\Forms\IO\Format\StringIOFormat; +use Combodo\iTop\Forms\Register\IORegister; use Symfony\Component\Form\Extension\Core\Type\TextType; /** @@ -16,10 +18,19 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; */ class TextFormBlock extends AbstractTypeFormBlock { + // Outputs + public const OUTPUT_TEXT = "text"; + /** @inheritdoc */ public function GetFormType(): string { return TextType::class; } + /** @inheritdoc */ + protected function RegisterIO(IORegister $oIORegister): void + { + parent::RegisterIO($oIORegister); + $oIORegister->AddOutput(self::OUTPUT_TEXT, StringIOFormat::class); + } } diff --git a/sources/Forms/Block/Expression/BooleanExpressionFormBlock.php b/sources/Forms/Block/Expression/BooleanExpressionFormBlock.php index 50e78e80d..b0e825a72 100644 --- a/sources/Forms/Block/Expression/BooleanExpressionFormBlock.php +++ b/sources/Forms/Block/Expression/BooleanExpressionFormBlock.php @@ -17,15 +17,15 @@ use Combodo\iTop\Forms\Register\IORegister; class BooleanExpressionFormBlock extends AbstractExpressionFormBlock { // Outputs - public const OUTPUT_CONDITION_MET = "condition_met"; - public const OUTPUT_CONDITION_UNMET = "condition_unmet"; + public const OUTPUT_RESULT = "result"; + public const OUTPUT_NOT_RESULT = "not_result"; /** @inheritdoc */ protected function RegisterIO(IORegister $oIORegister): void { parent::RegisterIO($oIORegister); - $oIORegister->AddOutput(self::OUTPUT_CONDITION_MET, BooleanIOFormat::class); - $oIORegister->AddOutput(self::OUTPUT_CONDITION_UNMET, BooleanIOFormat::class); + $oIORegister->AddOutput(self::OUTPUT_RESULT, BooleanIOFormat::class); + $oIORegister->AddOutput(self::OUTPUT_NOT_RESULT, BooleanIOFormat::class); } /** @@ -42,8 +42,8 @@ class BooleanExpressionFormBlock extends AbstractExpressionFormBlock // Update output $bResult = boolval($oResult); - $this->GetOutput(self::OUTPUT_CONDITION_MET)->SetValue($sEventType, new BooleanIOFormat($bResult)); - $this->GetOutput(self::OUTPUT_CONDITION_UNMET)->SetValue($sEventType, new BooleanIOFormat(!$bResult)); + $this->GetOutput(self::OUTPUT_RESULT)->SetValue($sEventType, new BooleanIOFormat($bResult)); + $this->GetOutput(self::OUTPUT_NOT_RESULT)->SetValue($sEventType, new BooleanIOFormat(!$bResult)); return $oResult; } diff --git a/sources/Forms/Block/Expression/IntegerExpressionFormBlock.php b/sources/Forms/Block/Expression/NumberExpressionFormBlock.php similarity index 72% rename from sources/Forms/Block/Expression/IntegerExpressionFormBlock.php rename to sources/Forms/Block/Expression/NumberExpressionFormBlock.php index 1c493dadd..ca2175ef6 100644 --- a/sources/Forms/Block/Expression/IntegerExpressionFormBlock.php +++ b/sources/Forms/Block/Expression/NumberExpressionFormBlock.php @@ -14,16 +14,16 @@ use Combodo\iTop\Forms\Register\IORegister; /** * */ -class IntegerExpressionFormBlock extends AbstractExpressionFormBlock +class NumberExpressionFormBlock extends AbstractExpressionFormBlock { // Outputs - public const OUTPUT_NUMBER = "number"; + public const OUTPUT_RESULT = "result"; /** @inheritdoc */ protected function RegisterIO(IORegister $oIORegister): void { parent::RegisterIO($oIORegister); - $oIORegister->AddOutput(self::OUTPUT_NUMBER, NumberIOFormat::class); + $oIORegister->AddOutput(self::OUTPUT_RESULT, NumberIOFormat::class); } /** @@ -39,8 +39,7 @@ class IntegerExpressionFormBlock extends AbstractExpressionFormBlock $oResult = parent::ComputeExpression($sEventType); // Update output - $iVal = intval($oResult); - $this->GetOutput(self::OUTPUT_NUMBER)->SetValue($sEventType, new NumberIOFormat($iVal)); + $this->GetOutput(self::OUTPUT_RESULT)->SetValue($sEventType, new NumberIOFormat($oResult)); return $oResult; }