From e0e676a6939140fa282bd4366d71e233f34e9583 Mon Sep 17 00:00:00 2001
From: Arnaud CHASSEUX <achasseu@prismamedia.com>
Date: Wed, 4 Feb 2015 18:46:52 +0100
Subject: [PATCH] For AND operator, the left operand should have parentheses,
 not only right operand

---
 Tests/CssSelectorTest.php      |  2 +-
 Tests/XPath/TranslatorTest.php | 16 +++++++++-------
 XPath/XPathExpr.php            |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Tests/CssSelectorTest.php b/Tests/CssSelectorTest.php
index 50daecc..9fbdf1d 100644
--- a/Tests/CssSelectorTest.php
+++ b/Tests/CssSelectorTest.php
@@ -47,7 +47,7 @@ public function getCssToXPathWithoutPrefixTestData()
             array('h1', "h1"),
             array('foo|h1', "foo:h1"),
             array('h1, h2, h3', "h1 | h2 | h3"),
-            array('h1:nth-child(3n+1)', "*/*[name() = 'h1' and (position() - 1 >= 0 and (position() - 1) mod 3 = 0)]"),
+            array('h1:nth-child(3n+1)', "*/*[(name() = 'h1') and (position() - 1 >= 0 and (position() - 1) mod 3 = 0)]"),
             array('h1 > p', "h1/p"),
             array('h1#foo', "h1[@id = 'foo']"),
             array('h1.foo', "h1[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]"),
diff --git a/Tests/XPath/TranslatorTest.php b/Tests/XPath/TranslatorTest.php
index 30f7189..9759d18 100644
--- a/Tests/XPath/TranslatorTest.php
+++ b/Tests/XPath/TranslatorTest.php
@@ -101,18 +101,20 @@ public function getCssToXPathTestData()
             array('e[foo^="bar"]', "e[@foo and starts-with(@foo, 'bar')]"),
             array('e[foo$="bar"]', "e[@foo and substring(@foo, string-length(@foo)-2) = 'bar']"),
             array('e[foo*="bar"]', "e[@foo and contains(@foo, 'bar')]"),
+            array('e[foo!="bar"]', "e[not(@foo) or @foo != 'bar']"),
+            array('e[foo!="bar"][foo!="baz"]', "e[(not(@foo) or @foo != 'bar') and (not(@foo) or @foo != 'baz')]"),
             array('e[hreflang|="en"]', "e[@hreflang and (@hreflang = 'en' or starts-with(@hreflang, 'en-'))]"),
-            array('e:nth-child(1)', "*/*[name() = 'e' and (position() = 1)]"),
-            array('e:nth-last-child(1)', "*/*[name() = 'e' and (position() = last() - 0)]"),
-            array('e:nth-last-child(2n+2)', "*/*[name() = 'e' and (last() - position() - 1 >= 0 and (last() - position() - 1) mod 2 = 0)]"),
+            array('e:nth-child(1)', "*/*[(name() = 'e') and (position() = 1)]"),
+            array('e:nth-last-child(1)', "*/*[(name() = 'e') and (position() = last() - 0)]"),
+            array('e:nth-last-child(2n+2)', "*/*[(name() = 'e') and (last() - position() - 1 >= 0 and (last() - position() - 1) mod 2 = 0)]"),
             array('e:nth-of-type(1)', "*/e[position() = 1]"),
             array('e:nth-last-of-type(1)', "*/e[position() = last() - 0]"),
             array('div e:nth-last-of-type(1) .aclass', "div/descendant-or-self::*/e[position() = last() - 0]/descendant-or-self::*/*[@class and contains(concat(' ', normalize-space(@class), ' '), ' aclass ')]"),
-            array('e:first-child', "*/*[name() = 'e' and (position() = 1)]"),
-            array('e:last-child', "*/*[name() = 'e' and (position() = last())]"),
+            array('e:first-child', "*/*[(name() = 'e') and (position() = 1)]"),
+            array('e:last-child', "*/*[(name() = 'e') and (position() = last())]"),
             array('e:first-of-type', "*/e[position() = 1]"),
             array('e:last-of-type', "*/e[position() = last()]"),
-            array('e:only-child', "*/*[name() = 'e' and (last() = 1)]"),
+            array('e:only-child', "*/*[(name() = 'e') and (last() = 1)]"),
             array('e:only-of-type', "e[last() = 1]"),
             array('e:empty', "e[not(*) and not(string-length())]"),
             array('e:EmPTY', "e[not(*) and not(string-length())]"),
@@ -126,7 +128,7 @@ public function getCssToXPathTestData()
             array('e:nOT(*)', "e[0]"),
             array('e f', "e/descendant-or-self::*/f"),
             array('e > f', "e/f"),
-            array('e + f', "e/following-sibling::*[name() = 'f' and (position() = 1)]"),
+            array('e + f', "e/following-sibling::*[(name() = 'f') and (position() = 1)]"),
             array('e ~ f', "e/following-sibling::f"),
             array('div#container p', "div[@id = 'container']/descendant-or-self::*/p"),
         );
diff --git a/XPath/XPathExpr.php b/XPath/XPathExpr.php
index c7ef97c..3434cc8 100644
--- a/XPath/XPathExpr.php
+++ b/XPath/XPathExpr.php
@@ -68,7 +68,7 @@ public function getElement()
      */
     public function addCondition($condition)
     {
-        $this->condition = $this->condition ? sprintf('%s and (%s)', $this->condition, $condition) : $condition;
+        $this->condition = $this->condition ? sprintf('(%s) and (%s)', $this->condition, $condition) : $condition;
 
         return $this;
     }