cs fix

Author: garak

.php-cs-fixer.php

@@ -10,8 +10,9 @@
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHP71Migration:risky' => true,
-        '@PHPUnit75Migration:risky' => true,
+        '@PHP80Migration:risky' => true,
+        '@PHP81Migration' => true,
+        '@PHPUnit100Migration:risky' => true,
         'declare_strict_types' => false,
         'native_function_invocation' => ['include' => ['@all']],
         'final_class' => true,

src/Factory.php

@@ -16,10 +16,10 @@ final class Factory
     /**
      * @throws InvalidShortidException
      */
-    public function generate(int $length = null, string $alphabet = null, bool $readable = null): Shortid
+    public function generate(?int $length = null, ?string $alphabet = null, ?bool $readable = null): Shortid
     {
-        $length = $length ?? $this->length;
-        $readable = $readable ?? $this->readable;
+        $length ??= $this->length;
+        $readable ??= $this->readable;
         if (null === $alphabet && $readable) {
             $alphabet = \str_replace(\str_split(Generator::AMBIGUOUS_CHARS), '', $this->alphabet);
             $alphabet .= \str_repeat('_', \strlen(Generator::AMBIGUOUS_CHARS) / 2);
@@ -65,7 +65,7 @@ public static function getFactory(): RandomLibFactory
         return self::$factory;
     }
 
-    public function checkLength(int $length = null, bool $strict = false): void
+    public function checkLength(?int $length = null, bool $strict = false): void
     {
         if (null === $length && !$strict) {
             return;

src/Shortid.php

@@ -9,7 +9,7 @@ final class Shortid implements \JsonSerializable, \Serializable, \Stringable
     /**
      * @throws InvalidShortidException
      */
-    public function __construct(private string $id, int $length = null, string $alphabet = null)
+    public function __construct(private string $id, ?int $length = null, ?string $alphabet = null)
     {
         if (!self::isValid($id, $length, $alphabet)) {
             throw new InvalidShortidException(\sprintf('Invalid shortid %s (length %d alphabet %s', $id, $length, $alphabet));
@@ -24,7 +24,7 @@ public function __toString(): string
     /**
      * @throws InvalidShortidException
      */
-    public static function generate(int $length = null, string $alphabet = null, bool $readable = false): self
+    public static function generate(?int $length = null, ?string $alphabet = null, bool $readable = false): self
     {
         if (null === $length) {
             self::getFactory()->checkLength($length);
@@ -43,14 +43,14 @@ public static function getFactory(): Factory
         return self::$factory;
     }
 
-    public static function setFactory(Factory $factory = null): void
+    public static function setFactory(?Factory $factory = null): void
     {
         self::$factory = $factory;
     }
 
-    public static function isValid(string $value, int $length = null, string $alphabet = null): bool
+    public static function isValid(string $value, ?int $length = null, ?string $alphabet = null): bool
     {
-        $length = $length ?? self::getFactory()->getLength();
+        $length ??= self::getFactory()->getLength();
         $alphabet = \preg_quote($alphabet ?: self::getFactory()->getAlphabet(), '/');
         $matches = [];
         $ok = \preg_match('/^(['.$alphabet.']{'.$length.'})$/', $value, $matches);

tests/ShortidTest.php

@@ -21,7 +21,7 @@ public function testGenerate(): void
         if (\method_exists($this, 'assertMatchesRegularExpression')) {
             self::assertMatchesRegularExpression('/^[a-z0-9\_\-]{7}$/i', $generated->__toString());
         } else {
-            self::assertRegExp('/^[a-z0-9\_\-]{7}$/i', $generated->__toString());
+            self::assertMatchesRegularExpression('/^[a-z0-9\_\-]{7}$/i', $generated->__toString());
         }
     }
 
@@ -32,7 +32,7 @@ public function testGenerateWithReadable(): void
         if (\method_exists($this, 'assertMatchesRegularExpression')) {
             self::assertMatchesRegularExpression('/^[a-z0-9\_\-]{7}$/i', $generated->__toString());
         } else {
-            self::assertRegExp('/^[a-z0-9\_\-]{7}$/i', $generated->__toString());
+            self::assertMatchesRegularExpression('/^[a-z0-9\_\-]{7}$/i', $generated->__toString());
         }
     }
 
@@ -43,7 +43,7 @@ public function testGenerateWithLength(): void
         if (\method_exists($this, 'assertMatchesRegularExpression')) {
             self::assertMatchesRegularExpression('/^[a-z0-9\_\-]{8}$/i', $generated->__toString());
         } else {
-            self::assertRegExp('/^[a-z0-9\_\-]{8}$/i', $generated->__toString());
+            self::assertMatchesRegularExpression('/^[a-z0-9\_\-]{8}$/i', $generated->__toString());
         }
     }