Refactor substr calls to remove null parameters and improve code clarity

Author: Spomky

.ci-tools/phpstan-baseline.neon

@@ -9441,7 +9441,7 @@ parameters:
 		-
 			rawMessage: 'Parameter #2 ...$values of function sprintf expects bool|float|int|string|null, mixed given.'
 			identifier: argument.type
-			count: 2
+			count: 1
 			path: ../src/Library/KeyManagement/Analyzer/UsageAnalyzer.php
 
 		-

.ci-tools/rector.php

@@ -8,7 +8,6 @@
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
-use Rector\Symfony\Symfony73\Rector\Class_\InvokableCommandInputAttributeRector;
 use Rector\ValueObject\PhpVersion;
 
 $builder = RectorConfig::configure();
@@ -37,7 +36,6 @@
     ]
 );
 $builder->withSkip([
-    InvokableCommandInputAttributeRector::class,
     PreferPHPUnitThisCallRector::class,
     __DIR__ . '/../src/Library/Core/JWKSet.php',
     __DIR__ . '/../src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php',

src/Library/Console/KeyFileLoaderCommand.php

@@ -22,7 +22,7 @@ protected function configure(): void
     {
         parent::configure();
         $this->addArgument('file', InputArgument::REQUIRED, 'Filename of the key.')
-            ->addOption('secret', 's', InputOption::VALUE_OPTIONAL, 'Secret if the key is encrypted.', null);
+            ->addOption('secret', 's', InputOption::VALUE_OPTIONAL, 'Secret if the key is encrypted.');
     }
 
     #[Override]

src/Library/Console/P12CertificateLoaderCommand.php

@@ -22,7 +22,7 @@ protected function configure(): void
     {
         parent::configure();
         $this->addArgument('file', InputArgument::REQUIRED, 'Filename of the P12 certificate.')
-            ->addOption('secret', 's', InputOption::VALUE_OPTIONAL, 'Secret if the key is encrypted.', null);
+            ->addOption('secret', 's', InputOption::VALUE_OPTIONAL, 'Secret if the key is encrypted.');
     }
 
     #[Override]

src/Library/Core/Util/ECSignature.php

@@ -97,7 +97,7 @@ private static function preparePositiveInteger(string $data): string
 
         while (str_starts_with($data, self::ASN1_NEGATIVE_INTEGER)
             && substr($data, 2, self::BYTE_SIZE) <= self::ASN1_BIG_INTEGER_LIMIT) {
-            $data = substr($data, 2, null);
+            $data = substr($data, 2);
         }
 
         return $data;

src/Library/Encryption/Algorithm/KeyEncryption/Util/RSACrypt.php

@@ -98,7 +98,7 @@ public static function decryptWithRSA15(RSAKey $key, string $c): string
             throw new InvalidArgumentException('Unable to decrypt');
         }
         $ps = substr($em, 2, (int) strpos($em, chr(0), 2) - 2);
-        $m = substr($em, strlen($ps) + 3, null);
+        $m = substr($em, strlen($ps) + 3);
         if (strlen($ps) < 8) {
             throw new InvalidArgumentException('Unable to decrypt');
         }

src/Library/KeyManagement/Analyzer/UsageAnalyzer.php

@@ -29,13 +29,18 @@ public function analyze(JWK $jwk, MessageBag $bag): void
         if ($jwk->has('key_ops')) {
             $key_ops = $jwk->get('key_ops');
             if (! is_array($key_ops)) {
-                $bag->add(
-                    Message::high(
-                        'The parameter "key_ops" must be an array of key operation values.'
-                    )
-                );
+                $bag->add(Message::high('The parameter "key_ops" must be an array of key operation values.'));
             } else {
-                $allowedOps = ['sign', 'verify', 'encrypt', 'decrypt', 'wrapKey', 'unwrapKey', 'deriveKey', 'deriveBits'];
+                $allowedOps = [
+                    'sign',
+                    'verify',
+                    'encrypt',
+                    'decrypt',
+                    'wrapKey',
+                    'unwrapKey',
+                    'deriveKey',
+                    'deriveBits',
+                ];
                 $unsupportedOps = array_diff($key_ops, $allowedOps);
                 if ($unsupportedOps !== []) {
                     $bag->add(

src/Library/Signature/Algorithm/Util/RSA.php

@@ -182,7 +182,7 @@ private static function verifyEMSAPSS(string $m, string $em, int $emBits, Hash $
         if (ord($db[$temp]) !== 1) {
             throw new InvalidArgumentException();
         }
-        $salt = substr($db, $temp + 1, null); // should be $sLen long
+        $salt = substr($db, $temp + 1); // should be $sLen long
         $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
         $h2 = $hash->hash($m2);