Merge branch '1.x' of github.com:inertiajs/inertia-laravel into 1.x

Author: joetannenbaum

Diff for: src/Response.php

@@ -95,6 +95,8 @@ public function toResponse($request)
             'props' => $props,
             'url' => Str::start(Str::after($request->fullUrl(), $request->getSchemeAndHttpHost()), '/'),
             'version' => $this->version,
+            'encryptHistory' => false,
+            'clearHistory' => false,
         ];
 
         if ($request->header(Header::INERTIA)) {

Diff for: src/ResponseFactory.php

@@ -46,7 +46,7 @@ public function share($key, $value = null): void
         }
     }
 
-    public function getShared(string $key = null, $default = null)
+    public function getShared(?string $key = null, $default = null)
     {
         if ($key) {
             return Arr::get($this->sharedProps, $key, $default);

Diff for: src/Testing/AssertableInertia.php

@@ -42,7 +42,7 @@ public static function fromTestResponse(TestResponse $response): self
         return $instance;
     }
 
-    public function component(string $value = null, $shouldExist = null): self
+    public function component(?string $value = null, $shouldExist = null): self
     {
         PHPUnit::assertSame($value, $this->component, 'Unexpected Inertia page component.');
 

Diff for: src/Testing/Concerns/Debugging.php

@@ -4,17 +4,17 @@
 
 trait Debugging
 {
-    public function dump(string $prop = null): self
+    public function dump(?string $prop = null): self
     {
         dump($this->prop($prop));
 
         return $this;
     }
 
-    public function dd(string $prop = null): void
+    public function dd(?string $prop = null): void
     {
         dd($this->prop($prop));
     }
 
-    abstract protected function prop(string $key = null);
+    abstract protected function prop(?string $key = null);
 }

Diff for: src/Testing/Concerns/Has.php

@@ -38,7 +38,7 @@ public function hasAll($key): self
     /**
      * @return $this
      */
-    public function has(string $key, $value = null, Closure $scope = null): self
+    public function has(string $key, $value = null, ?Closure $scope = null): self
     {
         PHPUnit::assertTrue(
             Arr::has($this->prop(), $key),
@@ -106,7 +106,7 @@ public function misses(string $key): self
         return $this->missing($key);
     }
 
-    abstract protected function prop(string $key = null);
+    abstract protected function prop(?string $key = null);
 
     abstract protected function dotPath(string $key): string;
 

Diff for: src/Testing/Concerns/Interaction.php

@@ -37,5 +37,5 @@ public function etc(): self
         return $this;
     }
 
-    abstract protected function prop(string $key = null);
+    abstract protected function prop(?string $key = null);
 }

Diff for: src/Testing/Concerns/Matching.php

@@ -68,7 +68,7 @@ protected function ensureSorted(&$value): void
 
     abstract protected function dotPath(string $key): string;
 
-    abstract protected function prop(string $key = null);
+    abstract protected function prop(?string $key = null);
 
-    abstract public function has(string $key, $value = null, Closure $scope = null);
+    abstract public function has(string $key, $value = null, ?Closure $scope = null);
 }

Diff for: src/Testing/Concerns/PageObject.php

@@ -8,7 +8,7 @@
 
 trait PageObject
 {
-    public function component(string $value = null, $shouldExist = null): self
+    public function component(?string $value = null, $shouldExist = null): self
     {
         PHPUnit::assertSame($value, $this->component, 'Unexpected Inertia page component.');
 
@@ -23,7 +23,7 @@ public function component(string $value = null, $shouldExist = null): self
         return $this;
     }
 
-    protected function prop(string $key = null)
+    protected function prop(?string $key = null)
     {
         return Arr::get($this->props, $key);
     }

Diff for: src/Testing/TestResponseMacros.php

@@ -8,7 +8,7 @@ class TestResponseMacros
 {
     public function assertInertia()
     {
-        return function (Closure $callback = null) {
+        return function (?Closure $callback = null) {
             $assert = AssertableInertia::fromTestResponse($this);
 
             if (is_null($callback)) {

Diff for: tests/ControllerTest.php

@@ -28,6 +28,8 @@ public function test_controller_returns_an_inertia_response(): void
             ],
             'url' => '/',
             'version' => '',
+            'encryptHistory' => false,
+            'clearHistory' => false,
         ]);
     }
 }

Diff for: tests/ResponseTest.php

@@ -46,7 +46,7 @@ public function test_server_response(): void
         $this->assertSame('Jonathan', $page['props']['user']['name']);
         $this->assertSame('/user/123', $page['url']);
         $this->assertSame('123', $page['version']);
-        $this->assertSame('<div id="app" data-page="{&quot;component&quot;:&quot;User\/Edit&quot;,&quot;props&quot;:{&quot;user&quot;:{&quot;name&quot;:&quot;Jonathan&quot;}},&quot;url&quot;:&quot;\/user\/123&quot;,&quot;version&quot;:&quot;123&quot;}"></div>', $view->render());
+        $this->assertSame('<div id="app" data-page="{&quot;component&quot;:&quot;User\/Edit&quot;,&quot;props&quot;:{&quot;user&quot;:{&quot;name&quot;:&quot;Jonathan&quot;}},&quot;url&quot;:&quot;\/user\/123&quot;,&quot;version&quot;:&quot;123&quot;,&quot;encryptHistory&quot;:false,&quot;clearHistory&quot;:false}"></div>', $view->render());
     }
 
     public function test_xhr_response(): void
@@ -98,8 +98,7 @@ public function test_lazy_resource_response(): void
         $callable = static function () use ($users) {
             $page = new LengthAwarePaginator($users->take(2), $users->count(), 2);
 
-            return new class($page, JsonResource::class) extends ResourceCollection {
-            };
+            return new class($page, JsonResource::class) extends ResourceCollection {};
         };
 
         $response = new Response('User/Index', ['users' => $callable], 'app', '123');