Skip to content

Commit 77c4ae8

Browse files
authored
chore: Update branch and PHP fixer references (#249)
1 parent d0e9f13 commit 77c4ae8

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

.kokoro/system_tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ fi
2323

2424
# Run code standards check when appropriate
2525
if [ "${RUN_CS_CHECK}" = "true" ]; then
26-
wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -O php-cs-fixer
26+
wget https://cs.symfony.com/download/php-cs-fixer-v2.phar -O php-cs-fixer
2727
chmod a+x php-cs-fixer
28-
./php-cs-fixer fix --dry-run --diff
28+
PHP_CS_FIXER_IGNORE_ENV=1 ./php-cs-fixer fix --dry-run --diff
2929
fi
3030

3131
if [ -f $KOKORO_GFILE_DIR/service-account.json ]; then
@@ -53,7 +53,7 @@ if [ "$PULL_REQUEST_NUMBER" != "" ]; then
5353
fi
5454

5555
# Install google/cloud-tools globally
56-
composer global require google/cloud-tools:dev-master
56+
composer global require google/cloud-tools:dev-main
5757

5858
# Install composer in all directories containing composer.json
5959
find . -name composer.json -not -path '*vendor/*' -exec dirname {} \; | while read COMPOSER_DIR

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ globally:
5353
composer global require phpunit/phpunit:^7
5454
```
5555

56-
These tests also use `google/cloud-tools:dev-master`. You can install this with
56+
These tests also use `google/cloud-tools:dev-main`. You can install this with
5757
composer globally:
5858

5959
```
60-
composer global require google/cloud-tools:dev-master
60+
composer global require google/cloud-tools:dev-main
6161
```
6262

6363
Now you can run the tests in the samples directory!

authenticate-users/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"require": {
3-
"php": ">=7.1",
4-
"google/auth": "^1.9",
5-
"google/cloud-core": "^1.32",
6-
"kelvinmo/simplejwt": "^0.4.0"
7-
}
2+
"require": {
3+
"php": ">=7.1",
4+
"google/auth": "^1.9",
5+
"google/cloud-core": "^1.32",
6+
"kelvinmo/simplejwt": "^0.4.0"
7+
}
88
}

sessions/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"require": {
3-
"google/cloud-firestore": "^1.9"
4-
}
2+
"require": {
3+
"google/cloud-firestore": "^1.9"
4+
}
55
}

0 commit comments

Comments
 (0)