Merge pull request #145 from samsonasik/enable-cs

Ocramius · web-flow · commit bc13cbd5b37d · 2022-07-28T14:25:14.000+02:00
Rolback // phpcs:enable and add return type declaration on ArrowFunction and Closure
diff --git a/src/UndisclosedPassword.php b/src/UndisclosedPassword.php
@@ -39,6 +39,7 @@ final class UndisclosedPassword extends AbstractValidator
         self::NOT_A_STRING      => 'The provided password is not a string, please provide a correct password',
     ];
 
+    // phpcs:enable
     private ClientInterface $httpClient;
 
     private RequestFactoryInterface $makeHttpRequest;
diff --git a/test/CallbackTest.php b/test/CallbackTest.php
@@ -90,7 +90,7 @@ public function testCanAcceptContextWithoutOptions(): void
     {
         $value     = 'bar';
         $context   = ['foo' => 'bar', 'bar' => 'baz'];
-        $validator = new Callback(static fn($v, $c) => ($value === $v) && ($context === $c));
+        $validator = new Callback(static fn($v, $c): bool => ($value === $v) && ($context === $c));
         $this->assertTrue($validator->isValid($value, $context));
     }
 
@@ -100,7 +100,7 @@ public function testCanAcceptContextWithOptions(): void
         $context   = ['foo' => 'bar', 'bar' => 'baz'];
         $options   = ['baz' => 'bat'];
         $validator = new Callback(
-            static fn($v, $c, $baz) => ($value === $v)
+            static fn($v, $c, $baz): bool => ($value === $v)
             && ($context === $c) && ($options['baz'] === $baz)
         );
         $validator->setCallbackOptions($options);
diff --git a/test/TestAsset/Uri/Uri.php b/test/TestAsset/Uri/Uri.php
@@ -1016,7 +1016,7 @@ public static function encodeUserInfo($userInfo)
 
         $regex   = '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:]|%(?![A-Fa-f0-9]{2}))/';
         $escaper = static::getEscaper();
-        $replace = static fn($match) => $escaper->escapeUrl($match[0]);
+        $replace = static fn($match): string => $escaper->escapeUrl($match[0]);
 
         return preg_replace_callback($regex, $replace, $userInfo);
     }
@@ -1042,7 +1042,7 @@ public static function encodePath($path)
 
         $regex   = '/(?:[^' . self::CHAR_UNRESERVED . ')(:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/';
         $escaper = static::getEscaper();
-        $replace = static fn($match) => $escaper->escapeUrl($match[0]);
+        $replace = static fn($match): string => $escaper->escapeUrl($match[0]);
 
         return preg_replace_callback($regex, $replace, $path);
     }
@@ -1069,7 +1069,7 @@ public static function encodeQueryFragment($input)
 
         $regex   = '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/';
         $escaper = static::getEscaper();
-        $replace = static fn($match) => $escaper->escapeUrl($match[0]);
+        $replace = static fn($match): string => $escaper->escapeUrl($match[0]);
 
         return preg_replace_callback($regex, $replace, $input);
     }
@@ -1381,7 +1381,7 @@ protected static function normalizeFragment($fragment)
      */
     protected static function decodeUrlEncodedChars($input, $allowed = '')
     {
-        $decodeCb = static function ($match) use ($allowed) {
+        $decodeCb = static function ($match) use ($allowed): string {
             $char = rawurldecode($match[0]);
             if (preg_match($allowed, $char)) {
                 return $char;
diff --git a/test/ValidatorChainTest.php b/test/ValidatorChainTest.php
@@ -232,13 +232,13 @@ public function getValidatorFalse()
     public function testCanAttachMultipleValidatorsOfTheSameTypeAsDiscreteInstances(): void
     {
         $this->validator->attachByName('Callback', [
-            'callback' => static fn($value) => true,
+            'callback' => static fn($value): bool => true,
             'messages' => [
                 'callbackValue' => 'This should not be seen in the messages',
             ],
         ]);
         $this->validator->attachByName('Callback', [
-            'callback' => static fn($value) => false,
+            'callback' => static fn($value): bool => false,
             'messages' => [
                 'callbackValue' => 'Second callback trapped',
             ],
