Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Adding missing conditional tests to the RNG Grammar #84

Merged
merged 1 commit into from

2 participants

@johan162

Some conditional tests (like "istrue" et.al) was missing in the grammar.

@mrook mrook merged commit 00a52de into phingofficial:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 10, 2012
  1. @johan162
This page is out of date. Refresh to see the latest.
Showing with 75 additions and 5 deletions.
  1. +75 −5 etc/phing-grammar.rng
View
80 etc/phing-grammar.rng
@@ -901,6 +901,11 @@
<ref name="equals"/>
<ref name="or"/>
<ref name="and"/>
+ <ref name="isfalse"/>
+ <ref name="istrue"/>
+ <ref name="isset"/>
+ <ref name="contains_cond"/>
+ <ref name="referenceexists"/>
</choice>
<ref name="then"/>
<zeroOrMore>
@@ -912,10 +917,54 @@
</element>
</define>
+ <define name="istrue">
+ <element name="istrue">
+ <attribute name="value"/>
+ </element>
+ </define>
+
+ <define name="isset">
+ <element name="isset">
+ <attribute name="property"/>
+ </element>
+ </define>
+
+ <define name="isfalse">
+ <element name="isfalse">
+ <attribute name="value"/>
+ </element>
+ </define>
+
+ <define name="referenceexists">
+ <element name="referenceexists">
+ <attribute name="ref"/>
+ </element>
+ </define>
+
+ <define name="contains_cond">
+ <element name="contains">
+ <interleave>
+ <attribute name="string"/>
+ <attribute name="substring"/>
+ <optional>
+ <attribute name="casesensitive"/>
+ </optional>
+ </interleave>
+ </element>
+ </define>
+
<define name="equals">
<element name="equals">
- <attribute name="arg1"/>
- <attribute name="arg2"/>
+ <interleave>
+ <attribute name="arg1"/>
+ <attribute name="arg2"/>
+ <optional>
+ <attribute name="casesensitive"/>
+ </optional>
+ <optional>
+ <attribute name="trim"/>
+ </optional>
+ </interleave>
</element>
</define>
@@ -935,6 +984,11 @@
<ref name="equals"/>
<ref name="or"/>
<ref name="and"/>
+ <ref name="isfalse"/>
+ <ref name="istrue"/>
+ <ref name="isset"/>
+ <ref name="contains_cond"/>
+ <ref name="referenceexists"/>
</choice>
<interleave>
<ref name="coretasks"/>
@@ -967,7 +1021,15 @@
<define name="or">
<element name="or">
<oneOrMore>
- <ref name="property"/>
+ <interleave>
+ <ref name="property"/>
+ <ref name="and"/>
+ <ref name="isfalse"/>
+ <ref name="istrue"/>
+ <ref name="isset"/>
+ <ref name="contains_cond"/>
+ <ref name="referenceexists"/>
+ </interleave>
</oneOrMore>
</element>
</define>
@@ -975,7 +1037,15 @@
<define name="and">
<element name="and">
<oneOrMore>
- <ref name="property"/>
+ <interleave>
+ <ref name="property"/>
+ <ref name="or"/>
+ <ref name="isfalse"/>
+ <ref name="istrue"/>
+ <ref name="isset"/>
+ <ref name="contains_cond"/>
+ <ref name="referenceexists"/>
+ </interleave>
</oneOrMore>
</element>
</define>
@@ -1501,7 +1571,7 @@
=========================================
ApiGenTask
=========================================
- -->
+ -->
<define name="apigen">
<element name="apigen">
Something went wrong with that request. Please try again.