Skip to content

Fixes for use with CF2018 and forward #15

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

Open
apendrag0n3 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for use with CF2018 and forward #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27f868
Much like Railo/Lucee - CF2018 has its own getCanonicalPath function.…
Jan 22, 2019
27b6e3b
Set theme jekyll-theme-time-machine
apendrag0n3 Jan 23, 2019
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
1 change: 1 addition & 0 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-time-machine
8 changes: 4 additions & 4 deletions corefiles/PathUtil.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<cfargument name="callerPath" type="string" required="true"
hint="I am FUSEBOX_CALLER_PATH." />

<cfset variables.approotdirectory = getCanonicalPath(normalizePartialPath(arguments.callerPath) & normalizePartialPath(arguments.appPath)) />
<cfset variables.approotdirectory = getFBCanonicalPath(normalizePartialPath(arguments.callerPath) & normalizePartialPath(arguments.appPath)) />
<cfset calculatePaths(variables.approotdirectory) />
<cfreturn this />
</cffunction>
Expand Down Expand Up @@ -60,7 +60,7 @@

</cffunction>

<cffunction name="getCanonicalPath" returntype="string" access="public" output="false"
<cffunction name="getFBCanonicalPath" returntype="string" access="public" output="false"
hint="I return a canonical file path (with all /../ sections resolved).">
<cfargument name="path" type="string" required="true"
hint="I am the path to resolve." />
Expand Down Expand Up @@ -134,8 +134,8 @@
hint="I deduce the dot-separated path to a CFC given its file system path (and a few heuristics).">
<cfargument name="filename" type="string" required="true" />

<cfset var cfcPath = getCanonicalPath(filename) />
<cfset var webRoot = getCanonicalPath(expandPath("/")) />
<cfset var cfcPath = getFBCanonicalPath(filename) />
<cfset var webRoot = getFBCanonicalPath(expandPath("/")) />
<cfset var lenWebRoot = len(webRoot) />
<cfset var lenAppRoot = len(getApplicationRoot()) />
<cfset var lenCfcPath = len(cfcPath) />
Expand Down
4 changes: 2 additions & 2 deletions corefiles/fuseboxApplication.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1291,12 +1291,12 @@ limitations under the License.

</cffunction>

<cffunction name="getCanonicalPath" returntype="string" access="public" output="false"
<cffunction name="getFBCanonicalPath" returntype="string" access="public" output="false"
hint="I return a canonical file path (with all /../ sections resolved).">
<cfargument name="path" type="string" required="true"
hint="I am the path to resolve." />

<cfreturn pathUtil.getCanonicalPath(arguments.path) />
<cfreturn pathUtil.getFBCanonicalPath(arguments.path) />

</cffunction>

Expand Down
2 changes: 1 addition & 1 deletion corefiles/fuseboxCircuit.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ limitations under the License.
</cfif>
</cfif>

<cfset variables.fullPath = variables.fuseboxApplication.getCanonicalPath(variables.fullPath) />
<cfset variables.fullPath = variables.fuseboxApplication.getFBCanonicalPath(variables.fullPath) />

<!---
this was not correctly normalized prior to ticket 139 but it didn't really matter
Expand Down
2 changes: 1 addition & 1 deletion corefiles/fuseboxPlugin.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ limitations under the License.
this.path,arguments.fbApp.getApplicationRoot()) />
</cfif>

<cfset this.rootpath = arguments.fbApp.getCanonicalPath(this.rootpath) />
<cfset this.rootpath = arguments.fbApp.getFBCanonicalPath(this.rootpath) />

<cfset variables.parameters = arguments.pluginXML.xmlChildren />
<cfset variables.paramVerbs = structNew() />
Expand Down