composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8772 - Removed RawFormat and OUTPUT_VALUE

Browse Source
This commit is contained in:
Eric Espie
2025-11-24 16:56:20 +01:00
parent ce53487093
commit f2a5559eea
18 changed files with 39 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/Forms/Block/AbstractFormBlock.php
View File

@@ -11,7 +11,6 @@ use Combodo\iTop\Forms\Block\Base\FormBlock;
use Combodo\iTop\Forms\IFormBlock;
use Combodo\iTop\Forms\IO\AbstractFormIO;
use Combodo\iTop\Forms\IO\Converter\AbstractConverter;
use Combodo\iTop\Forms\IO\Format\RawFormat;
use Combodo\iTop\Forms\IO\FormInput;
use Combodo\iTop\Forms\IO\FormOutput;
use Combodo\iTop\Forms\Register\IORegister;
@@ -27,7 +26,6 @@ use Combodo\iTop\Forms\Register\OptionsRegister;
abstract class AbstractFormBlock implements IFormBlock
{
// Outputs
public const OUTPUT_VALUE = 'value';
/** @var null|FormBlock */
private ?FormBlock $oParent = null;
@@ -393,7 +391,6 @@ abstract class AbstractFormBlock implements IFormBlock
*/
protected function RegisterIO(IORegister $oIORegister): void
{
$oIORegister->AddOutput(self::OUTPUT_VALUE, RawFormat::class);
}
protected function AfterIORegistered(IORegister $oIORegister): void

3
sources/Forms/Block/Base/CheckboxFormBlock.php
View File

@@ -8,7 +8,6 @@
namespace Combodo\iTop\Forms\Block\Base;
use Combodo\iTop\Forms\Block\AbstractTypeFormBlock;
use Combodo\iTop\Forms\IO\Converter\StringToBooleanConverter;
use Combodo\iTop\Forms\IO\Format\BooleanIOFormat;
use Combodo\iTop\Forms\Register\IORegister;
use Combodo\iTop\Forms\Register\OptionsRegister;
@@ -40,6 +39,6 @@ class CheckboxFormBlock extends AbstractTypeFormBlock
protected function RegisterIO(IORegister $oIORegister): void
{
parent::RegisterIO($oIORegister);
$oIORegister->AddOutput(self::OUTPUT_CHECKED, BooleanIOFormat::class, new StringToBooleanConverter());
$oIORegister->AddOutput(self::OUTPUT_CHECKED, BooleanIOFormat::class);
}
}

6
sources/Forms/Block/Base/ChoiceFormBlock.php
View File

@@ -10,7 +10,7 @@ namespace Combodo\iTop\Forms\Block\Base;
use Combodo\iTop\Forms\Block\AbstractTypeFormBlock;
use Combodo\iTop\Forms\FormType\Base\ChoiceFormType;
use Combodo\iTop\Forms\IO\Converter\ChoiceValueToLabelConverter;
use Combodo\iTop\Forms\IO\Format\RawFormat;
use Combodo\iTop\Forms\IO\Format\StringIOFormat;
use Combodo\iTop\Forms\Register\IORegister;
/**
@@ -21,6 +21,7 @@ class ChoiceFormBlock extends AbstractTypeFormBlock
{
// Outputs
public const OUTPUT_LABEL = 'label';
public const OUTPUT_CODE = 'code';
/** @inheritdoc */
public function GetFormType(): string
@@ -32,6 +33,7 @@ class ChoiceFormBlock extends AbstractTypeFormBlock
protected function RegisterIO(IORegister $oIORegister): void
{
parent::RegisterIO($oIORegister);
$oIORegister->AddOutput(self::OUTPUT_LABEL, RawFormat::class, new ChoiceValueToLabelConverter($this));
$oIORegister->AddOutput(self::OUTPUT_LABEL, StringIOFormat::class, new ChoiceValueToLabelConverter($this));
$oIORegister->AddOutput(self::OUTPUT_CODE, StringIOFormat::class);
}
}

3
sources/Forms/Block/DataModel/AttributeValueChoiceFormBlock.php
View File

@@ -12,7 +12,6 @@ use Combodo\iTop\Forms\Block\Base\ChoiceFormBlock;
use Combodo\iTop\Forms\Block\FormBlockException;
use Combodo\iTop\Forms\IO\Format\AttributeIOFormat;
use Combodo\iTop\Forms\IO\Format\ClassIOFormat;
use Combodo\iTop\Forms\IO\Format\RawFormat;
use Combodo\iTop\Forms\Register\IORegister;
use Combodo\iTop\Forms\Register\OptionsRegister;
use Exception;
@@ -46,7 +45,7 @@ class AttributeValueChoiceFormBlock extends ChoiceFormBlock
parent::RegisterIO($oIORegister);
$oIORegister->AddInput(self::INPUT_CLASS_NAME, ClassIOFormat::class);
$oIORegister->AddInput(self::INPUT_ATTRIBUTE, AttributeIOFormat::class);
$oIORegister->AddOutput(self::OUTPUT_VALUE, RawFormat::class);
$oIORegister->AddOutput(self::OUTPUT_VALUE, AttributeIOFormat::class);
}
/** @inheritdoc

2
sources/Forms/Block/Expression/ExpressionFormBlock.php
View File

@@ -10,7 +10,6 @@ namespace Combodo\iTop\Forms\Block\Expression;
use Combodo\iTop\Forms\Block\AbstractFormBlock;
use Combodo\iTop\Forms\Block\FormBlockException;
use Combodo\iTop\Forms\IO\Format\BooleanIOFormat;
use Combodo\iTop\Forms\IO\Format\RawFormat;
use Combodo\iTop\Forms\Register\IORegister;
use Expression;
use Symfony\Component\Form\FormEvents;
@@ -69,7 +68,6 @@ class ExpressionFormBlock extends AbstractFormBlock
$bResult = boolval($result);
$this->GetOutput(self::OUTPUT_RESULT)->SetValue($sEventType, new BooleanIOFormat($bResult));
$this->GetOutput(self::OUTPUT_RESULT_INVERT)->SetValue($sEventType, new BooleanIOFormat(!$bResult));
$this->GetOutput(self::OUTPUT_VALUE)->SetValue($sEventType, new RawFormat($result));
} catch (\Exception $e) {
throw new FormBlockException('Compute expression '.json_encode($sExpression).' block issue', 0, $e);
}