feature #80 add support for (NOT_)EQUALS in PatternMatch (sstok)

This PR was merged into the master branch. Discussion ---------- |Q |A | |--- |---| |Bug Fix? |no | |New Feature? |yes| |BC Breaks? |no | |Deprecations?|no | |Fixed Tickets|#79| |License |MIT| Commits ------- bfed29d add support for (NOT_)EQUALS in PatternMatch
rollerworks · Aug 9, 2015 · 68e1fcf · 68e1fcf
2 parents aa43570 + bfed29d
commit 68e1fcf
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 4 deletions.
diff --git a/src/Input/FilterQueryInput.php b/src/Input/FilterQueryInput.php
@@ -611,13 +611,18 @@ private function getPatternMatchOperator($subParse = false)
 
                 return 'REGEX';
 
+            case '=':
+                $this->match(Lexer::T_EQUALS);
+
+                return 'EQUALS';
+
             case !$subParse && '!':
                 $this->match(Lexer::T_NEGATE);
 
                 return 'NOT_'.$this->getPatternMatchOperator(true);
 
             default:
-                $this->syntaxError(['*', '>', '<', '?', '!*', '!>', '!<', '!?']);
+                $this->syntaxError(['*', '>', '<', '?', '!*', '!>', '!<', '!?', '=', '!=']);
         }
     }
 }
diff --git a/src/Input/schema/dic/input/xml-input-1.0.xsd b/src/Input/schema/dic/input/xml-input-1.0.xsd
@@ -114,6 +114,8 @@
                             <xsd:enumeration value="not_starts_with"/>
                             <xsd:enumeration value="not_ends_with"/>
                             <xsd:enumeration value="not_regex"/>
+                            <xsd:enumeration value="equals"/>
+                            <xsd:enumeration value="not_equals"/>
                         </xsd:restriction>
                     </xsd:simpleType>
                 </xsd:attribute>

diff --git a/src/Value/PatternMatch.php b/src/Value/PatternMatch.php
@@ -24,6 +24,8 @@ final class PatternMatch
     const PATTERN_NOT_STARTS_WITH = 6;
     const PATTERN_NOT_ENDS_WITH = 7;
     const PATTERN_NOT_REGEX = 8;
