From 84647c6c586f16f04cf6cdbe3990c30acf798e2c Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Tue, 25 Mar 2025 13:14:44 -0400 Subject: [PATCH 1/8] Lucee 6 compat updates --- .github/workflows/tests.yml | 4 ++-- models/HyperBuilder.cfc | 2 +- models/HyperRequest.cfc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d165ad7..496d200 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - cfengine: ["lucee@5", "adobe@2018", "adobe@2021", "adobe@2023", "boxlang@be"] + cfengine: ["lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023", "boxlang@be"] coldbox: ["coldbox@6", "coldbox@7"] steps: - name: Checkout Repository @@ -28,7 +28,7 @@ jobs: - name: Install dependencies run: | box install - box install ${{ matrix.coldbox }} --noSave + box install ${{ matrix.coldbox }} --force --noSave - name: Start server run: | diff --git a/models/HyperBuilder.cfc b/models/HyperBuilder.cfc index 78a5b71..59452d2 100644 --- a/models/HyperBuilder.cfc +++ b/models/HyperBuilder.cfc @@ -76,7 +76,7 @@ component singleton { * @returns A new HyperRequest instance from the default request. */ public HyperRequest function new() { - var req = this.defaults.clone(); + var req = this.defaults.duplicate(); req.setBuilder( this ); if ( !isNull( variables.fakeConfiguration ) ) { req.setFakeConfiguration( variables.fakeConfiguration ); diff --git a/models/HyperRequest.cfc b/models/HyperRequest.cfc index fcd5597..505b0fe 100644 --- a/models/HyperRequest.cfc +++ b/models/HyperRequest.cfc @@ -1283,7 +1283,7 @@ component accessors="true" { req.setBody( duplicate( variables.body ) ); req.setBodyFormat( variables.bodyFormat ); req.setReferrer( isNull( variables.referrer ) ? javacast( "null", "" ) : variables.referrer ); - req.setHeaders( variables.headers.clone() ); + req.setHeaders( variables.headers.duplicate() ); req.setQueryParams( duplicate( variables.queryParams ) ); req.setFiles( duplicate( variables.files ) ); req.setThrowOnError( variables.throwOnError ); From e3940fb8ff622c1c503ba164774311d4ebd5d50b Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Tue, 25 Mar 2025 13:26:18 -0400 Subject: [PATCH 2/8] fix reference usage --- models/HyperBuilder.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/HyperBuilder.cfc b/models/HyperBuilder.cfc index 59452d2..78a5b71 100644 --- a/models/HyperBuilder.cfc +++ b/models/HyperBuilder.cfc @@ -76,7 +76,7 @@ component singleton { * @returns A new HyperRequest instance from the default request. */ public HyperRequest function new() { - var req = this.defaults.duplicate(); + var req = this.defaults.clone(); req.setBuilder( this ); if ( !isNull( variables.fakeConfiguration ) ) { req.setFakeConfiguration( variables.fakeConfiguration ); From 225819d1b0c85c7329abeeebfb2d9ce41a76db95 Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Fri, 28 Mar 2025 11:44:48 -0400 Subject: [PATCH 3/8] fix invalid date --- tests/specs/unit/HyperResponseSpec.cfc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/specs/unit/HyperResponseSpec.cfc b/tests/specs/unit/HyperResponseSpec.cfc index dad5b7a..749743f 100644 --- a/tests/specs/unit/HyperResponseSpec.cfc +++ b/tests/specs/unit/HyperResponseSpec.cfc @@ -228,7 +228,7 @@ component extends="testbox.system.BaseSpec" { headers = { "Set-Cookie" : [ "foo=bar;path=/;secure;samesite=none;httponly", - "baz=qux;path=/;expires=Mon, 31 Dec 2038 23:59:59 GMT", + "baz=qux;path=/;expires=Fri, 31 Dec 2038 23:59:59 GMT", "one=two;max-age=2592000;domain=example.com" ] } @@ -244,7 +244,7 @@ component extends="testbox.system.BaseSpec" { "baz" : { "value" : "qux", "path" : "/", - "expires" : "Mon, 31 Dec 2038 23:59:59 GMT" + "expires" : "Fri, 31 Dec 2038 23:59:59 GMT" }, "one" : { "value" : "two", @@ -262,7 +262,7 @@ component extends="testbox.system.BaseSpec" { headers = { "Set-Cookie" : [ "foo=bar;path=/;secure;samesite=none;httponly", - "baz=qux;path=/;expires=Mon, 31 Dec 2038 23:59:59 GMT", + "baz=qux;path=/;expires=Fri, 31 Dec 2038 23:59:59 GMT", "one=two;max-age=2592000;domain=example.com" ] } From f50bfede86757f6eb0b49e5b195fddeb92a4734c Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Fri, 28 Mar 2025 12:18:15 -0400 Subject: [PATCH 4/8] test updates --- .github/workflows/tests.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 496d200..f2eeca7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,19 +11,30 @@ jobs: strategy: fail-fast: false matrix: - cfengine: ["lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023", "boxlang@be"] + cfengine: ["lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang@be"] coldbox: ["coldbox@6", "coldbox@7"] steps: - name: Checkout Repository uses: actions/checkout@v2 + - name: Setup Java + if: ${{ matrix.cfengine == 'boxlang@be' || matrix.cfengine == 'adobe@2025' }} + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: "21" + - name: Setup Java JDK + if: ${{ matrix.cfengine != 'boxlang@be' && matrix.cfengine != 'adobe@2025' }} uses: actions/setup-java@v1.4.3 with: java-version: 11 - name: Set Up CommandBox - uses: elpete/setup-commandbox@v1.0.0 + uses: ortussolutions/setup-commandbox@v2.0.1 + with: + # Update when 6.2 is released + version: "6.2.0-alpha" - name: Install dependencies run: | From c958c90ed13991a9934d6122e0a8c208afbac388 Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Fri, 28 Mar 2025 12:19:13 -0400 Subject: [PATCH 5/8] typo --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f2eeca7..52bcc7a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: java-version: 11 - name: Set Up CommandBox - uses: ortussolutions/setup-commandbox@v2.0.1 + uses: ortus-solutions/setup-commandbox@v2.0.1 with: # Update when 6.2 is released version: "6.2.0-alpha" From 8ba3d0e6ef3d14e59b30433dba8dc11bfe06bda2 Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Fri, 28 Mar 2025 12:45:29 -0400 Subject: [PATCH 6/8] move ACF 2025 to experimental until Coldbox issues are resolved --- .github/workflows/tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 52bcc7a..02a4f53 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,8 +11,14 @@ jobs: strategy: fail-fast: false matrix: - cfengine: ["lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang@be"] + cfengine: ["lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023", "boxlang@be"] coldbox: ["coldbox@6", "coldbox@7"] + experimental: [ false ] + # Experimental: ColdBox BE vs All Engines + include: + - coldbox: "coldbox@7" + cfengine: "adobe@2025" + experimental: true steps: - name: Checkout Repository uses: actions/checkout@v2 From 5009ddcc21cec4a808fe3beb09249ea6c0422e7d Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Fri, 28 Mar 2025 12:46:08 -0400 Subject: [PATCH 7/8] comment update [ci skip] --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 02a4f53..d6ea5f9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: cfengine: ["lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023", "boxlang@be"] coldbox: ["coldbox@6", "coldbox@7"] experimental: [ false ] - # Experimental: ColdBox BE vs All Engines + # Experimental Engine Support include: - coldbox: "coldbox@7" cfengine: "adobe@2025" From c8565ebf23ca7a7cb53a2ebf84004a9fdb647664 Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Fri, 28 Mar 2025 17:15:13 -0400 Subject: [PATCH 8/8] add continue-on-error --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d6ea5f9..adf3035 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,6 +8,7 @@ jobs: tests: runs-on: ubuntu-latest name: Tests + continue-on-error: ${{ matrix.experimental }} strategy: fail-fast: false matrix: