refactor(functions): declarative function signature for helloworld_http (GoogleCloudPlatform#1553)

anniefu · web-flow · commit bc94c2a7e574 · 2021-11-29T10:35:06.000-08:00
diff --git a/functions/helloworld_http/SampleUnitTest.php b/functions/helloworld_http/SampleUnitTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2020 Google LLC.
  *
diff --git a/functions/helloworld_http/composer.json b/functions/helloworld_http/composer.json
@@ -1,6 +1,7 @@
 {
     "require": {
-        "google/cloud-functions-framework": "^1.0"
+        "php": ">= 7.4",
+        "google/cloud-functions-framework": "^1.1"
     },
     "scripts": {
         "start": [
diff --git a/functions/helloworld_http/index.php b/functions/helloworld_http/index.php
@@ -16,8 +16,15 @@
 <!-- [START functions_helloworld_http] ->
 <?php
 
+use Google\CloudFunctions\FunctionsFramework;
 use Psr\Http\Message\ServerRequestInterface;
 
+// Register the function with Functions Framework.
+// This enables omitting the `FUNCTIONS_SIGNATURE_TYPE=http` environment
+// variable when deploying. The `FUNCTION_TARGET` environment variable should
+// match the first parameter.
+FunctionsFramework::http('helloHttp', 'helloHttp');
+
 function helloHttp(ServerRequestInterface $request): string
 {
     $name = 'World';
diff --git a/functions/helloworld_pubsub/composer.json b/functions/helloworld_pubsub/composer.json
@@ -1,11 +1,12 @@
 {
     "require": {
-        "google/cloud-functions-framework": "^1.0.0"
+        "cloudevents/sdk-php": "^1.0",
+        "google/cloud-functions-framework": "^1.1"
     },
     "scripts": {
         "start": [
             "Composer\\Config::disableProcessTimeout",
-            "FUNCTION_SIGNATURE_TYPE=cloudevent FUNCTION_TARGET=helloworldPubsub php -S localhost:${PORT:-8080} vendor/bin/router.php"
+            "FUNCTION_TARGET=helloworldPubsub php -S localhost:${PORT:-8080} vendor/bin/router.php"
         ]
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`
	`2`	`+`
`2`	`3`	`/**`
`3`	`4`	`* Copyright 2020 Google LLC.`
`4`	`5`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "google/cloud-functions-framework": "^1.0"`
	`3`	`+ "php": ">= 7.4",`
	`4`	`+ "google/cloud-functions-framework": "^1.1"`
`4`	`5`	`},`
`5`	`6`	`"scripts": {`
`6`	`7`	`"start": [`