diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index adfcbdd..bf5c278 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -1,11 +1,9 @@ name: PHP Conformance CI on: - pull_request: - branches: - - master push: branches: - - master + - main + pull_request: workflow_dispatch: jobs: build: @@ -81,4 +79,4 @@ jobs: functionType: 'cloudevent' useBuildpacks: false validateMapping: true - cmd: "'php -S localhost:8080 router.php'" \ No newline at end of file + cmd: "'php -S localhost:8080 router.php'" diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 4973c9a..9efdb37 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -2,7 +2,7 @@ name: PHP Lint CI on: push: branches: - - master + - main pull_request: jobs: php-cs-fixer: diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index 56ba817..2b99351 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -2,7 +2,7 @@ name: PHP Unit CI on: push: branches: - - master + - main pull_request: jobs: build: diff --git a/README.md b/README.md index 6f097b4..7836273 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,7 @@ gcloud run deploy my-cloud-function \ After your instance deploys, you can access it at the URL provided, or view it in the [Cloud Console][cloud-run-console]. -[functions-samples]: https://github.com/GoogleCloudPlatform/php-docs-samples/tree/master/functions +[functions-samples]: https://github.com/GoogleCloudPlatform/php-docs-samples/tree/main/functions [functions-how-to]: https://cloud.google.com/functions/docs/how-to [gcloud]: https://cloud.google.com/sdk/gcloud/ [gcloud-auth]: https://cloud.google.com/sdk/docs/authorizing diff --git a/src/LegacyEventMapper.php b/src/LegacyEventMapper.php index 3dc225d..77f57a2 100644 --- a/src/LegacyEventMapper.php +++ b/src/LegacyEventMapper.php @@ -23,7 +23,7 @@ class LegacyEventMapper { // Maps background/legacy event types to their equivalent CloudEvent types. // For more info on event mappings see - // https://github.com/GoogleCloudPlatform/functions-framework-conformance/blob/master/docs/mapping.md + // https://github.com/GoogleCloudPlatform/functions-framework-conformance/blob/main/docs/mapping.md private static $ceTypeMap = [ 'google.pubsub.topic.publish' => 'google.cloud.pubsub.topic.v1.messagePublished', 'providers/cloud.pubsub/eventTypes/topic.publish' => 'google.cloud.pubsub.topic.v1.messagePublished',