Skip to content

Commit

Permalink
Upgrade composer version to 2.2.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 642634701
Change-Id: I17363c6858282f8e565e472ddea86ae559533752
  • Loading branch information
kennethye1 authored and copybara-github committed Jun 12, 2024
1 parent 4450be1 commit 342b274
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion builders/php/acceptance/gcf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func TestFailures(t *testing.T) {
{
App: "fail_vendored_framework_no_router_script",
VersionInclusionConstraint: "< 8.2.0",
MustMatch: `functions framework router script vendor/bin/router\.php is not present`,
MustMatch: `functions framework router script vendor/google/cloud-functions-framework/router.php is not present`,
},
{
App: "fail_vendored_no_framework_no_installed_json",
Expand Down
2 changes: 1 addition & 1 deletion cmd/php/cloudfunctions/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

const (
// routerScript is the path to the functions framework invoker script.
routerScript = "vendor/bin/router.php"
routerScript = "vendor/google/cloud-functions-framework/router.php"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/php/cloudfunctions/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestEntrypoint(t *testing.T) {
t.Fatalf("unexpected error creating entrypoint: %v", err)
}

want := "serve -enable-dynamic-workers -workers=1024 vendor/bin/router.php"
want := "serve -enable-dynamic-workers -workers=1024 vendor/google/cloud-functions-framework/router.php"
if ep.Command != want {
t.Errorf("entrypoint set wrong, got: %q, want: %q", ep.Command, want)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/php/composer_install/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var (
composerLayer = "composer"
composerJSON = "composer.json"
composerSetup = "composer-setup"
composerVer = "2.1.3"
composerVer = "2.2.24"
versionKey = "version"
composerSigURL = "https://composer.github.io/installer.sig"
composerSetupURL = "https://getcomposer.org/installer"
Expand Down
2 changes: 1 addition & 1 deletion cmd/php/functions_framework/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const (
ffPackagistURL = "https://packagist.org/packages/google/cloud-functions-framework"

// routerScript is the path to the functions framework invoker script.
routerScript = "vendor/bin/router.php"
routerScript = "vendor/google/cloud-functions-framework/router.php"

// cacheTag is the cache tag for the `composer install` layer. We only cache in one case: There
// is no composer.json file and there is no vendor directory (i.e. a dependency-less function).
Expand Down

0 comments on commit 342b274

Please sign in to comment.