chore(tests): [PubSub] run rest tests against the emulator

.github/workflows/system-tests-pubsub-emulator.yaml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - run: ./.github/emulator/start-emulator.sh pubsub 413.0.0-emulators
+      - run: ./.github/emulator/start-emulator.sh pubsub
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

PubSub/tests/System/PubSubTestCase.php

@@ -34,13 +34,14 @@ public function clientProvider()
     {
         self::setUpTestFixtures();
 
-        $result = [
+        if (is_null(self::$grpcClient)) {
+            return ['rest' => [self::$restClient]];
+        }
+
+        return [
             'grpc' => [self::$grpcClient],
+            'rest' => [self::$restClient],
         ];
-        if (!self::isEmulatorUsed()) {
-            $result['rest'] = [self::$restClient];
-        }
-        return $result;
     }
 
     /**
@@ -53,14 +54,16 @@ public static function setUpTestFixtures(): void
         }
 
         $keyFilePath = getenv('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH');
-        self::$restClient = new PubSubClientRest([
+        self::$restClient = new PubSubClient([
             'credentials' => $keyFilePath,
             'transport' => 'rest',
         ]);
-        self::$grpcClient = new PubSubClientGrpc([
-            'credentials' => $keyFilePath,
-            'transport' => 'grpc',
-        ]);
+        if (extension_loaded('grpc')) {
+            self::$grpcClient = new PubSubClient([
+                'credentials' => $keyFilePath,
+                'transport' => 'grpc',
+            ]);
+        }
         self::setUsingEmulatorForClassPrefix((bool) getenv('PUBSUB_EMULATOR_HOST'));
         self::setupQueue();
         self::$hasSetUp = true;
@@ -105,7 +108,3 @@ public static function topicAndSubscription(PubSubClient $client, array $topicCo
     }
 }
 
-//@codingStandardsIgnoreStart
-class PubSubClientRest extends PubSubClient {}
-class PubSubClientGrpc extends PubSubClient {}
-//@codingStandardsIgnoreEnd