Skip to content

Commit 7aa28e5

Browse files
committed
Merge branch 'main' into fix-add-sample-to-readme
2 parents c5b74ae + 08d5bd2 commit 7aa28e5

5,305 files changed

Lines changed: 190204 additions & 238446 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
ref: v0.0.3
4747
path: cloud-bigtable-clients-test
4848

49-
- uses: actions/setup-go@v5
49+
- uses: actions/setup-go@v6
5050
with:
5151
go-version: '>=1.20.2'
5252

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v5
1616
- name: Setup Python
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6
1818
with:
1919
python-version: '3.13'
2020
- run: pip install --no-deps --require-hashes -r .kokoro/docs/docker/requirements.txt

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v5
2323

24-
- run: ./.github/emulator/start-emulator.sh bigtable 419.0.0-emulators
24+
- run: ./.github/emulator/start-emulator.sh bigtable 522.0.0-emulators
2525

2626
- name: Setup PHP
2727
uses: shivammathur/setup-php@v2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v5
2323

24-
- run: ./.github/emulator/start-emulator.sh datastore 419.0.0-emulators
24+
- run: ./.github/emulator/start-emulator.sh datastore 522.0.0-emulators
2525

2626
- name: Setup PHP
2727
uses: shivammathur/setup-php@v2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v5
2323

24-
- run: ./.github/emulator/start-emulator.sh firestore 453.0.0-emulators
24+
- run: ./.github/emulator/start-emulator.sh firestore 522.0.0-emulators
2525

2626
- name: Setup PHP
2727
uses: shivammathur/setup-php@v2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v5
2929

3030
- name: Create Spanner instance
31-
uses: google-github-actions/setup-gcloud@v2
31+
uses: google-github-actions/setup-gcloud@v3
3232
with:
3333
version: '516.0.0'
3434
- run: gcloud info

.github/workflows/release-checks.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,10 @@ jobs:
122122
echo "Missing repositories for one or more new components"
123123
exit 1
124124
fi
125+
126+
next-release-label-check:
127+
name: Check for "next release" label
128+
uses: GoogleCloudPlatform/php-tools/.github/workflows/release-checks.yml@main
129+
if: github.event.pull_request.user.login == 'release-please[bot]'
130+
with:
131+
next-release-label-check: true

