Skip to content

Commit 031ded4

Browse files
committed
fix(BaseEntity): Use announce as official method for interception points
1 parent c823213 commit 031ded4

File tree

5 files changed

+39
-4
lines changed

5 files changed

+39
-4
lines changed

.github/workflows/cron.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,38 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
15-
coldbox: ["coldbox@7", "coldbox@be"]
15+
coldbox: ["coldbox@^7", "coldbox@^8"]
1616
experimental: [ false ]
1717
include:
1818
- cfengine: "lucee@be"
19+
coldbox: "coldbox@^7"
20+
experimental: true
21+
- cfengine: "lucee@be"
22+
coldbox: "coldbox@^8"
23+
experimental: true
24+
- cfengine: "lucee@be"
25+
coldbox: "coldbox@be"
26+
experimental: true
27+
- cfengine: "adobe@be"
28+
coldbox: "coldbox@^7"
1929
experimental: true
2030
- cfengine: "adobe@be"
31+
coldbox: "coldbox@^8"
2132
experimental: true
33+
- cfengine: "adobe@be"
34+
coldbox: "coldbox@be"
35+
experimental: true
36+
- cfengine: "boxlang@1"
37+
coldbox: "coldbox@^8"
38+
experimental: false
2239
- cfengine: "boxlang@1"
40+
coldbox: "coldbox@be"
41+
experimental: true
42+
- cfengine: "boxlang@be"
43+
coldbox: "coldbox@^8"
2344
experimental: true
2445
- cfengine: "boxlang@be"
46+
coldbox: "coldbox@be"
2547
experimental: true
2648
services:
2749
mysql:

.github/workflows/pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
23+
coldbox: ["coldbox@^7", "coldbox@^8"]
24+
include:
25+
- cfengine: "boxlang@1"
26+
coldbox: "coldbox@^8"
2327
services:
2428
mysql:
2529
image: mysql:5.7

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
18+
coldbox: ["coldbox@^7", "coldbox@^8"]
19+
include:
20+
- cfengine: "boxlang@1"
21+
coldbox: "coldbox@^8"
1822
services:
1923
mysql:
2024
image: mysql:5.7

box.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"mementifier":"^3.0.0"
3535
},
3636
"devDependencies":{
37-
"coldbox":"^7.3.0",
38-
"testbox":"be",
37+
"coldbox":"^8.0.0",
38+
"testbox":"^6.0.0",
3939
"cfcollection":"^3.6.4",
4040
"cfmigrations":"^5.0.0"
4141
},

models/BaseEntity.cfc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3302,7 +3302,12 @@ component accessors="true" {
33023302
);
33033303
}
33043304
if ( !isNull( variables._interceptorService ) ) {
3305-
variables._interceptorService.processState( "quick" & arguments.eventName, arguments.eventData );
3305+
param variables.useAnnounceMethodForInterceptorService = variables._interceptorService.keyExists( "announce" );
3306+
if ( variables.useAnnounceMethodForInterceptorService ) {
3307+
variables._interceptorService.announce( "quick" & arguments.eventName, arguments.eventData );
3308+
} else {
3309+
variables._interceptorService.processState( "quick" & arguments.eventName, arguments.eventData );
3310+
}
33063311
}
33073312
}
33083313

0 commit comments

Comments
 (0)