fix: fix compatibility with phpspec/prophecy v1.10

Firestore/tests/Unit/FirestoreClientTest.php

@@ -513,23 +513,6 @@ public function testRunTransactionExceedsMaxRetriesLowerLimit()
         }, ['maxRetries' => 2]);
     }
 
-    /**
-     * @expectedException RuntimeException
-     */
-    public function testInvalidNestedTransaction()
-    {
-        $transactionId = 'foobar';
-        $this->connection->beginTransaction(Argument::any())->willReturn([
-            'transaction' => $transactionId
-        ]);
-
-        $this->client->___setProperty('connection', $this->connection->reveal());
-
-        $this->client->runTransaction(function ($t) {
-            $this->client->runTransaction($this->noop());
-        });
-    }
-
     public function testGeoPoint()
     {
         $lat = 1.1;

Spanner/tests/Snippet/ArrayTypeTest.php

@@ -23,13 +23,13 @@
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Spanner\Admin\Instance\V1\InstanceAdminClient;
 use Google\Cloud\Spanner\ArrayType;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Instance;
 use Google\Cloud\Spanner\Session\Session;
 use Google\Cloud\Spanner\Session\SessionPoolInterface;
 use Google\Cloud\Spanner\StructType;
 use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Prophecy\Argument;
 
 /**
@@ -40,6 +40,7 @@ class ArrayTypeTest extends SnippetTestCase
 {
     use GrpcTestTrait;
     use OperationRefreshTrait;
+    use StubCreationTrait;
 
     const PROJECT = 'my-awesome-project';
     const DATABASE = 'my-database';
@@ -64,7 +65,7 @@ public function setUp()
         $sessionPool->setDatabase(Argument::any())
             ->willReturn(null);
 
-        $this->connection = $this->prophesize(ConnectionInterface::class);
+        $this->connection = $this->getConnStub();
         $this->database = TestHelpers::stub(Database::class, [
             $this->connection->reveal(),
             $instance->reveal(),

Spanner/tests/Snippet/Batch/BatchClientTest.php

@@ -29,6 +29,7 @@
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Operation;
 use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Prophecy\Argument;
 
@@ -40,6 +41,7 @@ class BatchClientTest extends SnippetTestCase
 {
     use GrpcTestTrait;
     use OperationRefreshTrait;
+    use StubCreationTrait;
 
     const DATABASE = 'projects/my-awesome-project/instances/my-instance/databases/my-database';
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
@@ -52,7 +54,7 @@ public function setUp()
     {
         $this->checkAndSkipGrpcTests();
 
-        $this->connection = $this->prophesize(ConnectionInterface::class);
+        $this->connection = $this->getConnStub();
         $this->client = TestHelpers::stub(BatchClient::class, [
             new Operation($this->connection->reveal(), false),
             self::DATABASE

Spanner/tests/Snippet/Batch/BatchSnapshotTest.php

@@ -24,12 +24,12 @@
 use Google\Cloud\Spanner\Batch\BatchSnapshot;
 use Google\Cloud\Spanner\Batch\PartitionInterface;
 use Google\Cloud\Spanner\Batch\QueryPartition;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Operation;
 use Google\Cloud\Spanner\Result;
 use Google\Cloud\Spanner\Session\Session;
 use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Google\Cloud\Spanner\V1\SpannerClient;
 use Prophecy\Argument;
@@ -42,6 +42,7 @@ class BatchSnapshotTest extends SnippetTestCase
 {
     use GrpcTestTrait;
     use OperationRefreshTrait;
+    use StubCreationTrait;
 
     const DATABASE = 'projects/my-awesome-project/instances/my-instance/databases/my-database';
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
@@ -56,7 +57,7 @@ public function setUp()
     {
         $this->checkAndSkipGrpcTests();
 
-        $this->connection = $this->prophesize(ConnectionInterface::class);
+        $this->connection = $this->getConnStub();
 
         $sessData = SpannerClient::parseName(self::SESSION, 'session');
         $this->session = $this->prophesize(Session::class);

Spanner/tests/Snippet/Batch/QueryPartitionTest.php

@@ -22,8 +22,8 @@
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Spanner\Batch\BatchClient;
 use Google\Cloud\Spanner\Batch\QueryPartition;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\Operation;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Prophecy\Argument;
 
@@ -35,6 +35,7 @@ class QueryPartitionTest extends SnippetTestCase
 {
     use GrpcTestTrait;
     use PartitionSharedSnippetTestTrait;
+    use StubCreationTrait;
 
     const DATABASE = 'projects/my-awesome-project/instances/my-instance/databases/my-database';
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
@@ -54,7 +55,7 @@ public function setUp()
 
     public function testClass()
     {
-        $connection = $this->prophesize(ConnectionInterface::class);
+        $connection = $this->getConnStub();
         $connection->createSession(Argument::any())
             ->shouldBeCalledTimes(1)
             ->willReturn([

Spanner/tests/Snippet/Batch/ReadPartitionTest.php

@@ -22,9 +22,9 @@
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Spanner\Batch\BatchClient;
 use Google\Cloud\Spanner\Batch\ReadPartition;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\KeySet;
 use Google\Cloud\Spanner\Operation;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Prophecy\Argument;
 
@@ -38,6 +38,7 @@ class ReadPartitionTest extends SnippetTestCase
     use PartitionSharedSnippetTestTrait {
         provideGetters as private getters;
     }
+    use StubCreationTrait;
 
     const DATABASE = 'projects/my-awesome-project/instances/my-instance/databases/my-database';
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
@@ -62,7 +63,7 @@ public function setUp()
 
     public function testClass()
     {
-        $connection = $this->prophesize(ConnectionInterface::class);
+        $connection = $this->getConnStub();
         $connection->createSession(Argument::any())
             ->shouldBeCalledTimes(1)
             ->willReturn([

Spanner/tests/Snippet/BatchDmlResultTest.php

@@ -17,25 +17,26 @@
 
 namespace Google\Cloud\Spanner\Tests\Snippet;
 
-use Prophecy\Argument;
+use Google\Cloud\Core\LongRunning\LongRunningConnectionInterface;
+use Google\Cloud\Core\Testing\GrpcTestTrait;
+use Google\Cloud\Core\Testing\Snippet\SnippetTestCase;
+use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Core\TimeTrait;
+use Google\Cloud\Spanner\BatchDmlResult;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Instance;
-use Google\Cloud\Spanner\BatchDmlResult;
 use Google\Cloud\Spanner\Session\Session;
-use Google\Cloud\Core\Testing\TestHelpers;
-use Google\Cloud\Core\Testing\GrpcTestTrait;
-use Google\Cloud\Core\Testing\Snippet\SnippetTestCase;
 use Google\Cloud\Spanner\Session\SessionPoolInterface;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
-use Google\Cloud\Core\LongRunning\LongRunningConnectionInterface;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
+use Prophecy\Argument;
 
 /**
  * @group spanner
  */
 class BatchDmlResultTest extends SnippetTestCase
 {
     use GrpcTestTrait;
+    use StubCreationTrait;
     use TimeTrait;
 
     private $result;
@@ -66,7 +67,7 @@ public function setUp()
 
     public function testClass()
     {
-        $connection = $this->prophesize(ConnectionInterface::class);
+        $connection = $this->getConnStub();
         $connection->executeBatchDml(Argument::any())
             ->shouldBeCalled()
             ->willReturn([

Spanner/tests/Snippet/CommitTimestampTest.php

@@ -22,8 +22,8 @@
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Core\Timestamp;
 use Google\Cloud\Spanner\CommitTimestamp;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\SpannerClient;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Prophecy\Argument;
 
 /**
@@ -33,6 +33,7 @@
 class CommitTimestampTest extends SnippetTestCase
 {
     use GrpcTestTrait;
+    use StubCreationTrait;
 
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
 
@@ -46,7 +47,7 @@ public function testClass()
         $id = 'abc';
 
         $client = TestHelpers::stub(SpannerClient::class);
-        $conn = $this->prophesize(ConnectionInterface::class);
+        $conn = $this->getConnStub();
         $conn->createSession(Argument::any())
             ->willReturn([
                 'name' => self::SESSION

Spanner/tests/Snippet/DatabaseTest.php

@@ -26,7 +26,6 @@
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Spanner\Admin\Database\V1\DatabaseAdminClient;
 use Google\Cloud\Spanner\Admin\Instance\V1\InstanceAdminClient;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Instance;
 use Google\Cloud\Spanner\KeySet;
@@ -36,6 +35,7 @@
 use Google\Cloud\Spanner\Snapshot;
 use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
 use Google\Cloud\Spanner\Tests\ResultGeneratorTrait;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Google\Cloud\Spanner\Transaction;
 use Prophecy\Argument;
@@ -49,6 +49,7 @@ class DatabaseTest extends SnippetTestCase
     use GrpcTestTrait;
     use OperationRefreshTrait;
     use ResultGeneratorTrait;
+    use StubCreationTrait;
 
     const PROJECT = 'my-awesome-project';
     const DATABASE = 'my-database';
@@ -74,7 +75,7 @@ public function setUp()
             ->willReturn(null);
         $sessionPool->clear()->willReturn(null);
 
-        $this->connection = $this->prophesize(ConnectionInterface::class);
+        $this->connection = $this->getConnStub();
         $this->database = TestHelpers::stub(Database::class, [
             $this->connection->reveal(),
             $instance->reveal(),

Spanner/tests/Snippet/InstanceConfigurationTest.php

@@ -21,8 +21,8 @@
 use Google\Cloud\Core\Testing\Snippet\SnippetTestCase;
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Spanner\Admin\Instance\V1\InstanceAdminClient;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\InstanceConfiguration;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Prophecy\Argument;
 
 /**
@@ -32,6 +32,7 @@
 class InstanceConfigurationTest extends SnippetTestCase
 {
     use GrpcTestTrait;
+    use StubCreationTrait;
 
     const PROJECT = 'my-awesome-project';
     const CONFIG = 'regional-europe-west';
@@ -43,7 +44,7 @@ public function setUp()
     {
         $this->checkAndSkipGrpcTests();
 
-        $this->connection = $this->prophesize(ConnectionInterface::class);
+        $this->connection = $this->getConnStub();
         $this->config = TestHelpers::stub(InstanceConfiguration::class, [
             $this->connection->reveal(),
             self::PROJECT,

Spanner/tests/Snippet/InstanceTest.php

@@ -26,10 +26,10 @@
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Spanner\Admin\Database\V1\DatabaseAdminClient;
 use Google\Cloud\Spanner\Admin\Instance\V1\InstanceAdminClient;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Instance;
 use Google\Cloud\Spanner\InstanceConfiguration;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Prophecy\Argument;
 
 /**
@@ -39,6 +39,7 @@
 class InstanceTest extends SnippetTestCase
 {
     use GrpcTestTrait;
+    use StubCreationTrait;
 
     const PROJECT = 'my-awesome-project';
     const INSTANCE = 'my-instance';
@@ -51,7 +52,7 @@ public function setUp()
     {
         $this->checkAndSkipGrpcTests();
 
-        $this->connection = $this->prophesize(ConnectionInterface::class);
+        $this->connection = $this->getConnStub();
         $this->instance = TestHelpers::stub(Instance::class, [
             $this->connection->reveal(),
             $this->prophesize(LongRunningConnectionInterface::class)->reveal(),

Spanner/tests/Snippet/SnapshotTest.php

@@ -20,12 +20,12 @@
 use Google\Cloud\Core\Testing\GrpcTestTrait;
 use Google\Cloud\Core\Testing\Snippet\SnippetTestCase;
 use Google\Cloud\Core\Testing\TestHelpers;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Operation;
 use Google\Cloud\Spanner\Session\Session;
 use Google\Cloud\Spanner\Snapshot;
 use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Google\Cloud\Spanner\Timestamp;
 
 /**
@@ -35,6 +35,7 @@ class SnapshotTest extends SnippetTestCase
 {
     use GrpcTestTrait;
     use OperationRefreshTrait;
+    use StubCreationTrait;
 
     const TRANSACTION = 'my-transaction';
 
@@ -45,7 +46,7 @@ public function setUp()
     {
         $this->checkAndSkipGrpcTests();
 
-        $this->connection = $this->prophesize(ConnectionInterface::class);
+        $this->connection = $this->getConnStub();
         $operation = $this->prophesize(Operation::class);
         $session = $this->prophesize(Session::class);
 

Spanner/tests/Snippet/SpannerClientTest.php

@@ -27,7 +27,6 @@
 use Google\Cloud\Spanner\Batch\BatchClient;
 use Google\Cloud\Spanner\Bytes;
 use Google\Cloud\Spanner\CommitTimestamp;
-use Google\Cloud\Spanner\Connection\ConnectionInterface;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Date;
 use Google\Cloud\Spanner\Duration;
@@ -36,6 +35,7 @@
 use Google\Cloud\Spanner\KeyRange;
 use Google\Cloud\Spanner\KeySet;
 use Google\Cloud\Spanner\SpannerClient;
+use Google\Cloud\Spanner\Tests\StubCreationTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Prophecy\Argument;
 
@@ -45,6 +45,7 @@
 class SpannerClientTest extends SnippetTestCase
 {
     use GrpcTestTrait;
+    use StubCreationTrait;
 
     const PROJECT = 'my-awesome-project';
     const CONFIG = 'foo';
@@ -57,7 +58,7 @@ public function setUp()
     {
         $this->checkAndSkipGrpcTests();
 
-        $this->connection = $this->prophesize(ConnectionInterface::class);
+        $this->connection = $this->getConnStub();
         $this->client = TestHelpers::stub(SpannerClient::class);
         $this->client->___setProperty('connection', $this->connection->reveal());
     }