From d3fb08ba815acac2480cc3d625d1e25ca502dff0 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Wed, 18 May 2022 18:32:40 +0200 Subject: [PATCH] PHP 8.1: Replace strlen() usages with utils::StrLen() for compatibility --- core/ormStyle.class.inc.php | 24 +++++++++---------- .../Base/Component/Input/InputWithLabel.php | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/core/ormStyle.class.inc.php b/core/ormStyle.class.inc.php index e7c62a0ea..8f3b02abf 100644 --- a/core/ormStyle.class.inc.php +++ b/core/ormStyle.class.inc.php @@ -50,7 +50,7 @@ class ormStyle */ public function HasMainColor(): bool { - return strlen($this->sMainColor) > 0; + return utils::StrLen($this->sMainColor) > 0; } /** @@ -68,7 +68,7 @@ class ormStyle */ public function SetMainColor(?string $sMainColor) { - $this->sMainColor = (strlen($sMainColor) === 0) ? null : $sMainColor; + $this->sMainColor = (utils::StrLen($sMainColor) === 0) ? null : $sMainColor; return $this; } @@ -78,7 +78,7 @@ class ormStyle */ public function HasComplementaryColor(): bool { - return strlen($this->sComplementaryColor) > 0; + return utils::StrLen($this->sComplementaryColor) > 0; } /** @@ -96,7 +96,7 @@ class ormStyle */ public function SetComplementaryColor(?string $sComplementaryColor) { - $this->sComplementaryColor = (strlen($sComplementaryColor) === 0) ? null : $sComplementaryColor; + $this->sComplementaryColor = (utils::StrLen($sComplementaryColor) === 0) ? null : $sComplementaryColor; return $this; } @@ -116,7 +116,7 @@ class ormStyle */ public function HasStyleClass(): bool { - return strlen($this->sStyleClass) > 0; + return utils::StrLen($this->sStyleClass) > 0; } /** @@ -134,7 +134,7 @@ class ormStyle */ public function SetStyleClass(?string $sStyleClass) { - $this->sStyleClass = (strlen($sStyleClass) === 0) ? null : $sStyleClass; + $this->sStyleClass = (utils::StrLen($sStyleClass) === 0) ? null : $sStyleClass; return $this; } @@ -144,7 +144,7 @@ class ormStyle */ public function HasAltStyleClass(): bool { - return strlen($this->sAltStyleClass) > 0; + return utils::StrLen($this->sAltStyleClass) > 0; } /** @@ -162,7 +162,7 @@ class ormStyle */ public function SetAltStyleClass(?string $sAltStyleClass) { - $this->sAltStyleClass = (strlen($sAltStyleClass) === 0) ? null : $sAltStyleClass; + $this->sAltStyleClass = (utils::StrLen($sAltStyleClass) === 0) ? null : $sAltStyleClass; return $this; } @@ -172,7 +172,7 @@ class ormStyle */ public function HasDecorationClasses(): bool { - return strlen($this->sDecorationClasses) > 0; + return utils::StrLen($this->sDecorationClasses) > 0; } /** @@ -190,7 +190,7 @@ class ormStyle */ public function SetDecorationClasses(?string $sDecorationClasses) { - $this->sDecorationClasses = (strlen($sDecorationClasses) === 0) ? null : $sDecorationClasses; + $this->sDecorationClasses = (utils::StrLen($sDecorationClasses) === 0) ? null : $sDecorationClasses; return $this; } @@ -200,7 +200,7 @@ class ormStyle */ public function HasIcon(): bool { - return strlen($this->sIcon) > 0; + return utils::StrLen($this->sIcon) > 0; } /** @@ -210,7 +210,7 @@ class ormStyle */ public function SetIcon(?string $sIcon) { - $this->sIcon = (strlen($sIcon) === 0) ? null : $sIcon; + $this->sIcon = (utils::StrLen($sIcon) === 0) ? null : $sIcon; return $this; } diff --git a/sources/application/UI/Base/Component/Input/InputWithLabel.php b/sources/application/UI/Base/Component/Input/InputWithLabel.php index 325d15275..b7ce8f4d9 100644 --- a/sources/application/UI/Base/Component/Input/InputWithLabel.php +++ b/sources/application/UI/Base/Component/Input/InputWithLabel.php @@ -9,6 +9,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\Input; use Combodo\iTop\Application\UI\Base\UIBlock; +use utils; /** * You might want to use a {@link \Combodo\iTop\Application\UI\Base\Component\Field\Field} component instead... @@ -134,7 +135,7 @@ class InputWithLabel extends UIBlock */ public function HasDescription(): bool { - return strlen($this->sDescription) > 0; + return utils::StrLen($this->sDescription) > 0; } } \ No newline at end of file