Merge branch 'main' into spanner-v2-owlbot-updates

Author: bshaffer

.github/run-package-tests.sh

@@ -45,7 +45,7 @@ FAILED_FILE=$(mktemp -d)/failed
 for DIR in ${DIRS}; do {
     cp ${DIR}/composer.json ${DIR}/composer-local.json
     # Update composer to use local packages
-    for i in CommonProtos,common-protos,4.0 BigQuery,cloud-bigquery Core,cloud-core Logging,cloud-logging PubSub,cloud-pubsub Storage,cloud-storage ShoppingCommonProtos,shopping-common-protos GeoCommonProtos,geo-common-protos,0.1; do
+    for i in CommonProtos,common-protos,4.100 BigQuery,cloud-bigquery Core,cloud-core Logging,cloud-logging PubSub,cloud-pubsub Storage,cloud-storage ShoppingCommonProtos,shopping-common-protos GeoCommonProtos,geo-common-protos,0.1; do
         IFS=","; set -- $i;
         if grep -q "\"google/$2\":" ${DIR}/composer.json; then
             # determine local package version

.github/workflows/conformance-tests-bigtable-emulator.yaml

@@ -0,0 +1,58 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Github action job to test core java library features on
+# downstream client libraries before they are released.
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'Bigtable/**'
+      - '.github/workflows/conformance-tests-bigtable-emulator.yaml'
+  pull_request:
+    paths:
+      - 'Bigtable/**'
+      - '.github/workflows/conformance-tests-bigtable-emulator.yaml'
+  workflow_dispatch:
+name: Run Bigtable Conformance Tests With Emulator
+jobs:
+  conformance:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: grpc
+
+      - name: Checkout Bigtable conformance tests
+        uses: actions/checkout@v4
+        with:
+          repository: googleapis/cloud-bigtable-clients-test
+          ref: main
+          path: cloud-bigtable-clients-test
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '>=1.20.2'
+
+      - name: Install Road Runner PHP
+        run: |
+          wget https://github.com/roadrunner-server/roadrunner/releases/download/v2024.3.1/roadrunner-2024.3.1-linux-amd64.deb
+          sudo dpkg -i roadrunner-2024.3.1-linux-amd64.deb
+
+      - run: bash Bigtable/tests/Conformance/proxy/conformance.sh

.github/workflows/conformance-tests-storage-emulator.yaml

@@ -4,19 +4,19 @@ on:
       - main
     paths:
       - 'Storage/**'
-      - '.github/workflows/emulator-conformance-tests-storage.yaml'
+      - '.github/workflows/conformance-tests-storage-emulator.yaml'
   pull_request:
     paths:
       - 'Storage/**'
-      - '.github/workflows/emulator-conformance-tests-storage.yaml'
+      - '.github/workflows/conformance-tests-storage-emulator.yaml'
 name: Run Storage Retry Conformance Tests With Emulator
 jobs:
   test:
     runs-on: ubuntu-20.04
 
     services:
       emulator:
-        image: gcr.io/cloud-devrel-public-resources/storage-testbench:v0.49.0
+        image: gcr.io/cloud-devrel-public-resources/storage-testbench:v0.52.0
         ports:
           - 9000:9000
 

.github/workflows/docs.yaml

@@ -26,7 +26,7 @@ jobs:
       id: extract
       uses: shrink/actions-docker-extract@v2
       with:
-        image: "phpdoc/phpdoc:3.4.1"
+        image: "phpdoc/phpdoc:3.5.3"
         path: "/opt/phpdoc/."
     - name: Symlink phpDocumentor
       run: ln -s $(pwd)/${{ steps.extract.outputs.destination }}/bin/phpdoc /usr/local/bin/phpdoc

.github/workflows/lint.yaml

@@ -8,7 +8,7 @@ on:
 permissions:
   contents: read
 jobs:
-  style:
+  style_phpcs:
     runs-on: ubuntu-latest
     name: PHP Style Check
     steps:
@@ -21,6 +21,33 @@ jobs:
       run: composer global require "squizlabs/php_codesniffer:3.*"
     - name: Run PHPCS Code Style Checker
       run: ~/.composer/vendor/bin/phpcs --standard=phpcs-ruleset.xml -p
+
+  style_csfixer:
+    name: PHP CS Fixer
+    uses: GoogleCloudPlatform/php-tools/.github/workflows/code-standards.yml@main
+    with:
+      config: GoogleCloudPlatform/php-tools/.php-cs-fixer.default.php@main
+      exclude-patterns: |
+        [
+          "#.*/src/V[0-9]+#",
+          "#.*/src/.*/V[0-9]+#",
+          "#.*/(tests|samples|metadata)#",
+          "vendor",
+          "dev",
+          "docs",
+          "AccessContextManager/src/Type",
+          "Asset/external",
+          "BigQueryDataExchange/src/Common",
+          "CommonProtos",
+          "Core/src/Testing",
+          "GSuiteAddOns/external",
+          "OsLogin/src/Common",
+          "LongRunning/src/ApiCore/LongRunning",
+          "LongRunning/src/LongRunning",
+          "Translate/src/Connection",
+          "Translate/src/TranslateClient.php"
+        ]
+
   staticanalysis:
     runs-on: ubuntu-latest
     name: PHPStan Static Analysis

.github/workflows/system-tests-pubsub-emulator.yaml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - run: ./.github/emulator/start-emulator.sh pubsub 413.0.0-emulators
+      - run: ./.github/emulator/start-emulator.sh pubsub
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/system-tests-spanner-emulator.yaml

@@ -18,7 +18,7 @@ jobs:
 
     services:
       emulator:
-        image: gcr.io/cloud-spanner-emulator/emulator:1.5.25
+        image: gcr.io/cloud-spanner-emulator/emulator:1.5.28
         ports:
           - 9010:9010
           - 9020:9020

.github/workflows/unit-tests.yaml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, windows-latest]
-        php: [ "8.0", "8.1", "8.2", "8.3" ]
+        php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
         extensions: ["grpc-1.54.0"]
         type: ["Unit Test"]
         include:

