style: Update PHP-CS-Fixer (#244)

theofidry · Dec 7, 2024 · 51f0970 · 51f0970
1 parent a681ea3
commit 51f0970
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ PSALM_BIN = vendor-bin/psalm/vendor/vimeo/psalm/psalm
 PSALM = $(PSALM_BIN) --no-cache
 
 PHP_CS_FIXER_BIN = vendor-bin/php-cs-fixer/vendor/friendsofphp/php-cs-fixer/php-cs-fixer
-PHP_CS_FIXER = $(PHP_CS_FIXER_BIN) fix --ansi --verbose --config=.php-cs-fixer.php
+PHP_CS_FIXER = PHP_CS_FIXER_IGNORE_ENV=1 $(PHP_CS_FIXER_BIN) fix --ansi --verbose --config=.php-cs-fixer.php
 
 
 .DEFAULT_GOAL := check

diff --git a/composer.json b/composer.json
@@ -20,6 +20,7 @@
         "symfony/console": "^6.4 || ^7.0",
         "symfony/deprecation-contracts": "^3.4",
         "symfony/event-dispatcher-contracts": "^2.5 || ^3.0",
+        "symfony/polyfill-php84": "^1.31",
         "symfony/service-contracts": "^2.5 || ^3.0",
         "thecodingmachine/safe": "^2.0",
         "webmozart/assert": "^1.11"

diff --git a/src/Internal/Type/NonEmptyStringType.php b/src/Internal/Type/NonEmptyStringType.php
@@ -15,8 +15,8 @@
 
 use Fidry\Console\Input\InvalidInputValueType;
 use Fidry\Console\Internal\InputAssert;
+use function mb_trim;
 use function sprintf;
-use function trim;
 
 /**
  * @implements ScalarType<non-empty-string>
@@ -27,7 +27,7 @@ public function coerceValue(array|bool|string|null $value, string $label): strin
     {
         InputAssert::string($value, $label);
 
-        $trimmedValue = trim($value);
+        $trimmedValue = mb_trim($value);
 
         if ('' === $trimmedValue) {
             throw new InvalidInputValueType(

diff --git a/src/Internal/Type/StringType.php b/src/Internal/Type/StringType.php
@@ -14,7 +14,7 @@
 namespace Fidry\Console\Internal\Type;
 
 use Fidry\Console\Internal\InputAssert;
-use function trim;
+use function mb_trim;
 
 /**
  * @implements ScalarType<string>
@@ -25,7 +25,7 @@ public function coerceValue(array|bool|string|null $value, string $label): strin
     {
         InputAssert::string($value, $label);
 
-        return trim($value);
+        return mb_trim($value);
     }
 
     public function getTypeClassNames(): array

diff --git a/vendor-bin/pph-cs-fixer/composer.json b/vendor-bin/pph-cs-fixer/composer.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/vendor-bin/pph-cs-fixer/composer.lock b/vendor-bin/pph-cs-fixer/composer.lock