.kokoro/docs/docker/requirements.txt

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
#
55
# pip-compile --generate-hashes requirements.in
66
#
7-
cachetools==6.1.0 \
8-
--hash=sha256:1c7bb3cf9193deaf3508b7c5f2a79986c13ea38965c5adcff1f84519cf39163e \
9-
--hash=sha256:b4c4f404392848db3ce7aac34950d17be4d864da4b8b66911008e430bc544587
7+
cachetools==6.2.0 \
8+
--hash=sha256:1c76a8960c0041fcc21097e357f882197c79da0dbff766e7317890a65d7d8ba6 \
9+
--hash=sha256:38b328c0889450f05f5e120f56ab68c8abaf424e1275522b138ffc93253f7e32
1010
# via google-auth
11-
certifi==2025.1.31 \
12-
--hash=sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651 \
13-
--hash=sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe
11+
certifi==2025.8.3 \
12+
--hash=sha256:e564105f78ded564e3ae7c923924435e1daa7463faeab5bb932bc53ffae63407 \
13+
--hash=sha256:f6c12493cfb1b06ba2ff328595af9350c65d6644968e5d3a2ffd78699af217a5
1414
# via requests
1515
charset-normalizer==2.1.1 \
1616
--hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \
1717
--hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f
1818
# via requests
19-
click==8.1.8 \
20-
--hash=sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2 \
21-
--hash=sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a
19+
click==8.3.0 \
20+
--hash=sha256:9b9f285302c6e3064f4330c05f05b81945b2a39544279343e6e7c5f27a9baddc \
21+
--hash=sha256:e7b8232224eba16f4ebe410c25ced9f7875cb5f3263ffc93cc3e8da705e229c4
2222
# via gcp-docuploader
2323
colorlog==6.9.0 \
2424
--hash=sha256:5906e71acd67cb07a71e779c47c4bcb45fb8c2993eebe9e5adcd6a6f1b283eff \
@@ -28,15 +28,15 @@ gcp-docuploader==0.7.2 \
2828
--hash=sha256:3916d2b46239a2d86ba9427a7f21e3762f21c1e1d34e4f066317a9765e43c90c \
2929
--hash=sha256:aaa7ef9d2ecc3cd03fa284977a68772e03ca4b0cbd8ae3cc85a745dc57fad25e
3030
# via -r requirements.in
31-
google-api-core==2.24.2 \
32-
--hash=sha256:810a63ac95f3c441b7c0e43d344e372887f62ce9071ba972eacf32672e072de9 \
33-
--hash=sha256:81718493daf06d96d6bc76a91c23874dbf2fac0adbbf542831b805ee6e974696
31+
google-api-core==2.25.1 \
32+
--hash=sha256:8a2a56c1fef82987a524371f99f3bd0143702fecc670c72e600c1cda6bf8dbb7 \
33+
--hash=sha256:d2aaa0b13c78c61cb3f4282c464c046e45fbd75755683c9c525e6e8f7ed0a5e8
3434
# via
3535
# google-cloud-core
3636
# google-cloud-storage
37-
google-auth==2.38.0 \
38-
--hash=sha256:8285113607d3b80a3f1543b75962447ba8a09fe85783432a784fdeef6ac094c4 \
39-
--hash=sha256:e7dae6694313f434a2727bf2906f27ad259bae090d7aa896590d86feec3d9d4a
37+
google-auth==2.40.3 \
38+
--hash=sha256:1370d4593e86213563547f97a92752fc658456fe4514c809544f330fed45a7ca \
39+
--hash=sha256:500c3a29adedeb36ea9cf24b8d10858e152f2412e3ca37829b3fa18e33d63b77
4040
# via
4141
# google-api-core
4242
# google-cloud-core
@@ -45,9 +45,9 @@ google-cloud-core==2.4.3 \
4545
--hash=sha256:1fab62d7102844b278fe6dead3af32408b1df3eb06f5c7e8634cbd40edc4da53 \
4646
--hash=sha256:5130f9f4c14b4fafdff75c79448f9495cfade0d8775facf1b09c3bf67e027f6e
4747
# via google-cloud-storage
48-
google-cloud-storage==3.1.0 \
49-
--hash=sha256:944273179897c7c8a07ee15f2e6466a02da0c7c4b9ecceac2a26017cb2972049 \
50-
--hash=sha256:eaf36966b68660a9633f03b067e4a10ce09f1377cae3ff9f2c699f69a81c66c6
48+
google-cloud-storage==3.4.0 \
49+
--hash=sha256:16eeca305e4747a6871f8f7627eef3b862fdd365b872ca74d4a89e9841d0f8e8 \
50+
--hash=sha256:4c77ec00c98ccc6428e4c39404926f41e2152f48809b02af29d5116645c3c317
5151
# via gcp-docuploader
5252
google-crc32c==1.7.1 \
5353
--hash=sha256:0f99eaa09a9a7e642a61e06742856eec8b19fc0037832e03f941fe7cf0c8e4db \
@@ -91,9 +91,9 @@ google-resumable-media==2.7.2 \
9191
--hash=sha256:3ce7551e9fe6d99e9a126101d2536612bb73486721951e9562fee0f90c6ababa \
9292
--hash=sha256:5280aed4629f2b60b847b0d42f9857fd4935c11af266744df33d8074cae92fe0
9393
# via google-cloud-storage
94-
googleapis-common-protos==1.69.2 \
95-
--hash=sha256:0b30452ff9c7a27d80bfc5718954063e8ab53dd3697093d3bc99581f5fd24212 \
96-
--hash=sha256:3e1b904a27a33c821b4b749fd31d334c0c9c30e6113023d495e48979a3dc9c5f
94+
googleapis-common-protos==1.70.0 \
95+
--hash=sha256:0e1b44e0ea153e6594f9f394fef15193a68aaaea2d843f83e2742717ca753257 \
96+
--hash=sha256:b8bfcca8c25a2bb253e0e0b0adaf8c00773e5e6af6fd92397576680b807e0fd8
9797
# via google-api-core
9898
idna==3.10 \
9999
--hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \
@@ -105,16 +105,16 @@ proto-plus==1.26.1 \
105105
# via
106106
# -r requirements.in
107107
# google-api-core
108-
protobuf==6.31.1 \
109-
--hash=sha256:0414e3aa5a5f3ff423828e1e6a6e907d6c65c1d5b7e6e975793d5590bdeecc16 \
110-
--hash=sha256:426f59d2964864a1a366254fa703b8632dcec0790d8862d30034d8245e1cd447 \
111-
--hash=sha256:4ee898bf66f7a8b0bd21bce523814e6fbd8c6add948045ce958b73af7e8878c6 \
112-
--hash=sha256:6f1227473dc43d44ed644425268eb7c2e488ae245d51c6866d19fe158e207402 \
113-
--hash=sha256:720a6c7e6b77288b85063569baae8536671b39f15cc22037ec7045658d80489e \
114-
--hash=sha256:7fa17d5a29c2e04b7d90e5e32388b8bfd0e7107cd8e616feef7ed3fa6bdab5c9 \
115-
--hash=sha256:8764cf4587791e7564051b35524b72844f845ad0bb011704c3736cce762d8fe9 \
116-
--hash=sha256:a40fc12b84c154884d7d4c4ebd675d5b3b5283e155f324049ae396b95ddebc39 \
117-
--hash=sha256:d8cac4c982f0b957a4dc73a80e2ea24fab08e679c0de9deb835f4a12d69aca9a
108+
protobuf==6.32.1 \
109+
--hash=sha256:2601b779fc7d32a866c6b4404f9d42a3f67c5b9f3f15b4db3cccabe06b95c346 \
110+
--hash=sha256:2f5b80a49e1eb7b86d85fcd23fe92df154b9730a725c3b38c4e43b9d77018bf4 \
111+
--hash=sha256:68ff170bac18c8178f130d1ccb94700cf72852298e016a2443bdb9502279e5f1 \
112+
--hash=sha256:a8a32a84bc9f2aad712041b8b366190f71dde248926da517bde9e832e4412085 \
113+
--hash=sha256:b00a7d8c25fa471f16bc8153d0e53d6c9e827f0953f3c09aaa4331c718cae5e1 \
114+
--hash=sha256:b1864818300c297265c83a4982fd3169f97122c299f56a56e2445c3698d34710 \
115+
--hash=sha256:d0975d0b2f3e6957111aa3935d08a0eb7e006b1505d825f862a1fffc8348e122 \
116+
--hash=sha256:d8c7e6eb619ffdf105ee4ab76af5a68b60a9d0f66da3ea12d1640e6d8dab7281 \
117+
--hash=sha256:ee2469e4a021474ab9baafea6cd070e5bf27c7d29433504ddea1a4ee5850f68d
118118
# via
119119
# gcp-docuploader
120120
# google-api-core
@@ -130,15 +130,15 @@ pyasn1-modules==0.4.2 \
130130
--hash=sha256:29253a9207ce32b64c3ac6600edc75368f98473906e8fd1043bd6b5b1de2c14a \
131131
--hash=sha256:677091de870a80aae844b1ca6134f54652fa2c8c5a52aa396440ac3106e941e6
132132
# via google-auth
133-
requests==2.32.4 \
134-
--hash=sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c \
135-
--hash=sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422
133+
requests==2.32.5 \
134+
--hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \
135+
--hash=sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf
136136
# via
137137
# google-api-core
138138
# google-cloud-storage
139-
rsa==4.9 \
140-
--hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \
141-
--hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21
139+
rsa==4.9.1 \
140+
--hash=sha256:68635866661c6836b8d39430f97a996acbd61bfa49406748ea243539fe239762 \
141+
--hash=sha256:e7bdbfdb5497da4c07dfd35530e1a902659db6ff241e39d9953cad06ebd0ae75
142142
# via google-auth
143143
urllib3==2.5.0 \
144144
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \

