fix snippet and cs tests

Author: bshaffer

Core/src/ApiHelperTrait.php

@@ -19,8 +19,8 @@
 
 use Google\ApiCore\ArrayTrait;
 use Google\ApiCore\Options\CallOptions;
-use Google\Protobuf\NullValue;
 use Google\Protobuf\Internal\Message;
+use Google\Protobuf\NullValue;
 
 /**
  * @internal

Spanner/src/Operation.php

@@ -34,10 +34,10 @@
 use Google\Cloud\Spanner\V1\ReadRequest;
 use Google\Cloud\Spanner\V1\RequestOptions;
 use Google\Cloud\Spanner\V1\RollbackRequest;
-use Google\Cloud\Spanner\V1\TransactionOptions\ReadWrite;
-use Google\Cloud\Spanner\V1\Type;
 use Google\Cloud\Spanner\V1\TransactionOptions;
+use Google\Cloud\Spanner\V1\TransactionOptions\ReadWrite;
 use Google\Cloud\Spanner\V1\TransactionSelector;
+use Google\Cloud\Spanner\V1\Type;
 use Google\Protobuf\Duration;
 use Google\Rpc\Code;
 use InvalidArgumentException;

Spanner/src/Serializer.php

@@ -2,12 +2,10 @@
 
 namespace Google\Cloud\Spanner;
 
-use Google\ApiCore\GPBType;
 use Google\ApiCore\Serializer as ApiCoreSerializer;
 use Google\Cloud\Core\ApiHelperTrait;
 use Google\Cloud\Spanner\V1\PartialResultSet;
 use Google\Cloud\Spanner\V1\Type;
-use Google\Protobuf\Internal\MapField;
 use Google\Protobuf\Internal\RepeatedField as DeprecatedRepeatedField;
 use Google\Protobuf\RepeatedField;
 use Google\Protobuf\Struct;
@@ -71,7 +69,20 @@ public function __construct()
                 return $v;
             },
             'google.protobuf.Value' => function ($v) {
-                if (!is_array($v)) {
+                if (!is_array($v) || (
+                    !isset($v['nullValue']) &&
+                  !isset($v['null_value']) &&
+                  !isset($v['numberValue']) &&
+                  !isset($v['number_value']) &&
+                  !isset($v['stringValue']) &&
+                  !isset($v['string_value']) &&
+                  !isset($v['boolValue']) &&
+                  !isset($v['bool_value']) &&
+                  !isset($v['structValue']) &&
+                  !isset($v['struct_value']) &&
+                  !isset($v['listValue']) &&
+                  !isset($v['list_value'])
+                )) {
                     return $this->formatValueForApi($v);
                 }
                 return $v;

Spanner/src/TransactionalReadTrait.php

@@ -20,7 +20,6 @@
 use Google\Cloud\Spanner\Session\Session;
 use Google\Cloud\Spanner\Session\SessionPoolInterface;
 use Google\Cloud\Spanner\V1\TransactionOptions;
-use Google\Cloud\Spanner\V1\TransactionOptions\PBReadOnly;
 
 /**
  * Shared methods for reads inside a transaction.