apply rector

composer.json

@@ -167,7 +167,8 @@
             "@md-lint",
             "@zh-lint",
             "@style-lint",
-            "@test"
+            "@test",
+            "@rector-dry-run"
         ],
         "composer-bin-all-update": "@composer bin all update --ansi -v",
         "composer-check-platform-reqs": "@composer check-platform-reqs --lock --ansi -v",

psalm.xml.dist

@@ -19,16 +19,11 @@
   </projectFiles>
   <issueHandlers>
     <PropertyNotSetInConstructor errorLevel="info"/>
-    <InvalidReturnStatement>
-      <errorLevel type="suppress">
-        <directory name="src/Clients"/>
-      </errorLevel>
-    </InvalidReturnStatement>
-    <UnusedClosureParam>
+    <!--<UnusedClosureParam>
       <errorLevel type="suppress">
         <directory name="src/Messages"/>
       </errorLevel>
-    </UnusedClosureParam>
+    </UnusedClosureParam>-->
   </issueHandlers>
   <plugins>
     <!--<pluginClass class="Psalm\LaravelPlugin\Plugin"/>-->

rector.php

@@ -26,13 +26,15 @@
 use Rector\Configuration\Option;
 use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
 use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\DowngradeLevelSetList;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
+use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
 use Rector\ValueObject\PhpVersion;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -43,7 +45,7 @@
     $rectorConfig->importNames(false, false);
     $rectorConfig->importShortClasses(false);
     $rectorConfig->parallel(240);
-    $rectorConfig->disableParallel();
+    // $rectorConfig->disableParallel();
     $rectorConfig->phpstanConfig(__DIR__.'/phpstan.neon');
     $rectorConfig->phpVersion(PhpVersion::PHP_74);
     // $rectorConfig->cacheClass(FileCacheStorage::class);
@@ -91,6 +93,12 @@
         RemoveEmptyClassMethodRector::class,
         ExplicitBoolCompareRector::class,
         AddSeeTestAnnotationRector::class,
+        DisallowedEmptyRuleFixerRector::class,
+        RemoveUselessReturnTagRector::class,
+
+        StaticClosureRector::class => [
+            __DIR__.'/tests',
+        ],
 
         // paths
         __DIR__.'/src/Clients',
