updated dependencies + working api connection

This commit is contained in:
Chris
2018-02-08 14:21:29 +00:00
parent dfc3c2194c
commit 30aea8e361
216 changed files with 21763 additions and 915 deletions

View File

@@ -31,7 +31,7 @@ class CssSelectorConverter
/**
* @param bool $html Whether HTML support should be enabled. Disable it for XML documents
*/
public function __construct(bool $html = true)
public function __construct($html = true)
{
$this->translator = new Translator();

View File

@@ -31,7 +31,7 @@ abstract class AbstractNode implements NodeInterface
/**
* @return string
*/
public function getNodeName(): string
public function getNodeName()
{
if (null === $this->nodeName) {
$this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', get_called_class());

View File

@@ -29,7 +29,14 @@ class AttributeNode extends AbstractNode
private $operator;
private $value;
public function __construct(NodeInterface $selector, ?string $namespace, string $attribute, string $operator, ?string $value)
/**
* @param NodeInterface $selector
* @param string $namespace
* @param string $attribute
* @param string $operator
* @param string $value
*/
public function __construct(NodeInterface $selector, $namespace, $attribute, $operator, $value)
{
$this->selector = $selector;
$this->namespace = $namespace;
@@ -38,27 +45,42 @@ class AttributeNode extends AbstractNode
$this->value = $value;
}
public function getSelector(): NodeInterface
/**
* @return NodeInterface
*/
public function getSelector()
{
return $this->selector;
}
public function getNamespace(): ?string
/**
* @return string
*/
public function getNamespace()
{
return $this->namespace;
}
public function getAttribute(): string
/**
* @return string
*/
public function getAttribute()
{
return $this->attribute;
}
public function getOperator(): string
/**
* @return string
*/
public function getOperator()
{
return $this->operator;
}
public function getValue(): ?string
/**
* @return string
*/
public function getValue()
{
return $this->value;
}
@@ -66,7 +88,7 @@ class AttributeNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
}
@@ -74,7 +96,7 @@ class AttributeNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
$attribute = $this->namespace ? $this->namespace.'|'.$this->attribute : $this->attribute;

View File

@@ -26,18 +26,28 @@ class ClassNode extends AbstractNode
private $selector;
private $name;
public function __construct(NodeInterface $selector, string $name)
/**
* @param NodeInterface $selector
* @param string $name
*/
public function __construct(NodeInterface $selector, $name)
{
$this->selector = $selector;
$this->name = $name;
}
public function getSelector(): NodeInterface
/**
* @return NodeInterface
*/
public function getSelector()
{
return $this->selector;
}
public function getName(): string
/**
* @return string
*/
public function getName()
{
return $this->name;
}
@@ -45,7 +55,7 @@ class ClassNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
}
@@ -53,7 +63,7 @@ class ClassNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
return sprintf('%s[%s.%s]', $this->getNodeName(), $this->selector, $this->name);
}

View File

@@ -27,24 +27,38 @@ class CombinedSelectorNode extends AbstractNode
private $combinator;
private $subSelector;
public function __construct(NodeInterface $selector, string $combinator, NodeInterface $subSelector)
/**
* @param NodeInterface $selector
* @param string $combinator
* @param NodeInterface $subSelector
*/
public function __construct(NodeInterface $selector, $combinator, NodeInterface $subSelector)
{
$this->selector = $selector;
$this->combinator = $combinator;
$this->subSelector = $subSelector;
}
public function getSelector(): NodeInterface
/**
* @return NodeInterface
*/
public function getSelector()
{
return $this->selector;
}
public function getCombinator(): string
/**
* @return string
*/
public function getCombinator()
{
return $this->combinator;
}
public function getSubSelector(): NodeInterface
/**
* @return NodeInterface
*/
public function getSubSelector()
{
return $this->subSelector;
}
@@ -52,7 +66,7 @@ class CombinedSelectorNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity());
}
@@ -60,7 +74,7 @@ class CombinedSelectorNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
$combinator = ' ' === $this->combinator ? '<followed>' : $this->combinator;

View File

@@ -30,7 +30,7 @@ class ElementNode extends AbstractNode
* @param string|null $namespace
* @param string|null $element
*/
public function __construct(string $namespace = null, string $element = null)
public function __construct($namespace = null, $element = null)
{
$this->namespace = $namespace;
$this->element = $element;
@@ -55,7 +55,7 @@ class ElementNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return new Specificity(0, 0, $this->element ? 1 : 0);
}
@@ -63,7 +63,7 @@ class ElementNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
$element = $this->element ?: '*';

View File

