Skip to content

Commit

Permalink
Composer update
Browse files Browse the repository at this point in the history
  • Loading branch information
dmhendricks committed Jun 9, 2018
1 parent bd04e95 commit 055b031
Show file tree
Hide file tree
Showing 27 changed files with 490 additions and 148 deletions.
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"wa72/htmlpagedom": "^1.3.1",
"composer/installers": "^1.5"
},
"minimum-stability": "dev",
"autoload": {
"psr-4": {
"CloudVerve\\RewriteContetUrls\\": "app/"
Expand Down
1 change: 1 addition & 0 deletions vendor/composer/autoload_files.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
$baseDir = dirname($vendorDir);

return array(
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
);
1 change: 1 addition & 0 deletions vendor/composer/autoload_psr4.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
return array(
'Wa72\\HtmlPageDom\\' => array($vendorDir . '/wa72/htmlpagedom/src'),
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'),
'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'),
'Composer\\Installers\\' => array($vendorDir . '/composer/installers/src/Composer/Installers'),
Expand Down
6 changes: 6 additions & 0 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
class ComposerStaticInitf6b68b169f3002301d4daeea9594d72c
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
);

Expand All @@ -18,6 +19,7 @@ class ComposerStaticInitf6b68b169f3002301d4daeea9594d72c
'S' =>
array (
'Symfony\\Polyfill\\Mbstring\\' => 26,
'Symfony\\Polyfill\\Ctype\\' => 23,
'Symfony\\Component\\DomCrawler\\' => 29,
'Symfony\\Component\\CssSelector\\' => 30,
),
Expand All @@ -37,6 +39,10 @@ class ComposerStaticInitf6b68b169f3002301d4daeea9594d72c
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
),
'Symfony\\Polyfill\\Ctype\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
),
'Symfony\\Component\\DomCrawler\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/dom-crawler',
Expand Down
124 changes: 89 additions & 35 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,23 +123,23 @@
},
{
"name": "symfony/css-selector",
"version": "dev-master",
"version_normalized": "9999999-dev",
"version": "v4.1.0",
"version_normalized": "4.1.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "797df6009c3ef46f54156011639a8347115f7223"
"reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/797df6009c3ef46f54156011639a8347115f7223",
"reference": "797df6009c3ef46f54156011639a8347115f7223",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
"reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"time": "2018-03-30T15:58:13+00:00",
"time": "2018-05-30T07:26:09+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -178,34 +178,35 @@
},
{
"name": "symfony/dom-crawler",
"version": "3.4.x-dev",
"version_normalized": "3.4.9999999.9999999-dev",
"version": "v4.1.0",
"version_normalized": "4.1.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "1a4cffeb059226ff6bee9f48acb388faf674afff"
"reference": "3350cacf151b48d903114ab8f7a4ccb23e07e10a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1a4cffeb059226ff6bee9f48acb388faf674afff",
"reference": "1a4cffeb059226ff6bee9f48acb388faf674afff",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/3350cacf151b48d903114ab8f7a4ccb23e07e10a",
"reference": "3350cacf151b48d903114ab8f7a4ccb23e07e10a",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8",
"php": "^7.1.3",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"symfony/css-selector": "~2.8|~3.0|~4.0"
"symfony/css-selector": "~3.4|~4.0"
},
"suggest": {
"symfony/css-selector": ""
},
"time": "2018-03-19T22:32:39+00:00",
"time": "2018-05-01T23:02:13+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
"dev-master": "4.1-dev"
}
},
"installation-source": "source",
Expand Down Expand Up @@ -234,19 +235,76 @@
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.8.0",
"version_normalized": "1.8.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2018-04-30T19:57:29+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
},
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"ctype",
"polyfill",
"portable"
]
},
{
"name": "symfony/polyfill-mbstring",
"version": "dev-master",
"version_normalized": "9999999-dev",
"version": "v1.8.0",
"version_normalized": "1.8.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
"reference": "3296adf6a6454a050679cde90f95350ad604b171"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
"reference": "3296adf6a6454a050679cde90f95350ad604b171",
"shasum": ""
},
"require": {
Expand All @@ -255,11 +313,11 @@
"suggest": {
"ext-mbstring": "For best performance"
},
"time": "2018-01-30T19:27:44+00:00",
"time": "2018-04-26T10:06:28+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.8-dev"
}
},
"installation-source": "source",
Expand Down Expand Up @@ -297,37 +355,33 @@
},
{
"name": "wa72/htmlpagedom",
"version": "1.3.x-dev",
"version_normalized": "1.3.9999999.9999999-dev",
"version": "v1.3.1",
"version_normalized": "1.3.1.0",
"source": {
"type": "git",
"url": "https://github.com/wasinger/htmlpagedom.git",
"reference": "1e6685c89105e8ee950f2d2d252e02c3049b390a"
"reference": "509520415f7f0cb1d3a4a0d3fd1b8eb4bab527a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wasinger/htmlpagedom/zipball/1e6685c89105e8ee950f2d2d252e02c3049b390a",
"reference": "1e6685c89105e8ee950f2d2d252e02c3049b390a",
"url": "https://api.github.com/repos/wasinger/htmlpagedom/zipball/509520415f7f0cb1d3a4a0d3fd1b8eb4bab527a1",
"reference": "509520415f7f0cb1d3a4a0d3fd1b8eb4bab527a1",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"symfony/css-selector": ">=2.3",
"symfony/dom-crawler": "^2.3 <2.8 | ^2.8.3 | ^3.0.1"
"symfony/dom-crawler": "^2.3 <2.8 | ^2.8.3 | ^3.0.1 | ^4"
},
"require-dev": {
"wa72/html-pretty-min": "^0.1.2"
"phpunit/phpunit": "^4|^5|^6|^7",
"wa72/html-pretty-min": "~0.1"
},
"suggest": {
"wa72/html-pretty-min": "Minify or indent HTML documents"
},
"time": "2016-10-06T08:01:22+00:00",
"time": "2018-03-08T21:15:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-4": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
*/
interface ExceptionInterface extends \Throwable
interface ExceptionInterface
{
}
4 changes: 2 additions & 2 deletions vendor/symfony/css-selector/Node/Specificity.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function __construct(int $a, int $b, int $c)
$this->c = $c;
}

