"Replace mb_* functions with equivalent non-multibyte functions" (#578)

This commit replaces mb_* functions with non-multibyte equivalent functions, which don't require mbstring extension. It also adjusts the required PHP version in composer.json from 8.3 to 8.2. This change reduces dependencies and broadens compatibility without impacting functionality. It is part of an overall code simplification and optimization effort.

Author: Spomky

.github/workflows/integrate.yml

@@ -68,6 +68,7 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
+          - "8.2"
           - "8.3"
         dependencies:
           - "lowest"
@@ -196,7 +197,7 @@ jobs:
       - name: "Install dependencies"
         uses: "ramsey/composer-install@v3"
         with:
-          dependency-versions: "highest"
+          dependency-versions: "lowest"
           composer-options: "--optimize-autoloader"
 
       - name: "Execute Rector"

castor.php

@@ -77,10 +77,13 @@ function cs(
 }
 
 #[AsTask(description: 'Running PHPStan')]
-function stan(): void
+function stan(bool $baseline = false): void
 {
     io()->title('Running PHPStan');
     $command = ['php', 'vendor/bin/phpstan', 'analyse'];
+    if ($baseline) {
+        $command[] = '--generate-baseline';
+    }
     $environment = [
         'XDEBUG_MODE' => 'off',
     ];

composer.json

@@ -46,9 +46,8 @@
         }
     },
     "require": {
-        "php": ">=8.3",
+        "php": ">=8.2",
         "ext-json": "*",
-        "ext-mbstring": "*",
         "ext-openssl": "*",
         "brick/math": "^0.12",
         "psr/clock": "^1.0",

phpstan-baseline.neon

@@ -1225,6 +1225,11 @@ parameters:
 			count: 1
 			path: src/Library/Core/JWKSet.php
 
+		-
+			message: "#^Parameter \\#2 \\$mode of function count expects 0\\|1, int given\\.$#"
+			count: 1
+			path: src/Library/Core/JWKSet.php
+
 		-
 			message: "#^Property Jose\\\\Component\\\\Core\\\\JWKSet\\:\\:\\$keys type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1346,12 +1351,12 @@ parameters:
 			path: src/Library/Encryption/Algorithm/ContentEncryption/AESCBCHS.php
 
 		-
-			message: "#^Parameter \\#3 \\$length of function mb_substr expects int\\|null, float\\|int\\<1, max\\> given\\.$#"
+			message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, float\\|int\\<1, max\\> given\\.$#"
 			count: 1
 			path: src/Library/Encryption/Algorithm/ContentEncryption/AESCBCHS.php
 
 		-
-			message: "#^Parameter \\#3 \\$length of function mb_substr expects int\\|null, float\\|int\\<min, \\-1\\> given\\.$#"
+			message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, float\\|int\\<min, \\-1\\> given\\.$#"
 			count: 1
 			path: src/Library/Encryption/Algorithm/KeyEncryption/AbstractECDH.php
 
@@ -1761,7 +1766,7 @@ parameters:
 			path: src/Library/KeyManagement/JWKFactory.php
 
 		-
-			message: "#^Parameter \\#3 \\$length of function mb_substr expects int\\|null, float\\|int\\<min, \\-1\\> given\\.$#"
+			message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, float\\|int\\<min, \\-1\\> given\\.$#"
 			count: 1
 			path: src/Library/KeyManagement/JWKFactory.php
 

rector.php

@@ -13,7 +13,7 @@
 
 return static function (RectorConfig $config): void {
     $config->import(SetList::DEAD_CODE);
-    $config->import(LevelSetList::UP_TO_PHP_83);
+    $config->import(LevelSetList::UP_TO_PHP_82);
     $config->import(SymfonySetList::SYMFONY_64);
     $config->import(SymfonySetList::SYMFONY_50_TYPES);
     $config->import(SymfonySetList::SYMFONY_52_VALIDATOR_ATTRIBUTES);
@@ -38,7 +38,7 @@
         __DIR__ . '/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php',
         __DIR__ . '/src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php',
     ]);
-    $config->phpVersion(PhpVersion::PHP_83);
+    $config->phpVersion(PhpVersion::PHP_82);
     $config->parallel();
     $config->importNames();
     $config->importShortClasses();

src/Bundle/Helper/ConfigurationHelper.php

@@ -9,7 +9,7 @@
 
 final readonly class ConfigurationHelper
 {
-    final public const string BUNDLE_ALIAS = 'jose';
+    final public const BUNDLE_ALIAS = 'jose';
 
     /**
      * @param string[] $signatureAlgorithms

src/Bundle/Serializer/JWEEncoder.php

@@ -17,7 +17,6 @@
 use Throwable;
 use function in_array;
 use function is_int;
-use function mb_strtolower;
 
 final readonly class JWEEncoder implements EncoderInterface, DecoderInterface, NormalizationAwareInterface
 {
@@ -54,7 +53,7 @@ public function encode(mixed $data, string $format, array $context = []): string
 
         try {
             return $this->serializerManager->serialize(
-                mb_strtolower($format),
+                strtolower($format),
                 $data,
                 $this->getRecipientIndex($context)
             );
@@ -91,6 +90,6 @@ private function getRecipientIndex(array $context): int
     private function formatSupported(?string $format): bool
     {
         return $format !== null
-            && in_array(mb_strtolower($format), $this->serializerManager->names(), true);
+            && in_array(strtolower($format), $this->serializerManager->names(), true);
     }
 }

src/Bundle/Serializer/JWESerializer.php

@@ -11,11 +11,10 @@
 use Override;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use function in_array;
-use function mb_strtolower;
 
 final readonly class JWESerializer implements DenormalizerInterface
 {
-    private readonly JWESerializerManager $serializerManager;
+    private JWESerializerManager $serializerManager;
 
     public function __construct(
         JWESerializerManagerFactory $serializerManagerFactory,
@@ -63,6 +62,6 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
     private function formatSupported(?string $format): bool
     {
         return $format !== null
-            && in_array(mb_strtolower($format), $this->serializerManager->names(), true);
+            && in_array(strtolower($format), $this->serializerManager->names(), true);
     }
 }

src/Bundle/Serializer/JWSEncoder.php

@@ -16,7 +16,6 @@
 use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use function in_array;
 use function is_int;
-use function mb_strtolower;
 
 final readonly class JWSEncoder implements EncoderInterface, DecoderInterface, NormalizationAwareInterface
 {
@@ -53,7 +52,7 @@ public function encode($data, $format, array $context = []): string
 
         try {
             return $this->serializerManager->serialize(
-                mb_strtolower($format),
+                strtolower($format),
                 $data,
                 $this->getSignatureIndex($context)
             );
@@ -90,6 +89,6 @@ private function getSignatureIndex(array $context): int
     private function formatSupported(?string $format): bool
     {
         return $format !== null
-            && in_array(mb_strtolower($format), $this->serializerManager->list(), true);
+            && in_array(strtolower($format), $this->serializerManager->list(), true);
     }
 }

src/Bundle/Serializer/JWSSerializer.php

@@ -11,7 +11,6 @@
 use Override;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use function in_array;
-use function mb_strtolower;
 
 final readonly class JWSSerializer implements DenormalizerInterface
 {
@@ -63,6 +62,6 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
     private function formatSupported(?string $format): bool
     {
         return $format !== null
-            && in_array(mb_strtolower($format), $this->serializerManager->list(), true);
+            && in_array(strtolower($format), $this->serializerManager->list(), true);
     }
 }