EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
MB trim
Yurii7f08acd6f56d
diff --git a/application/Espo/Classes/FieldSanitizers/ArrayStringTrim.php b/application/Espo/Classes/FieldSanitizers/ArrayStringTrim.phpindex 0a41fc49a7..b933f68cf9 100644--- a/application/Espo/Classes/FieldSanitizers/ArrayStringTrim.php+++ b/application/Espo/Classes/FieldSanitizers/ArrayStringTrim.php@@ -54,9 +54,19 @@ class ArrayStringTrim implements Sanitizercontinue;}- $value[$i] = trim($item);+ $value[$i] = self::trim($item);}$data->set($field, $value);}++ private static function trim(string $value): string+ {+ // @todo Remove check when PHP 8.4 is min supported.+ if (function_exists('mb_trim')) {+ return mb_trim($value);+ }++ return trim($value);+ }}diff --git a/application/Espo/Classes/FieldSanitizers/StringTrim.php b/application/Espo/Classes/FieldSanitizers/StringTrim.phpindex 0aa65a4ced..c9b126e2df 100644--- a/application/Espo/Classes/FieldSanitizers/StringTrim.php+++ b/application/Espo/Classes/FieldSanitizers/StringTrim.php@@ -49,7 +49,7 @@ class StringTrim implements Sanitizerreturn;}- $value = trim($value);+ $value = self::trim($value);if ($value === '') {$value = null;@@ -57,4 +57,14 @@ class StringTrim implements Sanitizer$data->set($field, $value);}++ private static function trim(string $value): string+ {+ // @todo Remove check when PHP 8.4 is min supported.+ if (function_exists('mb_trim')) {+ return mb_trim($value);+ }++ return trim($value);+ }}diff --git a/tests/unit/Espo/Classes/FieldSanitizers/ArrayStringTrimTest.php b/tests/unit/Espo/Classes/FieldSanitizers/ArrayStringTrimTest.phpnew file mode 100644index 0000000000..a1687214c7--- /dev/null+++ b/tests/unit/Espo/Classes/FieldSanitizers/ArrayStringTrimTest.php@@ -0,0 +1,63 @@+<?php+/************************************************************************+ * This file is part of EspoCRM.+ *+ * EspoCRM – Open Source CRM application.+ * Copyright (C) 2014-2026 EspoCRM, Inc.+ * Website: https://www.espocrm.com+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ *+ * The interactive user interfaces in modified source and object code versions+ * of this program must display Appropriate Legal Notices, as required under+ * Section 5 of the GNU Affero General Public License version 3.+ *+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.+ ************************************************************************/++namespace tests\unit\Espo\Classes\FieldSanitizers;++use Espo\Classes\FieldSanitizers\ArrayStringTrim;+use Espo\Core\FieldSanitize\Sanitizer\Data;+use PHPUnit\Framework\Attributes\DataProvider;+use PHPUnit\Framework\TestCase;++class ArrayStringTrimTest extends TestCase+{+ /**+ * @param string[] $expected+ * @param string[] $input+ * @return void+ */+ #[DataProvider('provider')]+ public function testTrim(array $expected, array $input): void+ {+ $data = new Data((object) ['test' => $input]);++ (new ArrayStringTrim())->sanitize($data, 'test');++ $this->assertEquals($expected, $data->get('test'));+ }++ /**+ * @return array{string[], string[]}[]+ */+ public static function provider(): array+ {+ return [+ [['test'], [' test ']],+ ];+ }+}diff --git a/tests/unit/Espo/Classes/FieldSanitizers/StringTrimTest.php b/tests/unit/Espo/Classes/FieldSanitizers/StringTrimTest.phpnew file mode 100644index 0000000000..c0b505351a--- /dev/null+++ b/tests/unit/Espo/Classes/FieldSanitizers/StringTrimTest.php@@ -0,0 +1,55 @@+<?php+/************************************************************************+ * This file is part of EspoCRM.+ *+ * EspoCRM – Open Source CRM application.+ * Copyright (C) 2014-2026 EspoCRM, Inc.+ * Website: https://www.espocrm.com+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ *+ * The interactive user interfaces in modified source and object code versions+ * of this program must display Appropriate Legal Notices, as required under+ * Section 5 of the GNU Affero General Public License version 3.+ *+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.+ ************************************************************************/++namespace tests\unit\Espo\Classes\FieldSanitizers;++use Espo\Classes\FieldSanitizers\StringTrim;+use Espo\Core\FieldSanitize\Sanitizer\Data;+use PHPUnit\Framework\Attributes\DataProvider;+use PHPUnit\Framework\TestCase;++class StringTrimTest extends TestCase+{+ #[DataProvider('provider')]+ public function testTrim(string $expected, string $input): void+ {+ $data = new Data((object) ['test' => $input]);++ (new StringTrim())->sanitize($data, 'test');++ $this->assertEquals($expected, $data->get('test'));+ }++ public static function provider(): array+ {+ return [+ ['test', ' test '],+ ];+ }+}