diff vendor/symfony/css-selector/XPath/XPathExpr.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

--- a/vendor/symfony/css-selector/XPath/XPathExpr.php	Mon Apr 23 09:33:26 2018 +0100
+++ b/vendor/symfony/css-selector/XPath/XPathExpr.php	Mon Apr 23 09:46:53 2018 +0100
@@ -23,19 +23,8 @@
  */
 class XPathExpr
 {
-    /**
-     * @var string
-     */
     private $path;
-
-    /**
-     * @var string
-     */
     private $element;
-
-    /**
-     * @var string
-     */
     private $condition;
 
     /**
@@ -70,7 +59,7 @@
      */
     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;
     }
@@ -114,7 +103,7 @@
      *
      * @return $this
      */
-    public function join($combiner, XPathExpr $expr)
+    public function join($combiner, self $expr)
     {
         $path = $this->__toString().$combiner;