chore: improve cleanup handling (#73)

* chore: improve cleanup handling

* Fix styling

* cleanup composer

* add test

* update tests

* ignore coverage

Author: pulkitjalan

.github/workflows/run-tests.yml

@@ -12,12 +12,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.3, 8.2, 8.1]
+        php: [8.3, 8.2, 8.1, 8.0]
         laravel: ["^11.0", "^10.0", "^9.0", "^8.0"]
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
           - laravel: "^11.0"
             php: 8.1
+          - laravel: "^11.0"
+            php: 8.0
+          - laravel: "^10.0"
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

composer.json

@@ -33,8 +33,6 @@
         }
     },
     "scripts": {
-        "analyse": "vendor/bin/phpstan analyse",
-        "baseline": "vendor/bin/phpstan analyse --generate-baseline",
         "test": "vendor/bin/pest"
     },
     "config": {

src/Client.php

@@ -98,11 +98,24 @@ public function make($service)
 
         $service = 'Google\\Service\\'.ucfirst(str_replace('_', '', $service));
 
-        if (class_exists($service)) {
-            return new $service($this->client);
+        try {
+            if (class_exists($service)) {
+                return new $service($this->client);
+            }
+            // catch any errors thrown when fetching the service
+            // this can be caused when the service was removed
+            // but the reference still exists in the auto loader
+            // @codeCoverageIgnoreStart
+        } catch (\ErrorException $e) {
+            if (str_contains($e->getMessage(), 'No such file or directory')) {
+                UnknownServiceException::throwForService($service, 0, $e);
+            }
+
+            throw $e;
+            // @codeCoverageIgnoreEnd
         }
 
-        throw new UnknownServiceException($service);
+        UnknownServiceException::throwForService($service);
     }
 
     /**

src/Exceptions/UnknownServiceException.php

@@ -2,7 +2,12 @@
 
 namespace PulkitJalan\Google\Exceptions;
 
+use Throwable;
+
 class UnknownServiceException extends \Exception
 {
-    //
+    public static function throwForService(string $service, int $code = 0, ?Throwable $previous = null)
+    {
+        throw new static("Unknown service [$service].", $code, $previous);
+    }
 }

tests/Unit/ClientTest.php

@@ -29,7 +29,17 @@
         ],
     ]);
 
-    expect('test')->toEqual($client->getClient()->getConfig('subject'));
+    expect($client->getClient()->getConfig('subject'))->toEqual('test');
+});
+
+test('client fallback to use application default credentials', function () {
+    $client = new Client([
+        'service' => [
+            'enable' => true,
+        ],
+    ]);
+
+    expect($client->getClient()->isUsingApplicationDefaultCredentials())->toBeTrue();
 });
 
 test('client sets prompt or approval_prompt', function () {
@@ -39,10 +49,10 @@
     ]);
 
     // default value should be empty
-    expect('auto')->toEqual($client->getClient()->getConfig('prompt'));
+    expect($client->getClient()->getConfig('prompt'))->toEqual('auto');
 
     // default value should be auto, since prompt is set, it should be ignored
-    expect('auto')->toEqual($client->getClient()->getConfig('approval_prompt'));
+    expect($client->getClient()->getConfig('approval_prompt'))->toEqual('auto');
 });
 
 test('client sets approval_prompt', function () {
@@ -51,10 +61,10 @@
     ]);
 
     // default value should be empty
-    expect('')->toEqual($client->getClient()->getConfig('prompt'));
+    expect($client->getClient()->getConfig('prompt'))->toBeEmpty();
 
     // default value should be auto
-    expect('consent')->toEqual($client->getClient()->getConfig('approval_prompt'));
+    expect($client->getClient()->getConfig('approval_prompt'))->toEqual('consent');
 });
 
 test('service make', function () {
@@ -68,18 +78,14 @@
 test('service make exception', function () {
     $client = new Client();
 
-    $this->expectException(UnknownServiceException::class);
-
     $client->make('storag');
-});
+})->throws(UnknownServiceException::class);
 
 test('magic method exception', function () {
     $client = new Client();
 
-    $this->expectException(BadMethodCallException::class);
-
     $client->getAuthTest();
-});
+})->throws(BadMethodCallException::class);
 
 test('no credentials', function () {
     $client = new Client();