composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 06:28:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8772 - Refactor

Browse Source
This commit is contained in:
Eric Espie
2025-11-14 16:42:42 +01:00
parent 3085023267
commit 51ebbc4274
9 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sources/Forms/IO/AbstractFormIO.php
View File

@@ -40,7 +40,7 @@ class AbstractFormIO
*/
public function __construct(string $sName, string $sType, AbstractFormBlock $oOwnerBlock)
{
$this->sName = $sName;
$this->SetName($sName);
$this->sType = $sType;
$this->oOwnerBlock = $oOwnerBlock;
}
@@ -71,9 +71,26 @@ class AbstractFormIO
* @param string $sName
*
* @return self
* @throws \Combodo\iTop\Forms\IO\FormBlockIOException
*/
public function SetName(string $sName): self
{
// Check name validity
if (preg_match('/(?<name>\w+)/', $sName, $aMatches)) {
$sParsedName = $aMatches['name'];
if ($sParsedName !== $sName) {
$sName = json_encode($sName);
$sParsedName = json_encode($sParsedName);
$sBlockName = json_encode($this->getName());
Throw new FormBlockIOException("Input $sName does not match $sParsedName for block $sBlockName.");
}
} else {
$sName = json_encode($sName);
$sBlockName = json_encode($this->getName());
Throw new FormBlockIOException("Input $sName is not valid for block $sBlockName.");
}
// Name is valid
$this->sName = $sName;
return $this;
@@ -210,7 +227,7 @@ class AbstractFormIO
*
* @return void
*/
public function Attach(FormBinding $oFormBinding)
public function Attach(FormBinding $oFormBinding): void
{
$this->oBinding = $oFormBinding;
}