From 42c845a05072ae0d9cb385e8b89d08d1ba4b30ff Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Tue, 2 Jun 2015 15:28:49 +0100 Subject: [PATCH] Issue #2498515 by Berdir, neclimdul: Update additional Symfony Components to 2.7.0 --- .gitattributes | 1 + core/composer.lock | 63 ++-- core/vendor/composer/autoload_namespaces.php | 3 - core/vendor/composer/autoload_psr4.php | 3 + core/vendor/composer/installed.json | 285 +++++++++--------- .../Component/BrowserKit => }/.gitignore | 0 .../Component/BrowserKit => }/CHANGELOG.md | 0 .../Component/BrowserKit => }/Client.php | 0 .../Component/BrowserKit => }/Cookie.php | 0 .../Component/BrowserKit => }/CookieJar.php | 0 .../Component/BrowserKit => }/History.php | 0 .../Component/BrowserKit => }/LICENSE | 0 .../Component/BrowserKit => }/README.md | 0 .../Component/BrowserKit => }/Request.php | 0 .../Component/BrowserKit => }/Response.php | 0 .../BrowserKit => }/Tests/ClientTest.php | 0 .../BrowserKit => }/Tests/CookieJarTest.php | 0 .../BrowserKit => }/Tests/CookieTest.php | 0 .../BrowserKit => }/Tests/HistoryTest.php | 0 .../BrowserKit => }/Tests/RequestTest.php | 0 .../BrowserKit => }/Tests/ResponseTest.php | 0 .../Component/BrowserKit => }/composer.json | 7 +- .../BrowserKit => }/phpunit.xml.dist | 1 + .../Component/Debug => console}/.gitignore | 0 core/vendor/symfony/console/Application.php | 14 +- .../symfony/console/Command/HelpCommand.php | 4 +- .../symfony/console/Command/ListCommand.php | 4 +- .../console/Formatter/OutputFormatter.php | 1 + .../symfony/console/Helper/DialogHelper.php | 4 +- .../symfony/console/Input/ArgvInput.php | 2 +- .../symfony/console/Input/InputDefinition.php | 2 +- .../symfony/console/Output/StreamOutput.php | 2 +- .../console/Question/ChoiceQuestion.php | 8 +- .../console/Resources/bin/hiddeninput.exe | Bin 9201 -> 9202 bytes .../symfony/console/Style/StyleInterface.php | 10 +- .../symfony/console/Style/SymfonyStyle.php | 14 +- .../console/Tests/Command/CommandTest.php | 9 - .../console/Tests/Fixtures/application_1.json | 2 +- .../console/Tests/Fixtures/application_1.md | 4 +- .../console/Tests/Fixtures/application_1.xml | 4 +- .../console/Tests/Fixtures/application_2.json | 2 +- .../console/Tests/Fixtures/application_2.md | 4 +- .../console/Tests/Fixtures/application_2.xml | 4 +- .../Tests/Fixtures/application_asxml1.txt | 4 +- .../Tests/Fixtures/application_run2.txt | 2 +- .../Tests/Fixtures/application_run3.txt | 2 +- .../Tests/Formatter/OutputFormatterTest.php | 16 + .../Tests/Helper/QuestionHelperTest.php | 86 +++++- .../Component/DomCrawler => debug}/.gitignore | 0 .../Component/Debug => }/CHANGELOG.md | 8 + .../{Symfony/Component/Debug => }/Debug.php | 0 .../Component/Debug => }/DebugClassLoader.php | 51 +++- .../Component/Debug => }/ErrorHandler.php | 50 +-- .../Exception/ClassNotFoundException.php | 0 .../Exception/ContextErrorException.php | 0 .../Debug => }/Exception/DummyException.php | 2 + .../Exception/FatalBaseException.php | 0 .../Exception/FatalErrorException.php | 5 + .../Debug => }/Exception/FlattenException.php | 0 .../Exception/OutOfMemoryException.php | 0 .../Exception/UndefinedFunctionException.php | 0 .../Exception/UndefinedMethodException.php | 0 .../Component/Debug => }/ExceptionHandler.php | 13 +- .../ClassNotFoundFatalErrorHandler.php | 0 .../FatalErrorHandlerInterface.php | 0 .../UndefinedFunctionFatalErrorHandler.php | 0 .../UndefinedMethodFatalErrorHandler.php | 2 +- .../{Symfony/Component/Debug => }/LICENSE | 0 .../{Symfony/Component/Debug => }/README.md | 0 .../symfony/debug/Resources/ext/README.md | 133 ++++++++ .../Debug => }/Resources/ext/config.m4 | 0 .../Debug => }/Resources/ext/config.w32 | 0 .../Resources/ext/php_symfony_debug.h | 13 +- .../Debug => }/Resources/ext/symfony_debug.c | 87 +++++- .../Debug => }/Resources/ext/tests/001.phpt | 6 +- .../debug/Resources/ext/tests/002.phpt | 64 ++++ .../debug/Resources/ext/tests/002_1.phpt | 47 +++ .../debug/Resources/ext/tests/003.phpt | 85 ++++++ .../Component/Debug/Resources/ext/README.rst | 72 ----- .../Debug => }/Tests/DebugClassLoaderTest.php | 91 ++++++ .../Debug => }/Tests/ErrorHandlerTest.php | 18 +- .../Tests/Exception/FlattenExceptionTest.php | 0 .../Debug => }/Tests/ExceptionHandlerTest.php | 0 .../ClassNotFoundFatalErrorHandlerTest.php | 0 ...UndefinedFunctionFatalErrorHandlerTest.php | 0 .../UndefinedMethodFatalErrorHandlerTest.php | 6 +- .../Debug => }/Tests/Fixtures/ClassAlias.php | 0 .../debug/Tests/Fixtures/DeprecatedClass.php | 12 + .../Tests/Fixtures/DeprecatedInterface.php | 12 + .../Debug => }/Tests/Fixtures/PEARClass.php | 0 .../Tests/Fixtures/casemismatch.php | 0 .../Debug => }/Tests/Fixtures/notPsr0Bis.php | 0 .../Tests/Fixtures/psr4/Psr4CaseMismatch.php | 0 .../Tests/Fixtures/reallyNotPsr0.php | 0 .../Tests/Fixtures2/RequiredTwice.php | 0 .../Debug => }/Tests/MockExceptionHandler.php | 0 .../Component/Debug => }/composer.json | 7 +- .../Component/Debug => }/phpunit.xml.dist | 4 + core/vendor/symfony/dom-crawler/.gitignore | 3 + .../Component/DomCrawler => }/CHANGELOG.md | 0 .../Component/DomCrawler => }/Crawler.php | 10 +- .../DomCrawler => }/Field/ChoiceFormField.php | 0 .../DomCrawler => }/Field/FileFormField.php | 0 .../DomCrawler => }/Field/FormField.php | 0 .../DomCrawler => }/Field/InputFormField.php | 0 .../Field/TextareaFormField.php | 0 .../Component/DomCrawler => }/Form.php | 0 .../DomCrawler => }/FormFieldRegistry.php | 0 .../Component/DomCrawler => }/LICENSE | 0 .../Component/DomCrawler => }/Link.php | 0 .../Component/DomCrawler => }/README.md | 0 .../DomCrawler => }/Tests/CrawlerTest.php | 7 + .../Tests/Field/ChoiceFormFieldTest.php | 0 .../Tests/Field/FileFormFieldTest.php | 0 .../Tests/Field/FormFieldTest.php | 0 .../Tests/Field/FormFieldTestCase.php | 0 .../Tests/Field/InputFormFieldTest.php | 0 .../Tests/Field/TextareaFormFieldTest.php | 0 .../Tests/Fixtures/no-extension | 0 .../Tests/Fixtures/windows-1250.html | 0 .../DomCrawler => }/Tests/FormTest.php | 0 .../DomCrawler => }/Tests/LinkTest.php | 0 .../Component/DomCrawler => }/composer.json | 7 +- .../DomCrawler => }/phpunit.xml.dist | 0 124 files changed, 977 insertions(+), 405 deletions(-) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/.gitignore (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/CHANGELOG.md (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Client.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Cookie.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/CookieJar.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/History.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/LICENSE (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/README.md (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Request.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Response.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Tests/ClientTest.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Tests/CookieJarTest.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Tests/CookieTest.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Tests/HistoryTest.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Tests/RequestTest.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/Tests/ResponseTest.php (100%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/composer.json (82%) rename core/vendor/symfony/browser-kit/{Symfony/Component/BrowserKit => }/phpunit.xml.dist (99%) rename core/vendor/symfony/{debug/Symfony/Component/Debug => console}/.gitignore (100%) rename core/vendor/symfony/{dom-crawler/Symfony/Component/DomCrawler => debug}/.gitignore (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/CHANGELOG.md (67%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Debug.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/DebugClassLoader.php (69%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/ErrorHandler.php (91%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/ClassNotFoundException.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/ContextErrorException.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/DummyException.php (76%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/FatalBaseException.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/FatalErrorException.php (92%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/FlattenException.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/OutOfMemoryException.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/UndefinedFunctionException.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Exception/UndefinedMethodException.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/ExceptionHandler.php (97%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/FatalErrorHandler/FatalErrorHandlerInterface.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php (93%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/LICENSE (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/README.md (100%) create mode 100644 core/vendor/symfony/debug/Resources/ext/README.md rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Resources/ext/config.m4 (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Resources/ext/config.w32 (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Resources/ext/php_symfony_debug.h (70%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Resources/ext/symfony_debug.c (66%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Resources/ext/tests/001.phpt (99%) create mode 100644 core/vendor/symfony/debug/Resources/ext/tests/002.phpt create mode 100644 core/vendor/symfony/debug/Resources/ext/tests/002_1.phpt create mode 100644 core/vendor/symfony/debug/Resources/ext/tests/003.phpt delete mode 100644 core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/README.rst rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/DebugClassLoaderTest.php (65%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/ErrorHandlerTest.php (95%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/Exception/FlattenExceptionTest.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/ExceptionHandlerTest.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php (83%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/Fixtures/ClassAlias.php (100%) create mode 100644 core/vendor/symfony/debug/Tests/Fixtures/DeprecatedClass.php create mode 100644 core/vendor/symfony/debug/Tests/Fixtures/DeprecatedInterface.php rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/Fixtures/PEARClass.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/Fixtures/casemismatch.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/Fixtures/notPsr0Bis.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/Fixtures/psr4/Psr4CaseMismatch.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/Fixtures/reallyNotPsr0.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/Fixtures2/RequiredTwice.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/Tests/MockExceptionHandler.php (100%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/composer.json (86%) rename core/vendor/symfony/debug/{Symfony/Component/Debug => }/phpunit.xml.dist (83%) create mode 100644 core/vendor/symfony/dom-crawler/.gitignore rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/CHANGELOG.md (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Crawler.php (98%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Field/ChoiceFormField.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Field/FileFormField.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Field/FormField.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Field/InputFormField.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Field/TextareaFormField.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Form.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/FormFieldRegistry.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/LICENSE (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Link.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/README.md (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/CrawlerTest.php (99%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/Field/ChoiceFormFieldTest.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/Field/FileFormFieldTest.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/Field/FormFieldTest.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/Field/FormFieldTestCase.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/Field/InputFormFieldTest.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/Field/TextareaFormFieldTest.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/Fixtures/no-extension (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/Fixtures/windows-1250.html (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/FormTest.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/Tests/LinkTest.php (100%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/composer.json (81%) rename core/vendor/symfony/dom-crawler/{Symfony/Component/DomCrawler => }/phpunit.xml.dist (100%) diff --git a/.gitattributes b/.gitattributes index 711b3acea43..b377ffb8e90 100644 --- a/.gitattributes +++ b/.gitattributes @@ -50,3 +50,4 @@ *.jpg -text diff *.png -text diff *.phar -text diff +*.exe -text diff diff --git a/core/composer.lock b/core/composer.lock index 014507970b9..53638988505 100644 --- a/core/composer.lock +++ b/core/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "61a2b6dec8252d78e904d37fbf1637d7", @@ -2143,21 +2143,20 @@ }, { "name": "symfony/browser-kit", - "version": "v2.6.9", - "target-dir": "Symfony/Component/BrowserKit", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "cf950c42947ea2f29c36a1f443202b6134f5c303" + "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/cf950c42947ea2f29c36a1f443202b6134f5c303", - "reference": "cf950c42947ea2f29c36a1f443202b6134f5c303", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/70cdc18dd601a486a8cc69ee26367cbaedd60400", + "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=5.3.9", "symfony/dom-crawler": "~2.0,>=2.0.5" }, "require-dev": { @@ -2171,11 +2170,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\BrowserKit\\": "" } }, @@ -2195,7 +2194,7 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-02 15:21:08" }, { "name": "symfony/class-loader", @@ -2249,16 +2248,16 @@ }, { "name": "symfony/console", - "version": "v2.7.0-BETA2", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64" + "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/555ba7fc54a538e1b83988e2299db09b6b6dca64", - "reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64", + "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399", + "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399", "shasum": "" }, "require": { @@ -2302,7 +2301,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:21:08" + "time": "2015-05-29 16:22:24" }, { "name": "symfony/css-selector", @@ -2359,21 +2358,20 @@ }, { "name": "symfony/debug", - "version": "v2.6.9", - "target-dir": "Symfony/Component/Debug", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33" + "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/4851a041c48e76b91a221db84ab5850daa6a7b33", - "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33", + "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d", + "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=5.3.9", "psr/log": "~1.0" }, "conflict": { @@ -2392,11 +2390,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Debug\\": "" } }, @@ -2416,7 +2414,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2015-05-20 13:09:45" + "time": "2015-05-22 14:54:25" }, { "name": "symfony/dependency-injection", @@ -2480,21 +2478,20 @@ }, { "name": "symfony/dom-crawler", - "version": "v2.6.9", - "target-dir": "Symfony/Component/DomCrawler", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "c74fe625d8c65fee512de2b40cceabba1b09503b" + "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/c74fe625d8c65fee512de2b40cceabba1b09503b", - "reference": "c74fe625d8c65fee512de2b40cceabba1b09503b", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3", + "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "require-dev": { "symfony/css-selector": "~2.3", @@ -2506,11 +2503,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\DomCrawler\\": "" } }, @@ -2530,7 +2527,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2015-05-22 14:53:08" + "time": "2015-05-22 14:54:25" }, { "name": "symfony/event-dispatcher", diff --git a/core/vendor/composer/autoload_namespaces.php b/core/vendor/composer/autoload_namespaces.php index 305ab18c681..60382889c86 100644 --- a/core/vendor/composer/autoload_namespaces.php +++ b/core/vendor/composer/autoload_namespaces.php @@ -9,9 +9,6 @@ return array( 'phpDocumentor' => array($vendorDir . '/phpdocumentor/reflection-docblock/src'), 'org\\bovigo\\vfs\\' => array($vendorDir . '/mikey179/vfsStream/src/main/php'), 'Twig_' => array($vendorDir . '/twig/twig/lib'), - 'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'), - 'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'), - 'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'), 'Stack' => array($vendorDir . '/stack/builder/src'), 'Psr\\Log\\' => array($vendorDir . '/psr/log'), 'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'), diff --git a/core/vendor/composer/autoload_psr4.php b/core/vendor/composer/autoload_psr4.php index af91507e480..a026f26f59a 100644 --- a/core/vendor/composer/autoload_psr4.php +++ b/core/vendor/composer/autoload_psr4.php @@ -18,10 +18,13 @@ return array( 'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'), 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'), 'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'), + 'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'), 'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'), + 'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'), 'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'), 'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'), 'Symfony\\Component\\ClassLoader\\' => array($vendorDir . '/symfony/class-loader'), + 'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'), 'Symfony\\Cmf\\Component\\Routing\\' => array($vendorDir . '/symfony-cmf/routing'), 'React\\Promise\\' => array($vendorDir . '/react/promise/src'), 'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'), diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index ca6969b7dab..457c12ec125 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -2478,65 +2478,6 @@ "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com" }, - { - "name": "symfony/console", - "version": "v2.7.0-BETA2", - "version_normalized": "2.7.0.0-beta2", - "source": { - "type": "git", - "url": "https://github.com/symfony/Console.git", - "reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/555ba7fc54a538e1b83988e2299db09b6b6dca64", - "reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/phpunit-bridge": "~2.7", - "symfony/process": "~2.1" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/process": "" - }, - "time": "2015-05-02 15:21:08", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - } - }, - "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 Console Component", - "homepage": "https://symfony.com" - }, { "name": "symfony/css-selector", "version": "v2.7.0", @@ -2654,69 +2595,6 @@ "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com" }, - { - "name": "symfony/debug", - "version": "v2.6.9", - "version_normalized": "2.6.9.0", - "target-dir": "Symfony/Component/Debug", - "source": { - "type": "git", - "url": "https://github.com/symfony/Debug.git", - "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/4851a041c48e76b91a221db84ab5850daa6a7b33", - "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/class-loader": "~2.2", - "symfony/http-foundation": "~2.1", - "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2", - "symfony/phpunit-bridge": "~2.7" - }, - "suggest": { - "symfony/http-foundation": "", - "symfony/http-kernel": "" - }, - "time": "2015-05-20 13:09:45", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Symfony\\Component\\Debug\\": "" - } - }, - "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 Debug Component", - "homepage": "https://symfony.com" - }, { "name": "symfony/http-foundation", "version": "v2.7.0", @@ -3288,23 +3166,143 @@ "homepage": "https://symfony.com" }, { - "name": "symfony/dom-crawler", - "version": "v2.6.9", - "version_normalized": "2.6.9.0", - "target-dir": "Symfony/Component/DomCrawler", + "name": "symfony/console", + "version": "v2.7.0", + "version_normalized": "2.7.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/DomCrawler.git", - "reference": "c74fe625d8c65fee512de2b40cceabba1b09503b" + "url": "https://github.com/symfony/Console.git", + "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/c74fe625d8c65fee512de2b40cceabba1b09503b", - "reference": "c74fe625d8c65fee512de2b40cceabba1b09503b", + "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399", + "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1", + "symfony/phpunit-bridge": "~2.7", + "symfony/process": "~2.1" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "time": "2015-05-29 16:22:24", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + } + }, + "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 Console Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/debug", + "version": "v2.7.0", + "version_normalized": "2.7.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/Debug.git", + "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d", + "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "psr/log": "~1.0" + }, + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + }, + "require-dev": { + "symfony/class-loader": "~2.2", + "symfony/http-foundation": "~2.1", + "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2", + "symfony/phpunit-bridge": "~2.7" + }, + "suggest": { + "symfony/http-foundation": "", + "symfony/http-kernel": "" + }, + "time": "2015-05-22 14:54:25", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + } + }, + "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 Debug Component", + "homepage": "https://symfony.com" + }, + { + "name": "symfony/dom-crawler", + "version": "v2.7.0", + "version_normalized": "2.7.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/DomCrawler.git", + "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3", + "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" }, "require-dev": { "symfony/css-selector": "~2.3", @@ -3313,16 +3311,16 @@ "suggest": { "symfony/css-selector": "" }, - "time": "2015-05-22 14:53:08", + "time": "2015-05-22 14:54:25", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\DomCrawler\\": "" } }, @@ -3345,22 +3343,21 @@ }, { "name": "symfony/browser-kit", - "version": "v2.6.9", - "version_normalized": "2.6.9.0", - "target-dir": "Symfony/Component/BrowserKit", + "version": "v2.7.0", + "version_normalized": "2.7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "cf950c42947ea2f29c36a1f443202b6134f5c303" + "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/cf950c42947ea2f29c36a1f443202b6134f5c303", - "reference": "cf950c42947ea2f29c36a1f443202b6134f5c303", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/70cdc18dd601a486a8cc69ee26367cbaedd60400", + "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=5.3.9", "symfony/dom-crawler": "~2.0,>=2.0.5" }, "require-dev": { @@ -3371,16 +3368,16 @@ "suggest": { "symfony/process": "" }, - "time": "2015-05-02 15:18:45", + "time": "2015-05-02 15:21:08", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\BrowserKit\\": "" } }, diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/.gitignore b/core/vendor/symfony/browser-kit/.gitignore similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/.gitignore rename to core/vendor/symfony/browser-kit/.gitignore diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/CHANGELOG.md b/core/vendor/symfony/browser-kit/CHANGELOG.md similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/CHANGELOG.md rename to core/vendor/symfony/browser-kit/CHANGELOG.md diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Client.php b/core/vendor/symfony/browser-kit/Client.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Client.php rename to core/vendor/symfony/browser-kit/Client.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php b/core/vendor/symfony/browser-kit/Cookie.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php rename to core/vendor/symfony/browser-kit/Cookie.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/CookieJar.php b/core/vendor/symfony/browser-kit/CookieJar.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/CookieJar.php rename to core/vendor/symfony/browser-kit/CookieJar.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/History.php b/core/vendor/symfony/browser-kit/History.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/History.php rename to core/vendor/symfony/browser-kit/History.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/LICENSE b/core/vendor/symfony/browser-kit/LICENSE similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/LICENSE rename to core/vendor/symfony/browser-kit/LICENSE diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/README.md b/core/vendor/symfony/browser-kit/README.md similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/README.md rename to core/vendor/symfony/browser-kit/README.md diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Request.php b/core/vendor/symfony/browser-kit/Request.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Request.php rename to core/vendor/symfony/browser-kit/Request.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Response.php b/core/vendor/symfony/browser-kit/Response.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Response.php rename to core/vendor/symfony/browser-kit/Response.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ClientTest.php b/core/vendor/symfony/browser-kit/Tests/ClientTest.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ClientTest.php rename to core/vendor/symfony/browser-kit/Tests/ClientTest.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieJarTest.php b/core/vendor/symfony/browser-kit/Tests/CookieJarTest.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieJarTest.php rename to core/vendor/symfony/browser-kit/Tests/CookieJarTest.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieTest.php b/core/vendor/symfony/browser-kit/Tests/CookieTest.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieTest.php rename to core/vendor/symfony/browser-kit/Tests/CookieTest.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/HistoryTest.php b/core/vendor/symfony/browser-kit/Tests/HistoryTest.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/HistoryTest.php rename to core/vendor/symfony/browser-kit/Tests/HistoryTest.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/RequestTest.php b/core/vendor/symfony/browser-kit/Tests/RequestTest.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/RequestTest.php rename to core/vendor/symfony/browser-kit/Tests/RequestTest.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ResponseTest.php b/core/vendor/symfony/browser-kit/Tests/ResponseTest.php similarity index 100% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ResponseTest.php rename to core/vendor/symfony/browser-kit/Tests/ResponseTest.php diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/composer.json b/core/vendor/symfony/browser-kit/composer.json similarity index 82% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/composer.json rename to core/vendor/symfony/browser-kit/composer.json index 343ecd3a33d..0cb629c0854 100644 --- a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/composer.json +++ b/core/vendor/symfony/browser-kit/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=5.3.3", + "php": ">=5.3.9", "symfony/dom-crawler": "~2.0,>=2.0.5" }, "require-dev": { @@ -28,13 +28,12 @@ "symfony/process": "" }, "autoload": { - "psr-0": { "Symfony\\Component\\BrowserKit\\": "" } + "psr-4": { "Symfony\\Component\\BrowserKit\\": "" } }, - "target-dir": "Symfony/Component/BrowserKit", "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } } } diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist b/core/vendor/symfony/browser-kit/phpunit.xml.dist similarity index 99% rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist rename to core/vendor/symfony/browser-kit/phpunit.xml.dist index d6ca28bf1c6..d76b2b98afd 100644 --- a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist +++ b/core/vendor/symfony/browser-kit/phpunit.xml.dist @@ -9,6 +9,7 @@ + ./Tests/ diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/.gitignore b/core/vendor/symfony/console/.gitignore similarity index 100% rename from core/vendor/symfony/debug/Symfony/Component/Debug/.gitignore rename to core/vendor/symfony/console/.gitignore diff --git a/core/vendor/symfony/console/Application.php b/core/vendor/symfony/console/Application.php index 11ac33378f7..1ee2831b797 100644 --- a/core/vendor/symfony/console/Application.php +++ b/core/vendor/symfony/console/Application.php @@ -717,7 +717,7 @@ class Application 'args' => array(), )); - for ($i = 0, $count = count($trace); $i < $count; $i++) { + for ($i = 0, $count = count($trace); $i < $count; ++$i) { $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : ''; $type = isset($trace[$i]['type']) ? $trace[$i]['type'] : ''; $function = $trace[$i]['function']; @@ -925,12 +925,12 @@ class Application return new InputDefinition(array( new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'), - new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'), - new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'), - new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'), - new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'), - new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'), - new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'), + new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'), + new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'), + new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'), + new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'), + new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'), + new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'), new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'), )); } diff --git a/core/vendor/symfony/console/Command/HelpCommand.php b/core/vendor/symfony/console/Command/HelpCommand.php index 4cf93624198..ae06af50e59 100644 --- a/core/vendor/symfony/console/Command/HelpCommand.php +++ b/core/vendor/symfony/console/Command/HelpCommand.php @@ -38,7 +38,7 @@ class HelpCommand extends Command ->setDefinition(array( new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'), new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML'), - new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats', 'txt'), + new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'), new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help'), )) ->setDescription('Displays help for a command') @@ -77,6 +77,8 @@ EOF } if ($input->getOption('xml')) { + trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED); + $input->setOption('format', 'xml'); } diff --git a/core/vendor/symfony/console/Command/ListCommand.php b/core/vendor/symfony/console/Command/ListCommand.php index 58868e4706a..c42a6f27d34 100644 --- a/core/vendor/symfony/console/Command/ListCommand.php +++ b/core/vendor/symfony/console/Command/ListCommand.php @@ -69,6 +69,8 @@ EOF protected function execute(InputInterface $input, OutputInterface $output) { if ($input->getOption('xml')) { + trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED); + $input->setOption('format', 'xml'); } @@ -89,7 +91,7 @@ EOF new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'), new InputOption('xml', null, InputOption::VALUE_NONE, 'To output list as XML'), new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'), - new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats', 'txt'), + new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'), )); } } diff --git a/core/vendor/symfony/console/Formatter/OutputFormatter.php b/core/vendor/symfony/console/Formatter/OutputFormatter.php index 90b1970f4b2..a053ac6ba09 100644 --- a/core/vendor/symfony/console/Formatter/OutputFormatter.php +++ b/core/vendor/symfony/console/Formatter/OutputFormatter.php @@ -142,6 +142,7 @@ class OutputFormatter implements OutputFormatterInterface */ public function format($message) { + $message = (string) $message; $offset = 0; $output = ''; $tagRegex = '[a-z][a-z0-9_=;-]*'; diff --git a/core/vendor/symfony/console/Helper/DialogHelper.php b/core/vendor/symfony/console/Helper/DialogHelper.php index ebac99c9e33..886baafd42a 100644 --- a/core/vendor/symfony/console/Helper/DialogHelper.php +++ b/core/vendor/symfony/console/Helper/DialogHelper.php @@ -145,7 +145,7 @@ class DialogHelper extends InputAwareHelper // Backspace Character if ("\177" === $c) { if (0 === $numMatches && 0 !== $i) { - $i--; + --$i; // Move cursor backwards $output->write("\033[1D"); } @@ -198,7 +198,7 @@ class DialogHelper extends InputAwareHelper } else { $output->write($c); $ret .= $c; - $i++; + ++$i; $numMatches = 0; $ofs = 0; diff --git a/core/vendor/symfony/console/Input/ArgvInput.php b/core/vendor/symfony/console/Input/ArgvInput.php index f5cc5d136bd..97b0cfc05d2 100644 --- a/core/vendor/symfony/console/Input/ArgvInput.php +++ b/core/vendor/symfony/console/Input/ArgvInput.php @@ -123,7 +123,7 @@ class ArgvInput extends Input private function parseShortOptionSet($name) { $len = strlen($name); - for ($i = 0; $i < $len; $i++) { + for ($i = 0; $i < $len; ++$i) { if (!$this->definition->hasShortcut($name[$i])) { throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i])); } diff --git a/core/vendor/symfony/console/Input/InputDefinition.php b/core/vendor/symfony/console/Input/InputDefinition.php index 7efb849ab24..044ec265b24 100644 --- a/core/vendor/symfony/console/Input/InputDefinition.php +++ b/core/vendor/symfony/console/Input/InputDefinition.php @@ -391,7 +391,7 @@ class InputDefinition /** * Gets the synopsis. * - * @param bool $short Whether to return the short version (with options foloded) or not + * @param bool $short Whether to return the short version (with options folded) or not * * @return string The synopsis */ diff --git a/core/vendor/symfony/console/Output/StreamOutput.php b/core/vendor/symfony/console/Output/StreamOutput.php index 8de10b4716f..494cded85ed 100644 --- a/core/vendor/symfony/console/Output/StreamOutput.php +++ b/core/vendor/symfony/console/Output/StreamOutput.php @@ -94,7 +94,7 @@ class StreamOutput extends Output */ protected function hasColorSupport() { - if (DIRECTORY_SEPARATOR == '\\') { + if (DIRECTORY_SEPARATOR === '\\') { return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI'); } diff --git a/core/vendor/symfony/console/Question/ChoiceQuestion.php b/core/vendor/symfony/console/Question/ChoiceQuestion.php index ce4ff67779e..9586c5bf3ac 100644 --- a/core/vendor/symfony/console/Question/ChoiceQuestion.php +++ b/core/vendor/symfony/console/Question/ChoiceQuestion.php @@ -149,19 +149,19 @@ class ChoiceQuestion extends Question $result = array_search($value, $choices); if (!$isAssoc) { - if (!empty($result)) { + if (false !== $result) { $result = $choices[$result]; } elseif (isset($choices[$value])) { $result = $choices[$value]; } - } elseif (empty($result) && array_key_exists($value, $choices)) { + } elseif (false === $result && isset($choices[$value])) { $result = $value; } - if (empty($result)) { + if (false === $result) { throw new \InvalidArgumentException(sprintf($errorMessage, $value)); } - array_push($multiselectChoices, $result); + array_push($multiselectChoices, (string) $result); } if ($multiselect) { diff --git a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe index b59fd5b7935e856dc92af806dd500f9346b0e92a..9f4a2aa6357a7dd48f810a66982dc0f78a1c27f6 100644 GIT binary patch delta 12 Tcmez9{>gnpDI@R3(i&v|Cy)h7 delta 10 Rcmez5{?UCx>Bh1eWdI;x1w8-& diff --git a/core/vendor/symfony/console/Style/StyleInterface.php b/core/vendor/symfony/console/Style/StyleInterface.php index 214782e3939..2448547f855 100644 --- a/core/vendor/symfony/console/Style/StyleInterface.php +++ b/core/vendor/symfony/console/Style/StyleInterface.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Console\Style; /** - * Output style helpers + * Output style helpers. * * @author Kevin Bond */ @@ -92,9 +92,9 @@ interface StyleInterface /** * Asks a question. * - * @param string $question - * @param string|null $default - * @param callable|null $validator + * @param string $question + * @param string|null $default + * @param callable|null $validator * * @return string */ @@ -132,7 +132,7 @@ interface StyleInterface public function choice($question, array $choices, $default = null); /** - * Add newline(s) + * Add newline(s). * * @param int $count The number of newlines */ diff --git a/core/vendor/symfony/console/Style/SymfonyStyle.php b/core/vendor/symfony/console/Style/SymfonyStyle.php index 1ccccc9df3c..6d69eca54af 100644 --- a/core/vendor/symfony/console/Style/SymfonyStyle.php +++ b/core/vendor/symfony/console/Style/SymfonyStyle.php @@ -52,15 +52,15 @@ class SymfonyStyle extends OutputStyle /** * Formats a message as a block of text. * - * @param string|array $messages The message to write in the block - * @param string|null $type The block type (added in [] on first line) - * @param string|null $style The style to apply to the whole block - * @param string $prefix The prefix for the block - * @param bool $padding Whether to add vertical padding + * @param string|array $messages The message to write in the block + * @param string|null $type The block type (added in [] on first line) + * @param string|null $style The style to apply to the whole block + * @param string $prefix The prefix for the block + * @param bool $padding Whether to add vertical padding */ public function block($messages, $type = null, $style = null, $prefix = ' ', $padding = false) { - $messages = array_values((array) $messages); + $messages = is_array($messages) ? array_values($messages) : array($messages); $lines = array(); // add type @@ -85,7 +85,7 @@ class SymfonyStyle extends OutputStyle foreach ($lines as &$line) { $line = sprintf('%s%s', $prefix, $line); - $line .= str_repeat(' ', $this->lineLength - Helper::strlen($line)); + $line .= str_repeat(' ', $this->lineLength - Helper::strlenWithoutDecoration($this->getFormatter(), $line)); if ($style) { $line = sprintf('<%s>%s', $style, $line); diff --git a/core/vendor/symfony/console/Tests/Command/CommandTest.php b/core/vendor/symfony/console/Tests/Command/CommandTest.php index 08761163eb2..1f1160efb60 100644 --- a/core/vendor/symfony/console/Tests/Command/CommandTest.php +++ b/core/vendor/symfony/console/Tests/Command/CommandTest.php @@ -167,15 +167,6 @@ class CommandTest extends \PHPUnit_Framework_TestCase $this->assertEquals($formatterHelper->getName(), $command->getHelper('formatter')->getName(), '->getHelper() returns the correct helper'); } - public function testGet() - { - $application = new Application(); - $command = new \TestCommand(); - $command->setApplication($application); - $formatterHelper = new FormatterHelper(); - $this->assertEquals($formatterHelper->getName(), $command->getHelper('formatter')->getName(), '->__get() returns the correct helper'); - } - public function testMergeApplicationDefinition() { $application1 = new Application(); diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_1.json b/core/vendor/symfony/console/Tests/Fixtures/application_1.json index aa4ae9a0dc9..b17b38d8a3e 100644 --- a/core/vendor/symfony/console/Tests/Fixtures/application_1.json +++ b/core/vendor/symfony/console/Tests/Fixtures/application_1.json @@ -1 +1 @@ -{"commands":[{"name":"help","usage":["help [--xml] [--format FORMAT] [--raw] [--] []"],"description":"Displays help for a command","help":"The help<\/info> command displays help for a given command:\n\n php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the --format<\/comment> option:\n\n php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the list<\/info> command.","definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"list","usage":["list [--xml] [--raw] [--format FORMAT] [--] []"],"description":"Lists commands","help":"The list<\/info> command lists all commands:\n\n php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the --format<\/comment> option:\n\n php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n php app\/console list --raw<\/info>","definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]} +{"commands":[{"name":"help","usage":["help [--xml] [--format FORMAT] [--raw] [--] []"],"description":"Displays help for a command","help":"The help<\/info> command displays help for a given command:\n\n php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the --format<\/comment> option:\n\n php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the list<\/info> command.","definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"The output format (txt, xml, json, or md)","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"list","usage":["list [--xml] [--raw] [--format FORMAT] [--] []"],"description":"Lists commands","help":"The list<\/info> command lists all commands:\n\n php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the --format<\/comment> option:\n\n php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n php app\/console list --raw<\/info>","definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"The output format (txt, xml, json, or md)","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]} diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_1.md b/core/vendor/symfony/console/Tests/Fixtures/application_1.md index c3890613892..82a605da699 100644 --- a/core/vendor/symfony/console/Tests/Fixtures/application_1.md +++ b/core/vendor/symfony/console/Tests/Fixtures/application_1.md @@ -51,7 +51,7 @@ To display the list of available commands, please use the list comm * Accept value: yes * Is value required: yes * Is multiple: no -* Description: To output help in other formats +* Description: The output format (txt, xml, json, or md) * Default: `'txt'` **raw:** @@ -197,5 +197,5 @@ It's also possible to get raw list of commands (useful for embedding command run * Accept value: yes * Is value required: yes * Is multiple: no -* Description: To output list in other formats +* Description: The output format (txt, xml, json, or md) * Default: `'txt'` diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_1.xml b/core/vendor/symfony/console/Tests/Fixtures/application_1.xml index ed84905a068..35d1db4dc95 100644 --- a/core/vendor/symfony/console/Tests/Fixtures/application_1.xml +++ b/core/vendor/symfony/console/Tests/Fixtures/application_1.xml @@ -28,7 +28,7 @@ To output help as XML