@@ -34,19 +34,25 @@ class FunctionNode extends AbstractNode
* @param string $name
* @param Token[] $arguments
*/
public function __construct(NodeInterface $selector, string $name, array $arguments = array())
public function __construct(NodeInterface $selector, $name, array $arguments = array())
{
$this->selector = $selector;
$this->name = strtolower($name);
$this->arguments = $arguments;
}
public function getSelector(): NodeInterface
/**
* @return NodeInterface
*/
public function getSelector()
{
return $this->selector;
}
public function getName(): string
/**
* @return string
*/
public function getName()
{
return $this->name;
}
@@ -62,7 +68,7 @@ class FunctionNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
}
@@ -70,7 +76,7 @@ class FunctionNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
$arguments = implode(', ', array_map(function (Token $token) {
return "'".$token->getValue()."'";

View File

@@ -26,18 +26,28 @@ class HashNode extends AbstractNode
private $selector;
private $id;
public function __construct(NodeInterface $selector, string $id)
/**
* @param NodeInterface $selector
* @param string $id
*/
public function __construct(NodeInterface $selector, $id)
{
$this->selector = $selector;
$this->id = $id;
}
public function getSelector(): NodeInterface
/**
* @return NodeInterface
*/
public function getSelector()
{
return $this->selector;
}
public function getId(): string
/**
* @return string
*/
public function getId()
{
return $this->id;
}
@@ -45,7 +55,7 @@ class HashNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return $this->selector->getSpecificity()->plus(new Specificity(1, 0, 0));
}
@@ -53,7 +63,7 @@ class HashNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
return sprintf('%s[%s#%s]', $this->getNodeName(), $this->selector, $this->id);
}

View File

@@ -51,7 +51,7 @@ class NegationNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity());
}
@@ -59,7 +59,7 @@ class NegationNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
return sprintf('%s[%s:not(%s)]', $this->getNodeName(), $this->selector, $this->subSelector);
}

View File

@@ -23,9 +23,24 @@ namespace Symfony\Component\CssSelector\Node;
*/
interface NodeInterface
{
public function getNodeName(): string;
/**
* Returns node's name.
*
* @return string
*/
public function getNodeName();
public function getSpecificity(): Specificity;
/**
* Returns node's specificity.
*
* @return Specificity
*/
public function getSpecificity();
public function __toString(): string;
/**
* Returns node's string representation.
*
* @return string
*/
public function __toString();
}

View File

@@ -26,18 +26,28 @@ class PseudoNode extends AbstractNode
private $selector;
private $identifier;
public function __construct(NodeInterface $selector, string $identifier)
/**
* @param NodeInterface $selector
* @param string $identifier
*/
public function __construct(NodeInterface $selector, $identifier)
{
$this->selector = $selector;
$this->identifier = strtolower($identifier);
}
public function getSelector(): NodeInterface
/**
* @return NodeInterface
*/
public function getSelector()
{
return $this->selector;
}
public function getIdentifier(): string
/**
* @return string
*/
public function getIdentifier()
{
return $this->identifier;
}
@@ -45,7 +55,7 @@ class PseudoNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
}
@@ -53,7 +63,7 @@ class PseudoNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
return sprintf('%s[%s:%s]', $this->getNodeName(), $this->selector, $this->identifier);
}

View File

@@ -26,18 +26,28 @@ class SelectorNode extends AbstractNode
private $tree;
private $pseudoElement;
public function __construct(NodeInterface $tree, string $pseudoElement = null)
/**
* @param NodeInterface $tree
* @param null|string $pseudoElement
*/
public function __construct(NodeInterface $tree, $pseudoElement = null)
{
$this->tree = $tree;
$this->pseudoElement = $pseudoElement ? strtolower($pseudoElement) : null;
}
public function getTree(): NodeInterface
/**
* @return NodeInterface
*/
public function getTree()
{
return $this->tree;
}
public function getPseudoElement(): ?string
/**
* @return null|string
*/
public function getPseudoElement()
{
return $this->pseudoElement;
}
@@ -45,7 +55,7 @@ class SelectorNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function getSpecificity(): Specificity
public function getSpecificity()
{
return $this->tree->getSpecificity()->plus(new Specificity(0, 0, $this->pseudoElement ? 1 : 0));
}
@@ -53,7 +63,7 @@ class SelectorNode extends AbstractNode
/**
* {@inheritdoc}
*/
public function __toString(): string
public function __toString()
{
return sprintf('%s[%s%s]', $this->getNodeName(), $this->tree, $this->pseudoElement ? '::'.$this->pseudoElement : '');
}

View File

@@ -33,19 +33,32 @@ class Specificity
private $b;
private $c;
public function __construct(int $a, int $b, int $c)
/**
* @param int $a
* @param int $b
* @param int $c
*/
public function __construct($a, $b, $c)
{
$this->a = $a;
$this->b = $b;
$this->c = $c;
}
public function plus(Specificity $specificity): Specificity
/**
* @return self
*/
public function plus(Specificity $specificity)
{
return new self($this->a + $specificity->a, $this->b + $specificity->b, $this->c + $specificity->c);
}
public function getValue(): int
/**
* Returns global specificity value.
*
* @return int
*/
public function getValue()
{
return $this->a * self::A_FACTOR + $this->b * self::B_FACTOR + $this->c * self::C_FACTOR;
}

