resolve conflicts in src classes

Author: bshaffer

.github/run-package-tests.sh

@@ -15,6 +15,20 @@
 
 set -e
 
+# USAGE:
+#
+#     run-package-tests.sh [DIRECTORY] [PREFER_LOWEST]
+#
+# DIRECTORY:     Optionally pass in a component directory and only run the script
+#.               for that component.
+#
+# PREFER_LOWEST: can be "--prefer-lowest" or "--prefer-lowest-strict". When the
+#                "--prefer-lowest-strict" flag is set, local package dependencies
+#                are  installed according to their version number in
+#                `[Component]/VERSION`. This flag is set on the release PRs to
+#.               ensure the dependencies for the upcoming release will be
+#                configured correctly.
+
 DIRS=$(find * -maxdepth 0 -type d -name '[A-Z]*')
 PREFER_LOWEST=""
 if [ "$#" -eq 1 ]; then

Core/src/ApiHelperTrait.php

@@ -17,7 +17,6 @@
  */
 namespace Google\Cloud\Core;
 
-use Exception;
 use Google\ApiCore\ArrayTrait;
 use Google\ApiCore\Options\CallOptions;
 use Google\Protobuf\Internal\Message;

EventarcPublishing/src/V1/Client/PublisherClient.php

@@ -104,9 +104,7 @@ final class PublisherClient
     private const CODEGEN_NAME = 'gapic';
 
     /** The default scopes required by the service. */
-    public static $serviceScopes = [
-        'https://www.googleapis.com/auth/cloud-platform',
-    ];
+    public static $serviceScopes = ['https://www.googleapis.com/auth/cloud-platform'];
 
     private static function getClientDefaults()
     {
@@ -260,8 +258,10 @@ public function publish(PublishRequest $request, array $callOptions = []): Publi
      *
      * @throws ApiException Thrown if the API call fails.
      */
-    public function publishChannelConnectionEvents(PublishChannelConnectionEventsRequest $request, array $callOptions = []): PublishChannelConnectionEventsResponse
-    {
+    public function publishChannelConnectionEvents(
+        PublishChannelConnectionEventsRequest $request,
+        array $callOptions = []
+    ): PublishChannelConnectionEventsResponse {
         return $this->startApiCall('PublishChannelConnectionEvents', $request, $callOptions)->wait();
     }
 

Spanner/composer.json

@@ -6,7 +6,7 @@
     "require": {
         "php": "^8.1",
         "ext-grpc": "*",
-        "google/cloud-core": "^1.66",
+        "google/cloud-core": "^1.68",
         "google/gax": "^1.38.0"
     },
     "require-dev": {