chore: update dependencies

Author: NeoIsRecursive

composer.json

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

composer.lock

@@ -1,66 +1,37 @@
-# Mago configuration file
-# For more information, see https://mago.carthage.software/#/getting-started/configuration
-php_version = "8.4.0"
+# Welcome to Mago!
+# 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",
-]
+excludes = []
 
-[format]
-print_width = 120
-tab_width = 4
-use_tabs = false
-null_type_hint = "Question"
+[formatter]
+print-width = 120
+tab-width = 4
+use-tabs = false
+null-type-hint = "question"
 
 [linter]
-default_plugins = true
-plugins = ["php-unit"]
-
-# NAMING
-[[linter.rules]]
-name = "naming/interface"
-psr = false
-
-[[linter.rules]]
-name = "naming/trait"
-psr = false
-
-[[linter.rules]]
-name = "naming/class"
-psr = false
-
-# STRICTNESS
-
-[[linter.rules]]
-name = "strictness/require-parameter-type"
-ignore_arrow_function = true
-ignore_closure = true
-
-[[linter.rules]]
-name = "strictness/require-return-type"
-ignore_arrow_function = true
-ignore_closure = true
-
-[[linter.rules]]
-name = "analysis/override-attribute"
-level = "off"
-
-[[linter.rules]]
-name = "maintainability/halstead"
-level = "off"
-
-[[linter.rules]]
-name = "maintainability/too-many-methods"
-level = "off"
-
-[[linter.rules]]
-name = "maintainability/kan-defect"
-level = "off"
-
-[[linter.rules]]
-name = "maintainability/cyclomatic-complexity"
-level = "off"
+integrations = ["phpunit"]
+
+[linter.rules]
+ambiguous-function-call = { enabled = false }
+literal-named-argument = { enabled = false }
+halstead = { effort-threshold = 7000 }
+parameter-type = { ignore-closure = true, ignore-arrow-function = true }
+return-type = { ignore-arrow-function = true }
+too-many-methods = { enabled = false }
+trait-name = { enabled = false}
+class-name = { enabled = false}
+interface-name = { enabled = false}
+cyclomatic-complexity = { threshold = 18 }
+
+[analyzer]
+find-unused-definitions = true
+find-unused-expressions = false
+analyze-dead-code = false
+check-throws = true
+allow-possibly-undefined-array-keys = true
+perform-heuristic-checks = true

mago.toml

