Skip to content

Commit 45c11fa

Browse files
kennethye1kennethye1
authored
Merge branch 'GoogleCloudPlatform:main' into main
2 parents f21d46c + 5d1b532 commit 45c11fa

File tree

52 files changed

+160
-138
lines changed

Some content is hidden

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

52 files changed

+160
-138
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Install PHP
1414
uses: shivammathur/setup-php@v2
1515
with:
16-
php-version: '8.0'
16+
php-version: '8.2'
1717

1818
- name: Run Script
1919
run: testing/run_cs_check.sh
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install PHP
2626
uses: shivammathur/setup-php@v2
2727
with:
28-
php-version: '8.0'
28+
php-version: '8.2'
2929
- name: Get changed files
3030
id: changedFiles
3131
uses: tj-actions/changed-files@v44

‎.kokoro/deploy_gae.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/php80"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/php81"
77
}
88

99
# Run the deployment tests

‎.kokoro/deploy_gcf.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/php80"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/php81"
77
}
88

99
# Run the deployment tests

‎.kokoro/deploy_misc.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/php80"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/php81"
77
}
88

99
# Run the deployment tests

.kokoro/php80.cfg renamed to .kokoro/php83.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/php80"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/php83"
77
}
88

99
# Give the docker image a unique project ID and credentials per PHP version

‎.kokoro/php_rest.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/php80"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/php81"
77
}
88

99
# Set this project to run REST tests only

‎appengine/standard/getting-started/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Getting Started on App Engine for PHP 7.4
1+
# Getting Started on App Engine for PHP 8.1
22

33
This sample demonstrates how to deploy a PHP application which integrates with
4-
Cloud SQL and Cloud Storage on App Engine Standard for PHP 7.4. The tutorial
4+
Cloud SQL and Cloud Storage on App Engine Standard for PHP 8.1. The tutorial
55
uses the Slim framework.
66

7-
## View the [full tutorial](https://cloud.google.com/appengine/docs/standard/php7/building-app/)
7+
## View the [full tutorial](https://cloud.google.com/appengine/docs/standard/php-gen2/building-app)

‎appengine/standard/slim-framework/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Slim Framework on App Engine for PHP 7.4
1+
# Slim Framework on App Engine for PHP
22

33
This sample demonstrates how to deploy a *very* basic [Slim][slim] application to
4-
[Google App Engine for PHP 7.4][appengine-php]. For a more complete guide, follow
4+
[Google App Engine for PHP][appengine-php]. For a more complete guide, follow
55
the [Building an App][building-an-app] tutorial.
66

77
## Setup
@@ -34,7 +34,7 @@ The application consists of three components:
3434
3. An [`index.php`](index.php) which handles all the requests which get routed to your app.
3535

3636
The `index.php` file is the most important. All applications running on App Engine
37-
for PHP 7.4 require use of a [front controller][front-controller] file.
37+
for PHP require use of a [front controller][front-controller] file.
3838

3939
[console]: https://console.developers.google.com/project
4040
[slim]: https://www.slimframework.com/

‎appengine/standard/slim-framework/phpunit.xml.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-->
1717
<phpunit bootstrap="../../../testing/bootstrap.php">
1818
<testsuites>
19-
<testsuite name="AppEngine for PHP 7.4 Slim Framework test">
19+
<testsuite name="AppEngine for PHP Slim Framework test">
2020
<directory>test</directory>
2121
</testsuite>
2222
</testsuites>

‎bigtable/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"google/cloud-bigtable": "^1.30"
3+
"google/cloud-bigtable": "^2.0"
44
},
55
"autoload-dev": {
66
"psr-4": {

0 commit comments

Comments
 (0)