.repo-metadata-full.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@
416416
"distribution_name": "google/common-protos",
417417
"release_level": "stable",
418418
"client_documentation": "https://cloud.google.com/php/docs/reference/common-protos/latest",
419-
"library_type": "GAPIC_AUTO",
419+
"library_type": "CORE",
420420
"api_shortname": ""
421421
},
422422
"Compute": {
@@ -881,6 +881,14 @@
881881
"library_type": "GAPIC_AUTO",
882882
"api_shortname": "lifesciences"
883883
},
884+
"LocationFinder": {
885+
"language": "php",
886+
"distribution_name": "google/cloud-locationfinder",
887+
"release_level": "preview",
888+
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-locationfinder/latest",
889+
"library_type": "GAPIC_AUTO",
890+
"api_shortname": "cloudlocationfinder"
891+
},
884892
"Logging": {
885893
"language": "php",
886894
"distribution_name": "google/cloud-logging",
@@ -1297,6 +1305,14 @@
12971305
"library_type": "GAPIC_AUTO",
12981306
"api_shortname": "securitycentermanagement"
12991307
},
1308+
"SecurityCompliance": {
1309+
"language": "php",
1310+
"distribution_name": "google/cloud-securitycompliance",
1311+
"release_level": "preview",
1312+
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-securitycompliance/latest",
1313+
"library_type": "GAPIC_AUTO",
1314+
"api_shortname": "cloudsecuritycompliance"
1315+
},
13001316
"SecurityPrivateCa": {
13011317
"language": "php",
13021318
"distribution_name": "google/cloud-security-private-ca",

AUTHENTICATION.md

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ For more information, see
3232
### Environment Variables
3333

3434
**NOTE**: This library uses [`getenv`](https://www.php.net/manual/en/function.getenv.php), so if
35-
your environemnt variables are set in PHP, they must use
35+
your environment variables are set in PHP, they must use
3636
[`putenv`](https://www.php.net/manual/en/function.putenv.php),
3737

3838
```php
@@ -79,8 +79,6 @@ Each Google Cloud PHP client may be authenticated in code when creating a client
7979
Most clients use the `credentials` option for providing credentials as a constructor option:
8080

8181
```php
82-
require 'vendor/autoload.php';
83-
8482
use Google\Cloud\VideoIntelligence\V1\VideoIntelligenceServiceClient;
8583

8684
// Authenticating with keyfile data.
@@ -94,6 +92,36 @@ $video = new VideoIntelligenceServiceClient([
9492
]);
9593
```
9694

95+
#### Note:
96+
Some clients accept the `keyFilePath` and `keyFile` configuration options pointing to the credentials
97+
file. However, both of these options are deprecated in favor of using the `credentialsFetcher`
98+
option or
99+
[Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials).
100+
101+
```php
102+
require 'vendor/autoload.php';
103+
104+
use Google\Cloud\Storage\StorageClient;
105+
use Google\Auth\Credentials\ServiceAccountCredentials;
106+
107+
// Create the service account credentials and pass them in using the "credentialsFile" option
108+
$keyFile = json_decode(file_get_contents('/path/to/keyfile.json'), true);
109+
$storage = new StorageClient([
110+
'credentialsFetcher' => new ServiceAccountCredentials($scopes, $keyFile),
111+
]);
112+
```
113+
A list of clients that accept these parameters are:
114+
115+
- [BigQuery](https://github.com/googleapis/google-cloud-php-bigquery)
116+
- [Datastore](https://github.com/googleapis/google-cloud-php-datastore)
117+
- [Firestore](https://github.com/googleapis/google-cloud-php-firestore)
118+
- [Logging](https://github.com/googleapis/google-cloud-php-logging)
119+
- [Spanner](https://github.com/googleapis/google-cloud-php-spanner)
120+
- [Storage](https://github.com/googleapis/google-cloud-php-storage)
121+
122+
We recommend to visit the Check the [client documentation][php-ref-docs] for the client library you're using
123+
for more in depth information.
124+
97125
### Local ADC file
98126

99127
This option allows for an easy way to authenticate in a local environment during development. If

0 commit comments

Comments
 (0)