cleanup from code review and tests

Author: bshaffer

Core/src/LongRunning/LongRunningClientConnection.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016 Google Inc.
+ * Copyright 2025 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Core/src/LongRunning/LongRunningOperation.php

@@ -254,7 +254,7 @@ public function reload(array $options = [])
         $this->result = null;
         $this->error = null;
 
-        if (isset($res['done']) && $res['done'] && isset($res['metadata']['typeUrl'])) {
+        if ($res['done'] ?? false && isset($res['metadata']['typeUrl'])) {
             $type = $res['metadata']['typeUrl'];
             $this->result = $this->executeDoneCallback($type, $res['response']);
             $this->error = $res['error'] ?? null;

Core/src/TimeTrait.php

@@ -77,7 +77,7 @@ private function formatTimeAsString(\DateTimeInterface $dateTime, $ns)
             $dateTime = clone $dateTime;
         }
         $dateTime = $dateTime->setTimeZone(new \DateTimeZone('UTC'));
-        if ($ns === null) {
+        if (is_null($ns)) {
             return $dateTime->format(Timestamp::FORMAT);
         } else {
             return sprintf(

Core/tests/Unit/ApiHelperTraitTest.php

@@ -286,10 +286,10 @@ public function testValidateOptionsCustomSerializer($options, $optionTypes, $exp
         $numMessages = count(array_filter($expected, fn ($optionType) => $optionType instanceof Message));
         $serializer = $this->prophesize(Serializer::class);
         $serializer->decodeMessage(Argument::type(Message::class), Argument::type('array'))
-        ->shouldBeCalledTimes($numMessages)
-        ->will(function ($args) {
+            ->shouldBeCalledTimes($numMessages)
+            ->will(function ($args) {
                 return (new Serializer())->decodeMessage($args[0], $args[1]);
-        });
+            });
 
         // test using an implementation with custom serializer
         $implementation = new ApiHelpersTraitImpl();

Spanner/composer.json

@@ -44,16 +44,5 @@
             "Testing\\Data\\": "tests/data/generated/Testing/Data",
             "GPBMetadata\\Data\\": "tests/data/generated/GPBMetadata/Data"
         }
-    },
-    "repositories": {
-        "google-cloud": {
-            "type": "path",
-            "url": "../Core",
-            "options": {
-                "versions": {
-                    "google/cloud-core": "1.60"
-                }
-            }
-        }
     }
 }

Spanner/src/Middleware/SpannerMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2025 Google LLC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Spanner/src/Serializer.php

@@ -1,4 +1,34 @@
 <?php
+/*
+ * Copyright 2025 Google LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 namespace Google\Cloud\Spanner;