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

Update Drupal core to 8.5.2 via Composer

  *
  * @internal
  */
 class XPathExpr
 {
-    /**
-     * @var string
-     */
     private $path;
-
-    /**
-     * @var string
-     */
     private $element;
-
-    /**
-     * @var string
-     */
     private $condition;
 
     /**
      * @param string $path
      * @param string $element

      *
      * @return $this
      */
     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;
     }
 
     /**

      * @param string    $combiner
      * @param XPathExpr $expr
      *
      * @return $this
      */
-    public function join($combiner, XPathExpr $expr)
+    public function join($combiner, self $expr)
     {
         $path = $this->__toString().$combiner;
 
         if ('*/' !== $expr->path) {
             $path .= $expr->path;