Merge branch 'main' into renovate/translate-google-cloud-translate-2.x

Author: bshaffer

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ jobs:
   styles:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
@@ -21,7 +21,7 @@ jobs:
   staticanalysis:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:

.kokoro/secrets-example.sh

@@ -100,6 +100,10 @@ export GOOGLE_KMS_SERVICEACCOUNTEMAIL=
 export REDIS_HOST=
 export REDIS_PORT=
 
+# Model Armor
+export MA_FOLDER_ID=
+export MA_ORG_ID=
+
 # PubSub
 export GOOGLE_PUBSUB_SUBSCRIPTION=php-example-subscription
 export GOOGLE_PUBSUB_TOPIC=php-example-topic

.kokoro/secrets.sh.enc

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/analytics-data": "^0.22.0"
+        "google/analytics-data": "^0.23.0"
     }
 }

analyticsdata/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/analytics-data": "^0.22.0",
+        "google/analytics-data": "^0.23.0",
         "ext-bcmath":  "*"
     }
 }

analyticsdata/quickstart_oauth2/composer.json

@@ -4,7 +4,7 @@ env: flex
 runtime_config:
   document_root: web
   operating_system: ubuntu22
-  runtime_version: 8.3
+  runtime_version: 8.4
 
 # This sample incurs costs to run on the App Engine flexible environment.
 # The settings below are to reduce costs during testing and are not appropriate

appengine/flexible/helloworld/app.yaml

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-error-reporting": "^0.23.0"
+        "google/cloud-error-reporting": "^0.25.0"
     },
     "autoload": {
         "files": [

appengine/standard/errorreporting/composer.json

@@ -1,7 +1,7 @@
-# Getting Started on App Engine for PHP 8.1
+# Getting Started on App Engine for PHP 8.4
 
 This sample demonstrates how to deploy a PHP application which integrates with
-Cloud SQL and Cloud Storage on App Engine Standard for PHP 8.1. The tutorial
+Cloud SQL and Cloud Storage on App Engine Standard for PHP 8.4. The tutorial
 uses the Slim framework.
 
 ## View the [full tutorial](https://cloud.google.com/appengine/docs/standard/php-gen2/building-app)

appengine/standard/getting-started/README.md

@@ -1,7 +1,7 @@
 # See https://cloud.google.com/appengine/docs/standard/php/config/appref for a
 # complete list of `app.yaml` directives.
 
-runtime: php81
+runtime: php84
 
 env_variables:
     GOOGLE_STORAGE_BUCKET: ""

appengine/standard/getting-started/app.yaml

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-spanner": "^1.15.0",
+        "google/cloud-spanner": "^2.0.0",
         "google/cloud-monitoring": "^2.0.0",
         "google/cloud-speech": "^2.0.0"
     },