From a4f5f0654aacd4ed89378109549ff555019a6ada Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 16 Jan 2015 11:32:29 -0500
Subject: [PATCH] Updated dependencies.
---
composer.json | 2 +-
composer.lock | 46 +--
vendor/autoload.php | 2 +-
vendor/composer/autoload_real.php | 8 +-
vendor/composer/installed.json | 278 +++++++++---------
.../Component/CssSelector/CssSelector.php | 35 ++-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/ExpressionErrorException.php | 2 +-
.../Exception/InternalErrorException.php | 2 +-
.../CssSelector/Exception/ParseException.php | 2 +-
.../Exception/SyntaxErrorException.php | 2 +-
.../Symfony/Component/CssSelector/LICENSE | 2 +-
.../CssSelector/Node/AbstractNode.php | 2 +-
.../CssSelector/Node/AttributeNode.php | 2 +-
.../Component/CssSelector/Node/ClassNode.php | 2 +-
.../CssSelector/Node/CombinedSelectorNode.php | 2 +-
.../CssSelector/Node/ElementNode.php | 2 +-
.../CssSelector/Node/FunctionNode.php | 2 +-
.../Component/CssSelector/Node/HashNode.php | 2 +-
.../CssSelector/Node/NegationNode.php | 2 +-
.../CssSelector/Node/NodeInterface.php | 2 +-
.../Component/CssSelector/Node/PseudoNode.php | 2 +-
.../CssSelector/Node/SelectorNode.php | 2 +-
.../CssSelector/Node/Specificity.php | 3 +-
.../Parser/Handler/CommentHandler.php | 2 +-
.../Parser/Handler/HandlerInterface.php | 2 +-
.../Parser/Handler/HashHandler.php | 2 +-
.../Parser/Handler/IdentifierHandler.php | 2 +-
.../Parser/Handler/NumberHandler.php | 2 +-
.../Parser/Handler/StringHandler.php | 2 +-
.../Parser/Handler/WhitespaceHandler.php | 2 +-
.../Component/CssSelector/Parser/Parser.php | 2 +-
.../CssSelector/Parser/ParserInterface.php | 2 +-
.../Component/CssSelector/Parser/Reader.php | 2 +-
.../Parser/Shortcut/ClassParser.php | 2 +-
.../Parser/Shortcut/ElementParser.php | 2 +-
.../Parser/Shortcut/EmptyStringParser.php | 2 +-
.../Parser/Shortcut/HashParser.php | 2 +-
.../Component/CssSelector/Parser/Token.php | 2 +-
.../CssSelector/Parser/TokenStream.php | 2 +-
.../Parser/Tokenizer/Tokenizer.php | 2 +-
.../Parser/Tokenizer/TokenizerEscaping.php | 2 +-
.../Parser/Tokenizer/TokenizerPatterns.php | 2 +-
.../Symfony/Component/CssSelector/README.md | 7 +-
.../XPath/Extension/AbstractExtension.php | 2 +-
.../Extension/AttributeMatchingExtension.php | 2 +-
.../XPath/Extension/CombinationExtension.php | 2 +-
.../XPath/Extension/ExtensionInterface.php | 2 +-
.../XPath/Extension/FunctionExtension.php | 2 +-
.../XPath/Extension/HtmlExtension.php | 2 +-
.../XPath/Extension/NodeExtension.php | 2 +-
.../XPath/Extension/PseudoClassExtension.php | 2 +-
.../CssSelector/XPath/Translator.php | 2 +-
.../CssSelector/XPath/TranslatorInterface.php | 4 +-
.../Component/CssSelector/XPath/XPathExpr.php | 2 +-
.../Component/CssSelector/phpunit.xml.dist | 4 +
.../Component/Process/ExecutableFinder.php | 4 +-
.../process/Symfony/Component/Process/LICENSE | 2 +-
.../Component/Process/PhpExecutableFinder.php | 2 +-
.../Component/Process/Pipes/UnixPipes.php | 2 +-
.../Component/Process/Pipes/WindowsPipes.php | 2 +-
.../Symfony/Component/Process/Process.php | 45 +--
.../Component/Process/ProcessBuilder.php | 6 +-
.../Component/Process/ProcessUtils.php | 6 +-
.../Process/Tests/AbstractProcessTest.php | 111 +++++--
.../Process/Tests/ExecutableFinderTest.php | 14 +-
.../Process/Tests/NonStopableProcess.php | 3 +-
.../Process/Tests/PhpExecutableFinderTest.php | 10 +-
.../Process/Tests/ProcessBuilderTest.php | 16 +-
.../Tests/ProcessFailedExceptionTest.php | 4 +-
.../Process/Tests/ProcessUtilsTest.php | 2 +-
.../Tests/SigchildEnabledProcessTest.php | 2 +-
.../Process/Tests/SimpleProcessTest.php | 6 +-
.../Component/Process/phpunit.xml.dist | 4 +
.../yaml/Symfony/Component/Yaml/Inline.php | 2 +-
.../yaml/Symfony/Component/Yaml/LICENSE | 2 +-
.../yaml/Symfony/Component/Yaml/Parser.php | 14 +-
.../yaml/Symfony/Component/Yaml/README.md | 2 +-
.../Component/Yaml/Tests/DumperTest.php | 1 -
.../Yaml/Tests/ParseExceptionTest.php | 1 -
.../Component/Yaml/Tests/ParserTest.php | 2 -
.../yaml/Symfony/Component/Yaml/Unescaper.php | 2 +-
.../Symfony/Component/Yaml/phpunit.xml.dist | 4 +
.../zendframework/zendframework/CHANGELOG.md | 33 ++-
vendor/zendframework/zendframework/README.md | 23 +-
.../Zend/Db/Adapter/Platform/SqlServer.php | 1 +
.../zendframework/library/Zend/Ldap/Ldap.php | 4 +
.../library/Zend/Session/SessionManager.php | 9 +
.../library/Zend/Version/Version.php | 2 +-
89 files changed, 492 insertions(+), 332 deletions(-)
diff --git a/composer.json b/composer.json
index ea3e48a0c9b..83952c81ab0 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
"symfony/yaml": "*",
"vufind-org/vufindcode": "*",
"vufind-org/vufindhttp": "*",
- "zendframework/zendframework": "2.2.7",
+ "zendframework/zendframework": "2.2.9",
"zendframework/zendrest": "2.*",
"zendframework/zendservice-amazon": "2.*",
"zendframework/zendservice-recaptcha": "2.*"
diff --git a/composer.lock b/composer.lock
index cd5fe028776..b725c54b631 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "d5901d4c84a7e286ec6f2076c447928c",
+ "hash": "0bcf71e8265164107ab6c874a47f118d",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -512,17 +512,17 @@
},
{
"name": "symfony/yaml",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
+ "reference": "82462a90848a52c2533aa6b598b107d68076b018"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
- "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/82462a90848a52c2533aa6b598b107d68076b018",
+ "reference": "82462a90848a52c2533aa6b598b107d68076b018",
"shasum": ""
},
"require": {
@@ -555,7 +555,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-03 15:33:07"
},
{
"name": "vufind-org/vufindcode",
@@ -641,17 +641,17 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.2.7",
+ "version": "2.2.9",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "ffca3e3eefd7fbe0f316ed0224edff368949223d"
+ "reference": "351279d669cf16eb5c640f86e944fe8f84c8b181"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-ffca3e3eefd7fbe0f316ed0224edff368949223d-zip-486378.zip",
- "reference": "2.2.7",
- "shasum": "0e386ea1eed09bbb50be7d957f8f3d7cefb7bd3d"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-351279d669cf16eb5c640f86e944fe8f84c8b181-zip-14eaac.zip",
+ "reference": "2.2.9",
+ "shasum": "022a1c0d5b3e54c3bd0333f1fedf79020ba57eea"
},
"require": {
"php": ">=5.3.3",
@@ -753,10 +753,10 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.7",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.9",
"issues": "https://github.com/zendframework/zf2/issues"
},
- "time": "2014-04-15 14:31:59"
+ "time": "2015-01-14 16:28:50"
},
{
"name": "zendframework/zendrest",
@@ -1068,17 +1068,17 @@
},
{
"name": "symfony/css-selector",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
- "reference": "93eb315b545b60a908271762fb4bfa1f9954b851"
+ "reference": "3f80ecc614fec68d5b4a84a0703db3fdf5ce8584"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/93eb315b545b60a908271762fb4bfa1f9954b851",
- "reference": "93eb315b545b60a908271762fb4bfa1f9954b851",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/3f80ecc614fec68d5b4a84a0703db3fdf5ce8584",
+ "reference": "3f80ecc614fec68d5b4a84a0703db3fdf5ce8584",
"shasum": ""
},
"require": {
@@ -1115,21 +1115,21 @@
],
"description": "Symfony CssSelector Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-03 08:01:59"
},
{
"name": "symfony/process",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a"
+ "reference": "319794f611bd8bdefbac72beb3f05e847f8ebc92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/bf0c9bd625f13b0b0bbe39919225cf145dfb935a",
- "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/319794f611bd8bdefbac72beb3f05e847f8ebc92",
+ "reference": "319794f611bd8bdefbac72beb3f05e847f8ebc92",
"shasum": ""
},
"require": {
@@ -1162,7 +1162,7 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-06 22:47:52"
}
],
"aliases": [],
diff --git a/vendor/autoload.php b/vendor/autoload.php
index dc9c17e6711..5b0c21812b8 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitf4acc9fe958f13f4ed1b60de39066403::getLoader();
+return ComposerAutoloaderInit33a49fb77f37eff1109c166f3c8fbb99::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index ba171a1ff9f..12fe88897e0 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitf4acc9fe958f13f4ed1b60de39066403
+class ComposerAutoloaderInit33a49fb77f37eff1109c166f3c8fbb99
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitf4acc9fe958f13f4ed1b60de39066403
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitf4acc9fe958f13f4ed1b60de39066403', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit33a49fb77f37eff1109c166f3c8fbb99', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitf4acc9fe958f13f4ed1b60de39066403', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit33a49fb77f37eff1109c166f3c8fbb99', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
@@ -48,7 +48,7 @@ class ComposerAutoloaderInitf4acc9fe958f13f4ed1b60de39066403
}
}
-function composerRequiref4acc9fe958f13f4ed1b60de39066403($file)
+function composerRequire33a49fb77f37eff1109c166f3c8fbb99($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6618bffed04..22399313e7a 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -518,127 +518,6 @@
"issues": "https://github.com/zendframework/ZendXml/issues"
}
},
- {
- "name": "zendframework/zendframework",
- "version": "2.2.7",
- "version_normalized": "2.2.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zf2.git",
- "reference": "ffca3e3eefd7fbe0f316ed0224edff368949223d"
- },
- "dist": {
- "type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-ffca3e3eefd7fbe0f316ed0224edff368949223d-zip-486378.zip",
- "reference": "2.2.7",
- "shasum": "0e386ea1eed09bbb50be7d957f8f3d7cefb7bd3d"
- },
- "require": {
- "php": ">=5.3.3",
- "zendframework/zendxml": "~1.0-dev"
- },
- "replace": {
- "zendframework/zend-authentication": "self.version",
- "zendframework/zend-barcode": "self.version",
- "zendframework/zend-cache": "self.version",
- "zendframework/zend-captcha": "self.version",
- "zendframework/zend-code": "self.version",
- "zendframework/zend-config": "self.version",
- "zendframework/zend-console": "self.version",
- "zendframework/zend-crypt": "self.version",
- "zendframework/zend-db": "self.version",
- "zendframework/zend-debug": "self.version",
- "zendframework/zend-di": "self.version",
- "zendframework/zend-dom": "self.version",
- "zendframework/zend-escaper": "self.version",
- "zendframework/zend-eventmanager": "self.version",
- "zendframework/zend-feed": "self.version",
- "zendframework/zend-file": "self.version",
- "zendframework/zend-filter": "self.version",
- "zendframework/zend-form": "self.version",
- "zendframework/zend-http": "self.version",
- "zendframework/zend-i18n": "self.version",
- "zendframework/zend-inputfilter": "self.version",
- "zendframework/zend-json": "self.version",
- "zendframework/zend-ldap": "self.version",
- "zendframework/zend-loader": "self.version",
- "zendframework/zend-log": "self.version",
- "zendframework/zend-mail": "self.version",
- "zendframework/zend-math": "self.version",
- "zendframework/zend-memory": "self.version",
- "zendframework/zend-mime": "self.version",
- "zendframework/zend-modulemanager": "self.version",
- "zendframework/zend-mvc": "self.version",
- "zendframework/zend-navigation": "self.version",
- "zendframework/zend-paginator": "self.version",
- "zendframework/zend-permissions-acl": "self.version",
- "zendframework/zend-permissions-rbac": "self.version",
- "zendframework/zend-progressbar": "self.version",
- "zendframework/zend-resources": "self.version",
- "zendframework/zend-serializer": "self.version",
- "zendframework/zend-server": "self.version",
- "zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-session": "self.version",
- "zendframework/zend-soap": "self.version",
- "zendframework/zend-stdlib": "self.version",
- "zendframework/zend-tag": "self.version",
- "zendframework/zend-test": "self.version",
- "zendframework/zend-text": "self.version",
- "zendframework/zend-uri": "self.version",
- "zendframework/zend-validator": "self.version",
- "zendframework/zend-version": "self.version",
- "zendframework/zend-view": "self.version",
- "zendframework/zend-xmlrpc": "self.version"
- },
- "require-dev": {
- "doctrine/annotations": ">=1.0",
- "fabpot/php-cs-fixer": "*@dev",
- "ircmaxell/random-lib": "dev-master",
- "ircmaxell/security-lib": "dev-master",
- "ocramius/proxy-manager": "0.4.*",
- "phpunit/phpunit": "3.7.*"
- },
- "suggest": {
- "doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
- "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
- "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
- "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
- "zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
- "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
- },
- "time": "2014-04-15 14:31:59",
- "bin": [
- "bin/classmap_generator.php",
- "bin/pluginmap_generator.php",
- "bin/templatemap_generator.php"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Zend\\": "library/"
- }
- },
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Zend Framework 2",
- "homepage": "http://framework.zend.com/",
- "keywords": [
- "framework",
- "zf2"
- ],
- "support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.7",
- "issues": "https://github.com/zendframework/zf2/issues"
- }
- },
{
"name": "zendframework/zendrest",
"version": "2.0.2",
@@ -1060,24 +939,24 @@
},
{
"name": "symfony/yaml",
- "version": "v2.6.1",
- "version_normalized": "2.6.1.0",
+ "version": "v2.6.3",
+ "version_normalized": "2.6.3.0",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
+ "reference": "82462a90848a52c2533aa6b598b107d68076b018"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
- "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/82462a90848a52c2533aa6b598b107d68076b018",
+ "reference": "82462a90848a52c2533aa6b598b107d68076b018",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2014-12-02 20:19:20",
+ "time": "2015-01-03 15:33:07",
"type": "library",
"extra": {
"branch-alias": {
@@ -1107,26 +986,147 @@
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com"
},
+ {
+ "name": "zendframework/zendframework",
+ "version": "2.2.9",
+ "version_normalized": "2.2.9.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zf2.git",
+ "reference": "351279d669cf16eb5c640f86e944fe8f84c8b181"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-351279d669cf16eb5c640f86e944fe8f84c8b181-zip-14eaac.zip",
+ "reference": "2.2.9",
+ "shasum": "022a1c0d5b3e54c3bd0333f1fedf79020ba57eea"
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zendxml": "~1.0-dev"
+ },
+ "replace": {
+ "zendframework/zend-authentication": "self.version",
+ "zendframework/zend-barcode": "self.version",
+ "zendframework/zend-cache": "self.version",
+ "zendframework/zend-captcha": "self.version",
+ "zendframework/zend-code": "self.version",
+ "zendframework/zend-config": "self.version",
+ "zendframework/zend-console": "self.version",
+ "zendframework/zend-crypt": "self.version",
+ "zendframework/zend-db": "self.version",
+ "zendframework/zend-debug": "self.version",
+ "zendframework/zend-di": "self.version",
+ "zendframework/zend-dom": "self.version",
+ "zendframework/zend-escaper": "self.version",
+ "zendframework/zend-eventmanager": "self.version",
+ "zendframework/zend-feed": "self.version",
+ "zendframework/zend-file": "self.version",
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-form": "self.version",
+ "zendframework/zend-http": "self.version",
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-inputfilter": "self.version",
+ "zendframework/zend-json": "self.version",
+ "zendframework/zend-ldap": "self.version",
+ "zendframework/zend-loader": "self.version",
+ "zendframework/zend-log": "self.version",
+ "zendframework/zend-mail": "self.version",
+ "zendframework/zend-math": "self.version",
+ "zendframework/zend-memory": "self.version",
+ "zendframework/zend-mime": "self.version",
+ "zendframework/zend-modulemanager": "self.version",
+ "zendframework/zend-mvc": "self.version",
+ "zendframework/zend-navigation": "self.version",
+ "zendframework/zend-paginator": "self.version",
+ "zendframework/zend-permissions-acl": "self.version",
+ "zendframework/zend-permissions-rbac": "self.version",
+ "zendframework/zend-progressbar": "self.version",
+ "zendframework/zend-resources": "self.version",
+ "zendframework/zend-serializer": "self.version",
+ "zendframework/zend-server": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-session": "self.version",
+ "zendframework/zend-soap": "self.version",
+ "zendframework/zend-stdlib": "self.version",
+ "zendframework/zend-tag": "self.version",
+ "zendframework/zend-test": "self.version",
+ "zendframework/zend-text": "self.version",
+ "zendframework/zend-uri": "self.version",
+ "zendframework/zend-validator": "self.version",
+ "zendframework/zend-version": "self.version",
+ "zendframework/zend-view": "self.version",
+ "zendframework/zend-xmlrpc": "self.version"
+ },
+ "require-dev": {
+ "doctrine/annotations": ">=1.0",
+ "fabpot/php-cs-fixer": "*@dev",
+ "ircmaxell/random-lib": "dev-master",
+ "ircmaxell/security-lib": "dev-master",
+ "ocramius/proxy-manager": "0.4.*",
+ "phpunit/phpunit": "3.7.*"
+ },
+ "suggest": {
+ "doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
+ "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
+ "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
+ "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
+ "zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
+ "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
+ },
+ "time": "2015-01-14 16:28:50",
+ "bin": [
+ "bin/classmap_generator.php",
+ "bin/pluginmap_generator.php",
+ "bin/templatemap_generator.php"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev",
+ "dev-develop": "2.3-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Zend\\": "library/"
+ }
+ },
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Zend Framework 2",
+ "homepage": "http://framework.zend.com/",
+ "keywords": [
+ "framework",
+ "zf2"
+ ],
+ "support": {
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.9",
+ "issues": "https://github.com/zendframework/zf2/issues"
+ }
+ },
{
"name": "symfony/css-selector",
- "version": "v2.6.1",
- "version_normalized": "2.6.1.0",
+ "version": "v2.6.3",
+ "version_normalized": "2.6.3.0",
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
- "reference": "93eb315b545b60a908271762fb4bfa1f9954b851"
+ "reference": "3f80ecc614fec68d5b4a84a0703db3fdf5ce8584"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/93eb315b545b60a908271762fb4bfa1f9954b851",
- "reference": "93eb315b545b60a908271762fb4bfa1f9954b851",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/3f80ecc614fec68d5b4a84a0703db3fdf5ce8584",
+ "reference": "3f80ecc614fec68d5b4a84a0703db3fdf5ce8584",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2014-12-02 20:19:20",
+ "time": "2015-01-03 08:01:59",
"type": "library",
"extra": {
"branch-alias": {
@@ -1162,24 +1162,24 @@
},
{
"name": "symfony/process",
- "version": "v2.6.1",
- "version_normalized": "2.6.1.0",
+ "version": "v2.6.3",
+ "version_normalized": "2.6.3.0",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a"
+ "reference": "319794f611bd8bdefbac72beb3f05e847f8ebc92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/bf0c9bd625f13b0b0bbe39919225cf145dfb935a",
- "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/319794f611bd8bdefbac72beb3f05e847f8ebc92",
+ "reference": "319794f611bd8bdefbac72beb3f05e847f8ebc92",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2014-12-02 20:19:20",
+ "time": "2015-01-06 22:47:52",
"type": "library",
"extra": {
"branch-alias": {
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/CssSelector.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/CssSelector.php
index 58d84662452..82c9283ea2a 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/CssSelector.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/CssSelector.php
@@ -24,9 +24,42 @@ use Symfony\Component\CssSelector\XPath\Translator;
*
* $xpath = CssSelector::toXpath('h1.foo');
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
+ * Copyright (c) 2007-2012 Ian Bicking and contributors. See AUTHORS
+ * for more details.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. Neither the name of Ian Bicking nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL IAN BICKING OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
* @author Fabien Potencier <fabien@symfony.com>
*
* @api
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ExceptionInterface.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ExceptionInterface.php
index da01c2b2717..e4c5ae1b6b3 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ExceptionInterface.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ExceptionInterface.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Exception;
/**
* Interface for exceptions.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php
index 151dbf03504..756a12a75ae 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Exception;
/**
* ParseException is thrown when a CSS selector syntax is not valid.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/InternalErrorException.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/InternalErrorException.php
index 8a815fb9ea5..2decde67fed 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/InternalErrorException.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/InternalErrorException.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Exception;
/**
* ParseException is thrown when a CSS selector syntax is not valid.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ParseException.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ParseException.php
index 9c119f84c6a..3b0b0ee8f14 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ParseException.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/ParseException.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Exception;
/**
* ParseException is thrown when a CSS selector syntax is not valid.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Fabien Potencier <fabien@symfony.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
index 529b891a3f5..831b001340f 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
@@ -16,7 +16,7 @@ use Symfony\Component\CssSelector\Parser\Token;
/**
* ParseException is thrown when a CSS selector syntax is not valid.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/LICENSE b/vendor/symfony/css-selector/Symfony/Component/CssSelector/LICENSE
index 0b3292cf902..43028bc600f 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/LICENSE
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/AbstractNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/AbstractNode.php
index f5324e191b0..b1c8e9508d9 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/AbstractNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/AbstractNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Abstract base node class.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/AttributeNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/AttributeNode.php
index e2fa9a294c5..b10a4dd5b34 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/AttributeNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/AttributeNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a "<selector>[<namespace>|<attribute> <operator> <value>]" node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/ClassNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/ClassNode.php
index a7a59a33a9f..544342f871f 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/ClassNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/ClassNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a "<selector>.<name>" node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
index 4e085ea4e1a..6d00db431c5 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a combined node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/ElementNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/ElementNode.php
index 9ab13c3f243..71ef121741e 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/ElementNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/ElementNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a "<namespace>|<element>" node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/FunctionNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/FunctionNode.php
index ecd11a50b00..f94af8dafce 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/FunctionNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/FunctionNode.php
@@ -16,7 +16,7 @@ use Symfony\Component\CssSelector\Parser\Token;
/**
* Represents a "<selector>:<name>(<arguments>)" node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/HashNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/HashNode.php
index 7fb407579b6..ddbe76477ad 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/HashNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/HashNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a "<selector>#<id>" node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/NegationNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/NegationNode.php
index 2529689095e..0fafb0a120b 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/NegationNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/NegationNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a "<selector>:not(<identifier>)" node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/NodeInterface.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/NodeInterface.php
index 1601c33a6ed..dd300e23cde 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/NodeInterface.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/NodeInterface.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Interface for nodes.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/PseudoNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/PseudoNode.php
index 4f2d538f6f5..0e413adc548 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/PseudoNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/PseudoNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a "<selector>:<identifier>" node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/SelectorNode.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/SelectorNode.php
index 49f417f2860..4958da55afa 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/SelectorNode.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/SelectorNode.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a "<selector>(::|:)<pseudoElement>" node.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/Specificity.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/Specificity.php
index d0c215e0f2e..0dfec3b9556 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/Specificity.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Node/Specificity.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Node;
/**
* Represents a node specificity.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @see http://www.w3.org/TR/selectors/#specificity
@@ -81,6 +81,7 @@ class Specificity
* 0 if they are equal, and 1 if the argument is lower
*
* @param Specificity $specificity
+ *
* @return int
*/
public function compareTo(Specificity $specificity)
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php
index 97c3f8dd24c..f480776d2c4 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php
@@ -17,7 +17,7 @@ use Symfony\Component\CssSelector\Parser\TokenStream;
/**
* CSS selector comment handler.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php
index c7a48c0d6eb..049ddd3ec4c 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php
@@ -17,7 +17,7 @@ use Symfony\Component\CssSelector\Parser\TokenStream;
/**
* CSS selector handler interface.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php
index 2227ea62a6a..b144223fbd6 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php
@@ -20,7 +20,7 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
/**
* CSS selector comment handler.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php
index 346532ec151..86739eab99a 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php
@@ -20,7 +20,7 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
/**
* CSS selector comment handler.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php
index 208f83c08fe..97a9387b185 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php
@@ -19,7 +19,7 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
/**
* CSS selector comment handler.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php
index 2663fe87b51..9f7a5946b02 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php
@@ -22,7 +22,7 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
/**
* CSS selector comment handler.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php
index 806cfbb5135..234bbd84cf6 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php
@@ -18,7 +18,7 @@ use Symfony\Component\CssSelector\Parser\TokenStream;
/**
* CSS selector whitespace handler.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Parser.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Parser.php
index c622383e841..9625e3e8a11 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Parser.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Parser.php
@@ -18,7 +18,7 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\Tokenizer;
/**
* CSS selector parser.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/ParserInterface.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/ParserInterface.php
index b27f79f4a6e..3b43a52fde5 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/ParserInterface.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/ParserInterface.php
@@ -16,7 +16,7 @@ use Symfony\Component\CssSelector\Node\SelectorNode;
/**
* CSS selector parser interface.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Reader.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Reader.php
index 2a6c4bbd439..ba2a7f0da95 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Reader.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Reader.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Parser;
/**
* CSS selector reader.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php
index bb9653ce016..142bd163153 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php
@@ -19,7 +19,7 @@ use Symfony\Component\CssSelector\Parser\ParserInterface;
/**
* CSS selector class parser shortcut.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php
index eae18b94679..f62d25960cc 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php
@@ -18,7 +18,7 @@ use Symfony\Component\CssSelector\Parser\ParserInterface;
/**
* CSS selector element parser shortcut.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
index 0031f7cfef3..98a08fde069 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php
@@ -22,7 +22,7 @@ use Symfony\Component\CssSelector\Parser\ParserInterface;
* - The parser fails to parse an empty string.
* - In the previous version, an empty string matches each tags.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php
index 28c7d296f1b..fde614149b7 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php
@@ -19,7 +19,7 @@ use Symfony\Component\CssSelector\Parser\ParserInterface;
/**
* CSS selector hash parser shortcut.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php
index ba5d657f7bf..6f7586f612e 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Token.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Parser;
/**
* CSS selector token.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/TokenStream.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/TokenStream.php
index 05d715b961a..8184b832b3c 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/TokenStream.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/TokenStream.php
@@ -17,7 +17,7 @@ use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
/**
* CSS selector token stream.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
index c850276728c..79fa7b77d06 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php
@@ -19,7 +19,7 @@ use Symfony\Component\CssSelector\Parser\TokenStream;
/**
* CSS selector tokenizer.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php
index 76386c93714..bf5096be9fd 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Parser\Tokenizer;
/**
* CSS selector tokenizer escaping applier.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php
index 6fc98b71e12..326f0208219 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\Parser\Tokenizer;
/**
* CSS selector tokenizer patterns builder.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md b/vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md
index e0212b1570c..ef28bc9d177 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/README.md
@@ -36,10 +36,9 @@ names are lower-cased, the following extra pseudo-classes are supported:
Resources
---------
-This component is a port of the Python lxml library, which is copyright Infrae
-and distributed under the BSD license.
-
-Current code is a port of https://github.com/SimonSapin/cssselect/releases/tag/v0.7.1
+This component is a port of the Python cssselect library
+[v0.7.1](https://github.com/SimonSapin/cssselect/releases/tag/v0.7.1),
+which is distributed under the BSD license.
You can run the unit tests with the following command:
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php
index 1b147e9ecf6..c70609c695d 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\XPath\Extension;
/**
* XPath expression translator abstract extension.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
index 31d24b28eff..cbe48c57a9a 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
@@ -17,7 +17,7 @@ use Symfony\Component\CssSelector\XPath\XPathExpr;
/**
* XPath expression translator attribute extension.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php
index 639e9249521..9ce018f13a7 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php
@@ -16,7 +16,7 @@ use Symfony\Component\CssSelector\XPath\XPathExpr;
/**
* XPath expression translator combination extension.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php
index 22312659429..9b47f24f361 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\XPath\Extension;
/**
* XPath expression translator extension interface.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
index e8494743831..0086240c81f 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
@@ -21,7 +21,7 @@ use Symfony\Component\CssSelector\XPath\XPathExpr;
/**
* XPath expression translator function extension.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
index 71ed4b4a795..883156be709 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php
@@ -19,7 +19,7 @@ use Symfony\Component\CssSelector\XPath\XPathExpr;
/**
* XPath expression translator HTML extension.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
index 212955c1f2d..2b8920f1ab5 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
@@ -18,7 +18,7 @@ use Symfony\Component\CssSelector\XPath\XPathExpr;
/**
* XPath expression translator node extension.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
index d59857225cf..008ec2b4b15 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
@@ -17,7 +17,7 @@ use Symfony\Component\CssSelector\XPath\XPathExpr;
/**
* XPath expression translator pseudo-class extension.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php
index 011882cca37..5053793ea06 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/Translator.php
@@ -21,7 +21,7 @@ use Symfony\Component\CssSelector\Parser\ParserInterface;
/**
* XPath expression translator interface.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/TranslatorInterface.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/TranslatorInterface.php
index b26cf5b0c39..1d9d1c88ee4 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/TranslatorInterface.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/TranslatorInterface.php
@@ -16,7 +16,7 @@ use Symfony\Component\CssSelector\Node\SelectorNode;
/**
* XPath expression translator interface.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
@@ -34,7 +34,7 @@ interface TranslatorInterface
public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::');
/**
- * Translates a parsed selector node to an XPath expression
+ * Translates a parsed selector node to an XPath expression.
*
* @param SelectorNode $selector
* @param string $prefix
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/XPathExpr.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/XPathExpr.php
index 4ec9fda672c..c7ef97cb9a1 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/XPathExpr.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/XPath/XPathExpr.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\CssSelector\XPath;
/**
* XPath expression translator interface.
*
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
*
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/phpunit.xml.dist b/vendor/symfony/css-selector/Symfony/Component/CssSelector/phpunit.xml.dist
index 3eb0a1ece0c..7f885331517 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/phpunit.xml.dist
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/phpunit.xml.dist
@@ -6,6 +6,10 @@
colors="true"
bootstrap="vendor/autoload.php"
>
+ <php>
+ <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
+ <ini name="error_reporting" value="-16385"/>
+ </php>
<testsuites>
<testsuite name="Symfony CssSelector Component Test Suite">
<directory>./Tests/</directory>
diff --git a/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php b/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php
index 6ae74dca174..a9c0a5c8795 100644
--- a/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php
+++ b/vendor/symfony/process/Symfony/Component/Process/ExecutableFinder.php
@@ -72,13 +72,13 @@ class ExecutableFinder
}
$suffixes = array('');
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$pathExt = getenv('PATHEXT');
$suffixes = $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes;
}
foreach ($suffixes as $suffix) {
foreach ($dirs as $dir) {
- if (is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && (defined('PHP_WINDOWS_VERSION_BUILD') || is_executable($file))) {
+ if (is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || is_executable($file))) {
return $file;
}
}
diff --git a/vendor/symfony/process/Symfony/Component/Process/LICENSE b/vendor/symfony/process/Symfony/Component/Process/LICENSE
index 0b3292cf902..43028bc600f 100644
--- a/vendor/symfony/process/Symfony/Component/Process/LICENSE
+++ b/vendor/symfony/process/Symfony/Component/Process/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php b/vendor/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php
index 7854487a26b..91d6d78a670 100644
--- a/vendor/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php
+++ b/vendor/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php
@@ -60,7 +60,7 @@ class PhpExecutableFinder
}
$dirs = array(PHP_BINDIR);
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$dirs[] = 'C:\xampp\php\\';
}
diff --git a/vendor/symfony/process/Symfony/Component/Process/Pipes/UnixPipes.php b/vendor/symfony/process/Symfony/Component/Process/Pipes/UnixPipes.php
index 69f31467a03..6150d4a7094 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Pipes/UnixPipes.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Pipes/UnixPipes.php
@@ -121,7 +121,7 @@ class UnixPipes extends AbstractPipes
$r = $this->pipes;
}
// discard read on stdin
- unset ($r[0]);
+ unset($r[0]);
$w = isset($this->pipes[0]) ? array($this->pipes[0]) : null;
$e = null;
diff --git a/vendor/symfony/process/Symfony/Component/Process/Pipes/WindowsPipes.php b/vendor/symfony/process/Symfony/Component/Process/Pipes/WindowsPipes.php
index ecdf50eee2a..86cde67d025 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Pipes/WindowsPipes.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Pipes/WindowsPipes.php
@@ -230,7 +230,7 @@ class WindowsPipes extends AbstractPipes
if (false === $data || (true === $close && feof($r['input']) && '' === $data)) {
// no more data to read on input resource
// use an empty buffer in the next reads
- unset($this->input);
+ $this->input = null;
}
}
diff --git a/vendor/symfony/process/Symfony/Component/Process/Process.php b/vendor/symfony/process/Symfony/Component/Process/Process.php
index b91bc5dea78..bbbc9a018fd 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Process.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Process.php
@@ -155,7 +155,7 @@ class Process
// on Gnu/Linux, PHP builds with --enable-maintainer-zts are also affected
// @see : https://bugs.php.net/bug.php?id=51800
// @see : https://bugs.php.net/bug.php?id=50524
- if (null === $this->cwd && (defined('ZEND_THREAD_SAFE') || defined('PHP_WINDOWS_VERSION_BUILD'))) {
+ if (null === $this->cwd && (defined('ZEND_THREAD_SAFE') || '\\' === DIRECTORY_SEPARATOR)) {
$this->cwd = getcwd();
}
if (null !== $env) {
@@ -164,10 +164,10 @@ class Process
$this->input = $input;
$this->setTimeout($timeout);
- $this->useFileHandles = defined('PHP_WINDOWS_VERSION_BUILD');
+ $this->useFileHandles = '\\' === DIRECTORY_SEPARATOR;
$this->pty = false;
$this->enhanceWindowsCompatibility = true;
- $this->enhanceSigchildCompatibility = !defined('PHP_WINDOWS_VERSION_BUILD') && $this->isSigchildEnabled();
+ $this->enhanceSigchildCompatibility = '\\' !== DIRECTORY_SEPARATOR && $this->isSigchildEnabled();
$this->options = array_replace(array('suppress_errors' => true, 'binary_pipes' => true), $options);
}
@@ -276,7 +276,7 @@ class Process
$commandline = $this->commandline;
- if (defined('PHP_WINDOWS_VERSION_BUILD') && $this->enhanceWindowsCompatibility) {
+ if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
$commandline = 'cmd /V:ON /E:ON /C "('.$commandline.')';
foreach ($this->processPipes->getFiles() as $offset => $filename) {
$commandline .= ' '.$offset.'>'.ProcessUtils::escapeArgument($filename);
@@ -356,8 +356,8 @@ class Process
do {
$this->checkTimeout();
- $running = defined('PHP_WINDOWS_VERSION_BUILD') ? $this->isRunning() : $this->processPipes->areOpen();
- $close = !defined('PHP_WINDOWS_VERSION_BUILD') || !$running;
+ $running = '\\' === DIRECTORY_SEPARATOR ? $this->isRunning() : $this->processPipes->areOpen();
+ $close = '\\' !== DIRECTORY_SEPARATOR || !$running;
$this->readPipes(true, $close);
} while ($running);
@@ -476,7 +476,7 @@ class Process
$this->requireProcessIsStarted(__FUNCTION__);
- $this->readPipes(false, defined('PHP_WINDOWS_VERSION_BUILD') ? !$this->processInformation['running'] : true);
+ $this->readPipes(false, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
return $this->stdout;
}
@@ -499,6 +499,11 @@ class Process
$data = $this->getOutput();
$latest = substr($data, $this->incrementalOutputOffset);
+
+ if (false === $latest) {
+ return '';
+ }
+
$this->incrementalOutputOffset = strlen($data);
return $latest;
@@ -535,7 +540,7 @@ class Process
$this->requireProcessIsStarted(__FUNCTION__);
- $this->readPipes(false, defined('PHP_WINDOWS_VERSION_BUILD') ? !$this->processInformation['running'] : true);
+ $this->readPipes(false, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
return $this->stderr;
}
@@ -559,6 +564,11 @@ class Process
$data = $this->getErrorOutput();
$latest = substr($data, $this->incrementalErrorOutputOffset);
+
+ if (false === $latest) {
+ return '';
+ }
+
$this->incrementalErrorOutputOffset = strlen($data);
return $latest;
@@ -787,7 +797,7 @@ class Process
{
$timeoutMicro = microtime(true) + $timeout;
if ($this->isRunning()) {
- if (defined('PHP_WINDOWS_VERSION_BUILD') && !$this->isSigchildEnabled()) {
+ if ('\\' === DIRECTORY_SEPARATOR && !$this->isSigchildEnabled()) {
exec(sprintf("taskkill /F /T /PID %d 2>&1", $this->getPid()), $output, $exitCode);
if ($exitCode > 0) {
throw new RuntimeException('Unable to kill the process');
@@ -907,7 +917,7 @@ class Process
*
* To disable the timeout, set this value to null.
*
- * @param int|float|null $timeout The timeout in seconds
+ * @param int|float|null $timeout The timeout in seconds
*
* @return self The current Process instance.
*
@@ -936,7 +946,7 @@ class Process
*/
public function setTty($tty)
{
- if (defined('PHP_WINDOWS_VERSION_BUILD') && $tty) {
+ if ('\\' === DIRECTORY_SEPARATOR && $tty) {
throw new RuntimeException('TTY mode is not supported on Windows platform.');
}
@@ -958,7 +968,7 @@ class Process
/**
* Sets PTY mode.
*
- * @param bool $bool
+ * @param bool $bool
*
* @return self
*/
@@ -1228,7 +1238,7 @@ class Process
return $result;
}
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
return $result = false;
}
@@ -1249,7 +1259,7 @@ class Process
*/
private function getDescriptors()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->processPipes = WindowsPipes::create($this, $this->input);
} else {
$this->processPipes = UnixPipes::create($this, $this->input);
@@ -1310,7 +1320,7 @@ class Process
$this->processInformation = proc_get_status($this->process);
$this->captureExitCode();
- $this->readPipes($blocking, defined('PHP_WINDOWS_VERSION_BUILD') ? !$this->processInformation['running'] : true);
+ $this->readPipes($blocking, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
if (!$this->processInformation['running']) {
$this->close();
@@ -1341,7 +1351,7 @@ class Process
/**
* Validates and returns the filtered timeout.
*
- * @param int|float|null $timeout
+ * @param int|float|null $timeout
*
* @return float|null
*
@@ -1370,11 +1380,12 @@ class Process
{
$result = $this->processPipes->readAndWrite($blocking, $close);
+ $callback = $this->callback;
foreach ($result as $type => $data) {
if (3 == $type) {
$this->fallbackExitcode = (int) $data;
} else {
- call_user_func($this->callback, $type === self::STDOUT ? self::OUT : self::ERR, $data);
+ $callback($type === self::STDOUT ? self::OUT : self::ERR, $data);
}
}
}
diff --git a/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php b/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php
index 71633cd7fac..189ab8a3d13 100644
--- a/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php
+++ b/vendor/symfony/process/Symfony/Component/Process/ProcessBuilder.php
@@ -32,7 +32,7 @@ class ProcessBuilder
private $outputDisabled = false;
/**
- * Constructor
+ * Constructor.
*
* @param string[] $arguments An array of arguments
*/
@@ -129,7 +129,7 @@ class ProcessBuilder
}
/**
- * Sets an environment variable
+ * Sets an environment variable.
*
* Setting a variable overrides its previous value. Use `null` to unset a
* defined environment variable.
@@ -187,7 +187,7 @@ class ProcessBuilder
*
* To disable the timeout, set this value to null.
*
- * @param float|null
+ * @param float|null $timeout
*
* @return ProcessBuilder
*
diff --git a/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php b/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php
index 2ec321cc12c..0f4cb89e6b4 100644
--- a/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php
+++ b/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php
@@ -23,7 +23,7 @@ use Symfony\Component\Process\Exception\InvalidArgumentException;
class ProcessUtils
{
/**
- * This class should not be instantiated
+ * This class should not be instantiated.
*/
private function __construct()
{
@@ -42,7 +42,7 @@ class ProcessUtils
//Fix for PHP bug #49446 escapeshellarg doesn't work on Windows
//@see https://bugs.php.net/bug.php?id=43784
//@see https://bugs.php.net/bug.php?id=49446
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
if ('' === $argument) {
return escapeshellarg($argument);
}
@@ -75,7 +75,7 @@ class ProcessUtils
}
/**
- * Validates and normalizes a Process input
+ * Validates and normalizes a Process input.
*
* @param string $caller The name of method call that validates the input
* @param mixed $input The input to validate
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
index d48698a7cf3..5bfd1a86925 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -128,7 +128,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
- * tests results from sub processes
+ * tests results from sub processes.
*
* @dataProvider responsesCodeProvider
*/
@@ -141,7 +141,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
- * tests results from sub processes
+ * tests results from sub processes.
*
* @dataProvider pipesCodeProvider
*/
@@ -236,7 +236,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function chainedCommandsOutputProvider()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
return array(
array("2 \r\n2\r\n", '&&', '2'),
);
@@ -249,7 +249,6 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
- *
* @dataProvider chainedCommandsOutputProvider
*/
public function testChainedCommandsOutput($expected, $operator, $input)
@@ -309,6 +308,37 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$this->assertEmpty($p->getErrorOutput());
}
+ public function testGetEmptyIncrementalErrorOutput()
+ {
+ // use a lock file to toggle between writing ("W") and reading ("R") the
+ // output stream
+ $lock = tempnam(sys_get_temp_dir(), get_class($this).'Lock');
+ file_put_contents($lock, 'W');
+
+ $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
+
+ $p->start();
+
+ $shouldWrite = false;
+
+ while ($p->isRunning()) {
+ if ('R' === file_get_contents($lock)) {
+ if (!$shouldWrite) {
+ $this->assertLessThanOrEqual(1, preg_match_all('/ERROR/', $p->getIncrementalOutput(), $matches));
+ $shouldWrite = true;
+ } else {
+ $this->assertSame('', $p->getIncrementalOutput());
+
+ file_put_contents($lock, 'W');
+ $shouldWrite = false;
+ }
+ }
+ usleep(100);
+ }
+
+ unlink($lock);
+ }
+
public function testGetOutput()
{
$p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { echo \' foo \'; $n++; }')));
@@ -347,9 +377,40 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$this->assertEmpty($p->getOutput());
}
+ public function testGetEmptyIncrementalOutput()
+ {
+ // use a lock file to toggle between writing ("W") and reading ("R") the
+ // output stream
+ $lock = tempnam(sys_get_temp_dir(), get_class($this).'Lock');
+ file_put_contents($lock, 'W');
+
+ $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { echo \' foo \'; $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
+
+ $p->start();
+
+ $shouldWrite = false;
+
+ while ($p->isRunning()) {
+ if ('R' === file_get_contents($lock)) {
+ if (!$shouldWrite) {
+ $this->assertLessThanOrEqual(1, preg_match_all('/foo/', $p->getIncrementalOutput(), $matches));
+ $shouldWrite = true;
+ } else {
+ $this->assertSame('', $p->getIncrementalOutput());
+
+ file_put_contents($lock, 'W');
+ $shouldWrite = false;
+ }
+ }
+ usleep(100);
+ }
+
+ unlink($lock);
+ }
+
public function testZeroAsOutput()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
// see http://stackoverflow.com/questions/7105433/windows-batch-echo-without-new-line
$p = $this->getProcess('echo | set /p dummyName=0');
} else {
@@ -362,7 +423,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testExitCodeCommandFailed()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX exit code');
}
@@ -375,7 +436,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testTTYCommand()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does have /dev/tty support');
}
@@ -390,7 +451,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testTTYCommandExitCode()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does have /dev/tty support');
}
@@ -403,7 +464,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testTTYInWindowsEnvironment()
{
- if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' !== DIRECTORY_SEPARATOR) {
$this->markTestSkipped('This test is for Windows platform only');
}
@@ -570,7 +631,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testProcessIsNotSignaled()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
@@ -581,7 +642,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testProcessWithoutTermSignalIsNotSignaled()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
@@ -592,7 +653,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testProcessWithoutTermSignal()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
@@ -603,7 +664,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testProcessIsSignaledIfStopped()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
@@ -615,7 +676,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testProcessWithTermSignal()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
@@ -631,7 +692,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testProcessThrowsExceptionWhenExternallySignaled()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
@@ -692,7 +753,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
$duration = microtime(true) - $start;
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
// Windows is a bit slower as it read file handles, then allow twice the precision
$maxDuration = $timeout + 2 * Process::TIMEOUT_PRECISION;
} else {
@@ -865,7 +926,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
{
$process = $this->getProcess('php -m');
$this->setExpectedException('Symfony\Component\Process\Exception\LogicException', sprintf('Process must be started before calling %s.', $method));
- call_user_func(array($process, $method));
+ $process->{$method}();
}
public function provideMethodsThatNeedARunningProcess()
@@ -887,7 +948,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$process = $this->getProcess('php -r "sleep(1);"');
$process->start();
try {
- call_user_func(array($process, $method));
+ $process->{$method}();
$process->stop(0);
$this->fail('A LogicException must have been thrown');
} catch (\Exception $e) {
@@ -909,7 +970,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
private function verifyPosixIsEnabled()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('POSIX signals do not work on Windows');
}
if (!defined('SIGUSR1')) {
@@ -922,7 +983,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
*/
public function testSignalWithWrongIntSignal()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('POSIX signals do not work on Windows');
}
@@ -936,7 +997,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
*/
public function testSignalWithWrongNonIntSignal()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('POSIX signals do not work on Windows');
}
@@ -1013,7 +1074,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$p = $this->getProcess('php -r "usleep(500000);"');
$p->disableOutput();
$this->setExpectedException($exception, $exceptionMessage);
- call_user_func(array($p, $startMethod), function () {});
+ $p->{$startMethod}(function () {});
}
public function provideStartMethods()
@@ -1034,7 +1095,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$p->disableOutput();
$p->start();
$this->setExpectedException('Symfony\Component\Process\Exception\LogicException', 'Output has been disabled.');
- call_user_func(array($p, $fetchMethod));
+ $p->{$fetchMethod}();
}
public function provideOutputFetchingMethods()
@@ -1064,7 +1125,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
'include \''.__DIR__.'/PipeStdinInStdoutStdErrStreamSelect.php\';',
);
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
// Avoid XL buffers on Windows because of https://bugs.php.net/bug.php?id=65650
$sizes = array(1, 2, 4, 8);
} else {
@@ -1082,7 +1143,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
- * provides default method names for simple getter/setter
+ * provides default method names for simple getter/setter.
*/
public function methodProvider()
{
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php
index 5fbe1e0aa70..5033cdab020 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php
@@ -94,7 +94,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
$this->markTestSkipped('Requires the PHP_BINARY constant');
}
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Cannot run test on windows');
}
@@ -102,7 +102,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
$this->markTestSkipped('Cannot test when open_basedir is set');
}
- ini_set('open_basedir', dirname(PHP_BINARY).PATH_SEPARATOR.'/');
+ $this->iniSet('open_basedir', dirname(PHP_BINARY).PATH_SEPARATOR.'/');
$finder = new ExecutableFinder();
$result = $finder->find($this->getPhpBinaryName());
@@ -120,10 +120,12 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
$this->markTestSkipped('Requires the PHP_BINARY constant');
}
- $execPath = __DIR__.'/SignalListener.php';
+ if ('\\' === DIRECTORY_SEPARATOR) {
+ $this->markTestSkipped('Cannot run test on windows');
+ }
$this->setPath('');
- ini_set('open_basedir', PHP_BINARY.PATH_SEPARATOR.'/');
+ $this->iniSet('open_basedir', PHP_BINARY.PATH_SEPARATOR.'/');
$finder = new ExecutableFinder();
$result = $finder->find($this->getPhpBinaryName(), false);
@@ -133,7 +135,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
private function assertSamePath($expected, $tested)
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertEquals(strtolower($expected), strtolower($tested));
} else {
$this->assertEquals($expected, $tested);
@@ -142,6 +144,6 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
private function getPhpBinaryName()
{
- return basename(PHP_BINARY, defined('PHP_WINDOWS_VERSION_BUILD') ? '.exe' : '');
+ return basename(PHP_BINARY, '\\' === DIRECTORY_SEPARATOR ? '.exe' : '');
}
}
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/NonStopableProcess.php b/vendor/symfony/process/Symfony/Component/Process/Tests/NonStopableProcess.php
index 2183e48c643..692feebba2a 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/NonStopableProcess.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/NonStopableProcess.php
@@ -1,13 +1,12 @@
<?php
/**
- * Runs a PHP script that can be stopped only with a SIGKILL (9) signal for 3 seconds
+ * Runs a PHP script that can be stopped only with a SIGKILL (9) signal for 3 seconds.
*
* @args duration Run this script with a custom duration
*
* @example `php NonStopableProcess.php 42` will run the script for 42 seconds
*/
-
function handleSignal($signal)
{
switch ($signal) {
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
index e16f3f8bed1..3acccacc3b1 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
@@ -19,7 +19,7 @@ use Symfony\Component\Process\PhpExecutableFinder;
class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
{
/**
- * tests find() with the env var PHP_PATH
+ * tests find() with the env var PHP_PATH.
*/
public function testFindWithPhpPath()
{
@@ -43,7 +43,7 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
}
/**
- * tests find() with the env var PHP_PATH
+ * tests find() with the env var PHP_PATH.
*/
public function testFindWithHHVM()
{
@@ -60,7 +60,7 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
}
/**
- * tests find() with the env var PHP_PATH
+ * tests find() with the env var PHP_PATH.
*/
public function testFindArguments()
{
@@ -74,7 +74,7 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
}
/**
- * tests find() with default executable
+ * tests find() with default executable.
*/
public function testFindWithSuffix()
{
@@ -89,7 +89,7 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
$current = $f->find();
//TODO maybe php executable is custom or even Windows
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertTrue(is_executable($current));
$this->assertTrue((bool) preg_match('/'.addSlashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable PHP with suffixes');
}
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessBuilderTest.php
index e864f662345..02a960d4e52 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessBuilderTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessBuilderTest.php
@@ -102,14 +102,14 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
$pb->setPrefix('/usr/bin/php');
$proc = $pb->setArguments(array('-v'))->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertEquals('"/usr/bin/php" "-v"', $proc->getCommandLine());
} else {
$this->assertEquals("'/usr/bin/php' '-v'", $proc->getCommandLine());
}
$proc = $pb->setArguments(array('-i'))->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertEquals('"/usr/bin/php" "-i"', $proc->getCommandLine());
} else {
$this->assertEquals("'/usr/bin/php' '-i'", $proc->getCommandLine());
@@ -122,14 +122,14 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
$pb->setPrefix(array('/usr/bin/php', 'composer.phar'));
$proc = $pb->setArguments(array('-v'))->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertEquals('"/usr/bin/php" "composer.phar" "-v"', $proc->getCommandLine());
} else {
$this->assertEquals("'/usr/bin/php' 'composer.phar' '-v'", $proc->getCommandLine());
}
$proc = $pb->setArguments(array('-i'))->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertEquals('"/usr/bin/php" "composer.phar" "-i"', $proc->getCommandLine());
} else {
$this->assertEquals("'/usr/bin/php' 'composer.phar' '-i'", $proc->getCommandLine());
@@ -141,7 +141,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
$pb = new ProcessBuilder(array('%path%', 'foo " bar', '%baz%baz'));
$proc = $pb->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertSame('^%"path"^% "foo \\" bar" "%baz%baz"', $proc->getCommandLine());
} else {
$this->assertSame("'%path%' 'foo \" bar' '%baz%baz'", $proc->getCommandLine());
@@ -154,7 +154,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
$pb->setPrefix('%prefix%');
$proc = $pb->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertSame('^%"prefix"^% "arg"', $proc->getCommandLine());
} else {
$this->assertSame("'%prefix%' 'arg'", $proc->getCommandLine());
@@ -175,7 +175,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
->setPrefix('/usr/bin/php')
->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertEquals('"/usr/bin/php"', $process->getCommandLine());
} else {
$this->assertEquals("'/usr/bin/php'", $process->getCommandLine());
@@ -187,7 +187,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
$process = ProcessBuilder::create(array('/usr/bin/php'))
->getProcess();
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertEquals('"/usr/bin/php"', $process->getCommandLine());
} else {
$this->assertEquals("'/usr/bin/php'", $process->getCommandLine());
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
index c48648f5173..20753df4a64 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
@@ -19,7 +19,7 @@ use Symfony\Component\Process\Exception\ProcessFailedException;
class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
{
/**
- * tests ProcessFailedException throws exception if the process was successful
+ * tests ProcessFailedException throws exception if the process was successful.
*/
public function testProcessFailedExceptionThrowsException()
{
@@ -42,7 +42,7 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
/**
* tests ProcessFailedException uses information from process output
- * to generate exception message
+ * to generate exception message.
*/
public function testProcessFailedExceptionPopulatesInformationFromProcessOutput()
{
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessUtilsTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessUtilsTest.php
index 8ba94c114d2..e6564cde5ba 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessUtilsTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessUtilsTest.php
@@ -25,7 +25,7 @@ class ProcessUtilsTest extends \PHPUnit_Framework_TestCase
public function dataArguments()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
return array(
array('"\"php\" \"-v\""', '"php" "-v"'),
array('"foo bar"', 'foo bar'),
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
index 3fea3ba1cd3..2668a9b4bf6 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
@@ -114,7 +114,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
public function testStartAfterATimeout()
{
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+ if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Restarting a timed-out process on Windows is not supported in sigchild environment');
}
parent::testStartAfterATimeout();
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/SimpleProcessTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/SimpleProcessTest.php
index cd206ea4c39..0a8b1262057 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/SimpleProcessTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/SimpleProcessTest.php
@@ -154,7 +154,7 @@ class SimpleProcessTest extends AbstractProcessTest
$process->run(function () use ($process) {
$process->stop();
});
- } catch (RuntimeException $e) {
+ } catch (\RuntimeException $e) {
$this->fail('A call to stop() is not expected to cause wait() to throw a RuntimeException');
}
}
@@ -170,7 +170,7 @@ class SimpleProcessTest extends AbstractProcessTest
$process->signal(defined('SIGKILL') ? SIGKILL : 9);
}
});
- } catch (RuntimeException $e) {
+ } catch (\RuntimeException $e) {
$this->fail('A call to signal() is not expected to cause wait() to throw a RuntimeException');
}
}
@@ -186,7 +186,7 @@ class SimpleProcessTest extends AbstractProcessTest
$process->signal(defined('SIGTERM') ? SIGTERM : 15);
}
});
- } catch (RuntimeException $e) {
+ } catch (\RuntimeException $e) {
$this->fail('A call to signal() is not expected to cause wait() to throw a RuntimeException');
}
}
diff --git a/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist b/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist
index fcb230a0625..8f147bca733 100644
--- a/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist
+++ b/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist
@@ -6,6 +6,10 @@
colors="true"
bootstrap="vendor/autoload.php"
>
+ <php>
+ <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
+ <ini name="error_reporting" value="-16385"/>
+ </php>
<testsuites>
<testsuite name="Symfony Process Component Test Suite">
<directory>./Tests/</directory>
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php
index e3fafe12bc6..aec52e6295e 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php
@@ -194,7 +194,7 @@ class Inline
/**
* Parses a scalar to a YAML string.
*
- * @param scalar $scalar
+ * @param string $scalar
* @param string $delimiters
* @param array $stringDelimiters
* @param int &$i
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE b/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE
index 0b3292cf902..43028bc600f 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
index 00c613dfdc4..23afb17e88a 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
@@ -29,7 +29,7 @@ class Parser
private $refs = array();
/**
- * Constructor
+ * Constructor.
*
* @param int $offset The offset of YAML document (used for line numbers in error messages)
*/
@@ -41,10 +41,10 @@ class Parser
/**
* Parses a YAML string to a PHP value.
*
- * @param string $value A YAML string
- * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
- * @param bool $objectSupport true if object support is enabled, false otherwise
- * @param bool $objectForMap true if maps should return a stdClass instead of array()
+ * @param string $value A YAML string
+ * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+ * @param bool $objectSupport true if object support is enabled, false otherwise
+ * @param bool $objectForMap true if maps should return a stdClass instead of array()
*
* @return mixed A PHP value
*
@@ -649,7 +649,7 @@ class Parser
}
/**
- * Returns true if the next line starts unindented collection
+ * Returns true if the next line starts unindented collection.
*
* @return bool Returns true if the next line starts unindented collection, false otherwise
*/
@@ -681,7 +681,7 @@ class Parser
}
/**
- * Returns true if the string is un-indented collection item
+ * Returns true if the string is un-indented collection item.
*
* @return bool Returns true if the string is un-indented collection item, false otherwise
*/
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/README.md b/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
index 50f9e094884..96abbbfd16f 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
@@ -6,7 +6,7 @@ YAML implements most of the YAML 1.2 specification.
```php
use Symfony\Component\Yaml\Yaml;
-$array = Yaml::parse($file);
+$array = Yaml::parse(file_get_contents(filename));
print Yaml::dump($array);
```
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/DumperTest.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/DumperTest.php
index aa27c4abeb9..b103b9a1844 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/DumperTest.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\Yaml\Tests;
-use Symfony\Component\Yaml\Yaml;
use Symfony\Component\Yaml\Parser;
use Symfony\Component\Yaml\Dumper;
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php
index 8c2b1a49a93..e4eb9c98a15 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Yaml\Tests;
use Symfony\Component\Yaml\Exception\ParseException;
-use Symfony\Component\Yaml\Yaml;
class ParseExceptionTest extends \PHPUnit_Framework_TestCase
{
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
index 7f16d925e44..d735ec6fde9 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -464,9 +464,7 @@ EOF;
}
/**
- *
* @expectedException \Symfony\Component\Yaml\Exception\ParseException
- *
*/
public function testUnindentedCollectionException()
{
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php
index 50b1018c404..ffddd95c7bc 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php
@@ -59,7 +59,7 @@ class Unescaper
}
/**
- * Unescapes a character that was found in a double-quoted string
+ * Unescapes a character that was found in a double-quoted string.
*
* @param string $value An escaped character
*
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist b/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist
index 90e0bcc27ef..39c04ce3a6b 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist
@@ -6,6 +6,10 @@
colors="true"
bootstrap="vendor/autoload.php"
>
+ <php>
+ <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
+ <ini name="error_reporting" value="-16385"/>
+ </php>
<testsuites>
<testsuite name="Symfony Yaml Component Test Suite">
<directory>./Tests/</directory>
diff --git a/vendor/zendframework/zendframework/CHANGELOG.md b/vendor/zendframework/zendframework/CHANGELOG.md
index 1cbaf0d11c6..e5242456c88 100644
--- a/vendor/zendframework/zendframework/CHANGELOG.md
+++ b/vendor/zendframework/zendframework/CHANGELOG.md
@@ -1,6 +1,37 @@
# CHANGELOG
-## 2.2.7 (2014-04-015)
+## 2.2.9 (2015-01-14)
+
+### SECURITY UPDATES
+
+- **ZF2015-01:** Session validators were not run if set before session start.
+ Essentially, the validators were writing to the `$_SESSION` superglobal before
+ session start, which meant the data was overwritten once the session began.
+ This meant on subsequent calls, the validators had no data to compare against,
+ making the sessions automatically valid. We have provided patches to ensure
+ that validators are run only after the session has begun, which will ensure
+ they validate sessions correctly going forward. If you use `Zend\Session`
+ validators, we recommend upgrading immediately.
+
+## 2.2.8 (2014-09-17)
+
+### SECURITY UPDATES
+
+- **ZF2014-05:** Due to an issue that existed in PHP's LDAP extension, it is
+ possible to perform an unauthenticated simple bind against a LDAP server by
+ using a null byte for the password, regardless of whether or not the user
+ normally requires a password. We have provided a patch in order to protect
+ users of unpatched PHP versions (PHP 5.5 <= 5.5.11, PHP 5.4 <= 5.4.27, all
+ versions of PHP 5.3 and below). If you use `Zend\Ldap` and are on an affected
+ version of PHP, we recommend upgrading immediately.
+- **ZF2014-06:** A potential SQL injection vector existed when using a SQL
+ Server adapter to manually quote values due to the fact that it was not
+ escaping null bytes. Code was added to ensure null bytes are escaped, and
+ thus mitigate the SQLi vector. We do not recommend manually quoting values,
+ but if you do, and use the SQL Server adapter without PDO, we recommend
+ upgrading immediately.
+
+## 2.2.7 (2014-04-15)
### SECURITY UPDATES
diff --git a/vendor/zendframework/zendframework/README.md b/vendor/zendframework/zendframework/README.md
index 5eca7d03c95..64fe80470f3 100644
--- a/vendor/zendframework/zendframework/README.md
+++ b/vendor/zendframework/zendframework/README.md
@@ -5,23 +5,24 @@ Develop: [` view helper in order to escape HTML attributes. This release
- patches them to use the `escapeHtmlAttr()` view helper in these situations.
- If you use form or navigation view helpers, or "HTML element" view helpers
- (such as `gravatar()`, `htmlFlash()`, `htmlPage()`, or `htmlQuicktime()`), we
- recommend upgrading immediately.
+- **ZF2015-01:** Session validators were not run if set before session start.
+ Essentially, the validators were writing to the `$_SESSION` superglobal before
+ session start, which meant the data was overwritten once the session began.
+ This meant on subsequent calls, the validators had no data to compare against,
+ making the sessions automatically valid. We have provided patches to ensure
+ that validators are run only after the session has begun, which will ensure
+ they validate sessions correctly going forward. If you use `Zend\Session`
+ validators, we recommend upgrading immediately.
Please see [CHANGELOG.md](CHANGELOG.md).
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
index 9588046abb7..4485fdb8085 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
@@ -117,6 +117,7 @@ class SqlServer implements PlatformInterface
'Attempting to quote a value in ' . __CLASS__ . ' without extension/driver support '
. 'can introduce security vulnerabilities in a production environment.'
);
+ $value = addcslashes($value, "\000\032");
return '\'' . str_replace('\'', '\'\'', $value) . '\'';
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
index 10454b8b6d9..4152649c87f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
@@ -758,6 +758,10 @@ class Ldap
{
$moreCreds = true;
+ // Security check: remove null bytes in password
+ // @see https://net.educause.edu/ir/library/pdf/csd4875.pdf
+ $password = str_replace("\0", '', $password);
+
if ($username === null) {
$username = $this->getUsername();
$password = $this->getPassword();
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php b/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php
index 545befd3ce9..3dafc003c6a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php
@@ -10,6 +10,7 @@
namespace Zend\Session;
use Zend\EventManager\EventManagerInterface;
+use Zend\Stdlib\ArrayUtils;
/**
* Session ManagerInterface implementation utilizing ext/session
@@ -92,8 +93,16 @@ class SessionManager extends AbstractManager
$this->registerSaveHandler($saveHandler);
}
+ $oldSessionData = $_SESSION;
+
session_start();
+ if ($oldSessionData instanceof \Traversable
+ || (! empty($oldSessionData) && is_array($oldSessionData))
+ ) {
+ $_SESSION = ArrayUtils::merge($oldSessionData, $_SESSION, true);
+ }
+
$storage = $this->getStorage();
// Since session is starting, we need to potentially repopulate our
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/Version.php b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
index 1cc4aabcce7..d2c502dd197 100644
--- a/vendor/zendframework/zendframework/library/Zend/Version/Version.php
+++ b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
@@ -19,7 +19,7 @@ final class Version
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '2.2.7';
+ const VERSION = '2.2.9';
/**
* Github Service Identifier for version information is retrieved from
--
GitLab