Mercurial > hg > cmmr2012-drupal-site
diff vendor/symfony/dom-crawler/Crawler.php @ 4:a9cd425dd02b
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:11:55 +0000 |
parents | c75dbcec494b |
children | 12f9dff5fda9 |
line wrap: on
line diff
--- a/vendor/symfony/dom-crawler/Crawler.php Thu Feb 28 11:14:44 2019 +0000 +++ b/vendor/symfony/dom-crawler/Crawler.php Thu Feb 28 13:11:55 2019 +0000 @@ -30,7 +30,7 @@ /** * @var array A map of manually registered namespaces */ - private $namespaces = array(); + private $namespaces = []; /** * @var string The base href value @@ -45,7 +45,7 @@ /** * @var \DOMElement[] */ - private $nodes = array(); + private $nodes = []; /** * Whether the Crawler contains HTML or XML content (used when converting CSS to XPath). @@ -92,7 +92,7 @@ */ public function clear() { - $this->nodes = array(); + $this->nodes = []; $this->document = null; } @@ -112,12 +112,12 @@ $this->addNodeList($node); } elseif ($node instanceof \DOMNode) { $this->addNode($node); - } elseif (is_array($node)) { + } elseif (\is_array($node)) { $this->addNodes($node); - } elseif (is_string($node)) { + } elseif (\is_string($node)) { $this->addContent($node); } elseif (null !== $node) { - throw new \InvalidArgumentException(sprintf('Expecting a DOMNodeList or DOMNode instance, an array, a string, or null, but got "%s".', is_object($node) ? get_class($node) : gettype($node))); + throw new \InvalidArgumentException(sprintf('Expecting a DOMNodeList or DOMNode instance, an array, a string, or null, but got "%s".', \is_object($node) ? \get_class($node) : \gettype($node))); } } @@ -129,7 +129,7 @@ * HTTP 1.1 specification. * * @param string $content A string to parse as HTML/XML - * @param null|string $type The content type of the string + * @param string|null $type The content type of the string */ public function addContent($content, $type = null) { @@ -208,10 +208,10 @@ $this->addDocument($dom); - $base = $this->filterRelativeXPath('descendant-or-self::base')->extract(array('href')); + $base = $this->filterRelativeXPath('descendant-or-self::base')->extract(['href']); $baseHref = current($base); - if (count($base) && !empty($baseHref)) { + if (\count($base) && !empty($baseHref)) { if ($this->baseHref) { $linkNode = $dom->createElement('a'); $linkNode->setAttribute('href', $baseHref); @@ -322,7 +322,7 @@ } // Don't add duplicate nodes in the Crawler - if (in_array($node, $this->nodes, true)) { + if (\in_array($node, $this->nodes, true)) { return; } @@ -363,7 +363,7 @@ */ public function each(\Closure $closure) { - $data = array(); + $data = []; foreach ($this->nodes as $i => $node) { $data[] = $closure($this->createSubCrawler($node), $i); } @@ -381,7 +381,7 @@ */ public function slice($offset = 0, $length = null) { - return $this->createSubCrawler(array_slice($this->nodes, $offset, $length)); + return $this->createSubCrawler(\array_slice($this->nodes, $offset, $length)); } /** @@ -395,7 +395,7 @@ */ public function reduce(\Closure $closure) { - $nodes = array(); + $nodes = []; foreach ($this->nodes as $i => $node) { if (false !== $closure($this->createSubCrawler($node), $i)) { $nodes[] = $node; @@ -422,7 +422,7 @@ */ public function last() { - return $this->eq(count($this->nodes) - 1); + return $this->eq(\count($this->nodes) - 1); } /** @@ -487,7 +487,7 @@ } $node = $this->getNode(0); - $nodes = array(); + $nodes = []; while ($node = $node->parentNode) { if (XML_ELEMENT_NODE === $node->nodeType) { @@ -513,7 +513,7 @@ $node = $this->getNode(0)->firstChild; - return $this->createSubCrawler($node ? $this->sibling($node) : array()); + return $this->createSubCrawler($node ? $this->sibling($node) : []); } /** @@ -605,7 +605,7 @@ throw new \LogicException('Cannot evaluate the expression on an uninitialized crawler.'); } - $data = array(); + $data = []; $domxpath = $this->createDOMXPath($this->document, $this->findNamespacePrefixes($xpath)); foreach ($this->nodes as $node) { @@ -626,7 +626,7 @@ * * Example: * - * $crawler->filter('h1 a')->extract(array('_text', 'href')); + * $crawler->filter('h1 a')->extract(['_text', 'href']); * * @param array $attributes An array of attributes * @@ -635,11 +635,11 @@ public function extract($attributes) { $attributes = (array) $attributes; - $count = count($attributes); + $count = \count($attributes); - $data = array(); + $data = []; foreach ($this->nodes as $node) { - $elements = array(); + $elements = []; foreach ($attributes as $attribute) { if ('_text' === $attribute) { $elements[] = $node->nodeValue; @@ -765,7 +765,7 @@ $node = $this->getNode(0); if (!$node instanceof \DOMElement) { - throw new \InvalidArgumentException(sprintf('The selected node should be instance of DOMElement, got "%s".', get_class($node))); + throw new \InvalidArgumentException(sprintf('The selected node should be instance of DOMElement, got "%s".', \get_class($node))); } return new Link($node, $this->baseHref, $method); @@ -780,10 +780,10 @@ */ public function links() { - $links = array(); + $links = []; foreach ($this->nodes as $node) { if (!$node instanceof \DOMElement) { - throw new \InvalidArgumentException(sprintf('The current node list should contain only DOMElement instances, "%s" found.', get_class($node))); + throw new \InvalidArgumentException(sprintf('The current node list should contain only DOMElement instances, "%s" found.', \get_class($node))); } $links[] = new Link($node, $this->baseHref, 'get'); @@ -801,14 +801,14 @@ */ public function image() { - if (!count($this)) { + if (!\count($this)) { throw new \InvalidArgumentException('The current node list is empty.'); } $node = $this->getNode(0); if (!$node instanceof \DOMElement) { - throw new \InvalidArgumentException(sprintf('The selected node should be instance of DOMElement, got "%s".', get_class($node))); + throw new \InvalidArgumentException(sprintf('The selected node should be instance of DOMElement, got "%s".', \get_class($node))); } return new Image($node, $this->baseHref); @@ -821,10 +821,10 @@ */ public function images() { - $images = array(); + $images = []; foreach ($this as $node) { if (!$node instanceof \DOMElement) { - throw new \InvalidArgumentException(sprintf('The current node list should contain only DOMElement instances, "%s" found.', get_class($node))); + throw new \InvalidArgumentException(sprintf('The current node list should contain only DOMElement instances, "%s" found.', \get_class($node))); } $images[] = new Image($node, $this->baseHref); @@ -852,7 +852,7 @@ $node = $this->getNode(0); if (!$node instanceof \DOMElement) { - throw new \InvalidArgumentException(sprintf('The selected node should be instance of DOMElement, got "%s".', get_class($node))); + throw new \InvalidArgumentException(sprintf('The selected node should be instance of DOMElement, got "%s".', \get_class($node))); } $form = new Form($node, $this->uri, $method, $this->baseHref); @@ -889,7 +889,7 @@ * Escaped characters are: quotes (") and apostrophe ('). * * Examples: - * <code> + * * echo Crawler::xpathLiteral('foo " bar'); * //prints 'foo " bar' * @@ -898,7 +898,7 @@ * * echo Crawler::xpathLiteral('a\'b"c'); * //prints concat('a', "'", 'b"c') - * </code> + * * * @param string $s String to be escaped * @@ -915,7 +915,7 @@ } $string = $s; - $parts = array(); + $parts = []; while (true) { if (false !== $pos = strpos($string, "'")) { $parts[] = sprintf("'%s'", substr($string, 0, $pos)); @@ -965,13 +965,13 @@ */ private function relativize($xpath) { - $expressions = array(); + $expressions = []; // An expression which will never match to replace expressions which cannot match in the crawler // We cannot simply drop $nonMatchingExpression = 'a[name() = "b"]'; - $xpathLen = strlen($xpath); + $xpathLen = \strlen($xpath); $openedBrackets = 0; $startPosition = strspn($xpath, " \t\n\r\0\x0B"); @@ -1064,7 +1064,7 @@ */ public function count() { - return count($this->nodes); + return \count($this->nodes); } /** @@ -1083,7 +1083,7 @@ */ protected function sibling($node, $siblingDir = 'nextSibling') { - $nodes = array(); + $nodes = []; do { if ($node !== $this->getNode(0) && 1 === $node->nodeType) { @@ -1102,7 +1102,7 @@ * * @throws \InvalidArgumentException */ - private function createDOMXPath(\DOMDocument $document, array $prefixes = array()) + private function createDOMXPath(\DOMDocument $document, array $prefixes = []) { $domxpath = new \DOMXPath($document); @@ -1149,7 +1149,7 @@ return array_unique($matches['prefix']); } - return array(); + return []; } /**