.gitignore

@@ -17,3 +17,4 @@ keys/
 .testing
 .split
 __pycache__
+.vscode/

.kokoro/docs/docker/requirements.txt

@@ -8,9 +8,9 @@ cachetools==5.4.0 \
     --hash=sha256:3ae3b49a3d5e28a77a0be2b37dbcb89005058959cb2323858c2657c4a8cab474 \
     --hash=sha256:b8adc2e7c07f105ced7bc56dbb6dfbe7c4a00acce20e2227b3f355be89bc6827
     # via google-auth
-certifi==2024.7.4 \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2025.1.31 \
+    --hash=sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651 \
+    --hash=sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe
     # via requests
 charset-normalizer==2.1.1 \
     --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \
@@ -45,9 +45,9 @@ google-cloud-core==2.4.1 \
     --hash=sha256:9b7749272a812bde58fff28868d0c5e2f585b82f37e09a1f6ed2d4d10f134073 \
     --hash=sha256:a9e6a4422b9ac5c29f79a0ede9485473338e2ce78d91f2370c01e730eab22e61
     # via google-cloud-storage
-google-cloud-storage==2.18.0 \
-    --hash=sha256:0aa3f7c57f3632f81b455d91558d2b27ada96eee2de3aaa17f689db1470d9578 \
-    --hash=sha256:e8e1a9577952143c3fca8163005ecfadd2d70ec080fa158a8b305000e2c22fbb
+google-cloud-storage==3.0.0 \
+    --hash=sha256:2accb3e828e584888beff1165e5f3ac61aa9088965eb0165794a82d8c7f95297 \
+    --hash=sha256:f85fd059650d2dbb0ac158a9a6b304b66143b35ed2419afec2905ca522eb2c6a
     # via gcp-docuploader
 google-crc32c==1.5.0 \
     --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \