Declare Laravel v11 Support

bayareawebpro · Jun 6, 2024 · 291d341 · 291d341
1 parent 2ba021c
commit 291d341
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -9,17 +9,17 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "illuminate/http": "^10.0",
-        "illuminate/support": "^10.0",
-        "illuminate/session": "^10.0",
-        "illuminate/contracts": "^10.0",
-        "illuminate/validation": "^10.0"
+        "php": "^8.2",
+        "illuminate/http": "^11.0",
+        "illuminate/support": "^11.0",
+        "illuminate/session": "^11.0",
+        "illuminate/contracts": "^11.0",
+        "illuminate/validation": "^11.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.0",
-        "orchestra/testbench": "^8.0",
-        "larastan/larastan": "^v2.6.1"
+        "phpunit/phpunit": "^11.0",
+        "orchestra/testbench": "^9.0",
+        "larastan/larastan": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -32,7 +32,7 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
+        "test": "XDEBUG_MODE=coverage vendor/bin/phpunit",
         "lint": "vendor/bin/phpstan analyse"
     }
 }
diff --git a/src/MultiStepForm.php b/src/MultiStepForm.php
@@ -3,22 +3,17 @@
 namespace BayAreaWebPro\MultiStepForms;
 
 use Closure;
-
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Redirect;
-use Illuminate\Support\Facades\Route;
-use Illuminate\Validation\Rule;
-
+use Illuminate\Session\Store as Session;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
-use Illuminate\Session\Store as Session;
-
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Validation\Rule;
 
 class MultiStepForm implements Responsable, Arrayable
 {
@@ -162,7 +157,7 @@ protected function getData(array $data = []): array
     {
         return [...$data, ...Collection::make($this->data)
             ->merge($this->stepConfig()->get('data', []))
-            ->map(fn($value)=>is_callable($value) ? call_user_func($value, $this) : $value)];
+            ->map(fn($value) => is_callable($value) ? call_user_func($value, $this) : $value)];
     }
 
     protected function isShowRequest(): bool
@@ -209,11 +204,11 @@ protected function isNavigationRequest(): bool
 
     protected function handleNavigation(): RedirectResponse|JsonResponse
     {
-        if($this->isPreviousStepRequest()){
+        if ($this->isPreviousStepRequest()) {
             $this->setValue('form_step', $this->requestedStep());
         }
 
-        if($this->usesViews() && !$this->needsJsonResponse()){
+        if ($this->usesViews() && !$this->needsJsonResponse()) {
             return Redirect::back();
         }