@@ -25,7 +25,7 @@ final class InertiaResponse implements Response
 {
     use IsResponse;
 
-    // @mago-expect maintainability/excessive-parameter-list
+    // @mago-expect lint:excessive-parameter-list
     public function __construct(
         readonly Request $request,
         readonly string $component,
@@ -158,26 +158,25 @@ private static function resolvePropKeysThatShouldMerge(array $props, Request $re
      * Evaluates props recursively.
      * @pure
      */
-    private static function evaluateProps(array $props, Request $request, bool $unpackDotProps = true): array // @mago-expect best-practices/no-boolean-flag-parameter
+    // @mago-expect lint:no-boolean-flag-parameter
+    private static function evaluateProps(array $props, Request $request, bool $unpackDotProps = true): array
     {
-        return arr($props)
-            ->map(function ($value, string|int $key) use ($request): array {
-                $evaluated = ($value instanceof Closure) ? invoke($value) : $value;
-                $evaluated = ($evaluated instanceof CallableProp) ? $evaluated() : $evaluated;
-                $evaluated = ($evaluated instanceof ArrayInterface) ? $evaluated->toArray() : $evaluated;
-                $evaluated = is_array($evaluated)
-                    ? self::evaluateProps($evaluated, $request, unpackDotProps: false)
-                    : $evaluated;
-
-                return [$key, $evaluated];
-            })
-            ->reduce(function (array $acc, array $item) use ($unpackDotProps): array {
-                [$key, $value] = $item;
-                if ($unpackDotProps && is_string($key) && str_contains($key, needle: '.')) {
-                    return arr($acc)->set($key, $value)->toArray();
-                }
-                $acc[$key] = $value;
-                return $acc;
-            }, []);
+        return arr($props)->map(function ($value, string|int $key) use ($request): array {
+            $evaluated = $value instanceof Closure ? invoke($value) : $value;
+            $evaluated = $evaluated instanceof CallableProp ? $evaluated() : $evaluated;
+            $evaluated = $evaluated instanceof ArrayInterface ? $evaluated->toArray() : $evaluated;
+            $evaluated = is_array($evaluated)
+                ? self::evaluateProps($evaluated, $request, unpackDotProps: false)
+                : $evaluated;
+
+            return [$key, $evaluated];
+        })->reduce(function (array $acc, array $item) use ($unpackDotProps): array {
+            [$key, $value] = $item;
+            if ($unpackDotProps && is_string($key) && str_contains($key, needle: '.')) {
+                return arr($acc)->set($key, $value)->toArray();
+            }
+            $acc[$key] = $value;
+            return $acc;
+        }, []);
     }
 }

src/Http/InertiaResponse.php

@@ -46,8 +46,8 @@ public function __invoke(Request $request, HttpMiddlewareCallable $next): Respon
         }
 
         if (
-            $response->status === Status::FOUND &&
-                in_array($request->method, [Method::POST, Method::PUT, Method::PATCH], strict: true)
+            $response->status === Status::FOUND
+            && in_array($request->method, [Method::POST, Method::PUT, Method::PATCH], strict: true)
         ) {
             $response->setStatus(Status::SEE_OTHER);
         }

src/Http/Middleware.php

@@ -90,9 +90,7 @@ public function clearHistory(): self
 
     public function location(string|Redirect $url): Response
     {
-        $isInertiaRequest = $this
-            ->container->get(Request::class)
-            ->headers->has(Header::INERTIA);
+        $isInertiaRequest = $this->container->get(Request::class)->headers->has(Header::INERTIA);
 
         if ($isInertiaRequest) {
             if ($url instanceof Redirect) {
@@ -108,6 +106,6 @@ public function location(string|Redirect $url): Response
             );
         }
 
-        return ($url instanceof Redirect) ? $url : new Redirect($url);
+        return $url instanceof Redirect ? $url : new Redirect($url);
     }
 }

src/Inertia.php

@@ -13,7 +13,8 @@
 {
     public function __construct(
         public ?string $manifestPath = null,
-    ) {}
+    ) {
+    }
 
     public function resolve(Container $container): string
     {

src/ManifestVersionResolver.php

@@ -5,11 +5,10 @@
 namespace NeoIsRecursive\Inertia;
 
 use JsonSerializable;
-use Tempest\Support\Html\HtmlString;
 
 final readonly class PageData implements JsonSerializable
 {
-    // @mago-expect maintainability/excessive-parameter-list
+    // @mago-expect lint:excessive-parameter-list
     public function __construct(
         public string $component,
         public array $props,
@@ -19,7 +18,8 @@ public function __construct(
         public bool $encryptHistory,
         public ?array $propKeysToDefer = null,
         public ?array $propsKeysToMerge = null,
-    ) {}
+    ) {
+    }
 
     public function toArray(): array
     {

src/PageData.php

@@ -12,7 +12,7 @@ final class AlwaysPropTest extends TestCase
 {
     public function test_can_invoke(): void
     {
-        $alwaysProp = new AlwaysProp(function () {
+        $alwaysProp = new AlwaysProp(function (): string {
             return 'An always value';
         });
 
@@ -53,9 +53,7 @@ public function __invoke(): string
 
     public function test_can_resolve_bindings_when_invoked(): void
     {
-        $alwaysProp = new AlwaysProp(function (Request $request) {
-            return $request;
-        });
+        $alwaysProp = new AlwaysProp(fn(Request $request) => $request);
 
         static::assertInstanceOf(Request::class, $alwaysProp());
     }

tests/Integration/AlwaysPropTest.php

@@ -12,7 +12,7 @@ final class DeferPropsTest extends TestCase
 {
     public function test_can_invoke(): void
     {
-        $deferProp = new DeferProp(function () {
+        $deferProp = new DeferProp(function (): string {
             return 'A defered value';
         });
 
@@ -34,9 +34,7 @@ public function test_can_accept_scalar_values(): void
 
     public function test_can_resolve_bindings_when_invoked(): void
     {
-        $deferProp = new DeferProp(function (Request $request) {
-            return $request;
-        });
+        $deferProp = new DeferProp(fn(Request $request) => $request);
 
         static::assertInstanceOf(Request::class, $deferProp());
     }