public function plus(Specificity $specificity): Specificity
public function plus(self $specificity): self
{
return new self($this->a + $specificity->a, $this->b + $specificity->b, $this->c + $specificity->c);
}
Expand All @@ -56,7 +56,7 @@ public function getValue(): int
*
* @return int
*/
public function compareTo(Specificity $specificity)
public function compareTo(self $specificity)
{
if ($this->a !== $specificity->a) {
return $this->a > $specificity->a ? 1 : -1;
Expand Down
4 changes: 2 additions & 2 deletions vendor/symfony/css-selector/XPath/Translator.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public function selectorToXPath(SelectorNode $selector, string $prefix = 'descen
return ($prefix ?: '').$this->nodeToXPath($selector);
}

public function registerExtension(Extension\ExtensionInterface $extension): Translator
public function registerExtension(Extension\ExtensionInterface $extension): self
{
$this->extensions[$extension->getName()] = $extension;

Expand All @@ -139,7 +139,7 @@ public function getExtension(string $name): Extension\ExtensionInterface
return $this->extensions[$name];
}

public function registerParserShortcut(ParserInterface $shortcut): Translator
public function registerParserShortcut(ParserInterface $shortcut): self
{
$this->shortcutParsers[] = $shortcut;

Expand Down
6 changes: 3 additions & 3 deletions vendor/symfony/css-selector/XPath/XPathExpr.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function getElement(): string
return $this->element;
}

public function addCondition(string $condition): XPathExpr
public function addCondition(string $condition): self
{
$this->condition = $this->condition ? sprintf('(%s) and (%s)', $this->condition, $condition) : $condition;

Expand All @@ -55,7 +55,7 @@ public function getCondition(): string
return $this->condition;
}

public function addNameTest(): XPathExpr
public function addNameTest(): self
{
if ('*' !== $this->element) {
$this->addCondition('name() = '.Translator::getXpathLiteral($this->element));
Expand All @@ -65,7 +65,7 @@ public function addNameTest(): XPathExpr
return $this;
}

public function addStarPrefix(): XPathExpr
public function addStarPrefix(): self
{
$this->path .= '*/';

Expand Down
22 changes: 5 additions & 17 deletions vendor/symfony/dom-crawler/AbstractUriElement.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ abstract class AbstractUriElement
/**
* @param \DOMElement $node A \DOMElement instance
* @param string $currentUri The URI of the page where the link is embedded (or the base href)
* @param string $method The method to use for the link (get by default)
* @param string $method The method to use for the link (GET by default)
*
* @throws \InvalidArgumentException if the node is not a link
*/
public function __construct(\DOMElement $node, $currentUri, $method = 'GET')
public function __construct(\DOMElement $node, string $currentUri, ?string $method = 'GET')
{
if (!in_array(strtolower(substr($currentUri, 0, 4)), array('http', 'file'))) {
throw new \InvalidArgumentException(sprintf('Current URI must be an absolute URL ("%s").', $currentUri));
Expand Down Expand Up @@ -168,24 +168,16 @@ abstract protected function setNode(\DOMElement $node);

/**
* Removes the query string and the anchor from the given uri.
*
* @param string $uri The uri to clean
*
* @return string
*/
private function cleanupUri($uri)
private function cleanupUri(string $uri): string
{
return $this->cleanupQuery($this->cleanupAnchor($uri));
}

/**
* Remove the query string from the uri.
*
* @param string $uri
*
* @return string
*/
private function cleanupQuery($uri)
private function cleanupQuery(string $uri): string
{
if (false !== $pos = strpos($uri, '?')) {
return substr($uri, 0, $pos);
Expand All @@ -196,12 +188,8 @@ private function cleanupQuery($uri)

/**
* Remove the anchor from the uri.
*
* @param string $uri
*
* @return string
*/
private function cleanupAnchor($uri)
private function cleanupAnchor(string $uri): string
{
if (false !== $pos = strpos($uri, '#')) {
return substr($uri, 0, $pos);
Expand Down
Loading

0 comments on commit 055b031

Please sign in to comment.