fix: apply rector

Author: Chemaclass

.php-cs-fixer.dist.php

@@ -4,6 +4,7 @@
 
 use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
 
 $finder = Finder::create()
     ->files()
@@ -12,16 +13,21 @@
     ->in(__DIR__ . '/tests');
 
 return (new Config())
+    ->setParallelConfig(ParallelConfigFactory::detect())
     ->setFinder($finder)
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR12' => true,
         'array_syntax' => ['syntax' => 'short'],
         'backtick_to_shell_exec' => true,
-        'braces' => [
-            'allow_single_line_closure' => true,
-            'allow_single_line_anonymous_class_with_empty_body' => true,
-        ],
+        'single_space_around_construct' => true,
+        'control_structure_braces' => true,
+        'control_structure_continuation_position' => true,
+        'declare_parentheses' => true,
+        'no_multiple_statements_per_line' => true,
+        'braces_position' => true,
+        'statement_indentation' => true,
+        'no_extra_blank_lines' => true,
         'class_definition' => ['single_line' => true],
         'concat_space' => ['spacing' => 'one'],
         'declare_strict_types' => true,
@@ -30,7 +36,7 @@
         'ereg_to_preg' => true,
         'explicit_string_variable' => true,
         'fully_qualified_strict_types' => true,
-        'function_typehint_space' => true,
+        'type_declaration_spaces' => true,
         'general_phpdoc_annotation_remove' => [
             'annotations' => [
                 'author',
@@ -48,13 +54,12 @@
         'native_function_invocation' => [
             'include' => ['@compiler_optimized'],
         ],
-        'native_function_type_declaration_casing' => true,
-        'new_with_braces' => true,
+        'native_type_declaration_casing' => true,
+        'new_with_parentheses' => true,
         'no_blank_lines_after_class_opening' => true,
         'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
         'no_empty_statement' => true,
-        'no_extra_blank_lines' => true,
         'no_homoglyph_names' => true,
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
@@ -113,7 +118,11 @@
         'ternary_to_elvis_operator' => true,
         'ternary_to_null_coalescing' => true,
         'trailing_comma_in_multiline' => [
-            'elements' => ['arguments', 'arrays', 'match', 'parameters'],
+            'elements' => [
+                'arrays',
+                'arguments',
+                'parameters',
+            ],
         ],
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,

composer.json

@@ -13,14 +13,14 @@
         "gacela-project/phpstan-extension": "^0.3",
         "phpstan/phpstan": "^1.12",
         "phpunit/phpunit": "^9.6",
-        "psalm/plugin-phpunit": "^0.18",
+        "psalm/plugin-phpunit": "^0.19",
         "rector/rector": "^1.2",
         "symfony/var-dumper": "^7.2",
-        "vimeo/psalm": "^5.26"
+        "vimeo/psalm": "^6.11"
     },
     "config": {
         "platform": {
-            "php": "8.2"
+            "php": "8.2.27"
         },
         "allow-plugins": {
             "composer/package-versions-deprecated": true
@@ -48,11 +48,12 @@
             "@csfix",
             "@test-all"
         ],
-        "fix": "@csfix",
+        "fix": ["@csfix", "@rector"],
         "test": "@test-all",
         "test-all": [
             "@quality",
-            "@phpunit"
+            "@phpunit",
+            "@rector:dry"
         ],
         "quality": [
             "@csrun",
@@ -72,6 +73,8 @@
         "phpstan": "XDEBUG_MODE=off ./vendor/bin/phpstan analyze",
         "csfix": "XDEBUG_MODE=off ./vendor/bin/php-cs-fixer fix",
         "csrun": "XDEBUG_MODE=off ./vendor/bin/php-cs-fixer fix --dry-run",
+        "rector": "./vendor/bin/rector",
+        "rector:dry": "./vendor/bin/rector --dry-run",
         "serve": "php -S localhost:8080 public/index.php"
     }
 }

gacela.php

@@ -6,7 +6,7 @@
 use Gacela\Router\Config\RouterGacelaConfig;
 use PhpLightning\Invoice\Infrastructure\Plugin\InvoiceRoutesPlugin;
 
-return static function (GacelaConfig $config) : void {
+return static function (GacelaConfig $config): void {
     $config
         ->enableFileCache()
         ->addAppConfig('lightning-config.dist.php', 'lightning-config.php')

psalm.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
-    phpVersion="8.0"
+    phpVersion="8.2"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -24,9 +24,11 @@
         <InvalidReturnStatement errorLevel="suppress" />
         <LessSpecificReturnStatement errorLevel="suppress" />
         <MoreSpecificReturnType errorLevel="suppress" />
-        <MixedInferredReturnType errorLevel="suppress" />
         <MixedReturnStatement errorLevel="suppress" />
         <ArgumentTypeCoercion errorLevel="suppress" />
         <UnresolvableInclude errorLevel="suppress" />
+        <MissingOverrideAttribute errorLevel="suppress" />
+        <MixedMethodCall errorLevel="suppress" />
+        <UndefinedMethod errorLevel="suppress" />
     </issueHandlers>
 </psalm>

src/Config/LightningConfig.php

@@ -91,7 +91,7 @@ public function addBackendsFile(string $path): self
     public function jsonSerialize(): array
     {
         $result = [];
-        if ($this->backends !== null) {
+        if ($this->backends instanceof BackendsConfig) {
             $result['backends'] = $this->backends->jsonSerialize();
         }
         if ($this->domain !== null) {
@@ -100,7 +100,7 @@ public function jsonSerialize(): array
         if ($this->receiver !== null) {
             $result['receiver'] = $this->receiver;
         }
-        if ($this->sendableRange !== null) {
+        if ($this->sendableRange instanceof SendableRange) {
             $result['sendable-range'] = $this->sendableRange;
         }
         if ($this->callbackUrl !== null) {

src/Invoice/Application/CallbackUrl.php

@@ -10,7 +10,7 @@
 
 use function sprintf;
 
-final class CallbackUrl implements CallbackUrlInterface
+final readonly class CallbackUrl implements CallbackUrlInterface
 {
     private const TAG_PAY_REQUEST = 'payRequest';
 

src/Invoice/Application/InvoiceGenerator.php

@@ -10,7 +10,7 @@
 
 use function sprintf;
 
-final class InvoiceGenerator
+final readonly class InvoiceGenerator
 {
     public function __construct(
         private BackendInvoiceInterface $backendInvoice,

src/Invoice/Domain/BackendInvoice/EmptyBackendInvoice.php

@@ -6,13 +6,10 @@
 
 use PhpLightning\Shared\Transfer\BackendInvoiceResponse;
 
-final class EmptyBackendInvoice implements BackendInvoiceInterface
+final readonly class EmptyBackendInvoice implements BackendInvoiceInterface
 {
-    private string $name;
-
-    public function __construct(string $name)
+    public function __construct(private string $name)
     {
-        $this->name = $name;
     }
 
     public function requestInvoice(int $satsAmount, string $metadata): BackendInvoiceResponse

src/Invoice/Domain/BackendInvoice/LnbitsBackendInvoice.php

@@ -13,7 +13,7 @@ final class LnbitsBackendInvoice implements BackendInvoiceInterface
      * @param array{api_key:string, api_endpoint:string} $options
      */
     public function __construct(
-        private HttpApiInterface $httpApi,
+        private readonly HttpApiInterface $httpApi,
         private array $options,
     ) {
     }

src/Invoice/Domain/CallbackUrl/LnAddressGenerator.php

@@ -6,7 +6,7 @@
 
 use function sprintf;
 
-final class LnAddressGenerator implements LnAddressGeneratorInterface
+final readonly class LnAddressGenerator implements LnAddressGeneratorInterface
 {
     public function __construct(
         private string $defaultLnAddress,