+    const PATTERN_EQUALS = 9;
+    const PATTERN_NOT_EQUALS = 10;
 
     /**
      * @var string
@@ -67,7 +69,7 @@ public function __construct($value, $patternType, $caseInsensitive = false)
             }
         }
 
-        if ($patternType < 1 || $patternType > 8) {
+        if ($patternType < 1 || $patternType > 10) {
             throw new \InvalidArgumentException(sprintf('Unknown pattern-match type "%s".', $patternType));
         }
 
@@ -114,6 +116,7 @@ public function isExclusive()
                 self::PATTERN_NOT_CONTAINS,
                 self::PATTERN_NOT_ENDS_WITH,
                 self::PATTERN_NOT_REGEX,
+                self::PATTERN_NOT_EQUALS,
             ], true
         );
     }

diff --git a/tests/Input/ArrayInputTest.php b/tests/Input/ArrayInputTest.php
@@ -134,6 +134,10 @@ public function provideMatcherValues()
                                 ['value' => '^foo|bar?', 'type' => 'REGEX'],
                                 ['value' => 'value4', 'type' => 'NOT_CONTAINS'],
                                 ['value' => 'value5', 'type' => 'NOT_CONTAINS', 'case-insensitive' => true],
+                                ['value' => 'value9', 'type' => 'EQUALS'],
+                                ['value' => 'value10', 'type' => 'NOT_EQUALS'],
+                                ['value' => 'value11', 'type' => 'EQUALS', 'case-insensitive' => true],
+                                ['value' => 'value12', 'type' => 'NOT_EQUALS', 'case-insensitive' => true],
                             ],
                         ],
                     ],

diff --git a/tests/Input/FilterQueryInputTest.php b/tests/Input/FilterQueryInputTest.php
@@ -79,7 +79,7 @@ public function testPatternMatchLexerNoEndLessLoop()
 
         $this->setExpectedException(
             'Rollerworks\Component\Search\Input\FilterQuery\QueryException',
-            "[Syntax Error] line 0, col 8: Error: Expected '*' | '>' | '<' | '?' | '!*' | '!>' | '!<' | '!?', got '!'"
+            "[Syntax Error] line 0, col 8: Error: Expected '*' | '>' | '<' | '?' | '!*' | '!>' | '!<' | '!?' | '=' | '!=', got '!'"
         );
 
         $processor->process($config, 'name: ~!!*"value";');
@@ -192,7 +192,7 @@ public function provideComparisonValues()
     public function provideMatcherValues()
     {
         return [
-            ['name: ~*value, ~i>value2, ~<value3, ~?"^foo|bar?", ~!*value4, ~i!*value5;'],
+            ['name: ~*value, ~i>value2, ~<value3, ~?"^foo|bar?", ~!*value4, ~i!*value5, ~=value9, ~!=value10, ~i=value11, ~i!=value12;'],
         ];
     }
 

diff --git a/tests/Input/InputProcessorTestCase.php b/tests/Input/InputProcessorTestCase.php
@@ -268,6 +268,10 @@ public function it_processes_matchers($input)
         $values->addPatternMatch(new PatternMatch('^foo|bar?', PatternMatch::PATTERN_REGEX));
         $values->addPatternMatch(new PatternMatch('value4', PatternMatch::PATTERN_NOT_CONTAINS));
         $values->addPatternMatch(new PatternMatch('value5', PatternMatch::PATTERN_NOT_CONTAINS, true));
+        $values->addPatternMatch(new PatternMatch('value9', PatternMatch::PATTERN_EQUALS));
+        $values->addPatternMatch(new PatternMatch('value10', PatternMatch::PATTERN_NOT_EQUALS));
+        $values->addPatternMatch(new PatternMatch('value11', PatternMatch::PATTERN_EQUALS, true));
+        $values->addPatternMatch(new PatternMatch('value12', PatternMatch::PATTERN_NOT_EQUALS, true));
         $expectedGroup->addField('name', $values);
 
         $condition = new SearchCondition($config->getFieldSet(), $expectedGroup);

diff --git a/tests/Input/JsonInputTest.php b/tests/Input/JsonInputTest.php
@@ -158,6 +158,10 @@ public function provideMatcherValues()
                                     ['value' => '^foo|bar?', 'type' => 'REGEX'],
                                     ['value' => 'value4', 'type' => 'NOT_CONTAINS'],
                                     ['value' => 'value5', 'type' => 'NOT_CONTAINS', 'case-insensitive' => true],
+                                    ['value' => 'value9', 'type' => 'EQUALS'],
+                                    ['value' => 'value10', 'type' => 'NOT_EQUALS'],
+                                    ['value' => 'value11', 'type' => 'EQUALS', 'case-insensitive' => true],
+                                    ['value' => 'value12', 'type' => 'NOT_EQUALS', 'case-insensitive' => true],
                                 ],
                             ],
                         ],

diff --git a/tests/Input/XmlInputTest.php b/tests/Input/XmlInputTest.php
@@ -275,6 +275,10 @@ public function provideMatcherValues()
                             <pattern-matcher type="regex" case-insensitive="false">^foo|bar?</pattern-matcher>
                             <pattern-matcher type="not_contains" case-insensitive="false">value4</pattern-matcher>
                             <pattern-matcher type="not_contains" case-insensitive="true">value5</pattern-matcher>
+                            <pattern-matcher type="equals">value9</pattern-matcher>
+                            <pattern-matcher type="not_equals">value10</pattern-matcher>
+                            <pattern-matcher type="equals" case-insensitive="true">value11</pattern-matcher>
+                            <pattern-matcher type="not_equals" case-insensitive="true">value12</pattern-matcher>
                         </pattern-matchers>
                     </field>
                   </fields>