projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further Drupal 8.6.4 changes. Some core files were not committed before a commit...
[yaffs-website]
/
vendor
/
symfony
/
css-selector
/
XPath
/
Translator.php
diff --git
a/vendor/symfony/css-selector/XPath/Translator.php
b/vendor/symfony/css-selector/XPath/Translator.php
index 2b01fc8e52526e2733ff3d04999ba87753d95f10..f8585a057daba595f17ffd6d191740f429b79719 100644
(file)
--- a/
vendor/symfony/css-selector/XPath/Translator.php
+++ b/
vendor/symfony/css-selector/XPath/Translator.php
@@
-30,9
+30,6
@@
use Symfony\Component\CssSelector\Parser\ParserInterface;
*/
class Translator implements TranslatorInterface
{
*/
class Translator implements TranslatorInterface
{
- /**
- * @var ParserInterface
- */
private $mainParser;
/**
private $mainParser;
/**
@@
-41,33
+38,14
@@
class Translator implements TranslatorInterface
private $shortcutParsers = array();
/**
private $shortcutParsers = array();
/**
- * @var Extension\ExtensionInterface
+ * @var Extension\ExtensionInterface
[]
*/
private $extensions = array();
*/
private $extensions = array();
- /**
- * @var array
- */
private $nodeTranslators = array();
private $nodeTranslators = array();
-
- /**
- * @var array
- */
private $combinationTranslators = array();
private $combinationTranslators = array();
-
- /**
- * @var array
- */
private $functionTranslators = array();
private $functionTranslators = array();
-
- /**
- * @var array
- */
private $pseudoClassTranslators = array();
private $pseudoClassTranslators = array();
-
- /**
- * @var array
- */
private $attributeMatchingTranslators = array();
public function __construct(ParserInterface $parser = null)
private $attributeMatchingTranslators = array();
public function __construct(ParserInterface $parser = null)
@@
-111,7
+89,7
@@
class Translator implements TranslatorInterface
}
}
}
}
- return sprintf('concat(%s)', implode(
$parts, ', '
));
+ return sprintf('concat(%s)', implode(
', ', $parts
));
}
/**
}
/**
@@
-144,8
+122,6
@@
class Translator implements TranslatorInterface
/**
* Registers an extension.
*
/**
* Registers an extension.
*
- * @param Extension\ExtensionInterface $extension
- *
* @return $this
*/
public function registerExtension(Extension\ExtensionInterface $extension)
* @return $this
*/
public function registerExtension(Extension\ExtensionInterface $extension)
@@
-180,8
+156,6
@@
class Translator implements TranslatorInterface
/**
* Registers a shortcut parser.
*
/**
* Registers a shortcut parser.
*
- * @param ParserInterface $shortcut
- *
* @return $this
*/
public function registerParserShortcut(ParserInterface $shortcut)
* @return $this
*/
public function registerParserShortcut(ParserInterface $shortcut)
@@
-192,8
+166,6
@@
class Translator implements TranslatorInterface
}
/**
}
/**
- * @param NodeInterface $node
- *
* @return XPathExpr
*
* @throws ExpressionErrorException
* @return XPathExpr
*
* @throws ExpressionErrorException
@@
-204,7
+176,7
@@
class Translator implements TranslatorInterface
throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
}
throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
}
- return call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);
+ return
\
call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);
}
/**
}
/**
@@
-222,13
+194,10
@@
class Translator implements TranslatorInterface
throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
}
throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
}
- return call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
+ return
\
call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
}
/**
}
/**
- * @param XPathExpr $xpath
- * @param FunctionNode $function
- *
* @return XPathExpr
*
* @throws ExpressionErrorException
* @return XPathExpr
*
* @throws ExpressionErrorException
@@
-239,7
+208,7
@@
class Translator implements TranslatorInterface
throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
}
throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
}
- return call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);
+ return
\
call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);
}
/**
}
/**
@@
-256,7
+225,7
@@
class Translator implements TranslatorInterface
throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
}
throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
}
- return call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);
+ return
\
call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);
}
/**
}
/**
@@
-275,7
+244,7
@@
class Translator implements TranslatorInterface
throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
}
throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
}
- return call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);
+ return
\
call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);
}
/**
}
/**