From bfbafa24d3ef036729ace30a0339daaea14ed081 Mon Sep 17 00:00:00 2001 From: Demian Katz <demian.katz@villanova.edu> Date: Tue, 6 Oct 2015 11:54:35 -0400 Subject: [PATCH] Updated dependencies. --- composer.lock | 52 +- vendor/composer/include_paths.php | 2 +- vendor/composer/installed.json | 498 +++++++++--------- vendor/oyejorge/less.php/CHANGES.md | 6 + vendor/oyejorge/less.php/bin/lessc | 2 +- vendor/oyejorge/less.php/lessc.inc.php | 15 +- .../lib/Less/.easymin/ignore_prefixes | 0 vendor/oyejorge/less.php/lib/Less/Cache.php | 2 +- vendor/oyejorge/less.php/lib/Less/Colors.php | 0 .../less.php/lib/Less/Configurable.php | 0 .../less.php/lib/Less/Environment.php | 0 .../less.php/lib/Less/Exception/Chunk.php | 0 .../less.php/lib/Less/Exception/Compiler.php | 0 .../less.php/lib/Less/Exception/Parser.php | 0 .../oyejorge/less.php/lib/Less/Functions.php | 10 +- .../less.php/lib/Less/Less.php.combine | 0 vendor/oyejorge/less.php/lib/Less/Mime.php | 0 .../less.php/lib/Less/Output/Mapped.php | 0 vendor/oyejorge/less.php/lib/Less/Parser.php | 36 +- .../less.php/lib/Less/SourceMap/Base64VLQ.php | 0 .../less.php/lib/Less/SourceMap/Generator.php | 0 vendor/oyejorge/less.php/lib/Less/Tree.php | 0 .../oyejorge/less.php/lib/Less/Tree/Alpha.php | 0 .../less.php/lib/Less/Tree/Anonymous.php | 0 .../less.php/lib/Less/Tree/Assignment.php | 0 .../less.php/lib/Less/Tree/Attribute.php | 0 .../oyejorge/less.php/lib/Less/Tree/Call.php | 0 .../oyejorge/less.php/lib/Less/Tree/Color.php | 0 .../less.php/lib/Less/Tree/Comment.php | 0 .../less.php/lib/Less/Tree/Condition.php | 0 .../less.php/lib/Less/Tree/Dimension.php | 0 .../less.php/lib/Less/Tree/Directive.php | 0 .../less.php/lib/Less/Tree/Element.php | 0 .../less.php/lib/Less/Tree/Expression.php | 0 .../less.php/lib/Less/Tree/Extend.php | 0 .../less.php/lib/Less/Tree/Import.php | 0 .../less.php/lib/Less/Tree/Javascript.php | 0 .../less.php/lib/Less/Tree/Keyword.php | 0 .../oyejorge/less.php/lib/Less/Tree/Media.php | 0 .../less.php/lib/Less/Tree/Mixin/Call.php | 0 .../lib/Less/Tree/Mixin/Definition.php | 0 .../less.php/lib/Less/Tree/NameValue.php | 0 .../less.php/lib/Less/Tree/Negative.php | 0 .../less.php/lib/Less/Tree/Operation.php | 0 .../oyejorge/less.php/lib/Less/Tree/Paren.php | 0 .../less.php/lib/Less/Tree/Quoted.php | 0 .../oyejorge/less.php/lib/Less/Tree/Rule.php | 0 .../less.php/lib/Less/Tree/Ruleset.php | 0 .../less.php/lib/Less/Tree/Selector.php | 0 .../lib/Less/Tree/UnicodeDescriptor.php | 0 .../oyejorge/less.php/lib/Less/Tree/Unit.php | 0 .../lib/Less/Tree/UnitConversions.php | 0 .../oyejorge/less.php/lib/Less/Tree/Url.php | 0 .../oyejorge/less.php/lib/Less/Tree/Value.php | 0 .../less.php/lib/Less/Tree/Variable.php | 0 vendor/oyejorge/less.php/lib/Less/Version.php | 4 +- vendor/oyejorge/less.php/lib/Less/Visitor.php | 0 .../lib/Less/Visitor/extendFinder.php | 0 .../less.php/lib/Less/Visitor/import.php | 0 .../lib/Less/Visitor/joinSelector.php | 0 .../lib/Less/Visitor/processExtends.php | 0 .../less.php/lib/Less/Visitor/toCSS.php | 0 .../less.php/lib/Less/VisitorReplacing.php | 0 .../symfony/css-selector/Node/Specificity.php | 2 +- .../Parser/Shortcut/ClassParser.php | 15 +- .../Parser/Shortcut/ElementParser.php | 13 +- .../Parser/Shortcut/HashParser.php | 15 +- .../XPath/TranslatorInterface.php | 4 +- .../symfony/process/Pipes/AbstractPipes.php | 2 +- vendor/symfony/process/Pipes/UnixPipes.php | 2 +- vendor/symfony/process/Pipes/WindowsPipes.php | 4 +- vendor/symfony/process/Process.php | 2 +- .../process/Tests/AbstractProcessTest.php | 16 +- .../Tests/ProcessFailedExceptionTest.php | 2 +- vendor/symfony/yaml/Parser.php | 15 +- .../Tests/Fixtures/YtsDocumentSeparator.yml | 2 +- .../yaml/Tests/Fixtures/sfMergeKey.yml | 15 +- vendor/symfony/yaml/Tests/InlineTest.php | 4 +- vendor/symfony/yaml/Tests/ParserTest.php | 18 + vendor/symfony/yaml/Unescaper.php | 1 + 80 files changed, 414 insertions(+), 345 deletions(-) create mode 100644 vendor/oyejorge/less.php/CHANGES.md mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/.easymin/ignore_prefixes mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Cache.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Colors.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Configurable.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Environment.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Exception/Chunk.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Exception/Compiler.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Exception/Parser.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Functions.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Less.php.combine mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Mime.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Output/Mapped.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Parser.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/SourceMap/Base64VLQ.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/SourceMap/Generator.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Alpha.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Anonymous.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Assignment.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Attribute.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Call.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Color.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Comment.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Condition.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Dimension.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Directive.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Element.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Expression.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Extend.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Import.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Javascript.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Keyword.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Media.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Mixin/Call.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Mixin/Definition.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/NameValue.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Negative.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Operation.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Paren.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Quoted.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Rule.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Ruleset.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Selector.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/UnicodeDescriptor.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Unit.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/UnitConversions.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Url.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Value.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Tree/Variable.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Version.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Visitor.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Visitor/extendFinder.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Visitor/import.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Visitor/joinSelector.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Visitor/processExtends.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/Visitor/toCSS.php mode change 100755 => 100644 vendor/oyejorge/less.php/lib/Less/VisitorReplacing.php diff --git a/composer.lock b/composer.lock index ac22e8a4385..1f3d412bff1 100644 --- a/composer.lock +++ b/composer.lock @@ -260,16 +260,16 @@ }, { "name": "oyejorge/less.php", - "version": "v1.7.0.5", + "version": "v1.7.0.9", "source": { "type": "git", "url": "https://github.com/oyejorge/less.php.git", - "reference": "4385036b1dbfaf37f5380bd26a1e6006fc43149f" + "reference": "fb64e2f6ef647a229c50e9fa0f2076240a3484c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/oyejorge/less.php/zipball/4385036b1dbfaf37f5380bd26a1e6006fc43149f", - "reference": "4385036b1dbfaf37f5380bd26a1e6006fc43149f", + "url": "https://api.github.com/repos/oyejorge/less.php/zipball/fb64e2f6ef647a229c50e9fa0f2076240a3484c6", + "reference": "fb64e2f6ef647a229c50e9fa0f2076240a3484c6", "shasum": "" }, "require": { @@ -315,7 +315,7 @@ "php", "stylesheet" ], - "time": "2015-07-13 20:34:18" + "time": "2015-09-28 01:11:47" }, { "name": "pear-pear.php.net/Archive_Tar", @@ -377,10 +377,10 @@ }, { "name": "pear-pear.php.net/File_MARC", - "version": "1.1.1", + "version": "1.1.2", "dist": { "type": "file", - "url": "http://pear.php.net/get/File_MARC-1.1.1.tgz", + "url": "http://pear.php.net/get/File_MARC-1.1.2.tgz", "reference": null, "shasum": null }, @@ -388,7 +388,7 @@ "php": ">=5.3.0.0" }, "replace": { - "pear-pear/file_marc": "== 1.1.1.0" + "pear-pear/file_marc": "== 1.1.2.0" }, "type": "pear-library", "autoload": { @@ -596,16 +596,16 @@ }, { "name": "symfony/yaml", - "version": "v2.7.3", + "version": "v2.7.5", "source": { "type": "git", - "url": "https://github.com/symfony/Yaml.git", - "reference": "71340e996171474a53f3d29111d046be4ad8a0ff" + "url": "https://github.com/symfony/yaml.git", + "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff", - "reference": "71340e996171474a53f3d29111d046be4ad8a0ff", + "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770", + "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770", "shasum": "" }, "require": { @@ -641,7 +641,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-07-28 14:07:07" + "time": "2015-09-14 14:14:09" }, { "name": "vufind-org/vufindcode", @@ -1240,16 +1240,16 @@ }, { "name": "symfony/css-selector", - "version": "v2.7.3", + "version": "v2.7.5", "source": { "type": "git", - "url": "https://github.com/symfony/CssSelector.git", - "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092" + "url": "https://github.com/symfony/css-selector.git", + "reference": "abe19cc0429a06be0c133056d1f9859854860970" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/0b5c07b516226b7dd32afbbc82fe547a469c5092", - "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/abe19cc0429a06be0c133056d1f9859854860970", + "reference": "abe19cc0429a06be0c133056d1f9859854860970", "shasum": "" }, "require": { @@ -1289,20 +1289,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2015-05-15 13:33:16" + "time": "2015-09-22 13:49:29" }, { "name": "symfony/process", - "version": "v2.7.3", + "version": "v2.7.5", "source": { "type": "git", - "url": "https://github.com/symfony/Process.git", - "reference": "48aeb0e48600321c272955132d7606ab0a49adb3" + "url": "https://github.com/symfony/process.git", + "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/48aeb0e48600321c272955132d7606ab0a49adb3", - "reference": "48aeb0e48600321c272955132d7606ab0a49adb3", + "url": "https://api.github.com/repos/symfony/process/zipball/b27c8e317922cd3cdd3600850273cf6b82b2e8e9", + "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9", "shasum": "" }, "require": { @@ -1338,7 +1338,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2015-07-01 11:25:50" + "time": "2015-09-19 19:59:23" } ], "aliases": [], diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php index 8a050fd9658..20086434d93 100644 --- a/vendor/composer/include_paths.php +++ b/vendor/composer/include_paths.php @@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( - $vendorDir . '/pear-pear.php.net/File_MARC', $vendorDir . '/pear-pear.php.net/XML_Util', $vendorDir . '/pear-pear.php.net/PEAR', $vendorDir . '/pear-pear.php.net/Validate', @@ -14,4 +13,5 @@ return array( $vendorDir . '/pear-pear.php.net/Archive_Tar', $vendorDir . '/pear-pear.php.net/Console_Getopt', $vendorDir . '/pear-pear.php.net/Structures_Graph', + $vendorDir . '/pear-pear.php.net/File_MARC', ); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 28030a5e15c..6ec4600b736 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -350,37 +350,6 @@ "zf2" ] }, - { - "name": "pear-pear.php.net/File_MARC", - "version": "1.1.1", - "version_normalized": "1.1.1.0", - "dist": { - "type": "file", - "url": "http://pear.php.net/get/File_MARC-1.1.1.tgz", - "reference": null, - "shasum": null - }, - "require": { - "php": ">=5.3.0.0" - }, - "replace": { - "pear-pear/file_marc": "== 1.1.1.0" - }, - "type": "pear-library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "" - ] - }, - "include-path": [ - "/" - ], - "license": [ - "GNU Lesser General Public License" - ], - "description": "The standard for machine-readable cataloging (MARC) records is documented at http://loc.gov/marc/. This package enables you to read existing MARC records from a file, string, or (using the YAZ extension), from a Z39.50 source. You can also use this package to create new MARC records.\n\nThis package is based on the PHP MARC package, originally called \"php-marc\", that is part of the Emilda Project (http://www.emilda.org). Christoffer Landtman generously agreed to make the \"php-marc\" code available under the GNU LGPL so it could be used as the basis of this PEAR package." - }, { "name": "pear-pear.php.net/XML_Util", "version": "1.3.0", @@ -907,224 +876,6 @@ "service proxies" ] }, - { - "name": "oyejorge/less.php", - "version": "v1.7.0.5", - "version_normalized": "1.7.0.5", - "source": { - "type": "git", - "url": "https://github.com/oyejorge/less.php.git", - "reference": "4385036b1dbfaf37f5380bd26a1e6006fc43149f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/oyejorge/less.php/zipball/4385036b1dbfaf37f5380bd26a1e6006fc43149f", - "reference": "4385036b1dbfaf37f5380bd26a1e6006fc43149f", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "time": "2015-07-13 20:34:18", - "bin": [ - "bin/lessc" - ], - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Less": "lib/" - }, - "classmap": [ - "lessc.inc.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Matt Agar", - "homepage": "https://github.com/agar" - }, - { - "name": "Martin JantoÅ¡oviÄ", - "homepage": "https://github.com/Mordred" - }, - { - "name": "Josh Schmidt", - "homepage": "https://github.com/oyejorge" - } - ], - "description": "PHP port of the Javascript version of LESS http://lesscss.org", - "homepage": "http://lessphp.gpeasy.com", - "keywords": [ - "css", - "less", - "less.js", - "lesscss", - "php", - "stylesheet" - ] - }, - { - "name": "symfony/yaml", - "version": "v2.7.3", - "version_normalized": "2.7.3.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/Yaml.git", - "reference": "71340e996171474a53f3d29111d046be4ad8a0ff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff", - "reference": "71340e996171474a53f3d29111d046be4ad8a0ff", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, - "time": "2015-07-28 14:07:07", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/css-selector", - "version": "v2.7.3", - "version_normalized": "2.7.3.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/CssSelector.git", - "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/0b5c07b516226b7dd32afbbc82fe547a469c5092", - "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, - "time": "2015-05-15 13:33:16", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com" - }, - { - "name": "symfony/process", - "version": "v2.7.3", - "version_normalized": "2.7.3.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/Process.git", - "reference": "48aeb0e48600321c272955132d7606ab0a49adb3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/48aeb0e48600321c272955132d7606ab0a49adb3", - "reference": "48aeb0e48600321c272955132d7606ab0a49adb3", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, - "time": "2015-07-01 11:25:50", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Process Component", - "homepage": "https://symfony.com" - }, { "name": "pear-pear.php.net/Archive_Tar", "version": "1.4.0", @@ -1388,5 +1139,254 @@ ], "description": "VuFind 2.x HTTP service library", "homepage": "http://vufind.org/" + }, + { + "name": "oyejorge/less.php", + "version": "v1.7.0.9", + "version_normalized": "1.7.0.9", + "source": { + "type": "git", + "url": "https://github.com/oyejorge/less.php.git", + "reference": "fb64e2f6ef647a229c50e9fa0f2076240a3484c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/oyejorge/less.php/zipball/fb64e2f6ef647a229c50e9fa0f2076240a3484c6", + "reference": "fb64e2f6ef647a229c50e9fa0f2076240a3484c6", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "time": "2015-09-28 01:11:47", + "bin": [ + "bin/lessc" + ], + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Less": "lib/" + }, + "classmap": [ + "lessc.inc.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Matt Agar", + "homepage": "https://github.com/agar" + }, + { + "name": "Martin JantoÅ¡oviÄ", + "homepage": "https://github.com/Mordred" + }, + { + "name": "Josh Schmidt", + "homepage": "https://github.com/oyejorge" + } + ], + "description": "PHP port of the Javascript version of LESS http://lesscss.org", + "homepage": "http://lessphp.gpeasy.com", + "keywords": [ + "css", + "less", + "less.js", + "lesscss", + "php", + "stylesheet" + ] + }, + { + "name": "pear-pear.php.net/File_MARC", + "version": "1.1.2", + "version_normalized": "1.1.2.0", + "dist": { + "type": "file", + "url": "http://pear.php.net/get/File_MARC-1.1.2.tgz", + "reference": null, + "shasum": null + }, + "require": { + "php": ">=5.3.0.0" + }, + "replace": { + "pear-pear/file_marc": "== 1.1.2.0" + }, + "type": "pear-library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "" + ] + }, + "include-path": [ + "/" + ], + "license": [ + "GNU Lesser General Public License" + ], + "description": "The standard for machine-readable cataloging (MARC) records is documented at http://loc.gov/marc/. This package enables you to read existing MARC records from a file, string, or (using the YAZ extension), from a Z39.50 source. You can also use this package to create new MARC records.\n\nThis package is based on the PHP MARC package, originally called \"php-marc\", that is part of the Emilda Project (http://www.emilda.org). Christoffer Landtman generously agreed to make the \"php-marc\" code available under the GNU LGPL so it could be used as the basis of this PEAR package." + }, + { + "name": "symfony/yaml", + "version": "v2.7.5", + "version_normalized": "2.7.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770", + "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, + "time": "2015-09-14 14:14:09", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/css-selector", + "version": "v2.7.5", + "version_normalized": "2.7.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "abe19cc0429a06be0c133056d1f9859854860970" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/abe19cc0429a06be0c133056d1f9859854860970", + "reference": "abe19cc0429a06be0c133056d1f9859854860970", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, + "time": "2015-09-22 13:49:29", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/process", + "version": "v2.7.5", + "version_normalized": "2.7.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/b27c8e317922cd3cdd3600850273cf6b82b2e8e9", + "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, + "time": "2015-09-19 19:59:23", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com" } ] diff --git a/vendor/oyejorge/less.php/CHANGES.md b/vendor/oyejorge/less.php/CHANGES.md new file mode 100644 index 00000000000..906a9af1f04 --- /dev/null +++ b/vendor/oyejorge/less.php/CHANGES.md @@ -0,0 +1,6 @@ +This is where the changelog will go for 1.7.0.9 or higher now. + +# 1.7.0.9 + + - Remove space at beginning of Version.php + - Revert require() paths in test interface \ No newline at end of file diff --git a/vendor/oyejorge/less.php/bin/lessc b/vendor/oyejorge/less.php/bin/lessc index 0d93f303b95..fa1fb958837 100755 --- a/vendor/oyejorge/less.php/bin/lessc +++ b/vendor/oyejorge/less.php/bin/lessc @@ -5,7 +5,7 @@ require_once dirname(__FILE__) . '/../lib/Less/Autoloader.php'; Less_Autoloader::register(); // Create our environment -$env = array('compress' => false); +$env = array('compress' => false, 'relativeUrls' => false); $silent = false; $watch = false; $rootpath = ''; diff --git a/vendor/oyejorge/less.php/lessc.inc.php b/vendor/oyejorge/less.php/lessc.inc.php index 808f4c49688..c77a1c052f8 100644 --- a/vendor/oyejorge/less.php/lessc.inc.php +++ b/vendor/oyejorge/less.php/lessc.inc.php @@ -62,22 +62,33 @@ class lessc{ unset( $this->registeredVars[$name] ); } + public function setOptions($options){ + foreach( $options as $name => $value ){ + $this->setOption( $name, $value); + } + } + + public function setOption($name, $value){ + $this->options[$name] = $value; + } + public function parse($buffer, $presets = array()){ + $this->setVariables($presets); $parser = new Less_Parser($this->getOptions()); $parser->setImportDirs($this->getImportDirs()); - if( count( $this->registeredVars ) ) $parser->ModifyVars( $this->registeredVars ); foreach ($this->libFunctions as $name => $func) { $parser->registerFunction($name, $func); } $parser->parse($buffer); + if( count( $this->registeredVars ) ) $parser->ModifyVars( $this->registeredVars ); return $parser->getCss(); } protected function getOptions(){ - $options = array(); + $options = array('relativeUrls'=>false); switch($this->formatterName){ case 'compressed': $options['compress'] = true; diff --git a/vendor/oyejorge/less.php/lib/Less/.easymin/ignore_prefixes b/vendor/oyejorge/less.php/lib/Less/.easymin/ignore_prefixes old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Cache.php b/vendor/oyejorge/less.php/lib/Less/Cache.php old mode 100755 new mode 100644 index 0ff2e164cd4..8c8be39530e --- a/vendor/oyejorge/less.php/lib/Less/Cache.php +++ b/vendor/oyejorge/less.php/lib/Less/Cache.php @@ -91,7 +91,7 @@ class Less_Cache{ self::ListFiles($list_file, $list, $cached_name); $compiled_name = self::CompiledName($list); - // if $cached_name != $compiled_name, we know we need to recompile + // if $cached_name is the same as the $compiled name, don't regenerate if( !$cached_name || $cached_name === $compiled_name ){ $output_file = self::OutputFile($compiled_name, $parser_options ); diff --git a/vendor/oyejorge/less.php/lib/Less/Colors.php b/vendor/oyejorge/less.php/lib/Less/Colors.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Configurable.php b/vendor/oyejorge/less.php/lib/Less/Configurable.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Environment.php b/vendor/oyejorge/less.php/lib/Less/Environment.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Exception/Chunk.php b/vendor/oyejorge/less.php/lib/Less/Exception/Chunk.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Exception/Compiler.php b/vendor/oyejorge/less.php/lib/Less/Exception/Compiler.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Exception/Parser.php b/vendor/oyejorge/less.php/lib/Less/Exception/Parser.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Functions.php b/vendor/oyejorge/less.php/lib/Less/Functions.php old mode 100755 new mode 100644 index ead64ced950..419bee32ff5 --- a/vendor/oyejorge/less.php/lib/Less/Functions.php +++ b/vendor/oyejorge/less.php/lib/Less/Functions.php @@ -20,7 +20,7 @@ class Less_Functions{ /** * @param string $op */ - public static function operate( $op, $a, $b ){ + public static function operate( $op, $a, $b ){ switch ($op) { case '+': return $a + $b; case '-': return $a - $b; @@ -46,7 +46,7 @@ class Less_Functions{ return $value; } - public static function number($n){ + public static function number($n){ if ($n instanceof Less_Tree_Dimension) { return floatval( $n->unit->is('%') ? $n->value / 100 : $n->value); @@ -57,7 +57,7 @@ class Less_Functions{ } } - public static function scaled($n, $size = 255 ){ + public static function scaled($n, $size = 255 ){ if( $n instanceof Less_Tree_Dimension && $n->unit->is('%') ){ return (float)$n->value * $size / 100; } else { @@ -549,7 +549,7 @@ class Less_Functions{ return new Less_Tree_Quoted( $string->quote , $result, $string->escaped); } - public function unit( $val, $unit = null) { + public function unit( $val, $unit = null) { if( !($val instanceof Less_Tree_Dimension) ){ throw new Less_Exception_Compiler('The first argument to unit must be a number' . ($val instanceof Less_Tree_Operation ? '. Have you forgotten parenthesis?' : '.') ); } @@ -564,7 +564,7 @@ class Less_Functions{ $unit = ""; } return new Less_Tree_Dimension($val->value, $unit ); - } + } public function convert($val, $unit){ return $val->convertTo($unit->value); diff --git a/vendor/oyejorge/less.php/lib/Less/Less.php.combine b/vendor/oyejorge/less.php/lib/Less/Less.php.combine old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Mime.php b/vendor/oyejorge/less.php/lib/Less/Mime.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Output/Mapped.php b/vendor/oyejorge/less.php/lib/Less/Output/Mapped.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Parser.php b/vendor/oyejorge/less.php/lib/Less/Parser.php old mode 100755 new mode 100644 index 2217c860806..86d455f1dda --- a/vendor/oyejorge/less.php/lib/Less/Parser.php +++ b/vendor/oyejorge/less.php/lib/Less/Parser.php @@ -47,6 +47,7 @@ class Less_Parser{ private $pos; // current index in `input` private $saveStack = array(); // holds state for backtracking private $furthest; + private $mb_internal_encoding = ''; // for remember exists value of mbstring.internal_encoding /** * @var Less_Environment @@ -83,6 +84,14 @@ class Less_Parser{ $this->Reset( $env ); } + // mbstring.func_overload > 1 bugfix + // The encoding value must be set for each source file, + // therefore, to conserve resources and improve the speed of this design is taken here + if (ini_get('mbstring.func_overload')) { + $this->mb_internal_encoding = ini_get('mbstring.internal_encoding'); + @ini_set('mbstring.internal_encoding', 'ascii'); + } + } @@ -204,17 +213,26 @@ class Less_Parser{ } } catch (Exception $exc) { - // Intentional fall-through so we can reset environment - } + // Intentional fall-through so we can reset environment + } //reset php settings @ini_set('precision',$precision); setlocale(LC_NUMERIC, $locale); + // If you previously defined $this->mb_internal_encoding + // is required to return the encoding as it was before + if ($this->mb_internal_encoding != '') { + @ini_set("mbstring.internal_encoding", $this->mb_internal_encoding); + $this->mb_internal_encoding = ''; + } + // Rethrow exception after we handled resetting the environment if (!empty($exc)) { - throw $exc; - } + throw $exc; + } + + return $css; } @@ -466,17 +484,7 @@ class Less_Parser{ * @param string $file_path */ private function _parse( $file_path = null ){ - if (ini_get("mbstring.func_overload")) { - $mb_internal_encoding = ini_get("mbstring.internal_encoding"); - @ini_set("mbstring.internal_encoding", "ascii"); - } - $this->rules = array_merge($this->rules, $this->GetRules( $file_path )); - - //reset php settings - if (isset($mb_internal_encoding)) { - @ini_set("mbstring.internal_encoding", $mb_internal_encoding); - } } diff --git a/vendor/oyejorge/less.php/lib/Less/SourceMap/Base64VLQ.php b/vendor/oyejorge/less.php/lib/Less/SourceMap/Base64VLQ.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/SourceMap/Generator.php b/vendor/oyejorge/less.php/lib/Less/SourceMap/Generator.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree.php b/vendor/oyejorge/less.php/lib/Less/Tree.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Alpha.php b/vendor/oyejorge/less.php/lib/Less/Tree/Alpha.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Anonymous.php b/vendor/oyejorge/less.php/lib/Less/Tree/Anonymous.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Assignment.php b/vendor/oyejorge/less.php/lib/Less/Tree/Assignment.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Attribute.php b/vendor/oyejorge/less.php/lib/Less/Tree/Attribute.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Call.php b/vendor/oyejorge/less.php/lib/Less/Tree/Call.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Color.php b/vendor/oyejorge/less.php/lib/Less/Tree/Color.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Comment.php b/vendor/oyejorge/less.php/lib/Less/Tree/Comment.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Condition.php b/vendor/oyejorge/less.php/lib/Less/Tree/Condition.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Dimension.php b/vendor/oyejorge/less.php/lib/Less/Tree/Dimension.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Directive.php b/vendor/oyejorge/less.php/lib/Less/Tree/Directive.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Element.php b/vendor/oyejorge/less.php/lib/Less/Tree/Element.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Expression.php b/vendor/oyejorge/less.php/lib/Less/Tree/Expression.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Extend.php b/vendor/oyejorge/less.php/lib/Less/Tree/Extend.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Import.php b/vendor/oyejorge/less.php/lib/Less/Tree/Import.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Javascript.php b/vendor/oyejorge/less.php/lib/Less/Tree/Javascript.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Keyword.php b/vendor/oyejorge/less.php/lib/Less/Tree/Keyword.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Media.php b/vendor/oyejorge/less.php/lib/Less/Tree/Media.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Mixin/Call.php b/vendor/oyejorge/less.php/lib/Less/Tree/Mixin/Call.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Mixin/Definition.php b/vendor/oyejorge/less.php/lib/Less/Tree/Mixin/Definition.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/NameValue.php b/vendor/oyejorge/less.php/lib/Less/Tree/NameValue.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Negative.php b/vendor/oyejorge/less.php/lib/Less/Tree/Negative.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Operation.php b/vendor/oyejorge/less.php/lib/Less/Tree/Operation.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Paren.php b/vendor/oyejorge/less.php/lib/Less/Tree/Paren.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Quoted.php b/vendor/oyejorge/less.php/lib/Less/Tree/Quoted.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Rule.php b/vendor/oyejorge/less.php/lib/Less/Tree/Rule.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Ruleset.php b/vendor/oyejorge/less.php/lib/Less/Tree/Ruleset.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Selector.php b/vendor/oyejorge/less.php/lib/Less/Tree/Selector.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/UnicodeDescriptor.php b/vendor/oyejorge/less.php/lib/Less/Tree/UnicodeDescriptor.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Unit.php b/vendor/oyejorge/less.php/lib/Less/Tree/Unit.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/UnitConversions.php b/vendor/oyejorge/less.php/lib/Less/Tree/UnitConversions.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Url.php b/vendor/oyejorge/less.php/lib/Less/Tree/Url.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Value.php b/vendor/oyejorge/less.php/lib/Less/Tree/Value.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Tree/Variable.php b/vendor/oyejorge/less.php/lib/Less/Tree/Variable.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Version.php b/vendor/oyejorge/less.php/lib/Less/Version.php old mode 100755 new mode 100644 index fdbe5794f4c..704ec6e07b3 --- a/vendor/oyejorge/less.php/lib/Less/Version.php +++ b/vendor/oyejorge/less.php/lib/Less/Version.php @@ -8,8 +8,8 @@ */ class Less_Version{ - const version = '1.7.0.5'; // The current build number of less.php + const version = '1.7.0.9'; // The current build number of less.php const less_version = '1.7'; // The less.js version that this build should be compatible with const cache_version = '170'; // The parser cache version -} \ No newline at end of file +} diff --git a/vendor/oyejorge/less.php/lib/Less/Visitor.php b/vendor/oyejorge/less.php/lib/Less/Visitor.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Visitor/extendFinder.php b/vendor/oyejorge/less.php/lib/Less/Visitor/extendFinder.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Visitor/import.php b/vendor/oyejorge/less.php/lib/Less/Visitor/import.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Visitor/joinSelector.php b/vendor/oyejorge/less.php/lib/Less/Visitor/joinSelector.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Visitor/processExtends.php b/vendor/oyejorge/less.php/lib/Less/Visitor/processExtends.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/Visitor/toCSS.php b/vendor/oyejorge/less.php/lib/Less/Visitor/toCSS.php old mode 100755 new mode 100644 diff --git a/vendor/oyejorge/less.php/lib/Less/VisitorReplacing.php b/vendor/oyejorge/less.php/lib/Less/VisitorReplacing.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/css-selector/Node/Specificity.php b/vendor/symfony/css-selector/Node/Specificity.php index 0dfec3b9556..0ce0c3f3049 100644 --- a/vendor/symfony/css-selector/Node/Specificity.php +++ b/vendor/symfony/css-selector/Node/Specificity.php @@ -78,7 +78,7 @@ class Specificity /** * Returns -1 if the object specificity is lower than the argument, - * 0 if they are equal, and 1 if the argument is lower + * 0 if they are equal, and 1 if the argument is lower. * * @param Specificity $specificity * diff --git a/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php b/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php index 142bd163153..83f8d13d9cc 100644 --- a/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php +++ b/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php @@ -33,15 +33,14 @@ class ClassParser implements ParserInterface { // Matches an optional namespace, optional element, and required class // $source = 'test|input.ab6bd_field'; - // $matches = array (size=5) - // 0 => string 'test:input.ab6bd_field' (length=22) - // 1 => string 'test:' (length=5) - // 2 => string 'test' (length=4) - // 3 => string 'input' (length=5) - // 4 => string 'ab6bd_field' (length=11) - if (preg_match('/^(([a-z]+)\|)?([\w-]+|\*)?\.([\w-]+)$/i', trim($source), $matches)) { + // $matches = array (size=4) + // 0 => string 'test|input.ab6bd_field' (length=22) + // 1 => string 'test' (length=4) + // 2 => string 'input' (length=5) + // 3 => string 'ab6bd_field' (length=11) + if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+\.([\w-]++)$/i', trim($source), $matches)) { return array( - new SelectorNode(new ClassNode(new ElementNode($matches[2] ?: null, $matches[3] ?: null), $matches[4])), + new SelectorNode(new ClassNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])), ); } diff --git a/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php b/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php index f62d25960cc..00e443553b4 100644 --- a/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php +++ b/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php @@ -32,13 +32,12 @@ class ElementParser implements ParserInterface { // Matches an optional namespace, required element or `*` // $source = 'testns|testel'; - // $matches = array (size=4) - // 0 => string 'testns:testel' (length=13) - // 1 => string 'testns:' (length=7) - // 2 => string 'testns' (length=6) - // 3 => string 'testel' (length=6) - if (preg_match('/^(([a-z]+)\|)?([\w-]+|\*)$/i', trim($source), $matches)) { - return array(new SelectorNode(new ElementNode($matches[2] ?: null, $matches[3]))); + // $matches = array (size=3) + // 0 => string 'testns|testel' (length=13) + // 1 => string 'testns' (length=6) + // 2 => string 'testel' (length=6) + if (preg_match('/^(?:([a-z]++)\|)?([\w-]++|\*)$/i', trim($source), $matches)) { + return array(new SelectorNode(new ElementNode($matches[1] ?: null, $matches[2]))); } return array(); diff --git a/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php b/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php index fde614149b7..3dbad79d5b4 100644 --- a/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php +++ b/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php @@ -33,15 +33,14 @@ class HashParser implements ParserInterface { // Matches an optional namespace, optional element, and required id // $source = 'test|input#ab6bd_field'; - // $matches = array (size=5) - // 0 => string 'test:input#ab6bd_field' (length=22) - // 1 => string 'test:' (length=5) - // 2 => string 'test' (length=4) - // 3 => string 'input' (length=5) - // 4 => string 'ab6bd_field' (length=11) - if (preg_match('/^(([a-z]+)\|)?([\w-]+|\*)?#([\w-]+)$/i', trim($source), $matches)) { + // $matches = array (size=4) + // 0 => string 'test|input#ab6bd_field' (length=22) + // 1 => string 'test' (length=4) + // 2 => string 'input' (length=5) + // 3 => string 'ab6bd_field' (length=11) + if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+#([\w-]++)$/i', trim($source), $matches)) { return array( - new SelectorNode(new HashNode(new ElementNode($matches[2] ?: null, $matches[3] ?: null), $matches[4])), + new SelectorNode(new HashNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])), ); } diff --git a/vendor/symfony/css-selector/XPath/TranslatorInterface.php b/vendor/symfony/css-selector/XPath/TranslatorInterface.php index 1d9d1c88ee4..bc19ae86346 100644 --- a/vendor/symfony/css-selector/XPath/TranslatorInterface.php +++ b/vendor/symfony/css-selector/XPath/TranslatorInterface.php @@ -29,7 +29,7 @@ interface TranslatorInterface * @param string $cssExpr * @param string $prefix * - * @return XPathExpr + * @return string */ public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::'); @@ -39,7 +39,7 @@ interface TranslatorInterface * @param SelectorNode $selector * @param string $prefix * - * @return XPathExpr + * @return string */ public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or-self::'); } diff --git a/vendor/symfony/process/Pipes/AbstractPipes.php b/vendor/symfony/process/Pipes/AbstractPipes.php index d8b57d07a77..1ca85739f59 100644 --- a/vendor/symfony/process/Pipes/AbstractPipes.php +++ b/vendor/symfony/process/Pipes/AbstractPipes.php @@ -54,7 +54,7 @@ abstract class AbstractPipes implements PipesInterface } /** - * Unblocks streams + * Unblocks streams. */ protected function unblock() { diff --git a/vendor/symfony/process/Pipes/UnixPipes.php b/vendor/symfony/process/Pipes/UnixPipes.php index b3841031c4c..f8a0d1997dc 100644 --- a/vendor/symfony/process/Pipes/UnixPipes.php +++ b/vendor/symfony/process/Pipes/UnixPipes.php @@ -200,7 +200,7 @@ class UnixPipes extends AbstractPipes } /** - * Creates a new UnixPipes instance + * Creates a new UnixPipes instance. * * @param Process $process * @param string|resource $input diff --git a/vendor/symfony/process/Pipes/WindowsPipes.php b/vendor/symfony/process/Pipes/WindowsPipes.php index 01dd5d0600f..b20f3ec34dd 100644 --- a/vendor/symfony/process/Pipes/WindowsPipes.php +++ b/vendor/symfony/process/Pipes/WindowsPipes.php @@ -173,7 +173,7 @@ class WindowsPipes extends AbstractPipes } /** - * Removes temporary files + * Removes temporary files. */ private function removeFiles() { @@ -186,7 +186,7 @@ class WindowsPipes extends AbstractPipes } /** - * Writes input to stdin + * Writes input to stdin. * * @param bool $blocking * @param bool $close diff --git a/vendor/symfony/process/Process.php b/vendor/symfony/process/Process.php index 1474d698276..f87792be7a5 100644 --- a/vendor/symfony/process/Process.php +++ b/vendor/symfony/process/Process.php @@ -275,7 +275,7 @@ class Process $commandline = $this->commandline; if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) { - $commandline = 'cmd /V:ON /E:ON /C "('.$commandline.')'; + $commandline = 'cmd /V:ON /E:ON /D /C "('.$commandline.')'; foreach ($this->processPipes->getFiles() as $offset => $filename) { $commandline .= ' '.$offset.'>'.ProcessUtils::escapeArgument($filename); } diff --git a/vendor/symfony/process/Tests/AbstractProcessTest.php b/vendor/symfony/process/Tests/AbstractProcessTest.php index 2add8cc9385..93b5779ad21 100644 --- a/vendor/symfony/process/Tests/AbstractProcessTest.php +++ b/vendor/symfony/process/Tests/AbstractProcessTest.php @@ -172,6 +172,9 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase */ public function testSetStreamAsInput($code, $size) { + if ('\\' === DIRECTORY_SEPARATOR) { + $this->markTestIncomplete('This test fails with a timeout on Windows, can someone investigate please?'); + } $expected = str_repeat(str_repeat('*', 1024), $size).'!'; $expectedLength = (1024 * $size) + 1; @@ -179,7 +182,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase fwrite($stream, $expected); rewind($stream); - $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg($code))); + $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg($code)), null, null, null, 5); $p->setInput($stream); $p->run(); @@ -524,7 +527,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase $process = $this->getProcess('echo foo'); $this->assertSame($process, $process->mustRun()); - $this->assertEquals("foo".PHP_EOL, $process->getOutput()); + $this->assertEquals('foo'.PHP_EOL, $process->getOutput()); } public function testSuccessfulMustRunHasCorrectExitCode() @@ -559,7 +562,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase $start = microtime(true); $process->start(); $end = microtime(true); - $this->assertLessThan(0.2, $end-$start); + $this->assertLessThan(0.4, $end - $start); $process->wait(); } @@ -637,8 +640,10 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase { $process = $this->getProcess(self::$phpBin.' -r "sleep(1);"'); $process->start(); + + $this->assertFalse($process->isSuccessful()); + while ($process->isRunning()) { - $this->assertFalse($process->isSuccessful()); usleep(300000); } @@ -844,6 +849,9 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase public function testIdleTimeoutNotExceededWhenOutputIsSent() { + if ('\\' === DIRECTORY_SEPARATOR) { + $this->markTestIncomplete('This test fails with a timeout on Windows, can someone investigate please?'); + } $process = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 30; while ($n--) {echo "foo\n"; usleep(100000); }'))); $process->setTimeout(2); $process->setIdleTimeout(1); diff --git a/vendor/symfony/process/Tests/ProcessFailedExceptionTest.php b/vendor/symfony/process/Tests/ProcessFailedExceptionTest.php index b028395f9b4..de37353f917 100644 --- a/vendor/symfony/process/Tests/ProcessFailedExceptionTest.php +++ b/vendor/symfony/process/Tests/ProcessFailedExceptionTest.php @@ -91,7 +91,7 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase /** * Tests that ProcessFailedException does not extract information from - * process output if it was previously disabled + * process output if it was previously disabled. */ public function testDisabledOutputInFailedExceptionDoesNotPopulateOutput() { diff --git a/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php index 2de62e58bd0..651c0170496 100644 --- a/vendor/symfony/yaml/Parser.php +++ b/vendor/symfony/yaml/Parser.php @@ -115,6 +115,9 @@ class Parser $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap); } } + if ($isRef) { + $this->refs[$isRef] = end($data); + } } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values) && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))) { if ($context && 'sequence' == $context) { throw new ParseException('You cannot define a mapping item when in a sequence'); @@ -132,6 +135,11 @@ class Parser throw $e; } + // Convert float keys to strings, to avoid being converted to integers by PHP + if (is_float($key)) { + $key = (string) $key; + } + if ('<<' === $key) { $mergeNode = true; $allowOverwrite = true; @@ -227,6 +235,9 @@ class Parser $data[$key] = $value; } } + if ($isRef) { + $this->refs[$isRef] = $data[$key]; + } } else { // multiple documents are not supported if ('---' === $this->currentLine) { @@ -284,10 +295,6 @@ class Parser throw new ParseException($error, $this->getRealCurrentLineNb() + 1, $this->currentLine); } - - if ($isRef) { - $this->refs[$isRef] = end($data); - } } if (isset($mbEncoding)) { diff --git a/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml b/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml index f8501ddc296..d98810256ec 100644 --- a/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml +++ b/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml @@ -21,7 +21,7 @@ ruby: | test: Leading Document Separator todo: true brief: > - You can explicity give an opening + You can explicitly give an opening document separator to your YAML stream. yaml: | --- diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml b/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml index fd9910174da..4b67d341008 100644 --- a/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml +++ b/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml @@ -33,6 +33,17 @@ yaml: | isit: tested head: <<: [ *foo , *dong , *foo2 ] + taz: &taz + a: Steve + w: + p: 1234 + nested: + <<: *taz + d: Doug + w: &nestedref + p: 12345 + z: + <<: *nestedref php: | array( 'foo' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian'), @@ -41,5 +52,7 @@ php: | 'foo2' => array('a' => 'Ballmer'), 'ding' => array('fi', 'fei', 'fo', 'fam'), 'check' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam', 'isit' => 'tested'), - 'head' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam') + 'head' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam'), + 'taz' => array('a' => 'Steve', 'w' => array('p' => 1234)), + 'nested' => array('a' => 'Steve', 'w' => array('p' => 12345), 'd' => 'Doug', 'z' => array('p' => 12345)) ) diff --git a/vendor/symfony/yaml/Tests/InlineTest.php b/vendor/symfony/yaml/Tests/InlineTest.php index 0776e4fa8df..522d77053de 100644 --- a/vendor/symfony/yaml/Tests/InlineTest.php +++ b/vendor/symfony/yaml/Tests/InlineTest.php @@ -293,8 +293,8 @@ class InlineTest extends \PHPUnit_Framework_TestCase array('{ foo : bar, bar : foo, false : false, null : null, integer : 12 }', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)), array('{foo: \'bar\', bar: \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')), array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')), - array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', (object) array('foo\'' => 'bar', "bar\"" => 'foo: bar')), - array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', (object) array('foo: ' => 'bar', "bar: " => 'foo: bar')), + array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', (object) array('foo\'' => 'bar', 'bar"' => 'foo: bar')), + array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', (object) array('foo: ' => 'bar', 'bar: ' => 'foo: bar')), // nested sequences and mappings array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))), diff --git a/vendor/symfony/yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Tests/ParserTest.php index f434d5585d8..08ef43faa51 100644 --- a/vendor/symfony/yaml/Tests/ParserTest.php +++ b/vendor/symfony/yaml/Tests/ParserTest.php @@ -747,6 +747,24 @@ bar: 2 EOF; $this->assertEquals(array('foo' => 1, 'bar' => 2), $this->parser->parse($yaml)); } + + public function testFloatKeys() + { + $yaml = <<<EOF +foo: + 1.2: "bar" + 1.3: "baz" +EOF; + + $expected = array( + 'foo' => array( + '1.2' => 'bar', + '1.3' => 'baz', + ), + ); + + $this->assertEquals($expected, $this->parser->parse($yaml)); + } } class B diff --git a/vendor/symfony/yaml/Unescaper.php b/vendor/symfony/yaml/Unescaper.php index 93206f92335..1b5e5ec2dc5 100644 --- a/vendor/symfony/yaml/Unescaper.php +++ b/vendor/symfony/yaml/Unescaper.php @@ -24,6 +24,7 @@ class Unescaper * must be converted to that encoding. * * @deprecated since version 2.5, to be removed in 3.0 + * * @internal */ const ENCODING = 'UTF-8'; -- GitLab