googleapis · bshaffer · Jul 30, 2024 · Jul 30, 2024 · Jul 31, 2024 · Jul 31, 2024
diff --git a/Core/src/LongRunning/LongRunningOperationManager.php b/Core/src/LongRunning/LongRunningOperationManager.php
diff --git a/Core/src/LongRunning/LongRunningOperationTrait.php b/Core/src/LongRunning/LongRunningOperationTrait.php
diff --git a/Core/tests/Unit/LongRunning/OperationResponseTraitTest.php b/Core/tests/Unit/LongRunning/OperationResponseTraitTest.php
@@ -167,47 +167,6 @@ public function testLroCallable()
         $expected = 'any|all|1';
         $this->assertEquals($expected, $got);
     }
-
-    public function testLongRunningOperationManager()
-    {
-        $this->checkAndSkipTest([
-            DatabaseAdminClient::class,
-        ]);
-        $result = new AuthorizationInfo([
-            'permission' => 'all',
-            'granted' => true,
-            'resource' => 'any',
-        ]);
-        $meta = new RequestMetadata([
-            'caller_ip' => '127.8.9.10',
-        ]);
-        $response = new Response(self::METADATA_TYPE, $meta, self::RESULT_TYPE, $result);
-        $operation = new OperationResponse(self::OPERATION_NAME, null, ['lastProtoResponse' => $response]);
-
-        $requestHandler = $this->prophesize(RequestHandler::class);
-        $databaseAdminClient = $this->prophesize(DatabaseAdminClient::class);
-        $requestHandler->getClientObject(Argument::any())->willReturn($databaseAdminClient);
-        $databaseAdminClient->resumeOperation(Argument::cetera())->willReturn($operation);
-        $callables = [
-            [
-                'typeUrl' => self::METADATA_TYPE,
-                'callable' => function ($result) {
-                    return implode('|', [$result['resource'], $result['permission'], $result['granted']]);
-                }
-            ]
-        ];
-        $lro = new LongRunningOperationManager(
-            $requestHandler->reveal(),
-            $this->serializer,
-            $callables,
-            $this->lroResponseMappers,
-            DatabaseAdminClient::class,
-            self::OPERATION_NAME
-        );
-        $got = $lro->result();
-        $expected = 'any|all|1';
-        $this->assertEquals($expected, $got);
-    }
 }
 
 //@codingStandardsIgnoreStart

diff --git a/Spanner/MIGRATING.md b/Spanner/MIGRATING.md
@@ -98,7 +98,7 @@ however the underlying `LongRunningOperation` class has changed.
 // In V1, this used to return an instance of Google\Cloud\Core\LongRunning\LongRunningOperation.
 $lro = $instance->create($configuration);
 
-// In V2, this will return an instance of Google\Cloud\Core\LongRunning\LongRunningOperationManager.
+// In V2, this will return an instance of Google\ApiCore\OperationResponse.
 $lro = $instance->create($configuration);
 
 // Both the classes share the same functionality, so the following methods will work for both versions.

diff --git a/Spanner/composer.json b/Spanner/composer.json
@@ -7,7 +7,7 @@
         "php": "^8.0",
         "ext-grpc": "*",
         "google/cloud-core": "^1.60.0",
-        "google/gax": "^1.34.0"
+        "google/gax": "dev-result-function as 1.40.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",
@@ -16,7 +16,8 @@
         "phpdocumentor/reflection": "^5.3.3",
         "phpdocumentor/reflection-docblock": "^5.3",
         "erusev/parsedown": "^1.6",
-        "google/cloud-pubsub": "^2.0"
+        "google/cloud-pubsub": "^2.0",
+        "dg/bypass-finals": "^1.7"
     },
     "suggest": {
         "ext-protobuf": "Provides a significant increase in throughput over the pure PHP protobuf implementation. See https://cloud.google.com/php/grpc for installation instructions.",

diff --git a/Spanner/phpunit.xml.dist b/Spanner/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/Unit/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <coverage>
     <include>
       <directory suffix=".php">src</directory>