Skip to content

Commit cc0b268

Browse files
committed
WIP: All tests passing that don't use ORM or objectSave
1 parent 27b1e11 commit cc0b268

10 files changed

Lines changed: 202 additions & 84 deletions

File tree

server-boxlang@1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
"BOXLANG_DEBUG":true
3030
},
3131
"scripts":{
32-
"onServerInitialInstall":"install bx-mail,bx-pdf,bx-mysql,bx-esapi,bx-orm@be --noSave"
32+
"onServerInitialInstall":"install bx-mail,bx-pdf,bx-mysql,bx-esapi,testbox@be --noSave"
3333
}
3434
}

system/core/events/EventPoolManager.cfc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ component accessors="true" {
230230
if (
231231
structKeyExists( arguments.metadata, "extends" )
232232
AND
233+
!structIsEmpty( arguments.metadata.extends )
234+
AND
233235
NOT listFindNoCase( getStopRecursionClasses(), arguments.metadata.extends.name )
234236
) {
235237
parseMetadata( arguments.metadata.extends, arguments.eventsFound );

system/core/util/Util.cfc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,16 @@ component {
416416
if ( isObject( arguments.component ) ) {
417417
arguments.md = getMetadata( arguments.component );
418418
} else {
419-
arguments.md = getComponentMetadata( arguments.component );
419+
arguments.md = server.keyExists( "boxlang" ) ? getClassMetadata( arguments.component ) : getComponentMetadata(
420+
arguments.component
421+
);
420422
}
421423
}
422424

423425
// If it has a parent, stop and calculate it first, unless of course, we've reached a class we shouldn't recurse into.
424426
if (
425427
structKeyExists( arguments.md, "extends" ) &&
428+
!structIsEmpty( arguments.md.extends ) &&
426429
arguments.md.type eq "component" &&
427430
stopClassRecursion( md.extends.name, arguments.stopRecursions ) EQ FALSE
428431
) {

system/ioc/Builder.cfc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,9 +1036,9 @@ component serializable="false" accessors="true" {
10361036
var baseObject = variables.injector.buildInstance( arguments.mapping );
10371037
variables.mixerUtil.start( baseObject );
10381038
variables.injector.autowire(
1039-
target = baseObject,
1040-
mapping = arguments.mapping,
1041-
targetID: arguments.mapping.getName()
1039+
target = baseObject,
1040+
mapping = arguments.mapping,
1041+
targetID = arguments.mapping.getName()
10421042
);
10431043
10441044
// Mix them up baby!

0 commit comments

Comments
 (0)