Lint

app/Member/MemberController.php

@@ -17,7 +17,7 @@ use App\Setting\NamiSettings;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Response;
-use Zoomyboy\LaravelNami\NamiException;
+use Zoomyboy\LaravelNami\Exceptions\ConflictException;
 
 class MemberController extends Controller
 {
@@ -114,12 +114,8 @@ class MemberController extends Controller
     {
         try {
             $request->persistUpdate($member);
-        } catch (NamiException $e) {
-            if ($e->isConflict()) {
-                return redirect()->route('member.edit', ['member' => $member, 'conflict' => '1']);
-            } else {
-                throw $e;
-            }
+        } catch (ConflictException $e) {
+            return redirect()->route('member.edit', ['member' => $member, 'conflict' => '1']);
         }
 
         return redirect()->route('member.index');

app/Membership/Actions/MembershipStoreAction.php

@@ -15,7 +15,7 @@ use Illuminate\Validation\ValidationException;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\LaravelNami\Data\Membership as NamiMembership;
-use Zoomyboy\LaravelNami\NamiException;
+use Zoomyboy\LaravelNami\Exceptions\HttpException;
 
 class MembershipStoreAction
 {
@@ -32,7 +32,7 @@ class MembershipStoreAction
                 'activityId' => $activity->nami_id,
                 'subactivityId' => $subactivity ? $subactivity->nami_id : null,
             ]));
-        } catch (NamiException $e) {
+        } catch (HttpException $e) {
             throw ValidationException::withMessages(['nami' => htmlspecialchars($e->getMessage())]);
         }
 

packages/laravel-nami

@@ -1 +1 @@
-Subproject commit d51b0ec3896ba1c20796df32d49da7578f584153
+Subproject commit 1359721d67b9e4c61599645c394f895718026369

phpstan.neon

@@ -459,61 +459,6 @@ parameters:
             count: 1
             path: packages/laravel-nami/src/Activity.php
 
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:activities\\(\\) has no return type specified\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:activities\\(\\) has parameter \\$groupId with no type specified\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:exception\\(\\) has parameter \\$requestData with no value type specified in iterable type array\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:exception\\(\\) has parameter \\$response with no value type specified in iterable type array\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:fetchData\\(\\) return type has no value type specified in iterable type array\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:member\\(\\) return type has no value type specified in iterable type array\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:putMember\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:putMember\\(\\) return type has no value type specified in iterable type array\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Method Zoomyboy\\\\LaravelNami\\\\Api\\:\\:singleMemberFallback\\(\\) return type has no value type specified in iterable type array\\.$#"
-            count: 1
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Unable to resolve the template type TKey in call to function collect$#"
-            count: 4
-            path: packages/laravel-nami/src/Api.php
-
-        -
-            message: "#^Unable to resolve the template type TValue in call to function collect$#"
-            count: 4
-            path: packages/laravel-nami/src/Api.php
-
         -
             message: "#^Property Zoomyboy\\\\LaravelNami\\\\Authentication\\\\FakeCookie\\:\\:\\$authenticated type has no value type specified in iterable type array\\.$#"
             count: 1

tests/Feature/Member/UpdateTest.php

@@ -41,7 +41,7 @@ class UpdateTest extends TestCase
 
     public function testItChecksVersion(): void
     {
-        $this->login()->loginNami();
+        $this->login()->loginNami()->withoutExceptionHandling();
         $member = $this->member();
         $member->update(['version' => 43]);
         $this->fakeRequest();