chore: add conformance test coverage for typed function signature (#151)

Co-authored-by: Kayla Nguyen <[email protected]>

Author: garethgeorge

.github/workflows/conformance.yml

@@ -48,51 +48,58 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2.2.0
       with:
-        go-version: '1.15'
+        go-version: '1.20'
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@e42b1533877f1b639f508ec7fbcfb5be31aca663 # v1.2.1
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@5f2a796b58f099d749e70ecc83f531f6701c64af # v1.8.3
       env:
         FUNCTION_TARGET: 'httpFunc'
         FUNCTION_SIGNATURE_TYPE: 'http'
         FUNCTION_SOURCE: ${{ github.workspace }}/tests/conformance/index.php
       with:
-        version: 'v1.2.1'
         functionType: 'http'
         useBuildpacks: false
         cmd: "'php -S localhost:8080 router.php'"
 
     - name: Run Declarative HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@e42b1533877f1b639f508ec7fbcfb5be31aca663 # v1.2.1
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@5f2a796b58f099d749e70ecc83f531f6701c64af # v1.8.3
       env:
         FUNCTION_TARGET: 'declarativeHttpFunc'
         FUNCTION_SOURCE: ${{ github.workspace }}/tests/conformance/index.php
       with:
-        version: 'v1.2.1'
         functionType: 'http'
         useBuildpacks: false
         cmd: "'php -S localhost:8080 router.php'"
+    
+    - name: Run Declarative Typed conformance tests
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@5f2a796b58f099d749e70ecc83f531f6701c64af # v1.8.3
+      env:
+        FUNCTION_TARGET: 'declarativeTypedFunc'
+        FUNCTION_SOURCE: ${{ github.workspace }}/tests/conformance/index.php
+      with:
+        functionType: 'http'
+        declarativeType: 'typed'
+        useBuildpacks: false
+        cmd: "'php -S localhost:8080 router.php'"
 
     - name: Run CloudEvent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@e42b1533877f1b639f508ec7fbcfb5be31aca663 # v1.2.1
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@5f2a796b58f099d749e70ecc83f531f6701c64af # v1.8.3
       env:
         FUNCTION_TARGET: 'cloudEventFunc'
         FUNCTION_SIGNATURE_TYPE: 'cloudevent'
         FUNCTION_SOURCE: ${{ github.workspace }}/tests/conformance/index.php
       with:
-        version: 'v1.2.1'
         functionType: 'cloudevent'
         useBuildpacks: false
         validateMapping: true
         cmd: "'php -S localhost:8080 router.php'"
 
     - name: Run Declarative CloudEvent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@e42b1533877f1b639f508ec7fbcfb5be31aca663 # v1.2.1
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@5f2a796b58f099d749e70ecc83f531f6701c64af # v1.2.1
       env:
         FUNCTION_TARGET: 'declarativeCloudEventFunc'
         FUNCTION_SOURCE: ${{ github.workspace }}/tests/conformance/index.php
       with:
-        version: 'v1.2.1'
         functionType: 'cloudevent'
         useBuildpacks: false
         validateMapping: true

tests/conformance/index.php

@@ -16,6 +16,37 @@ function httpFunc(ServerRequestInterface $request)
     return "ok" . PHP_EOL;
 }
 
+FunctionsFramework::typed('declarativeTypedFunc', 'typedFunc');
+
+function typedFunc(ConformanceRequest $request)
+{
+    $resp = new ConformanceResponse();
+    $resp->payload = $request;
+    return $resp;
+}
+
+class ConformanceRequest
+{
+    /** @var string */
+    public $message;
+
+    public function mergeFromJsonString(string $body): void
+    {
+        $this->message = json_decode($body)->message;
+    }
+}
+
+class ConformanceResponse
+{
+    /** @var ConformanceRequest */
+    public $payload;
+
+    public function serializeToJsonString()
+    {
+        return json_encode(get_object_vars($this));
+    }
+}
+
 // PHP cannot distinguish between an empty array and an empty map because they
 // are represented by the same type. This means that when a JSON object
 // containing either an empty array or an empty map is decoded the type

tests/conformance/run_conformance_tests.sh

@@ -49,7 +49,10 @@ print_header "HTTP CONFORMANCE TESTS"
 FUNCTION_TARGET='httpFunc' FUNCTION_SIGNATURE_TYPE='http' FUNCTION_SOURCE=$(realpath tests/conformance/index.php) client -buildpacks=false -type=http -cmd='php -S localhost:8080 router.php' -start-delay 5 -validate-mapping=true
 
 print_header "DECLARATIVE HTTP CONFORMANCE TESTS"
-FUNCTION_TARGET='declarativeHttpFunc' FUNCTION_SIGNATURE_TYPE=  FUNCTION_SOURCE=$(realpath tests/conformance/index.php) client -buildpacks=false -type=http -cmd='php -S localhost:8080 router.php' -start-delay 5 -validate-mapping=true
+FUNCTION_TARGET='declarativeHttpFunc' FUNCTION_SIGNATURE_TYPE= FUNCTION_SOURCE=$(realpath tests/conformance/index.php) client -buildpacks=false -type=http -cmd='php -S localhost:8080 router.php' -start-delay 5 -validate-mapping=true
+
+print_header "DECLARATIVE TYPED CONFORMANCE TESTS"
+FUNCTION_TARGET='declarativeTypedFunc' FUNCTION_SIGNATURE_TYPE=http FUNCTION_SOURCE=$(realpath tests/conformance/index.php) client -buildpacks=false -type=http -declarative-type=typed -cmd='php -S localhost:8080 router.php' -start-delay 5 -validate-mapping=true
 
 print_header "CLOUDEVENT CONFORMANCE TESTS"
 FUNCTION_TARGET='cloudEventFunc' FUNCTION_SIGNATURE_TYPE='cloudevent' FUNCTION_SOURCE=$(realpath tests/conformance/index.php) client -buildpacks=false -type=cloudevent -cmd='php -S localhost:8080 router.php' -start-delay 5 -validate-mapping=true