Skip to content

fix(BaseEntity): Use announce as official method for interception points #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elpete merged 6 commits into from
Oct 23, 2025
Merged

fix(BaseEntity): Use announce as official method for interception points #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
031ded4
fix(BaseEntity): Use announce as official method for interception points
elpete Oct 14, 2025
0b1893a
Use structKeyExists instead of member function for component support
elpete Oct 14, 2025
32a71a9
Apply cfformat changes
elpete Oct 14, 2025
0ebaf71
Specify qb v13.0.11 as the minimum supported version
elpete Oct 14, 2025
6516d7d
Use qb v13.0.12 as the minimum supported version
elpete Oct 14, 2025
4cc006e
Remove BoxLang Prime support to get the ColdBox 8 support out the door
elpete Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion .github/workflows/cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,38 @@ jobs:
fail-fast: false
matrix:
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
coldbox: ["coldbox@7", "coldbox@be"]
coldbox: ["coldbox@^7", "coldbox@^8"]
experimental: [ false ]
include:
- cfengine: "lucee@be"
coldbox: "coldbox@^7"
experimental: true
- cfengine: "lucee@be"
coldbox: "coldbox@^8"
experimental: true
- cfengine: "lucee@be"
coldbox: "coldbox@be"
experimental: true
- cfengine: "adobe@be"
coldbox: "coldbox@^7"
experimental: true
- cfengine: "adobe@be"
coldbox: "coldbox@^8"
experimental: true
- cfengine: "adobe@be"
coldbox: "coldbox@be"
experimental: true
- cfengine: "boxlang@1"
coldbox: "coldbox@^8"
experimental: true
- cfengine: "boxlang@1"
coldbox: "coldbox@be"
experimental: true
- cfengine: "boxlang@be"
coldbox: "coldbox@^8"
experimental: true
- cfengine: "boxlang@be"
coldbox: "coldbox@be"
experimental: true
services:
mysql:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
fail-fast: false
matrix:
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
coldbox: ["coldbox@^7", "coldbox@^8"]
services:
mysql:
image: mysql:5.7
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
fail-fast: false
matrix:
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
coldbox: ["coldbox@^7", "coldbox@^8"]
services:
mysql:
image: mysql:5.7
Expand Down
6 changes: 3 additions & 3 deletions box.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
},
"type":"modules",
"dependencies":{
"qb":"^13.0.0",
"qb":"^13.0.12",
"str":"^4.0.0",
"mementifier":"^3.0.0"
},
"devDependencies":{
"coldbox":"^7.3.0",
"testbox":"be",
"coldbox":"^8.0.0",
"testbox":"^6.0.0",
"cfcollection":"^3.6.4",
"cfmigrations":"^5.0.0"
},
Expand Down
12 changes: 10 additions & 2 deletions models/BaseEntity.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ component accessors="true" {
*/
public string function qualifyColumn(
required string column,
string tableName = tableName(),
string tableName = this.tableName(),
boolean useParentLookup = true
) {
if (
Expand Down Expand Up @@ -3302,7 +3302,15 @@ component accessors="true" {
);
}
if ( !isNull( variables._interceptorService ) ) {
variables._interceptorService.processState( "quick" & arguments.eventName, arguments.eventData );
param variables.useAnnounceMethodForInterceptorService = structKeyExists(
variables._interceptorService,
"announce"
);
Comment on lines +3305 to +3308
Copy link

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The param statement is executed on every interception call, repeatedly checking for the existence of the announce method. This check should be performed once during initialization (e.g., in onDIComplete()) and cached for the lifetime of the entity to avoid unnecessary overhead on each interception.

Copilot uses AI. Check for mistakes.
if ( variables.useAnnounceMethodForInterceptorService ) {
variables._interceptorService.announce( "quick" & arguments.eventName, arguments.eventData );
} else {
variables._interceptorService.processState( "quick" & arguments.eventName, arguments.eventData );
}
}
}

Expand Down