chore!: tempest 2.0 (#16)

Author: NeoIsRecursive

.phpactor.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "/phpactor.schema.json",
+    "language_server_phpstan.enabled": false
+}

composer.json

@@ -35,11 +35,11 @@
   ],
   "require": {
     "php": "^8.4",
-    "tempest/framework": "^1.6"
+    "tempest/framework": "^2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^11.5.15",
-    "carthage-software/mago": "1.0.0-beta.8"
+    "carthage-software/mago": "1.0.0-beta.16"
   },
   "minimum-stability": "dev",
   "config": {

composer.lock

@@ -5,13 +5,18 @@ php-version = "8.4.0"
 [source]
 paths = ["src/", "tests/"]
 includes = ["vendor"]
-excludes = []
+excludes = [
+    "./vendor/symfony/cache/Traits/ValueWrapper.php",
+    "./vendor/composer",
+    "./tests"
+]
 
 [formatter]
 print-width = 120
 tab-width = 4
 use-tabs = false
-null-type-hint = "question"
+null-type-hint = "Question"
+
 
 [linter]
 integrations = ["phpunit"]
@@ -20,19 +25,17 @@ integrations = ["phpunit"]
 ambiguous-function-call = { enabled = false }
 literal-named-argument = { enabled = false }
 halstead = { effort-threshold = 7000 }
-parameter-type = { ignore-closure = true, ignore-arrow-function = true }
+interface-name = { enabled = false }
+trait-name = { enabled = false }
 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 }
+parameter-type = { ignore-closure = true, ignore-arrow-function = true }
+
 
 [analyzer]
-excludes = ["tests"]
+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 = true
+perform-heuristic-checks = false

mago.toml

@@ -29,5 +29,6 @@
     <env name="BASE_URI" value="" />
     <env name="CACHE" value="null" />
     <env name="DISCOVERY_CACHE" value="true" />
+    <env name="SIGNING_KEY" value="O0rt3MhQPTHBKqsq6QQzWqIuofsNQhzwubBMZLZfr34=" />
   </php>
-</phpunit>
+</phpunit>

phpunit.xml

@@ -4,10 +4,8 @@
 
 namespace NeoIsRecursive\Inertia\Concerns;
 
-use NeoIsRecursive\Inertia\Contracts\MergeableProp;
-
 /**
- * @implements MergeableProp
+ * @require-implements \NeoIsRecursive\Inertia\Contracts\MergeableProp
  */
 trait IsMergeableProp
 {

src/Concerns/IsMergeableProp.php

@@ -21,6 +21,7 @@
 use function Tempest\invoke;
 use function Tempest\Support\arr;
 
+// @mago-expect lint:cyclomatic-complexity
 final class InertiaResponse implements Response
 {
     use IsResponse;
@@ -116,6 +117,7 @@ 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);
@@ -157,8 +159,8 @@ private static function resolvePropKeysThatShouldMerge(array $props, Request $re
     /**
      * Evaluates props recursively.
      * @pure
+     * @mago-expect lint: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 {
@@ -170,13 +172,17 @@ private static function evaluateProps(array $props, Request $request, bool $unpa
                 : $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;
-        }, []);
+        })->reduce(
+            function (array $acc, array $item) use ($unpackDotProps): array {
+                /** @var string|int $key */
+                [$key, $value] = $item;
+                if ($unpackDotProps && is_string($key) && str_contains($key, '.')) {
+                    return arr($acc)->set($key, $value)->toArray();
+                }
+                $acc[$key] = $value;
+                return $acc;
+            },
+            [],
+        );
     }
 }

src/Http/InertiaResponse.php

@@ -6,6 +6,7 @@
 
 use NeoIsRecursive\Inertia\Inertia;
 use NeoIsRecursive\Inertia\Support\Header;
+use Override;
 use Tempest\Core\Priority;
 use Tempest\Http\Method;
 use Tempest\Http\Request;
@@ -23,12 +24,13 @@ public function __construct(
         private Session $session,
     ) {}
 
+    #[Override]
     public function __invoke(Request $request, HttpMiddlewareCallable $next): Response
     {
         /** @var Response $response */
         $response = $next($request);
 
-        $response->addHeader(
+        $response = $response->addHeader(
             key: 'Vary',
             value: Header::INERTIA,
         );
@@ -49,7 +51,7 @@ public function __invoke(Request $request, HttpMiddlewareCallable $next): Respon
             $response->status === Status::FOUND
             && in_array($request->method, [Method::POST, Method::PUT, Method::PATCH], strict: true)
         ) {
-            $response->setStatus(Status::SEE_OTHER);
+            $response = $response->setStatus(Status::SEE_OTHER);
         }
 
         return $response;

src/Http/Middleware.php

@@ -5,6 +5,7 @@
 namespace NeoIsRecursive\Inertia\Http\Middleware;
 
 use NeoIsRecursive\Inertia\Inertia;
+use Override;
 use Tempest\Discovery\SkipDiscovery;
 use Tempest\Http\Request;
 use Tempest\Http\Response;
@@ -18,6 +19,7 @@ public function __construct(
         private Inertia $inertia,
     ) {}
 
+    #[Override]
     public function __invoke(Request $request, HttpMiddlewareCallable $next): Response
     {
         $this->inertia->encryptHistory();

src/Http/Middleware/EncryptHistory.php

@@ -94,6 +94,7 @@ public function location(string|Redirect $url): Response
 
         if ($isInertiaRequest) {
             if ($url instanceof Redirect) {
+                /** @var string */
                 $url = $url->getHeader(name: 'Location')->values[0];
             }