Moved file to Client namespace

Author: kevinmeijer97

src/Services/PackagistClient.php src/Client/PackagistClient.phpsrc/Services/PackagistClient.php renamed to src/Client/PackagistClient.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace JustBetter\StatamicBase\Services;
+namespace JustBetter\StatamicBase\Client;
 
 use Composer\Semver\Semver;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
-use Throwable;
 
 class PackagistClient
 {
@@ -32,23 +31,24 @@ public function latestStableVersion(string $packageName): ?string
 
     public function isAvailable(): bool
     {
-        try {
-            $response = Http::timeout(5)->get('https://packagist.org/packages/justbetter/statamic-base.json');
-
-            return $response->successful();
-        } catch (Throwable) {
-            return false;
-        }
+        return rescue(
+            static function (): bool {
+                Http::timeout(5)
+                    ->get('https://packagist.org/packages/justbetter/statamic-base.json')
+                    ->throw();
+
+                return true;
+            },
+            false,
+        );
     }
 
     protected function fetchLatestStableVersion(string $packageName): ?string
     {
-        try {
-            $response = Http::timeout(5)->get("https://packagist.org/packages/{$packageName}.json");
-
-            if (! $response->successful()) {
-                return null;
-            }
+        return rescue(function () use ($packageName): ?string {
+            $response = Http::timeout(5)
+                ->get("https://packagist.org/packages/{$packageName}.json")
+                ->throw();
 
             /** @var array<string, mixed>|null $versions */
             $versions = $response->json('package.versions');
@@ -70,9 +70,7 @@ protected function fetchLatestStableVersion(string $packageName): ?string
             $sorted = Semver::rsort($stableVersions);
 
             return $sorted[0] ?? null;
-        } catch (Throwable) {
-            return null;
-        }
+        }, null);
     }
 
     protected function isStable(string $version): bool

src/ServiceProvider.php

@@ -3,12 +3,12 @@
 namespace JustBetter\StatamicBase;
 
 use Illuminate\Routing\Router;
+use JustBetter\StatamicBase\Client\PackagistClient;
 use JustBetter\StatamicBase\Http\Middleware\AuthorizePackages;
 use JustBetter\StatamicBase\Navigation\JustBetterNav;
 use JustBetter\StatamicBase\Services\IconFetcher;
 use JustBetter\StatamicBase\Services\InstalledPackageDiscovery;
 use JustBetter\StatamicBase\Services\PackageOverviewBuilder;
-use JustBetter\StatamicBase\Services\PackagistClient;
 use JustBetter\StatamicBase\Services\VersionComparator;
 use Statamic\Auth\Permission;
 use Statamic\CP\Navigation\Nav as Navigation;

src/Services/PackageOverviewBuilder.php

@@ -2,6 +2,7 @@
 
 namespace JustBetter\StatamicBase\Services;
 
+use JustBetter\StatamicBase\Client\PackagistClient;
 use JustBetter\StatamicBase\Data\DiscoveredPackage;
 use JustBetter\StatamicBase\Data\PackageOverview;
 use JustBetter\StatamicBase\Data\PackagesIndexData;

tests/Services/PackagistClientTest.php tests/Client/PackagistClientTest.phptests/Services/PackagistClientTest.php renamed to tests/Client/PackagistClientTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace JustBetter\StatamicBase\Tests\Services;
+namespace JustBetter\StatamicBase\Tests\Client;
 
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
-use JustBetter\StatamicBase\Services\PackagistClient;
+use JustBetter\StatamicBase\Client\PackagistClient;
 use JustBetter\StatamicBase\Tests\TestCase;
 use PHPUnit\Framework\Attributes\Test;
 

tests/Http/Controllers/PackagesControllerTest.php

@@ -5,9 +5,9 @@
 use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\Http;
 use Inertia\Testing\AssertableInertia;
+use JustBetter\StatamicBase\Client\PackagistClient;
 use JustBetter\StatamicBase\Services\InstalledPackageDiscovery;
 use JustBetter\StatamicBase\Services\PackageOverviewBuilder;
-use JustBetter\StatamicBase\Services\PackagistClient;
 use JustBetter\StatamicBase\Services\VersionComparator;
 use JustBetter\StatamicBase\Tests\TestCase;
 use PHPUnit\Framework\Attributes\Test;

tests/Services/PackageOverviewBuilderTest.php

@@ -4,10 +4,10 @@
 
 use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\Http;
+use JustBetter\StatamicBase\Client\PackagistClient;
 use JustBetter\StatamicBase\Enums\UpdateStatus;
 use JustBetter\StatamicBase\Services\InstalledPackageDiscovery;
 use JustBetter\StatamicBase\Services\PackageOverviewBuilder;
-use JustBetter\StatamicBase\Services\PackagistClient;
 use JustBetter\StatamicBase\Services\VersionComparator;
 use JustBetter\StatamicBase\Tests\TestCase;
 use PHPUnit\Framework\Attributes\Test;