View File

@@ -29,7 +29,7 @@ class CommentHandler implements HandlerInterface
/**
* {@inheritdoc}
*/
public function handle(Reader $reader, TokenStream $stream): bool
public function handle(Reader $reader, TokenStream $stream)
{
if ('/*' !== $reader->getSubstring(2)) {
return false;

View File

@@ -29,5 +29,5 @@ interface HandlerInterface
/**
* @return bool
*/
public function handle(Reader $reader, TokenStream $stream): bool;
public function handle(Reader $reader, TokenStream $stream);
}

View File

@@ -41,7 +41,7 @@ class HashHandler implements HandlerInterface
/**
* {@inheritdoc}
*/
public function handle(Reader $reader, TokenStream $stream): bool
public function handle(Reader $reader, TokenStream $stream)
{
$match = $reader->findPattern($this->patterns->getHashPattern());

View File

@@ -41,7 +41,7 @@ class IdentifierHandler implements HandlerInterface
/**
* {@inheritdoc}
*/
public function handle(Reader $reader, TokenStream $stream): bool
public function handle(Reader $reader, TokenStream $stream)
{
$match = $reader->findPattern($this->patterns->getIdentifierPattern());

View File

@@ -38,7 +38,7 @@ class NumberHandler implements HandlerInterface
/**
* {@inheritdoc}
*/
public function handle(Reader $reader, TokenStream $stream): bool
public function handle(Reader $reader, TokenStream $stream)
{
$match = $reader->findPattern($this->patterns->getNumberPattern());

View File

@@ -43,7 +43,7 @@ class StringHandler implements HandlerInterface
/**
* {@inheritdoc}
*/
public function handle(Reader $reader, TokenStream $stream): bool
public function handle(Reader $reader, TokenStream $stream)
{
$quote = $reader->getSubstring(1);

View File

@@ -30,7 +30,7 @@ class WhitespaceHandler implements HandlerInterface
/**
* {@inheritdoc}
*/
public function handle(Reader $reader, TokenStream $stream): bool
public function handle(Reader $reader, TokenStream $stream)
{
$match = $reader->findPattern('~^[ \t\r\n\f]+~');

View File

@@ -37,7 +37,7 @@ class Parser implements ParserInterface
/**
* {@inheritdoc}
*/
public function parse(string $source): array
public function parse($source)
{
$reader = new Reader($source);
$stream = $this->tokenizer->tokenize($reader);
@@ -50,9 +50,11 @@ class Parser implements ParserInterface
*
* @param Token[] $tokens
*
* @return array
*
* @throws SyntaxErrorException
*/
public static function parseSeries(array $tokens): array
public static function parseSeries(array $tokens)
{
foreach ($tokens as $token) {
if ($token->isString()) {
@@ -92,7 +94,12 @@ class Parser implements ParserInterface
);
}
private function parseSelectorList(TokenStream $stream): array
/**
* Parses selector nodes.
*
* @return array
*/
private function parseSelectorList(TokenStream $stream)
{
$stream->skipWhitespace();
$selectors = array();
@@ -111,7 +118,14 @@ class Parser implements ParserInterface
return $selectors;
}
private function parserSelectorNode(TokenStream $stream): Node\SelectorNode
/**
* Parses next selector or combined node.
*
* @return Node\SelectorNode
*
* @throws SyntaxErrorException
*/
private function parserSelectorNode(TokenStream $stream)
{
list($result, $pseudoElement) = $this->parseSimpleSelector($stream);
@@ -144,9 +158,14 @@ class Parser implements ParserInterface
/**
* Parses next simple node (hash, class, pseudo, negation).
*
* @param TokenStream $stream
* @param bool $insideNegation
*
* @return array
*
* @throws SyntaxErrorException
*/
private function parseSimpleSelector(TokenStream $stream, bool $insideNegation = false): array
private function parseSimpleSelector(TokenStream $stream, $insideNegation = false)
{
$stream->skipWhitespace();
@@ -260,7 +279,12 @@ class Parser implements ParserInterface
return array($result, $pseudoElement);
}
private function parseElementNode(TokenStream $stream): Node\ElementNode
/**
* Parses next element node.
*
* @return Node\ElementNode
*/
private function parseElementNode(TokenStream $stream)
{
$peek = $stream->getPeek();
@@ -286,7 +310,14 @@ class Parser implements ParserInterface
return new Node\ElementNode($namespace, $element);
}
private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream): Node\AttributeNode
/**
* Parses next attribute node.
*
* @return Node\AttributeNode
*
* @throws SyntaxErrorException
*/
private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream)
{
$stream->skipWhitespace();
$attribute = $stream->getNextIdentifierOrStar();

View File

@@ -28,7 +28,9 @@ interface ParserInterface
/**
* Parses given selector source into an array of tokens.
*
* @param string $source
*
* @return SelectorNode[]
*/
public function parse(string $source): array;
public function parse($source);
}

View File

@@ -27,33 +27,56 @@ class Reader
private $length;
private $position = 0;
public function __construct(string $source)
/**
* @param string $source
*/
public function __construct($source)
{
$this->source = $source;
$this->length = strlen($source);
}
public function isEOF(): bool
/**
* @return bool
*/
public function isEOF()
{
return $this->position >= $this->length;
}
public function getPosition(): int
/**
* @return int
*/
public function getPosition()
{
return $this->position;
}
public function getRemainingLength(): int
/**
* @return int
*/
public function getRemainingLength()
{
return $this->length - $this->position;
}
public function getSubstring(int $length, int $offset = 0): string
/**
* @param int $length
* @param int $offset
*
* @return string
*/
public function getSubstring($length, $offset = 0)
{
return substr($this->source, $this->position + $offset, $length);
}
public function getOffset(string $string)
/**
* @param string $string
*
* @return int
*/
public function getOffset($string)
{
$position = strpos($this->source, $string, $this->position);
@@ -61,9 +84,11 @@ class Reader
}
/**
* @param string $pattern
*
* @return array|false
*/
public function findPattern(string $pattern)
public function findPattern($pattern)
{
$source = substr($this->source, $this->position);
@@ -74,7 +99,10 @@ class Reader
return false;
}
public function moveForward(int $length)
/**
* @param int $length
*/
public function moveForward($length)
{
$this->position += $length;
}

View File

@@ -31,7 +31,7 @@ class ClassParser implements ParserInterface
/**
* {@inheritdoc}
*/
public function parse(string $source): array
public function parse($source)
{
// Matches an optional namespace, optional element, and required class
// $source = 'test|input.ab6bd_field';

View File

@@ -30,7 +30,7 @@ class ElementParser implements ParserInterface
/**
* {@inheritdoc}
*/
public function parse(string $source): array
public function parse($source)
{
// Matches an optional namespace, required element or `*`
// $source = 'testns|testel';

View File

@@ -34,7 +34,7 @@ class EmptyStringParser implements ParserInterface
/**
* {@inheritdoc}
*/
public function parse(string $source): array
public function parse($source)
{
// Matches an empty string
if ('' == $source) {

View File

@@ -31,7 +31,7 @@ class HashParser implements ParserInterface
/**
* {@inheritdoc}
*/
public function parse(string $source): array
public function parse($source)
{
// Matches an optional namespace, optional element, and required id
// $source = 'test|input#ab6bd_field';

View File

@@ -35,34 +35,54 @@ class Token
private $value;
private $position;
public function __construct(?string $type, ?string $value, ?int $position)
/**
* @param int $type
* @param string $value
* @param int $position
*/
public function __construct($type, $value, $position)
{
$this->type = $type;
$this->value = $value;
$this->position = $position;
}
public function getType(): ?int
/**
* @return int
*/
public function getType()
{
return $this->type;
}
public function getValue(): ?string
/**
* @return string
*/
public function getValue()
{
return $this->value;
}
public function getPosition(): ?int
/**
* @return int
*/
public function getPosition()
{
return $this->position;
}
public function isFileEnd(): bool
/**
* @return bool
*/
public function isFileEnd()
{
return self::TYPE_FILE_END === $this->type;
}
public function isDelimiter(array $values = array()): bool
/**
* @return bool
*/
public function isDelimiter(array $values = array())
{
if (self::TYPE_DELIMITER !== $this->type) {
return false;
@@ -75,32 +95,50 @@ class Token
return in_array($this->value, $values);
}
public function isWhitespace(): bool
/**
* @return bool
*/
public function isWhitespace()
{
return self::TYPE_WHITESPACE === $this->type;
}
public function isIdentifier(): bool
/**
* @return bool
*/
public function isIdentifier()
{
return self::TYPE_IDENTIFIER === $this->type;
}
public function isHash(): bool
/**
* @return bool
*/
public function isHash()
{
return self::TYPE_HASH === $this->type;
}
public function isNumber(): bool
/**
* @return bool
*/
public function isNumber()
{
return self::TYPE_NUMBER === $this->type;
}
public function isString(): bool
/**
* @return bool
*/
public function isString()
{
return self::TYPE_STRING === $this->type;
}
public function __toString(): string
/**
* @return string
*/
public function __toString()
{
if ($this->value) {
return sprintf('<%s "%s" at %s>', $this->type, $this->value, $this->position);

View File

@@ -30,21 +30,36 @@ class TokenizerEscaping
$this->patterns = $patterns;
}
public function escapeUnicode(string $value): string
/**
* @param string $value
*
* @return string
*/
public function escapeUnicode($value)
{
$value = $this->replaceUnicodeSequences($value);
return preg_replace($this->patterns->getSimpleEscapePattern(), '$1', $value);
}
public function escapeUnicodeAndNewLine(string $value): string
/**
* @param string $value
*
* @return string
*/
public function escapeUnicodeAndNewLine($value)
{
$value = preg_replace($this->patterns->getNewLineEscapePattern(), '', $value);
return $this->escapeUnicode($value);
}
private function replaceUnicodeSequences(string $value): string
/**
* @param string $value
*
* @return string
*/
private function replaceUnicodeSequences($value)
{
return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function ($match) {
$c = hexdec($match[1]);

View File

@@ -52,37 +52,60 @@ class TokenizerPatterns
$this->quotedStringPattern = '([^\n\r\f%s]|'.$this->stringEscapePattern.')*';
}
public function getNewLineEscapePattern(): string
/**
* @return string
*/
public function getNewLineEscapePattern()
{
return '~^'.$this->newLineEscapePattern.'~';
}
public function getSimpleEscapePattern(): string
/**
* @return string
*/
public function getSimpleEscapePattern()
{
return '~^'.$this->simpleEscapePattern.'~';
}
public function getUnicodeEscapePattern(): string
/**
* @return string
*/
public function getUnicodeEscapePattern()
{
return '~^'.$this->unicodeEscapePattern.'~i';
}
public function getIdentifierPattern(): string
/**
* @return string
*/
public function getIdentifierPattern()
{
return '~^'.$this->identifierPattern.'~i';
}
public function getHashPattern(): string
/**
* @return string
*/
public function getHashPattern()
{
return '~^'.$this->hashPattern.'~i';
}
public function getNumberPattern(): string
/**
* @return string
*/
public function getNumberPattern()
{
return '~^'.$this->numberPattern.'~';
}
public function getQuotedStringPattern(string $quote): string
/**
* @param string $quote
*
* @return string
*/
public function getQuotedStringPattern($quote)
{
return '~^'.sprintf($this->quotedStringPattern, $quote).'~i';
}

View File

@@ -43,17 +43,38 @@ class AttributeMatchingExtension extends AbstractExtension
);
}
public function translateExists(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
/**
* @param XPathExpr $xpath
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*/
public function translateExists(XPathExpr $xpath, $attribute, $value)
{
return $xpath->addCondition($attribute);
}
public function translateEquals(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
/**
* @param XPathExpr $xpath
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*/
public function translateEquals(XPathExpr $xpath, $attribute, $value)
{
return $xpath->addCondition(sprintf('%s = %s', $attribute, Translator::getXpathLiteral($value)));
}
public function translateIncludes(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
/**
* @param XPathExpr $xpath
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*/
public function translateIncludes(XPathExpr $xpath, $attribute, $value)
{
return $xpath->addCondition($value ? sprintf(
'%1$s and contains(concat(\' \', normalize-space(%1$s), \' \'), %2$s)',
@@ -62,7 +83,14 @@ class AttributeMatchingExtension extends AbstractExtension
) : '0');
}
public function translateDashMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
/**
* @param XPathExpr $xpath
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*/
public function translateDashMatch(XPathExpr $xpath, $attribute, $value)
{
return $xpath->addCondition(sprintf(
'%1$s and (%1$s = %2$s or starts-with(%1$s, %3$s))',
@@ -72,7 +100,14 @@ class AttributeMatchingExtension extends AbstractExtension
));
}
public function translatePrefixMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
/**
* @param XPathExpr $xpath
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*/
public function translatePrefixMatch(XPathExpr $xpath, $attribute, $value)
{
return $xpath->addCondition($value ? sprintf(
'%1$s and starts-with(%1$s, %2$s)',
@@ -81,7 +116,14 @@ class AttributeMatchingExtension extends AbstractExtension
) : '0');
}
public function translateSuffixMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
/**
* @param XPathExpr $xpath
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*/
public function translateSuffixMatch(XPathExpr $xpath, $attribute, $value)
{
return $xpath->addCondition($value ? sprintf(
'%1$s and substring(%1$s, string-length(%1$s)-%2$s) = %3$s',
@@ -91,7 +133,14 @@ class AttributeMatchingExtension extends AbstractExtension
) : '0');
}
public function translateSubstringMatch(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
/**
* @param XPathExpr $xpath
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*/
public function translateSubstringMatch(XPathExpr $xpath, $attribute, $value)
{
return $xpath->addCondition($value ? sprintf(
'%1$s and contains(%1$s, %2$s)',
@@ -100,7 +149,14 @@ class AttributeMatchingExtension extends AbstractExtension
) : '0');
}
public function translateDifferent(XPathExpr $xpath, string $attribute, ?string $value): XPathExpr
/**
* @param XPathExpr $xpath
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*/
public function translateDifferent(XPathExpr $xpath, $attribute, $value)
{
return $xpath->addCondition(sprintf(
$value ? 'not(%1$s) or %1$s != %2$s' : '%s != %s',

View File

@@ -28,7 +28,7 @@ class CombinationExtension extends AbstractExtension
/**
* {@inheritdoc}
*/
public function getCombinationTranslators(): array
public function getCombinationTranslators()
{
return array(
' ' => array($this, 'translateDescendant'),
@@ -41,7 +41,7 @@ class CombinationExtension extends AbstractExtension
/**
* @return XPathExpr
*/
public function translateDescendant(XPathExpr $xpath, XPathExpr $combinedXpath): XPathExpr
public function translateDescendant(XPathExpr $xpath, XPathExpr $combinedXpath)
{
return $xpath->join('/descendant-or-self::*/', $combinedXpath);
}

View File

@@ -46,9 +46,16 @@ class FunctionExtension extends AbstractExtension
}
/**
* @param XPathExpr $xpath
* @param FunctionNode $function
* @param bool $last
* @param bool $addNameTest
*
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function translateNthChild(XPathExpr $xpath, FunctionNode $function, bool $last = false, bool $addNameTest = true): XPathExpr
public function translateNthChild(XPathExpr $xpath, FunctionNode $function, $last = false, $addNameTest = true)
{
try {
list($a, $b) = Parser::parseSeries($function->getArguments());
@@ -103,20 +110,28 @@ class FunctionExtension extends AbstractExtension
// -1n+6 means elements 6 and previous
}
public function translateNthLastChild(XPathExpr $xpath, FunctionNode $function): XPathExpr
/**
* @return XPathExpr
*/
public function translateNthLastChild(XPathExpr $xpath, FunctionNode $function)
{
return $this->translateNthChild($xpath, $function, true);
}
public function translateNthOfType(XPathExpr $xpath, FunctionNode $function): XPathExpr
/**
* @return XPathExpr
*/
public function translateNthOfType(XPathExpr $xpath, FunctionNode $function)
{
return $this->translateNthChild($xpath, $function, false, false);
}
/**
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function translateNthLastOfType(XPathExpr $xpath, FunctionNode $function): XPathExpr
public function translateNthLastOfType(XPathExpr $xpath, FunctionNode $function)
{
if ('*' === $xpath->getElement()) {
throw new ExpressionErrorException('"*:nth-of-type()" is not implemented.');
@@ -126,9 +141,11 @@ class FunctionExtension extends AbstractExtension
}
/**
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function translateContains(XPathExpr $xpath, FunctionNode $function): XPathExpr
public function translateContains(XPathExpr $xpath, FunctionNode $function)
{
$arguments = $function->getArguments();
foreach ($arguments as $token) {
@@ -147,9 +164,11 @@ class FunctionExtension extends AbstractExtension
}
/**
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function translateLang(XPathExpr $xpath, FunctionNode $function): XPathExpr
public function translateLang(XPathExpr $xpath, FunctionNode $function)
{
$arguments = $function->getArguments();
foreach ($arguments as $token) {

View File

@@ -33,15 +33,21 @@ class NodeExtension extends AbstractExtension
private $flags;
public function __construct(int $flags = 0)
/**
* @param int $flags
*/
public function __construct($flags = 0)
{
$this->flags = $flags;
}
/**
* @param int $flag
* @param bool $on
*
* @return $this
*/
public function setFlag(int $flag, bool $on)
public function setFlag($flag, $on)
{
if ($on && !$this->hasFlag($flag)) {
$this->flags += $flag;
@@ -54,7 +60,12 @@ class NodeExtension extends AbstractExtension
return $this;
}
public function hasFlag(int $flag): bool
/**
* @param int $flag
*
* @return bool
*/
public function hasFlag($flag)
{
return (bool) ($this->flags & $flag);
}
@@ -77,17 +88,26 @@ class NodeExtension extends AbstractExtension
);
}
public function translateSelector(Node\SelectorNode $node, Translator $translator): XPathExpr
/**
* @return XPathExpr
*/
public function translateSelector(Node\SelectorNode $node, Translator $translator)
{
return $translator->nodeToXPath($node->getTree());
}
public function translateCombinedSelector(Node\CombinedSelectorNode $node, Translator $translator): XPathExpr
/**
* @return XPathExpr
*/
public function translateCombinedSelector(Node\CombinedSelectorNode $node, Translator $translator)
{
return $translator->addCombination($node->getCombinator(), $node->getSelector(), $node->getSubSelector());
}
public function translateNegation(Node\NegationNode $node, Translator $translator): XPathExpr
/**
* @return XPathExpr
*/
public function translateNegation(Node\NegationNode $node, Translator $translator)
{
$xpath = $translator->nodeToXPath($node->getSelector());
$subXpath = $translator->nodeToXPath($node->getSubSelector());
@@ -100,21 +120,30 @@ class NodeExtension extends AbstractExtension
return $xpath->addCondition('0');
}
public function translateFunction(Node\FunctionNode $node, Translator $translator): XPathExpr
/**
* @return XPathExpr
*/
public function translateFunction(Node\FunctionNode $node, Translator $translator)
{
$xpath = $translator->nodeToXPath($node->getSelector());
return $translator->addFunction($xpath, $node);
}
public function translatePseudo(Node\PseudoNode $node, Translator $translator): XPathExpr
/**
* @return XPathExpr
*/
public function translatePseudo(Node\PseudoNode $node, Translator $translator)
{
$xpath = $translator->nodeToXPath($node->getSelector());
return $translator->addPseudoClass($xpath, $node->getIdentifier());
}
public function translateAttribute(Node\AttributeNode $node, Translator $translator): XPathExpr
/**
* @return XPathExpr
*/
public function translateAttribute(Node\AttributeNode $node, Translator $translator)
{
$name = $node->getAttribute();
$safe = $this->isSafeName($name);
@@ -139,21 +168,30 @@ class NodeExtension extends AbstractExtension
return $translator->addAttributeMatching($xpath, $node->getOperator(), $attribute, $value);
}
public function translateClass(Node\ClassNode $node, Translator $translator): XPathExpr
/**
* @return XPathExpr
*/
public function translateClass(Node\ClassNode $node, Translator $translator)
{
$xpath = $translator->nodeToXPath($node->getSelector());
return $translator->addAttributeMatching($xpath, '~=', '@class', $node->getName());
}
public function translateHash(Node\HashNode $node, Translator $translator): XPathExpr
/**
* @return XPathExpr
*/
public function translateHash(Node\HashNode $node, Translator $translator)
{
$xpath = $translator->nodeToXPath($node->getSelector());
return $translator->addAttributeMatching($xpath, '=', '@id', $node->getId());
}
public function translateElement(Node\ElementNode $node): XPathExpr
/**
* @return XPathExpr
*/
public function translateElement(Node\ElementNode $node)
{
$element = $node->getElement();
@@ -190,7 +228,14 @@ class NodeExtension extends AbstractExtension
return 'node';
}
private function isSafeName(string $name): bool
/**
* Tests if given name is safe.
*
* @param string $name
*
* @return bool
*/
private function isSafeName($name)
{
return 0 < preg_match('~^[a-zA-Z_][a-zA-Z0-9_.-]*$~', $name);
}

View File

@@ -61,7 +61,12 @@ class Translator implements TranslatorInterface
;
}
public static function getXpathLiteral(string $element): string
/**
* @param string $element
*
* @return string
*/
public static function getXpathLiteral($element)
{
if (false === strpos($element, "'")) {
return "'".$element."'";
@@ -90,7 +95,7 @@ class Translator implements TranslatorInterface
/**
* {@inheritdoc}
*/
public function cssToXPath(string $cssExpr, string $prefix = 'descendant-or-self::'): string
public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::')
{
$selectors = $this->parseSelectors($cssExpr);
@@ -109,12 +114,17 @@ class Translator implements TranslatorInterface
/**
* {@inheritdoc}
*/
public function selectorToXPath(SelectorNode $selector, string $prefix = 'descendant-or-self::'): string
public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or-self::')
{
return ($prefix ?: '').$this->nodeToXPath($selector);
}
public function registerExtension(Extension\ExtensionInterface $extension): Translator
/**
* Registers an extension.
*
* @return $this
*/
public function registerExtension(Extension\ExtensionInterface $extension)
{
$this->extensions[$extension->getName()] = $extension;
@@ -128,9 +138,13 @@ class Translator implements TranslatorInterface
}
/**
* @param string $name
*
* @return Extension\ExtensionInterface
*
* @throws ExpressionErrorException
*/
public function getExtension(string $name): Extension\ExtensionInterface
public function getExtension($name)
{
if (!isset($this->extensions[$name])) {
throw new ExpressionErrorException(sprintf('Extension "%s" not registered.', $name));
@@ -139,7 +153,12 @@ class Translator implements TranslatorInterface
return $this->extensions[$name];
}
public function registerParserShortcut(ParserInterface $shortcut): Translator
/**
* Registers a shortcut parser.
*
* @return $this
*/
public function registerParserShortcut(ParserInterface $shortcut)
{
$this->shortcutParsers[] = $shortcut;
@@ -147,9 +166,11 @@ class Translator implements TranslatorInterface
}
/**
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function nodeToXPath(NodeInterface $node): XPathExpr
public function nodeToXPath(NodeInterface $node)
{
if (!isset($this->nodeTranslators[$node->getNodeName()])) {
throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
@@ -159,9 +180,15 @@ class Translator implements TranslatorInterface
}
/**
* @param string $combiner
* @param NodeInterface $xpath
* @param NodeInterface $combinedXpath
*
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function addCombination(string $combiner, NodeInterface $xpath, NodeInterface $combinedXpath): XPathExpr
public function addCombination($combiner, NodeInterface $xpath, NodeInterface $combinedXpath)
{
if (!isset($this->combinationTranslators[$combiner])) {
throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
@@ -171,9 +198,11 @@ class Translator implements TranslatorInterface
}
/**
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function addFunction(XPathExpr $xpath, FunctionNode $function): XPathExpr
public function addFunction(XPathExpr $xpath, FunctionNode $function)
{
if (!isset($this->functionTranslators[$function->getName()])) {
throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
@@ -183,9 +212,14 @@ class Translator implements TranslatorInterface
}
/**
* @param XPathExpr $xpath
* @param string $pseudoClass
*
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function addPseudoClass(XPathExpr $xpath, string $pseudoClass): XPathExpr
public function addPseudoClass(XPathExpr $xpath, $pseudoClass)
{
if (!isset($this->pseudoClassTranslators[$pseudoClass])) {
throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
@@ -195,9 +229,16 @@ class Translator implements TranslatorInterface
}
/**
* @param XPathExpr $xpath
* @param string $operator
* @param string $attribute
* @param string $value
*
* @return XPathExpr
*
* @throws ExpressionErrorException
*/
public function addAttributeMatching(XPathExpr $xpath, string $operator, string $attribute, $value): XPathExpr
public function addAttributeMatching(XPathExpr $xpath, $operator, $attribute, $value)
{
if (!isset($this->attributeMatchingTranslators[$operator])) {
throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
@@ -207,9 +248,11 @@ class Translator implements TranslatorInterface
}
/**
* @param string $css
*
* @return SelectorNode[]
*/
private function parseSelectors(string $css)
private function parseSelectors($css)
{
foreach ($this->shortcutParsers as $shortcut) {
$tokens = $shortcut->parse($css);

View File

@@ -27,11 +27,21 @@ interface TranslatorInterface
{
/**
* Translates a CSS selector to an XPath expression.
*
* @param string $cssExpr
* @param string $prefix
*
* @return string
*/
public function cssToXPath(string $cssExpr, string $prefix = 'descendant-or-self::'): string;
public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::');
/**
* Translates a parsed selector node to an XPath expression.
*
* @param SelectorNode $selector
* @param string $prefix
*
* @return string
*/
public function selectorToXPath(SelectorNode $selector, string $prefix = 'descendant-or-self::'): string;
public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or-self::');
}

View File

@@ -27,7 +27,13 @@ class XPathExpr
private $element;
private $condition;
public function __construct(string $path = '', string $element = '*', string $condition = '', bool $starPrefix = false)
/**
* @param string $path
* @param string $element
* @param string $condition
* @param bool $starPrefix
*/
public function __construct($path = '', $element = '*', $condition = '', $starPrefix = false)
{
$this->path = $path;
$this->element = $element;
@@ -38,24 +44,38 @@ class XPathExpr
}
}
public function getElement(): string
/**
* @return string
*/
public function getElement()
{
return $this->element;
}
public function addCondition(string $condition): XPathExpr
/**
* @param $condition
*
* @return $this
*/
public function addCondition($condition)
{
$this->condition = $this->condition ? sprintf('%s and (%s)', $this->condition, $condition) : $condition;
return $this;
}
public function getCondition(): string
/**
* @return string
*/
public function getCondition()
{
return $this->condition;
}
public function addNameTest(): XPathExpr
/**
* @return $this
*/
public function addNameTest()
{
if ('*' !== $this->element) {
$this->addCondition('name() = '.Translator::getXpathLiteral($this->element));
@@ -65,7 +85,10 @@ class XPathExpr
return $this;
}
public function addStarPrefix(): XPathExpr
/**
* @return $this
*/
public function addStarPrefix()
{
$this->path .= '*/';
@@ -75,9 +98,12 @@ class XPathExpr
/**
* Joins another XPathExpr with a combiner.
*
* @param string $combiner
* @param XPathExpr $expr
*
* @return $this
*/
public function join(string $combiner, XPathExpr $expr): XPathExpr
public function join($combiner, XPathExpr $expr)
{
$path = $this->__toString().$combiner;
@@ -92,7 +118,10 @@ class XPathExpr
return $this;
}
public function __toString(): string
/**
* @return string
*/
public function __toString()
{
$path = $this->path.$this->element;
$condition = null === $this->condition || '' === $this->condition ? '' : '['.$this->condition.']';

View File

@@ -20,7 +20,7 @@
}
],
"require": {
"php": "^7.1.3"
"php": "^5.5.9|>=7.0.8"
},
"autoload": {
"psr-4": { "Symfony\\Component\\CssSelector\\": "" },
@@ -31,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "3.4-dev"
}
}
}