Dev to Master #196
Merged
Dev to Master #196
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In some situations CFMLParser mixes content of analyzed files. That's why we need to create separate instance of CFMLParser for each file.
Allows nested ']]>' strings. Escape all control characters that are illegal in xml.
Generate xml with issues using stax implementation
…name (cfquery, cfloop, and cfinvoke) Fixed BugInfo to trim file names Fix cfml tag checker to verify the cfmlTag was not null before checking Added Test for cfelement variable nameEndsInNumberScript Added new Argument Default condition checker for variables that don't have a default and the code is checking if the argument exists or isdefined
# Conflicts: # src/main/java/com/cflint/tools/CFLintFilter.java
# Conflicts: # src/main/java/com/cflint/CFLint.java
Workaround context leaking
Merger from Head Master
# Conflicts: # pom.xml # src/main/java/com/cflint/CFLint.java # src/main/java/com/cflint/ant/CFLintTask.java # src/main/java/com/cflint/main/CFLintMain.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull changes to Master branch