@@ -113,25 +121,25 @@
     ]);
 
     $rectorConfig->sets([
-        // DowngradeLevelSetList::DOWN_TO_PHP_74,
-        // LevelSetList::UP_TO_PHP_74,
-        // // SetList::ACTION_INJECTION_TO_CONSTRUCTOR_INJECTION,
-        // SetList::CODE_QUALITY,
-        // SetList::CODING_STYLE,
-        // SetList::DEAD_CODE,
-        // // SetList::STRICT_BOOLEANS,
-        // // SetList::GMAGICK_TO_IMAGICK,
-        // // SetList::MYSQL_TO_MYSQLI,
-        // SetList::NAMING,
-        // // SetList::PRIVATIZATION,
-        // // SetList::PSR_4,
-        // SetList::TYPE_DECLARATION,
-        // SetList::EARLY_RETURN,
-        // SetList::INSTANCEOF,
-        //
-        // PHPUnitSetList::PHPUNIT_90,
-        // PHPUnitSetList::PHPUNIT_CODE_QUALITY,
-        // PHPUnitSetList::ANNOTATIONS_TO_ATTRIBUTES,
+        DowngradeLevelSetList::DOWN_TO_PHP_74,
+        LevelSetList::UP_TO_PHP_74,
+        // SetList::ACTION_INJECTION_TO_CONSTRUCTOR_INJECTION,
+        SetList::CODE_QUALITY,
+        SetList::CODING_STYLE,
+        SetList::DEAD_CODE,
+        // SetList::STRICT_BOOLEANS,
+        // SetList::GMAGICK_TO_IMAGICK,
+        // SetList::MYSQL_TO_MYSQLI,
+        SetList::NAMING,
+        // SetList::PRIVATIZATION,
+        // SetList::PSR_4,
+        SetList::TYPE_DECLARATION,
+        SetList::EARLY_RETURN,
+        SetList::INSTANCEOF,
+
+        PHPUnitSetList::PHPUNIT_90,
+        PHPUnitSetList::PHPUNIT_CODE_QUALITY,
+        PHPUnitSetList::ANNOTATIONS_TO_ATTRIBUTES,
     ]);
 
     $rectorConfig->rules([

src/Foundation/Credentials/AggregateCredential.php

@@ -22,9 +22,9 @@ class AggregateCredential implements Credential
      */
     private array $credentials;
 
-    public function __construct(Credential ...$credentials)
+    public function __construct(Credential ...$credential)
     {
-        $this->credentials = $credentials;
+        $this->credentials = $credential;
     }
 
     public function applyToOptions(array $options): array
@@ -40,7 +40,7 @@ public function applyToRequest(RequestInterface $request): RequestInterface
     {
         return array_reduce(
             $this->credentials,
-            static fn (RequestInterface $carry, Credential $credential): RequestInterface => $credential->applyToRequest($carry),
+            static fn (RequestInterface $request, Credential $credential): RequestInterface => $credential->applyToRequest($request),
             $request,
         );
     }

src/Foundation/Credentials/BasicAuthCredential.php

@@ -23,6 +23,7 @@
 class BasicAuthCredential extends NullCredential
 {
     private string $username;
+
     private string $password;
 
     public function __construct(string $username, string $password)

src/Foundation/Credentials/CertificateCredential.php

@@ -17,6 +17,7 @@
 class CertificateCredential extends NullCredential
 {
     private string $path;
+
     private ?string $password;
 
     public function __construct(string $path, ?string $password = null)

src/Foundation/Credentials/DigestAuthCredential.php

@@ -17,6 +17,7 @@
 class DigestAuthCredential extends NullCredential
 {
     private string $username;
+
     private string $password;
 
     public function __construct(string $username, string $password)

src/Foundation/Credentials/KeyValueCredential.php

@@ -17,7 +17,9 @@
 class KeyValueCredential extends NullCredential
 {
     private string $key;
+
     private string $value;
+
     private string $type;
 
     public function __construct(string $key, string $value, string $type = RequestOptions::HEADERS)

src/Foundation/Credentials/NtlmAuthCredential.php

@@ -17,6 +17,7 @@
 class NtlmAuthCredential extends NullCredential
 {
     private string $username;
+
     private string $password;
 
     public function __construct(string $username, string $password)

src/Foundation/Credentials/UriTemplateCredential.php

@@ -19,6 +19,7 @@
 class UriTemplateCredential extends NullCredential
 {
     private array $variables;
+
     private HttpFactory $httpFactory;
 
     public function __construct(array $variables)

src/Foundation/Credentials/WebHookCredential.php

@@ -18,6 +18,7 @@
 class WebHookCredential extends NullCredential
 {
     private string $webHook;
+
     private HttpFactory $httpFactory;
 
     public function __construct(string $webHook)

src/Foundation/Credentials/WsseAuthCredential.php

@@ -17,6 +17,7 @@
 class WsseAuthCredential extends NullCredential
 {
     private string $username;
+
     private string $password;
 
     public function __construct(string $username, string $password)

src/Foundation/Middleware/EnsureResponse.php

@@ -20,7 +20,7 @@ class EnsureResponse
 {
     public function __invoke(callable $handler): callable
     {
-        return Middleware::mapResponse(fn (ResponseInterface $response): ResponseInterface => Response::createFromPsrResponse($response))($handler);
+        return Middleware::mapResponse(static fn (ResponseInterface $response): ResponseInterface => Response::createFromPsrResponse($response))($handler);
     }
 
     public static function name(): string

src/Foundation/Support/Str.php

@@ -42,11 +42,7 @@ public static function pascal(string $value): string
      */
     public static function camel(string $value): string
     {
-        if (isset(static::$camelCache[$value])) {
-            return static::$camelCache[$value];
-        }
-
-        return static::$camelCache[$value] = lcfirst(static::studly($value));
+        return static::$camelCache[$value] ?? (static::$camelCache[$value] = lcfirst(static::studly($value)));
     }
 
     /**
@@ -82,7 +78,7 @@ public static function studly(string $value): string
 
         $words = explode(' ', static::replace(['-', '_'], ' ', $value));
 
-        $studlyWords = array_map(fn ($word) => static::ucfirst($word), $words);
+        $studlyWords = array_map(static fn ($word): string => static::ucfirst($word), $words);
 
         return static::$studlyCache[$key] = implode('', $studlyWords);
     }
@@ -94,8 +90,6 @@ public static function studly(string $value): string
      */
     public static function is($pattern, string $value): bool
     {
-        $value = (string) $value;
-
         if (! is_iterable($pattern)) {
             $pattern = [$pattern];
         }

src/Foundation/Support/UpdateHasHttpClientDocCommentRector.php

@@ -33,6 +33,7 @@
 class UpdateHasHttpClientDocCommentRector extends AbstractRector implements ConfigurableRectorInterface
 {
     private const MAIN_CLASS = \Guanguans\Notify\Foundation\Client::class;
+
     private const TRAIT = HasHttpClient::class;
 
     private array $except = [
@@ -49,6 +50,7 @@ class UpdateHasHttpClientDocCommentRector extends AbstractRector implements Conf
     ];
 
     private DocBlockUpdater $docBlockUpdater;
+
     private PhpDocInfoFactory $phpDocInfoFactory;
 
     public function __construct(DocBlockUpdater $docBlockUpdater, PhpDocInfoFactory $phpDocInfoFactory)
@@ -119,7 +121,7 @@ public function refactor(Node $node)
         foreach ($this->mixins as $mixin) {
             $reflectionMethods = array_filter(
                 (new \ReflectionClass($mixin))->getMethods(\ReflectionMethod::IS_PUBLIC),
-                fn (\ReflectionMethod $reflectionMethod) => ! Str::is($this->except, $reflectionMethod->getName())
+                fn (\ReflectionMethod $reflectionMethod): bool => ! Str::is($this->except, $reflectionMethod->getName())
             );
 
             foreach ($reflectionMethods as $reflectionMethod) {
@@ -160,7 +162,7 @@ private function createMethodPhpDocTagNode(\ReflectionMethod $reflectionMethod):
         $parameters = rtrim(
             array_reduce(
                 $reflectionMethod->getParameters(),
-                static function (string $carry, \ReflectionParameter $reflectionParameter) {
+                static function (string $carry, \ReflectionParameter $reflectionParameter): string {
                     if ($reflectionParameter->hasType()) {
                         /** @noinspection PhpVoidFunctionResultUsedInspection */
                         $type = $reflectionParameter->getType();

src/Foundation/Support/UpdateHasOptionsDocCommentRector.php

@@ -74,7 +74,7 @@ class Message extends \Guanguans\Notify\Foundation\Message
                         }
                         CODE_SAMPLE
                     ,
-                    ['\Guanguans\Notify\Foundation\Message::class']
+                    [Message::class]
                 ),
             ]
         );

src/Foundation/Support/helpers.php

@@ -39,7 +39,7 @@ function to_multipart(array $form): array
                 // preg_match('/^.*:\/\/.*$/', $contents);
                 is_string($contents) and is_file($contents) and $contents = Utils::tryFopen($contents, 'r');
 
-                return [compact('name', 'contents')];
+                return [['name' => $name, 'contents' => $contents]];
             }
 
             if (

src/Foundation/Traits/Conditionable.php

@@ -36,7 +36,8 @@ public function when($value = null, ?callable $callback = null, ?callable $defau
         if ($value) {
             return $callback($this, $value) ?? $this;
         }
-        if ($default) {
+
+        if (null !== $default) {
             return $default($this, $value) ?? $this;
         }
 
@@ -62,7 +63,8 @@ public function unless($value = null, ?callable $callback = null, ?callable $def
         if (! $value) {
             return $callback($this, $value) ?? $this;
         }
-        if ($default) {
+
+        if (null !== $default) {
             return $default($this, $value) ?? $this;
         }
 

src/Foundation/Traits/HasHttpClient.php

@@ -51,8 +51,11 @@
 trait HasHttpClient
 {
     private ?Client $httpClient = null;
+
     private $httpClientResolver;
+
     private ?HandlerStack $handlerStack = null;
+
     private array $httpOptions = [];
 
     /**
@@ -165,7 +168,7 @@ private function ensureWithApplyCredentialToRequest(HandlerStack $handlerStack):
             (function (): void {
                 $this->findByName(ApplyCredentialToRequest::name());
             })->call($handlerStack);
-        } catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $invalidArgumentException) {
             $handlerStack->push(
                 new ApplyCredentialToRequest($this->credential),
                 ApplyCredentialToRequest::name()