chore: update mago and improve static analysis issues

Author: NeoIsRecursive

composer.json

@@ -39,7 +39,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^11.5.15",
-    "carthage-software/mago": "1.0.0-beta.24"
+    "carthage-software/mago": "1.0.0-rc.1"
   },
   "minimum-stability": "dev",
   "config": {

composer.lock

@@ -0,0 +1,54 @@
+# Welcome to Mago!
+# yaml-language-server: $schema=./mago.schema.json
+# For full documentation, see https://mago.carthage.software/tools/overview
+php-version: "8.4.0"
+
+source:
+  paths:
+    - "src/"
+    - "tests/"
+  includes:
+    - "vendor"
+  excludes:
+    - "./vendor/symfony/cache/Traits/ValueWrapper.php"
+    - "./vendor/composer"
+    - "./tests"
+
+formatter:
+  print-width: 120
+  tab-width: 4
+  use-tabs: false
+  null-type-hint: "Question"
+
+linter:
+  integrations:
+    - "phpunit"
+
+linter.rules:
+  yoda-conditions:
+    enabled: false
+  ambiguous-function-call:
+    enabled: false
+  literal-named-argument:
+    enabled: false
+  halstead:
+    effort-threshold: 7000
+  interface-name:
+    enabled: false
+  trait-name:
+    enabled: false
+  return-type:
+    ignore-arrow-function: true
+  parameter-type:
+    ignore-closure: true
+    ignore-arrow-function: true
+
+analyzer:
+  excludes:
+    - "./tests"
+  find-unused-definitions: true
+  find-unused-expressions: false
+  analyze-dead-code: false
+  check-throws: true
+  allow-possibly-undefined-array-keys: true
+  perform-heuristic-checks: false

mago.toml

@@ -9,7 +9,7 @@
  */
 trait IsMergeableProp
 {
-    public function merge(): self
+    public function merge(): static
     {
         $this->shouldMerge = true;
 

mago.yaml

@@ -10,5 +10,5 @@ interface MergeableProp
         get;
     }
 
-    public function merge(): self;
+    public function merge(): static;
 }

src/Concerns/IsMergeableProp.php

@@ -120,7 +120,6 @@ private static function resolvePartialProps(Request $request, string $component,
             string: $headers->get(Header::PARTIAL_EXCEPT) ?? '',
         ));
 
-        /** @var mixed[]  */
         $filtered = $only ? array_intersect_key($props, array_flip($only)) : $props;
 
         return array_filter($filtered, static fn($key) => !in_array($key, $except, strict: true), ARRAY_FILTER_USE_KEY);
@@ -152,8 +151,8 @@ private static function resolvePropKeysThatShouldMerge(array $props, Request $re
         ));
 
         $propKeysToMerge = arr($props)
-            ->filter(fn($prop) => $prop instanceof MergeableProp && $prop->shouldMerge)
-            ->filter(fn($_, $key) => !$resetProps->contains($key))
+            ->filter(static fn($prop) => $prop instanceof MergeableProp && $prop->shouldMerge)
+            ->filter(static fn($_, $key) => !$resetProps->contains($key))
             ->keys();
 
         return $propKeysToMerge->isEmpty() ? null : $propKeysToMerge->toArray();

src/Contracts/MergeableProp.php

@@ -27,7 +27,6 @@ public function __construct(
     #[Override]
     public function __invoke(Request $request, HttpMiddlewareCallable $next): Response
     {
-        /** @var Response $response */
         $response = $next($request);
 
         $response = $response->addHeader(

src/Http/InertiaResponse.php

@@ -81,14 +81,8 @@ public function render(string $component, array $props = []): InertiaResponse
             props: array_merge($this->config->sharedProps, $props),
             rootView: $this->config->rootView,
             version: $this->version,
-            clearHistory: $this->session->get(
-                key: 'inertia.clear_history',
-                default: false,
-            ),
-            encryptHistory: $this->session->get(
-                key: 'inertia.encrypt_history',
-                default: false,
-            ),
+            clearHistory: $this->session->get(key: 'inertia.clear_history') === true,
+            encryptHistory: $this->session->get(key: 'inertia.encrypt_history') === true,
         );
     }
 
@@ -114,7 +108,6 @@ public function clearHistory(): self
 
     public function location(string|Redirect $url): Response
     {
-        /** @var bool */
         $isInertiaRequest = $this->container->get(Request::class)?->headers?->has(Header::INERTIA) ?? false;
 
         if ($isInertiaRequest) {

src/Http/Middleware.php

@@ -89,7 +89,7 @@ private function installReact(string $clientPath, string $pagesPath): void
         $this->publish(
             source: __DIR__ . '/React/main.tsx',
             destination: (string) path($clientPath, 'main.entrypoint.tsx'),
-            callback: function (string $_, string $target) use ($pagesPath): void {
+            callback: static function (string $_, string $target) use ($pagesPath): void {
                 $content = read_file($target);
 
                 write_file($target, replace(
@@ -145,7 +145,7 @@ private function installVue(string $clientPath, string $pagesPath): void
         $this->publish(
             source: __DIR__ . '/Vue/main.ts',
             destination: (string) path($clientPath, 'main.entrypoint.ts'),
-            callback: function (string $_, string $target) use ($pagesPath): void {
+            callback: static function (string $_, string $target) use ($pagesPath): void {
                 $content = read_file($target);
 
                 write_file($target, replace(