Fix CI failures: Pint formatting, test compatibility, and team plugins view

simonhamp · claude · simonhamp · commit 7d8910ea9187 · 2026-03-24T22:03:29.000Z
Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/app/Livewire/Customer/PurchasedPlugins/Index.php b/app/Livewire/Customer/PurchasedPlugins/Index.php
@@ -3,6 +3,7 @@
 namespace App\Livewire\Customer\PurchasedPlugins;
 
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Collection as SupportCollection;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
@@ -27,6 +28,32 @@ public function pluginLicenseKey(): string
         return auth()->user()->getPluginLicenseKey();
     }
 
+    #[Computed]
+    public function teamPlugins(): SupportCollection
+    {
+        $membership = auth()->user()->activeTeamMembership();
+
+        if (! $membership) {
+            return collect();
+        }
+
+        return $membership->team->owner->pluginLicenses()
+            ->active()
+            ->with('plugin')
+            ->get()
+            ->pluck('plugin')
+            ->filter()
+            ->unique('id');
+    }
+
+    #[Computed]
+    public function teamOwnerName(): ?string
+    {
+        $membership = auth()->user()->activeTeamMembership();
+
+        return $membership?->team->owner->display_name;
+    }
+
     public function rotateKey(): void
     {
         auth()->user()->regeneratePluginLicenseKey();
diff --git a/app/Models/Team.php b/app/Models/Team.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Enums\TeamUserStatus;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -40,7 +41,7 @@ public function users(): HasMany
     public function activeUsers(): HasMany
     {
         return $this->hasMany(TeamUser::class)
-            ->where('status', \App\Enums\TeamUserStatus::Active);
+            ->where('status', TeamUserStatus::Active);
     }
 
     /**
@@ -49,7 +50,7 @@ public function activeUsers(): HasMany
     public function pendingInvitations(): HasMany
     {
         return $this->hasMany(TeamUser::class)
-            ->where('status', \App\Enums\TeamUserStatus::Pending);
+            ->where('status', TeamUserStatus::Pending);
     }
 
     public function activeUserCount(): int
diff --git a/config/database.php b/config/database.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Str;
+use Pdo\Mysql;
 
 return [
 
@@ -59,7 +60,7 @@
             'strict' => true,
             'engine' => null,
             'options' => extension_loaded('pdo_mysql') ? array_filter([
-                Pdo\Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+                Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
 
diff --git a/database/factories/TeamFactory.php b/database/factories/TeamFactory.php
@@ -2,11 +2,12 @@
 
 namespace Database\Factories;
 
+use App\Models\Team;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Team>
+ * @extends Factory<Team>
  */
 class TeamFactory extends Factory
 {
diff --git a/database/factories/TeamUserFactory.php b/database/factories/TeamUserFactory.php
@@ -5,11 +5,12 @@
 use App\Enums\TeamUserRole;
 use App\Enums\TeamUserStatus;
 use App\Models\Team;
+use App\Models\TeamUser;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\TeamUser>
+ * @extends Factory<TeamUser>
  */
 class TeamUserFactory extends Factory
 {
diff --git a/resources/views/livewire/customer/purchased-plugins.blade.php b/resources/views/livewire/customer/purchased-plugins.blade.php
@@ -78,4 +78,54 @@
             <flux:button variant="primary" href="{{ route('plugins.marketplace') }}">Browse Plugins</flux:button>
         </x-customer.empty-state>
     @endif
+
+    {{-- Team Plugins --}}
+    @if($this->teamPlugins->isNotEmpty())
+        <flux:heading class="mb-3 mt-8">
+            Team Plugins
+            <span class="text-sm font-normal text-zinc-500 dark:text-white/70">— shared by {{ $this->teamOwnerName }}</span>
+        </flux:heading>
+        <flux:table>
+            <flux:table.columns>
+                <flux:table.column>Plugin</flux:table.column>
+                <flux:table.column>Access</flux:table.column>
+            </flux:table.columns>
+
+            <flux:table.rows>
+                @foreach($this->teamPlugins as $plugin)
+                    <flux:table.row :key="'team-' . $plugin->id">
+                        <flux:table.cell>
+                            <div class="flex items-center gap-3">
+                                <div class="shrink-0">
+                                    @if($plugin->hasLogo())
+                                        <img src="{{ $plugin->getLogoUrl() }}" alt="{{ $plugin->name }}" class="size-10 rounded-lg object-cover">
+                                    @elseif($plugin->hasGradientIcon())
+                                        <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br {{ $plugin->getGradientClasses() }} text-white">
+                                            <x-dynamic-component :component="'heroicon-o-' . $plugin->icon_name" class="size-5" />
+                                        </div>
+                                    @else
+                                        <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-indigo-500 to-purple-600 text-white">
+                                            <x-vaadin-plug class="size-5" />
+                                        </div>
+                                    @endif
+                                </div>
+                                <div>
+                                    <a href="{{ route('plugins.show', $plugin->routeParams()) }}" class="font-medium text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300">
+                                        {{ $plugin->name }}
+                                    </a>
+                                    @if($plugin->description)
+                                        <flux:text class="text-xs line-clamp-1">{{ $plugin->description }}</flux:text>
+                                    @endif
+                                </div>
+                            </div>
+                        </flux:table.cell>
+
+                        <flux:table.cell>
+                            <x-customer.status-badge status="Team" />
+                        </flux:table.cell>
+                    </flux:table.row>
+                @endforeach
+            </flux:table.rows>
+        </flux:table>
+    @endif
 </div>
diff --git a/tests/Feature/CustomerPluginReviewChecksTest.php b/tests/Feature/CustomerPluginReviewChecksTest.php
@@ -23,6 +23,7 @@ public function submitting_a_plugin_runs_review_checks(): void
 
         $user = User::factory()->create([
             'github_id' => '12345',
+            'github_token' => encrypt('fake-token'),
         ]);
         DeveloperAccount::factory()->withAcceptedTerms()->create([
             'user_id' => $user->id,
@@ -45,7 +46,7 @@ public function submitting_a_plugin_runs_review_checks(): void
                 'content' => base64_encode("# Test Plugin\n\nSupport: dev@testplugin.io"),
                 'encoding' => 'base64',
             ]),
-            "{$base}/contents/composer.json" => Http::response([
+            "{$base}/contents/composer.json*" => Http::response([
                 'content' => base64_encode($composerJson),
                 'encoding' => 'base64',
             ]),
@@ -55,6 +56,9 @@ public function submitting_a_plugin_runs_review_checks(): void
             "{$base}/tags*" => Http::response([]),
             "https://raw.githubusercontent.com/{$repoSlug}/*" => Http::response('', 404),
 
+            // Webhook creation
+            "{$base}/hooks" => Http::response(['id' => 1], 201),
+
             // ReviewPluginRepository calls
             $base => Http::response(['default_branch' => 'main']),
             "{$base}/git/trees/main*" => Http::response([
@@ -103,6 +107,7 @@ public function plugin_submitted_email_includes_failing_checks(): void
 
         $user = User::factory()->create([
             'github_id' => '12345',
+            'github_token' => encrypt('fake-token'),
         ]);
         DeveloperAccount::factory()->withAcceptedTerms()->create([
             'user_id' => $user->id,
@@ -121,7 +126,7 @@ public function plugin_submitted_email_includes_failing_checks(): void
                 'content' => base64_encode('# Bare Plugin'),
                 'encoding' => 'base64',
             ]),
-            "{$base}/contents/composer.json" => Http::response([
+            "{$base}/contents/composer.json*" => Http::response([
                 'content' => base64_encode($composerJson),
                 'encoding' => 'base64',
             ]),
@@ -131,6 +136,9 @@ public function plugin_submitted_email_includes_failing_checks(): void
             "{$base}/tags*" => Http::response([]),
             "https://raw.githubusercontent.com/{$repoSlug}/*" => Http::response('', 404),
 
+            // Webhook creation
+            "{$base}/hooks" => Http::response(['id' => 1], 201),
+
             $base => Http::response(['default_branch' => 'main']),
             "{$base}/git/trees/main*" => Http::response([
                 'tree' => [
diff --git a/tests/Feature/SendMaxToUltraAnnouncementTest.php b/tests/Feature/SendMaxToUltraAnnouncementTest.php
@@ -7,6 +7,7 @@
 use App\Notifications\MaxToUltraAnnouncement;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Notification;
+use Laravel\Cashier\SubscriptionItem;
 use Tests\TestCase;
 
 class SendMaxToUltraAnnouncementTest extends TestCase
@@ -36,7 +37,7 @@ private function createPaidMaxSubscription(User $user, ?string $priceId = null):
                 'is_comped' => false,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => $price,
@@ -58,7 +59,7 @@ private function createCompedMaxSubscription(User $user): \Laravel\Cashier\Subsc
                 'is_comped' => true,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => Subscription::Max->stripePriceId(),
@@ -80,7 +81,7 @@ private function createProSubscription(User $user): \Laravel\Cashier\Subscriptio
                 'is_comped' => false,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => Subscription::Pro->stripePriceId(),
@@ -101,7 +102,7 @@ private function createCompedUltraSubscription(User $user): \Laravel\Cashier\Sub
                 'stripe_price' => self::COMPED_ULTRA_PRICE_ID,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => self::COMPED_ULTRA_PRICE_ID,
diff --git a/tests/Feature/SendUltraLicenseHolderPromotionTest.php b/tests/Feature/SendUltraLicenseHolderPromotionTest.php
@@ -8,6 +8,7 @@
 use App\Notifications\UltraLicenseHolderPromotion;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Notification;
+use Laravel\Cashier\SubscriptionItem;
 use Tests\TestCase;
 
 class SendUltraLicenseHolderPromotionTest extends TestCase
@@ -35,7 +36,7 @@ private function createActiveSubscription(User $user, string $priceId): \Laravel
                 'is_comped' => false,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => $priceId,
diff --git a/tests/Feature/SendUltraUpgradePromotionTest.php b/tests/Feature/SendUltraUpgradePromotionTest.php
@@ -7,6 +7,7 @@
 use App\Notifications\UltraUpgradePromotion;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Notification;
+use Laravel\Cashier\SubscriptionItem;
 use Tests\TestCase;
 
 class SendUltraUpgradePromotionTest extends TestCase
@@ -34,7 +35,7 @@ private function createSubscription(User $user, string $priceId, bool $isComped
                 'is_comped' => $isComped,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => $priceId,
diff --git a/tests/Feature/UltraPluginAccessTest.php b/tests/Feature/UltraPluginAccessTest.php
@@ -11,7 +11,9 @@
 use App\Models\Team;
 use App\Models\TeamUser;
 use App\Models\User;
+use App\Services\CartService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Laravel\Cashier\SubscriptionItem;
 use Tests\TestCase;
 
 class UltraPluginAccessTest extends TestCase
@@ -38,7 +40,7 @@ private function createCompedUltraSubscription(User $user): \Laravel\Cashier\Sub
                 'stripe_price' => self::COMPED_ULTRA_PRICE_ID,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => self::COMPED_ULTRA_PRICE_ID,
@@ -60,7 +62,7 @@ private function createPaidMaxSubscription(User $user): \Laravel\Cashier\Subscri
                 'is_comped' => false,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => Subscription::Max->stripePriceId(),
@@ -82,7 +84,7 @@ private function createCompedMaxSubscription(User $user): \Laravel\Cashier\Subsc
                 'is_comped' => true,
             ]);
 
-        \Laravel\Cashier\SubscriptionItem::factory()
+        SubscriptionItem::factory()
             ->for($subscription, 'subscription')
             ->create([
                 'stripe_price' => Subscription::Max->stripePriceId(),
@@ -189,7 +191,7 @@ public function test_zero_cart_skips_stripe_and_creates_licenses(): void
 
         $this->actingAs($user);
 
-        $cartService = resolve(\App\Services\CartService::class);
+        $cartService = resolve(CartService::class);
         $cart = $cartService->getCart($user);
         $cartService->addPlugin($cart, $plugin);
 
@@ -225,7 +227,7 @@ public function test_free_checkout_does_not_create_duplicate_licenses(): void
 
         $this->actingAs($user);
 
-        $cartService = resolve(\App\Services\CartService::class);
+        $cartService = resolve(CartService::class);
         $cart = $cartService->getCart($user);
         $cartService->addPlugin($cart, $plugin);
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\Models;`
`4`	`4`
	`5`	`+use App\Enums\TeamUserStatus;`
`5`	`6`	`use Illuminate\Database\Eloquent\Factories\HasFactory;`
`6`	`7`	`use Illuminate\Database\Eloquent\Model;`
`7`	`8`	`use Illuminate\Database\Eloquent\Relations\BelongsTo;`
`@@ -40,7 +41,7 @@ public function users(): HasMany`
`40`	`41`	`public function activeUsers(): HasMany`
`41`	`42`	`{`
`42`	`43`	`return $this->hasMany(TeamUser::class)`
`43`		`- ->where('status', \App\Enums\TeamUserStatus::Active);`
	`44`	`+ ->where('status', TeamUserStatus::Active);`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`/**`
`@@ -49,7 +50,7 @@ public function activeUsers(): HasMany`
`49`	`50`	`public function pendingInvitations(): HasMany`
`50`	`51`	`{`
`51`	`52`	`return $this->hasMany(TeamUser::class)`
`52`		`- ->where('status', \App\Enums\TeamUserStatus::Pending);`
	`53`	`+ ->where('status', TeamUserStatus::Pending);`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`public function activeUserCount(): int`