d7ded0e Use required=true for consistency.
src/Regex.cfc | 46 ++++++++++----------
src/functions/RegexCompile.cfm | 2 +-
src/functions/RegexEscape.cfm | 2 +-
src/functions/RegexFind.cfm | 4 +-
src/functions/RegexMatch.cfm | 4 +-
src/functions/RegexMatches.cfm | 4 +-
src/functions/RegexQuote.cfm | 2 +-
src/functions/RegexReplace.cfm | 4 +-
src/functions/RegexSplit.cfm | 4 +-
src/legacy/Regex.cfc | 46 ++++++++++----------
10 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/src/Regex.cfc b/src/Regex.cfc
index a65eb09..5bd47fa 100644
--- a/src/Regex.cfc
+++ b/src/Regex.cfc
@@ -57,17 +57,17 @@
--->
<cffunction name="onStartTag" returntype="boolean" output=false >
- <cfargument name="Attributes" type="Struct" required />
- <cfargument name="Caller" type="Struct" required />
+ <cfargument name="Attributes" type="Struct" required=true />
+ <cfargument name="Caller" type="Struct" required=true />
<cfreturn true />
</cffunction>
<cffunction name="onEndTag" returntype="boolean" output=false >
- <cfargument name="Attributes" type="Struct" required />
- <cfargument name="Caller" type="Struct" required />
- <cfargument name="GeneratedContent" type="String" required />
+ <cfargument name="Attributes" type="Struct" required=true />
+ <cfargument name="Caller" type="Struct" required=true />
+ <cfargument name="GeneratedContent" type="String" required=true />
<cfif StructKeyExists(Arguments.Attributes,'Action')>
@@ -145,7 +145,7 @@
--->
<cffunction name="parseModes" returntype="Numeric" output="false" access="private">
- <cfargument name="ModeList" type="String" required />
+ <cfargument name="ModeList" type="String" required=true />
<cfargument name="IgnoreInvalidModes" type="Boolean" default="false"/>
<cfset var CurrentMode = ""/>
<cfset var ResultMode = 0/>
@@ -174,8 +174,8 @@
<cffunction name="compilePattern" returntype="void" output="false" access="private">
- <cfargument name="Pattern" type="String" required />
- <cfargument name="Modes" type="String" required />
+ <cfargument name="Pattern" type="String" required=true />
+ <cfargument name="Modes" type="String" required=true />
<cfset Variables.PatternText = Arguments.Pattern />
@@ -188,7 +188,7 @@
<cffunction name="buildMatchInfo" returntype="Struct" output="false" access="private">
- <cfargument name="Matcher" type="any" required />
+ <cfargument name="Matcher" type="any" required=true />
<cfargument name="PosOffset" type="Numeric" optional />
<cfargument name="GroupNames" type="any" optional />
@@ -238,7 +238,7 @@
<cffunction name="compile" returntype="Regex" output="false" access="public" action>
- <cfargument name="Pattern" type="String" required />
+ <cfargument name="Pattern" type="String" required=true />
<cfargument name="Modes" type="String" default="#Variables.DefaultModes#" />
<cfset StructDelete(This,'compile') />
<cfset StructDelete(This,'onStartTag') />
@@ -254,7 +254,7 @@
--->
<cffunction name="find" returntype="Array" output="false" access="public" action>
- <cfargument name="Text" type="String" required />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" default=1 />
<cfargument name="Limit" type="Numeric" default=0 />
<cfargument name="ReturnType" type="String" default="pos" />
@@ -302,7 +302,7 @@
<cffunction name="match" returntype="Array" output="false" access="public" action>
- <cfargument name="Text" type="String" required />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 />
<cfargument name="ReturnType" type="String" default="match" hint="match|groups|namedgroups|full" />
@@ -371,7 +371,7 @@
<cffunction name="matches" returntype="any" output="false" access="public" action>
- <cfargument name="Text" type="String" required />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="ReturnType" type="String" optional hint="exact,partial,start,end,count" />
<cfif StructKeyExists(Arguments,'ReturnType')>
@@ -476,7 +476,7 @@
<cffunction name="replace" returntype="String" output="false" access="public" action>
- <cfargument name="Text" type="String" required />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Replacement" type="Any" optional hint="String,Array,Function"/>
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 />
@@ -551,7 +551,7 @@
<cffunction name="split" returntype="Array" output="false" access="public" action>
- <cfargument name="Text" type="String" required />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 hint="The maximum number of times a split is made (i.e. limit+1=max array size)"/>
<cfargument name="GroupNames" type="any" default="" hint="Passed into Callback function if provided" />
@@ -645,10 +645,10 @@
See http://docs.cfregex.net/Callbacks.html
<cffunction name="ReplaceCallback" returntype="String" output="false">
- <cfargument name="Pos" type="Numeric" required hint="The start position of the match." />
- <cfargument name="Len" type="Numeric" required hint="The length of the match." />
- <cfargument name="Match" type="String" required hint="The text of the match." />
- <cfargument name="Groups" type="Array" required hint="Array of group information." />
+ <cfargument name="Pos" type="Numeric" required=true hint="The start position of the match." />
+ <cfargument name="Len" type="Numeric" required=true hint="The length of the match." />
+ <cfargument name="Match" type="String" required=true hint="The text of the match." />
+ <cfargument name="Groups" type="Array" required=true hint="Array of group information." />
<cfargument name="NamedGroups" type="Struct" optional hint="Struct of named group information." />
<cfargument name="Data" type="Struct" optional hint="Struct containing passed-in data." />
@@ -657,10 +657,10 @@
<cffunction name="BooleanCallback" returntype="Boolean" output="false">
- <cfargument name="Pos" type="Numeric" required hint="The start position of the match." />
- <cfargument name="Len" type="Numeric" required hint="The length of the match." />
- <cfargument name="Match" type="String" required hint="The text of the match." />
- <cfargument name="Groups" type="Array" required hint="Array of group information." />
+ <cfargument name="Pos" type="Numeric" required=true hint="The start position of the match." />
+ <cfargument name="Len" type="Numeric" required=true hint="The length of the match." />
+ <cfargument name="Match" type="String" required=true hint="The text of the match." />
+ <cfargument name="Groups" type="Array" required=true hint="Array of group information." />
<cfargument name="NamedGroups" type="Struct" optional hint="Struct of named group information." />
<cfargument name="Data" type="Struct" optional hint="Struct containing passed-in data." />
diff --git a/src/functions/RegexCompile.cfm b/src/functions/RegexCompile.cfm
index ae2461e..83287c0 100644
--- a/src/functions/RegexCompile.cfm
+++ b/src/functions/RegexCompile.cfm
@@ -1,5 +1,5 @@
<cffunction name="RegexCompile" returntype="Regex" output="false">
- <cfargument name="Pattern" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
<cfargument name="Flags" type="String" optional />
<cfreturn createObject("component","Regex").init(ArgumentCollection=Arguments) />
</cffunction>
\ No newline at end of file
diff --git a/src/functions/RegexEscape.cfm b/src/functions/RegexEscape.cfm
index 25519cf..5a02d4b 100644
--- a/src/functions/RegexEscape.cfm
+++ b/src/functions/RegexEscape.cfm
@@ -1,5 +1,5 @@
<cffunction name="RegexEscape" returntype="String" output="false" >
- <cfargument name="Pattern" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
<cfargument name="ReturnType" type="String" default=REGEX hint="regex|class" />
<cfargument name="Flags" type="String" optional />
<cfreturn new Regex(ArgumentCollection=Arguments,FuncName="escape").escape(ArgumentCollection=Arguments) />
diff --git a/src/functions/RegexFind.cfm b/src/functions/RegexFind.cfm
index fb216d8..dc44978 100644
--- a/src/functions/RegexFind.cfm
+++ b/src/functions/RegexFind.cfm
@@ -1,6 +1,6 @@
<cffunction name="RegexFind" returntype="Array" output="false" >
- <cfargument name="Pattern" type="String" required_ />
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" default=1 />
<cfargument name="Limit" type="Numeric" default=0 />
<cfargument name="ReturnType" type="String" default="pos" />
diff --git a/src/functions/RegexMatch.cfm b/src/functions/RegexMatch.cfm
index 00151ab..c4fc694 100644
--- a/src/functions/RegexMatch.cfm
+++ b/src/functions/RegexMatch.cfm
@@ -1,6 +1,6 @@
<cffunction name="RegexMatch" returntype="Array" output="false" >
- <cfargument name="Pattern" type="String" required_ />
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 />
<cfargument name="ReturnType" type="String" default="match" hint="match|groups|namedgroups|full" />
diff --git a/src/functions/RegexMatches.cfm b/src/functions/RegexMatches.cfm
index 549a39b..57de2e2 100644
--- a/src/functions/RegexMatches.cfm
+++ b/src/functions/RegexMatches.cfm
@@ -1,6 +1,6 @@
<cffunction name="RegexMatches" returntype="any" output="false" >
- <cfargument name="Pattern" type="String" required_ />
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="ReturnType" type="String" optional hint="exact,partial,start,end,count" />
<cfargument name="Flags" type="String" optional />
<cfreturn new Regex(ArgumentCollection=Arguments,FuncName="matches").matches(ArgumentCollection=Arguments) />
diff --git a/src/functions/RegexQuote.cfm b/src/functions/RegexQuote.cfm
index c73ae33..7acb10c 100644
--- a/src/functions/RegexQuote.cfm
+++ b/src/functions/RegexQuote.cfm
@@ -1,5 +1,5 @@
<cffunction name="RegexQuote" returntype="String" output="false" >
- <cfargument name="Pattern" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
<cfargument name="Flags" type="String" optional />
<cfreturn new Regex(ArgumentCollection=Arguments,FuncName="quote").quote(ArgumentCollection=Arguments) />
</cffunction>
\ No newline at end of file
diff --git a/src/functions/RegexReplace.cfm b/src/functions/RegexReplace.cfm
index 795d698..4152493 100644
--- a/src/functions/RegexReplace.cfm
+++ b/src/functions/RegexReplace.cfm
@@ -1,6 +1,6 @@
<cffunction name="RegexReplace" returntype="String" output="false" >
- <cfargument name="Pattern" type="String" required_ />
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Replacement" type="Any" optional hint="String,Array,Function"/>
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 />
diff --git a/src/functions/RegexSplit.cfm b/src/functions/RegexSplit.cfm
index 21dca93..9c38368 100644
--- a/src/functions/RegexSplit.cfm
+++ b/src/functions/RegexSplit.cfm
@@ -1,6 +1,6 @@
<cffunction name="RegexSplit" returntype="Array" output="false" >
- <cfargument name="Pattern" type="String" required_ />
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 hint="The maximum number of times a split is made (i.e. limit+1=max array size)"/>
<cfargument name="GroupNames" type="any" default="" hint="Passed into Callback function if provided" />
diff --git a/src/legacy/Regex.cfc b/src/legacy/Regex.cfc
index e73a950..95ff258 100644
--- a/src/legacy/Regex.cfc
+++ b/src/legacy/Regex.cfc
@@ -57,17 +57,17 @@
--->
<cffunction name="onStartTag" returntype="boolean" output=false >
- <cfargument name="Attributes" type="Struct" required_ />
- <cfargument name="Caller" type="Struct" required_ />
+ <cfargument name="Attributes" type="Struct" required=true />
+ <cfargument name="Caller" type="Struct" required=true />
<cfreturn true />
</cffunction>
<cffunction name="onEndTag" returntype="boolean" output=false >
- <cfargument name="Attributes" type="Struct" required_ />
- <cfargument name="Caller" type="Struct" required_ />
- <cfargument name="GeneratedContent" type="String" required_ />
+ <cfargument name="Attributes" type="Struct" required=true />
+ <cfargument name="Caller" type="Struct" required=true />
+ <cfargument name="GeneratedContent" type="String" required=true />
<cfif StructKeyExists(Arguments.Attributes,'Action')>
@@ -146,7 +146,7 @@
--->
<cffunction name="parseModes" returntype="Numeric" output="false" access="private">
- <cfargument name="ModeList" type="String" required_ />
+ <cfargument name="ModeList" type="String" required=true />
<cfargument name="IgnoreInvalidModes" type="Boolean" default="false"/>
<cfset var CurrentMode = ""/>
<cfset var ResultMode = 0/>
@@ -175,8 +175,8 @@
<cffunction name="compilePattern" returntype="void" output="false" access="private">
- <cfargument name="Pattern" type="String" required_ />
- <cfargument name="Modes" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
+ <cfargument name="Modes" type="String" required=true />
<cfset Variables.PatternText = Arguments.Pattern />
@@ -189,7 +189,7 @@
<cffunction name="buildMatchInfo" returntype="Struct" output="false" access="private">
- <cfargument name="Matcher" type="any" required_ />
+ <cfargument name="Matcher" type="any" required=true />
<cfargument name="PosOffset" type="Numeric" optional />
<cfargument name="GroupNames" type="any" optional />
@@ -239,7 +239,7 @@
<cffunction name="compile" returntype="Regex" output="false" access="public" action>
- <cfargument name="Pattern" type="String" required_ />
+ <cfargument name="Pattern" type="String" required=true />
<cfargument name="Modes" type="String" default="#Variables.DefaultModes#" />
<cfset StructDelete(This,'compile') />
<cfset StructDelete(This,'onStartTag') />
@@ -255,7 +255,7 @@
--->
<cffunction name="find" returntype="Array" output="false" access="public" action>
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" default=1 />
<cfargument name="Limit" type="Numeric" default=0 />
<cfargument name="ReturnType" type="String" default="pos" />
@@ -303,7 +303,7 @@
<cffunction name="match" returntype="Array" output="false" access="public" action>
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 />
<cfargument name="ReturnType" type="String" default="match" hint="match|groups|namedgroups|full" />
@@ -372,7 +372,7 @@
<cffunction name="matches" returntype="any" output="false" access="public" action>
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="ReturnType" type="String" optional hint="exact,partial,start,end,count" />
<cfif StructKeyExists(Arguments,'ReturnType')>
@@ -477,7 +477,7 @@
<cffunction name="replace" returntype="String" output="false" access="public" action>
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Replacement" type="Any" optional hint="String,Array,Function"/>
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 />
@@ -553,7 +553,7 @@
<cffunction name="split" returntype="Array" output="false" access="public" action>
- <cfargument name="Text" type="String" required_ />
+ <cfargument name="Text" type="String" required=true />
<cfargument name="Start" type="Numeric" optional />
<cfargument name="Limit" type="Numeric" default=0 hint="The maximum number of times a split is made (i.e. limit+1=max array size)"/>
<cfargument name="GroupNames" type="any" default="" hint="Passed into Callback function if provided" />
@@ -647,10 +647,10 @@
See http://docs.cfregex.net/Callbacks.html
<cffunction name="ReplaceCallback" returntype="String" output="false">
- <cfargument name="Pos" type="Numeric" required_ hint="The start position of the match." />
- <cfargument name="Len" type="Numeric" required_ hint="The length of the match." />
- <cfargument name="Match" type="String" required_ hint="The text of the match." />
- <cfargument name="Groups" type="Array" required_ hint="Array of group information." />
+ <cfargument name="Pos" type="Numeric" required=true hint="The start position of the match." />
+ <cfargument name="Len" type="Numeric" required=true hint="The length of the match." />
+ <cfargument name="Match" type="String" required=true hint="The text of the match." />
+ <cfargument name="Groups" type="Array" required=true hint="Array of group information." />
<cfargument name="NamedGroups" type="Struct" optional hint="Struct of named group information." />
<cfargument name="Data" type="Struct" optional hint="Struct containing passed-in data." />
@@ -659,10 +659,10 @@
<cffunction name="BooleanCallback" returntype="Boolean" output="false">
- <cfargument name="Pos" type="Numeric" required_ hint="The start position of the match." />
- <cfargument name="Len" type="Numeric" required_ hint="The length of the match." />
- <cfargument name="Match" type="String" required_ hint="The text of the match." />
- <cfargument name="Groups" type="Array" required_ hint="Array of group information." />
+ <cfargument name="Pos" type="Numeric" required=true hint="The start position of the match." />
+ <cfargument name="Len" type="Numeric" required=true hint="The length of the match." />
+ <cfargument name="Match" type="String" required=true hint="The text of the match." />
+ <cfargument name="Groups" type="Array" required=true hint="Array of group information." />
<cfargument name="NamedGroups" type="Struct" optional hint="Struct of named group information." />
<cfargument name="Data" type="Struct" optional hint="Struct containing passed-in data." />
