Merge pull request #1492 from cfwheels/architecture-3.0

Architecture 3.0

Author: bpamiri

public/Application.cfc

@@ -53,7 +53,7 @@ component output="false" {
 	// Put environment vars into env struct
 	if ( !structKeyExists(this,"env") ) {
 		this.env = {};
-		envFilePath = this.appDir & ".env";
+		envFilePath = this.appDir & "../.env";
 		if (fileExists(envFilePath)) {
 			envStruct = {};
 

vendor/wheels/Controller.cfc

@@ -132,7 +132,7 @@ component output="false" displayName="Controller" extends="wheels.Global"{
 		&& StructKeyExists(application, "wheels")
 		&& StructKeyExists(application.wheels, "viewPath")
 	) {
-		include "/wheels/tests/_assets/views/helpers.cfm";
+		include "#application.wheels.viewPath#/helpers.cfm";
 	}
 
 	/**

vendor/wheels/Global.cfc

@@ -161,7 +161,7 @@ component output="false" {
     }
 	}
 
-	public void function $location(boolean delay){
+	public void function $location(boolean delay = false){
     StructDelete(arguments, "$args", false);
     if(NOT arguments.delay){
       StructDelete(arguments, "delay", false);

vendor/wheels/events/onerror/cfmlerror.cfm

@@ -91,12 +91,22 @@
 		</cfif>
 		<!--- always skip cause since it's just a copy of rootCause anyway --->
 		<cfset local.skip = ListAppend(local.skip, "exception.cause")>
+		<cfset local.scopeMap = {
+			"CGI": CGI,
+			"Form": Form,
+			"URL": URL,
+			"Application": Application,
+			"Session": Session,
+			"Request": Request,
+			"Cookie": Cookie,
+			"Arguments.Exception": Arguments.Exception
+		}>
 		<h1>Details</h1>
 		<cfloop list="#local.scopes#" index="local.i">
 			<cfset local.scopeName = ListLast(local.i, ".")>
 			<cfif NOT ListFindNoCase(local.skip, local.scopeName) AND IsDefined(local.scopeName)>
 				<cftry>
-					<cfset local.scope = Evaluate(local.i)>
+					<cfset local.scope = local.scopeMap[local.i]>
 					<cfif IsStruct(local.scope)>
 						<p>
 							<strong>#local.scopeName#</strong>