From b65b47289ff08d57693873f291cfe12e23c55977 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 13 Jul 2015 13:49:14 +0100
Subject: [PATCH] Issue #2504967 by hussainweb, joshtaylor, jibran, Berdir:
Upgrade to Symfony 2.7.1
---
core/.gitignore | 3 +
core/composer.lock | 144 +--
core/vendor/composer/installed.json | 930 +++++++++---------
core/vendor/symfony/browser-kit/Client.php | 2 +-
core/vendor/symfony/browser-kit/Cookie.php | 17 +-
.../symfony/browser-kit/Tests/ClientTest.php | 23 +-
.../symfony/browser-kit/Tests/CookieTest.php | 18 +-
.../symfony/browser-kit/Tests/HistoryTest.php | 6 +-
core/vendor/symfony/class-loader/.gitignore | 3 +
.../class-loader/ApcUniversalClassLoader.php | 2 +-
.../symfony/class-loader/DebugClassLoader.php | 2 +-
.../DebugUniversalClassLoader.php | 2 +-
.../class-loader/UniversalClassLoader.php | 2 +-
core/vendor/symfony/console/Application.php | 10 +-
.../symfony/console/Command/Command.php | 4 +-
.../symfony/console/Command/HelpCommand.php | 2 +-
.../symfony/console/Command/ListCommand.php | 2 +-
.../symfony/console/Helper/DialogHelper.php | 2 +-
.../symfony/console/Helper/HelperSet.php | 6 +-
.../symfony/console/Helper/ProgressBar.php | 4 +-
.../symfony/console/Helper/ProgressHelper.php | 2 +-
core/vendor/symfony/console/Helper/Table.php | 15 +-
.../symfony/console/Helper/TableHelper.php | 2 +-
.../symfony/console/Input/InputDefinition.php | 4 +-
.../symfony/console/Input/StringInput.php | 2 +-
.../symfony/console/Style/SymfonyStyle.php | 109 +-
.../Style/SymfonyStyle/command/command_0.php | 11 +
.../Style/SymfonyStyle/command/command_1.php | 13 +
.../Style/SymfonyStyle/command/command_2.php | 16 +
.../Style/SymfonyStyle/command/command_3.php | 12 +
.../Style/SymfonyStyle/command/command_4.php | 34 +
.../Style/SymfonyStyle/command/command_5.php | 29 +
.../Style/SymfonyStyle/command/command_6.php | 16 +
.../Style/SymfonyStyle/command/command_7.php | 15 +
.../Style/SymfonyStyle/output/output_0.txt | 3 +
.../Style/SymfonyStyle/output/output_1.txt | 9 +
.../Style/SymfonyStyle/output/output_2.txt | 13 +
.../Style/SymfonyStyle/output/output_3.txt | 7 +
.../Style/SymfonyStyle/output/output_4.txt | 32 +
.../Style/SymfonyStyle/output/output_5.txt | 11 +
.../Style/SymfonyStyle/output/output_6.txt | 6 +
.../Style/SymfonyStyle/output/output_7.txt | 5 +
.../console/Tests/Style/SymfonyStyleTest.php | 64 ++
core/vendor/symfony/css-selector/.gitignore | 3 +
.../vendor/symfony/debug/DebugClassLoader.php | 8 +-
core/vendor/symfony/debug/ErrorHandler.php | 8 +-
.../debug/Exception/DummyException.php | 2 +-
.../vendor/symfony/debug/ExceptionHandler.php | 2 +-
.../symfony/dependency-injection/.gitignore | 3 +
.../dependency-injection/ContainerBuilder.php | 10 +-
.../dependency-injection/Definition.php | 16 +-
.../dependency-injection/Dumper/PhpDumper.php | 4 +-
.../Loader/XmlFileLoader.php | 22 +-
.../Loader/YamlFileLoader.php | 4 +
.../dependency-injection/SimpleXMLElement.php | 2 +-
.../Tests/ContainerBuilderTest.php | 7 +-
.../Tests/Fixtures/xml/legacy-services6.xml | 1 +
.../Tests/Fixtures/xml/services6.xml | 1 -
.../Tests/Fixtures/yaml/legacy-services6.yml | 5 +
.../Tests/Fixtures/yaml/services6.yml | 5 -
.../Tests/Loader/XmlFileLoaderTest.php | 9 +-
.../Tests/Loader/YamlFileLoaderTest.php | 9 +-
.../symfony/event-dispatcher/.gitignore | 3 +
.../vendor/symfony/event-dispatcher/Event.php | 4 +-
.../vendor/symfony/http-foundation/.gitignore | 3 +
.../symfony/http-foundation/Request.php | 4 +-
.../symfony/http-foundation/Response.php | 2 +-
.../Session/Flash/FlashBag.php | 2 +-
.../Handler/LegacyPdoSessionHandler.php | 2 +-
.../Tests/BinaryFileResponseTest.php | 2 +-
.../http-foundation/Tests/RequestTest.php | 29 +
core/vendor/symfony/http-kernel/.gitignore | 5 +
.../DataCollector/RequestDataCollector.php | 4 +-
.../http-kernel/Debug/ErrorHandler.php | 2 +-
.../http-kernel/Debug/ExceptionHandler.php | 2 +-
.../Debug/TraceableEventDispatcher.php | 2 +-
.../ContainerAwareHttpKernel.php | 2 +-
.../FragmentRendererPass.php | 2 +-
.../RegisterListenersPass.php | 2 +-
.../EventListener/ErrorsLoggerListener.php | 2 +-
.../http-kernel/EventListener/EsiListener.php | 2 +-
.../EventListener/FragmentListener.php | 2 +-
.../EventListener/LocaleListener.php | 2 +-
.../EventListener/ProfilerListener.php | 2 +-
.../EventListener/RouterListener.php | 4 +-
.../Exception/FatalErrorException.php | 2 +-
.../Exception/FlattenException.php | 2 +-
.../http-kernel/Fragment/FragmentHandler.php | 2 +-
.../symfony/http-kernel/HttpCache/Esi.php | 6 +-
.../HttpCache/EsiResponseCacheStrategy.php | 2 +-
.../EsiResponseCacheStrategyInterface.php | 2 +-
.../http-kernel/HttpCache/HttpCache.php | 4 +-
core/vendor/symfony/http-kernel/Kernel.php | 12 +-
.../symfony/http-kernel/Log/NullLogger.php | 10 +-
.../Profiler/MemcacheProfilerStorage.php | 2 +-
.../DataCollector/ConfigDataCollectorTest.php | 4 +-
core/vendor/symfony/process/.gitignore | 3 +
core/vendor/symfony/process/Process.php | 4 +-
core/vendor/symfony/process/ProcessUtils.php | 2 +-
.../process/Tests/PhpExecutableFinderTest.php | 2 +-
core/vendor/symfony/routing/.gitignore | 3 +
.../symfony/routing/Annotation/Route.php | 20 +-
.../symfony/routing/Loader/XmlFileLoader.php | 20 +-
.../symfony/routing/Loader/YamlFileLoader.php | 20 +-
.../routing/Matcher/ApacheUrlMatcher.php | 2 +-
.../Matcher/Dumper/ApacheMatcherDumper.php | 2 +-
core/vendor/symfony/routing/Route.php | 12 +-
core/vendor/symfony/serializer/.gitignore | 3 +
.../symfony/serializer/Encoder/JsonDecode.php | 2 +-
.../symfony/serializer/Encoder/JsonEncode.php | 2 +-
.../serializer/Encoder/JsonEncoder.php | 4 +-
.../Normalizer/AbstractNormalizer.php | 4 +-
core/vendor/symfony/translation/.gitignore | 3 +
.../translation/Loader/JsonFileLoader.php | 9 +-
.../translation/Loader/MoFileLoader.php | 2 +-
.../translation/Loader/XliffFileLoader.php | 2 +-
.../symfony/translation/MessageSelector.php | 2 +-
.../translation/Tests/MessageSelectorTest.php | 32 +
.../Tests/PluralizationRulesTest.php | 2 +-
.../translation/Tests/TranslatorCacheTest.php | 61 --
.../vendor/symfony/translation/Translator.php | 9 +-
core/vendor/symfony/validator/.gitignore | 3 +
.../symfony/validator/ConstraintValidator.php | 4 +-
.../symfony/validator/ConstraintViolation.php | 4 +-
.../validator/Constraints/Callback.php | 2 +-
.../Constraints/Collection/Optional.php | 2 +-
.../Constraints/Collection/Required.php | 2 +-
.../symfony/validator/Constraints/False.php | 2 +-
.../validator/Constraints/FalseValidator.php | 2 +-
.../validator/Constraints/GroupSequence.php | 12 +-
.../validator/Constraints/IsbnValidator.php | 4 +-
.../symfony/validator/Constraints/Null.php | 2 +-
.../validator/Constraints/NullValidator.php | 2 +-
.../symfony/validator/Constraints/True.php | 2 +-
.../validator/Constraints/TrueValidator.php | 2 +-
.../symfony/validator/Constraints/Valid.php | 2 +-
.../validator/Context/ExecutionContext.php | 10 +-
.../Context/LegacyExecutionContext.php | 2 +-
.../Context/LegacyExecutionContextFactory.php | 2 +-
.../symfony/validator/DefaultTranslator.php | 2 +-
.../symfony/validator/ExecutionContext.php | 2 +-
.../validator/ExecutionContextInterface.php | 4 +-
.../Mapping/BlackholeMetadataFactory.php | 2 +-
.../validator/Mapping/Cache/ApcCache.php | 2 +-
.../validator/Mapping/ClassMetadata.php | 8 +-
.../Mapping/ClassMetadataFactory.php | 2 +-
.../validator/Mapping/ElementMetadata.php | 2 +-
.../validator/Mapping/MemberMetadata.php | 8 +-
.../AbstractConstraintValidatorTest.php | 4 +-
.../symfony/validator/ValidationVisitor.php | 2 +-
core/vendor/symfony/validator/Validator.php | 2 +-
.../validator/Validator/LegacyValidator.php | 2 +-
.../Validator/RecursiveValidator.php | 6 +-
.../symfony/validator/ValidatorBuilder.php | 4 +-
.../LegacyConstraintViolationBuilder.php | 2 +-
core/vendor/symfony/yaml/.gitignore | 3 +
core/vendor/symfony/yaml/Yaml.php | 6 +-
157 files changed, 1365 insertions(+), 855 deletions(-)
create mode 100644 core/vendor/symfony/class-loader/.gitignore
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
create mode 100644 core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt
create mode 100644 core/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php
create mode 100644 core/vendor/symfony/css-selector/.gitignore
create mode 100644 core/vendor/symfony/dependency-injection/.gitignore
create mode 100644 core/vendor/symfony/event-dispatcher/.gitignore
create mode 100644 core/vendor/symfony/http-foundation/.gitignore
create mode 100644 core/vendor/symfony/http-kernel/.gitignore
create mode 100644 core/vendor/symfony/process/.gitignore
create mode 100644 core/vendor/symfony/routing/.gitignore
create mode 100644 core/vendor/symfony/serializer/.gitignore
create mode 100644 core/vendor/symfony/translation/.gitignore
create mode 100644 core/vendor/symfony/validator/.gitignore
create mode 100644 core/vendor/symfony/yaml/.gitignore
diff --git a/core/.gitignore b/core/.gitignore
index 91bd4cddab29..74b6a4c796d1 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -14,3 +14,6 @@ vendor/symfony/translation/Symfony/Component/Translation/*
# PHPUnit provides some binary dependencies that are already available.
vendor/phpunit/phpunit/build/dependencies
+
+# The PHAR file below contains CRLF characters that cause a problem with PIFR.
+vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar
diff --git a/core/composer.lock b/core/composer.lock
index 829db157b6e1..0ee64d874658 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -2194,16 +2194,16 @@
},
{
"name": "symfony/browser-kit",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/BrowserKit.git",
- "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400"
+ "reference": "d0a144a1a96d5dc90bed2814b2096a1322761672"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/70cdc18dd601a486a8cc69ee26367cbaedd60400",
- "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400",
+ "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/d0a144a1a96d5dc90bed2814b2096a1322761672",
+ "reference": "d0a144a1a96d5dc90bed2814b2096a1322761672",
"shasum": ""
},
"require": {
@@ -2245,20 +2245,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2015-05-02 15:21:08"
+ "time": "2015-06-04 20:11:48"
},
{
"name": "symfony/class-loader",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/ClassLoader.git",
- "reference": "fa19598cb708b92d983b34aae313f57c217f9386"
+ "reference": "84843730de48ca0feba91004a03c7c952f8ea1da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/fa19598cb708b92d983b34aae313f57c217f9386",
- "reference": "fa19598cb708b92d983b34aae313f57c217f9386",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/84843730de48ca0feba91004a03c7c952f8ea1da",
+ "reference": "84843730de48ca0feba91004a03c7c952f8ea1da",
"shasum": ""
},
"require": {
@@ -2295,20 +2295,20 @@
],
"description": "Symfony ClassLoader Component",
"homepage": "https://symfony.com",
- "time": "2015-05-15 13:33:16"
+ "time": "2015-06-08 09:37:21"
},
{
"name": "symfony/console",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399"
+ "reference": "564398bc1f33faf92fc2ec86859983d30eb81806"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
- "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/564398bc1f33faf92fc2ec86859983d30eb81806",
+ "reference": "564398bc1f33faf92fc2ec86859983d30eb81806",
"shasum": ""
},
"require": {
@@ -2352,11 +2352,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2015-05-29 16:22:24"
+ "time": "2015-06-10 15:30:22"
},
{
"name": "symfony/css-selector",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
@@ -2409,16 +2409,16 @@
},
{
"name": "symfony/debug",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/Debug.git",
- "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d"
+ "reference": "075070230c5bbc65abde8241191655bbce0716e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d",
- "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d",
+ "url": "https://api.github.com/repos/symfony/Debug/zipball/075070230c5bbc65abde8241191655bbce0716e2",
+ "reference": "075070230c5bbc65abde8241191655bbce0716e2",
"shasum": ""
},
"require": {
@@ -2465,20 +2465,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2015-05-22 14:54:25"
+ "time": "2015-06-08 09:37:21"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/DependencyInjection.git",
- "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d"
+ "reference": "1a409e52a38ec891de0a7a61a191d1c62080b69d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
- "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/1a409e52a38ec891de0a7a61a191d1c62080b69d",
+ "reference": "1a409e52a38ec891de0a7a61a191d1c62080b69d",
"shasum": ""
},
"require": {
@@ -2525,11 +2525,11 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2015-05-29 14:44:44"
+ "time": "2015-06-11 19:13:11"
},
{
"name": "symfony/dom-crawler",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/DomCrawler.git",
@@ -2582,16 +2582,16 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "687039686d0e923429ba6e958d0baa920cd5d458"
+ "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/687039686d0e923429ba6e958d0baa920cd5d458",
- "reference": "687039686d0e923429ba6e958d0baa920cd5d458",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
+ "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
"shasum": ""
},
"require": {
@@ -2636,20 +2636,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2015-05-02 15:21:08"
+ "time": "2015-06-08 09:37:21"
},
{
"name": "symfony/http-foundation",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
- "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb"
+ "reference": "4f363c426b0ced57e3d14460022feb63937980ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/729de183da037c125c5f6366bd4f0631ba1a1abb",
- "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb",
+ "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/4f363c426b0ced57e3d14460022feb63937980ff",
+ "reference": "4f363c426b0ced57e3d14460022feb63937980ff",
"shasum": ""
},
"require": {
@@ -2689,20 +2689,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2015-05-22 14:54:25"
+ "time": "2015-06-10 15:30:22"
},
{
"name": "symfony/http-kernel",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
- "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16"
+ "reference": "208101c7a11e31933183bd2a380486e528c74302"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
- "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/208101c7a11e31933183bd2a380486e528c74302",
+ "reference": "208101c7a11e31933183bd2a380486e528c74302",
"shasum": ""
},
"require": {
@@ -2769,20 +2769,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2015-05-30 16:52:28"
+ "time": "2015-06-11 21:15:28"
},
{
"name": "symfony/process",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1"
+ "reference": "552d8efdc80980cbcca50b28d626ac8e36e3cdd1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
- "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/552d8efdc80980cbcca50b28d626ac8e36e3cdd1",
+ "reference": "552d8efdc80980cbcca50b28d626ac8e36e3cdd1",
"shasum": ""
},
"require": {
@@ -2818,7 +2818,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2015-05-15 13:33:16"
+ "time": "2015-06-08 09:37:21"
},
{
"name": "symfony/psr-http-message-bridge",
@@ -2876,16 +2876,16 @@
},
{
"name": "symfony/routing",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
- "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9"
+ "reference": "5581be29185b8fb802398904555f70da62f6d50d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Routing/zipball/6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
- "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/5581be29185b8fb802398904555f70da62f6d50d",
+ "reference": "5581be29185b8fb802398904555f70da62f6d50d",
"shasum": ""
},
"require": {
@@ -2943,20 +2943,20 @@
"uri",
"url"
],
- "time": "2015-05-19 06:58:17"
+ "time": "2015-06-11 17:20:40"
},
{
"name": "symfony/serializer",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/Serializer.git",
- "reference": "634d3adf119396320fba4c14caa01390700e7f3b"
+ "reference": "edf2820c4948389e3f168a0160151806cefd6ac3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Serializer/zipball/634d3adf119396320fba4c14caa01390700e7f3b",
- "reference": "634d3adf119396320fba4c14caa01390700e7f3b",
+ "url": "https://api.github.com/repos/symfony/Serializer/zipball/edf2820c4948389e3f168a0160151806cefd6ac3",
+ "reference": "edf2820c4948389e3f168a0160151806cefd6ac3",
"shasum": ""
},
"require": {
@@ -3004,20 +3004,20 @@
],
"description": "Symfony Serializer Component",
"homepage": "https://symfony.com",
- "time": "2015-05-29 14:44:44"
+ "time": "2015-06-08 09:37:21"
},
{
"name": "symfony/translation",
- "version": "v2.7.0-BETA2",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
- "reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f"
+ "reference": "8349a2b0d11bd0311df9e8914408080912983a0b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
- "reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/8349a2b0d11bd0311df9e8914408080912983a0b",
+ "reference": "8349a2b0d11bd0311df9e8914408080912983a0b",
"shasum": ""
},
"require": {
@@ -3065,20 +3065,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2015-05-11 02:35:29"
+ "time": "2015-06-11 17:26:34"
},
{
"name": "symfony/validator",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/Validator.git",
- "reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824"
+ "reference": "3c58b1ef26ab2114f8f84d1808937b9b76bad8f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Validator/zipball/3a5461a388ff8962790fd5a39e6e2da84ba1e824",
- "reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824",
+ "url": "https://api.github.com/repos/symfony/Validator/zipball/3c58b1ef26ab2114f8f84d1808937b9b76bad8f5",
+ "reference": "3c58b1ef26ab2114f8f84d1808937b9b76bad8f5",
"shasum": ""
},
"require": {
@@ -3135,20 +3135,20 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
- "time": "2015-05-29 14:44:44"
+ "time": "2015-06-08 09:37:21"
},
{
"name": "symfony/yaml",
- "version": "v2.7.0",
+ "version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3"
+ "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/4a29a5248aed4fb45f626a7bbbd330291492f5c3",
- "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/9808e75c609a14f6db02f70fccf4ca4aab53c160",
+ "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160",
"shasum": ""
},
"require": {
@@ -3184,7 +3184,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2015-05-02 15:21:08"
+ "time": "2015-06-10 15:30:22"
},
{
"name": "twig/twig",
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index fa618a835159..36a7285271eb 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -2373,38 +2373,34 @@
"homepage": "http://vfs.bovigo.org/"
},
{
- "name": "symfony/class-loader",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "doctrine/lexer",
+ "version": "v1.0.1",
+ "version_normalized": "1.0.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/ClassLoader.git",
- "reference": "fa19598cb708b92d983b34aae313f57c217f9386"
+ "url": "https://github.com/doctrine/lexer.git",
+ "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/fa19598cb708b92d983b34aae313f57c217f9386",
- "reference": "fa19598cb708b92d983b34aae313f57c217f9386",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+ "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
- },
- "require-dev": {
- "symfony/finder": "~2.0,>=2.0.5",
- "symfony/phpunit-bridge": "~2.7"
+ "php": ">=5.3.2"
},
- "time": "2015-05-15 13:33:16",
+ "time": "2014-09-09 13:34:57",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Symfony\\Component\\ClassLoader\\": ""
+ "psr-0": {
+ "Doctrine\\Common\\Lexer\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2413,49 +2409,54 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
- "description": "Symfony ClassLoader Component",
- "homepage": "https://symfony.com"
+ "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "lexer",
+ "parser"
+ ]
},
{
- "name": "symfony/css-selector",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "psr/http-message",
+ "version": "1.0",
+ "version_normalized": "1.0.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/CssSelector.git",
- "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092"
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/0b5c07b516226b7dd32afbbc82fe547a469c5092",
- "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+ "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "php": ">=5.3.0"
},
- "time": "2015-05-15 13:33:16",
+ "time": "2015-05-04 20:22:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\CssSelector\\": ""
+ "Psr\\Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2464,64 +2465,52 @@
],
"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"
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
}
],
- "description": "Symfony CssSelector Component",
- "homepage": "https://symfony.com"
+ "description": "Common interface for HTTP messages",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ]
},
{
- "name": "symfony/dependency-injection",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/psr-http-message-bridge",
+ "version": "v0.2",
+ "version_normalized": "0.2.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/DependencyInjection.git",
- "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d"
+ "url": "https://github.com/symfony/psr-http-message-bridge.git",
+ "reference": "dc7e308e1dc2898a46776e2221a643cb08315453"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
- "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
+ "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453",
+ "reference": "dc7e308e1dc2898a46776e2221a643cb08315453",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
- },
- "conflict": {
- "symfony/expression-language": "<2.6"
+ "php": ">=5.3.3",
+ "psr/http-message": "~1.0",
+ "symfony/http-foundation": "~2.3|~3.0"
},
"require-dev": {
- "symfony/config": "~2.2",
- "symfony/expression-language": "~2.6",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.1"
+ "symfony/phpunit-bridge": "~2.7|~3.0"
},
"suggest": {
- "symfony/config": "",
- "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
- "symfony/yaml": ""
- },
- "time": "2015-05-29 14:44:44",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7-dev"
- }
+ "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
},
+ "time": "2015-05-29 17:57:12",
+ "type": "symfony-bridge",
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\DependencyInjection\\": ""
+ "Symfony\\Bridge\\PsrHttpMessage\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2530,103 +2519,97 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
- "description": "Symfony DependencyInjection Component",
- "homepage": "https://symfony.com"
+ "description": "PSR HTTP message bridge",
+ "homepage": "http://symfony.com",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr-7"
+ ]
},
{
- "name": "symfony/http-foundation",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "zendframework/zend-diactoros",
+ "version": "1.1.0",
+ "version_normalized": "1.1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpFoundation.git",
- "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb"
+ "url": "https://github.com/zendframework/zend-diactoros.git",
+ "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/729de183da037c125c5f6366bd4f0631ba1a1abb",
- "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb",
+ "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
+ "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.4",
+ "psr/http-message": "~1.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "~1.0.0"
},
"require-dev": {
- "symfony/expression-language": "~2.4",
- "symfony/phpunit-bridge": "~2.7"
+ "phpunit/phpunit": "~4.6",
+ "squizlabs/php_codesniffer": "^2.3.1"
},
- "time": "2015-05-22 14:54:25",
+ "time": "2015-06-24 20:42:54",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.0-dev",
+ "dev-develop": "1.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\HttpFoundation\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
+ "Zend\\Diactoros\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
+ "BSD-2-Clause"
],
- "description": "Symfony HttpFoundation Component",
- "homepage": "https://symfony.com"
+ "description": "PSR HTTP Message implementations",
+ "homepage": "https://github.com/zendframework/zend-diactoros",
+ "keywords": [
+ "http",
+ "psr",
+ "psr-7"
+ ]
},
{
- "name": "symfony/event-dispatcher",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/class-loader",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "687039686d0e923429ba6e958d0baa920cd5d458"
+ "url": "https://github.com/symfony/ClassLoader.git",
+ "reference": "84843730de48ca0feba91004a03c7c952f8ea1da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/687039686d0e923429ba6e958d0baa920cd5d458",
- "reference": "687039686d0e923429ba6e958d0baa920cd5d458",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/84843730de48ca0feba91004a03c7c952f8ea1da",
+ "reference": "84843730de48ca0feba91004a03c7c952f8ea1da",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/config": "~2.0,>=2.0.5",
- "symfony/dependency-injection": "~2.6",
- "symfony/expression-language": "~2.6",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/stopwatch": "~2.3"
- },
- "suggest": {
- "symfony/dependency-injection": "",
- "symfony/http-kernel": ""
+ "symfony/finder": "~2.0,>=2.0.5",
+ "symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-05-02 15:21:08",
+ "time": "2015-06-08 09:37:21",
"type": "library",
"extra": {
"branch-alias": {
@@ -2636,7 +2619,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\EventDispatcher\\": ""
+ "Symfony\\Component\\ClassLoader\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2653,62 +2636,39 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony EventDispatcher Component",
+ "description": "Symfony ClassLoader Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/http-kernel",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/console",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/HttpKernel.git",
- "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16"
+ "url": "https://github.com/symfony/Console.git",
+ "reference": "564398bc1f33faf92fc2ec86859983d30eb81806"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
- "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/564398bc1f33faf92fc2ec86859983d30eb81806",
+ "reference": "564398bc1f33faf92fc2ec86859983d30eb81806",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "psr/log": "~1.0",
- "symfony/debug": "~2.6,>=2.6.2",
- "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
- "symfony/http-foundation": "~2.5,>=2.5.4"
- },
- "conflict": {
- "symfony/config": "<2.7"
+ "php": ">=5.3.9"
},
"require-dev": {
- "symfony/browser-kit": "~2.3",
- "symfony/class-loader": "~2.1",
- "symfony/config": "~2.7",
- "symfony/console": "~2.3",
- "symfony/css-selector": "~2.0,>=2.0.5",
- "symfony/dependency-injection": "~2.2",
- "symfony/dom-crawler": "~2.0,>=2.0.5",
- "symfony/expression-language": "~2.4",
- "symfony/finder": "~2.0,>=2.0.5",
+ "psr/log": "~1.0",
+ "symfony/event-dispatcher": "~2.1",
"symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.0,>=2.0.5",
- "symfony/routing": "~2.2",
- "symfony/stopwatch": "~2.3",
- "symfony/templating": "~2.2",
- "symfony/translation": "~2.0,>=2.0.5",
- "symfony/var-dumper": "~2.6"
+ "symfony/process": "~2.1"
},
"suggest": {
- "symfony/browser-kit": "",
- "symfony/class-loader": "",
- "symfony/config": "",
- "symfony/console": "",
- "symfony/dependency-injection": "",
- "symfony/finder": "",
- "symfony/var-dumper": ""
+ "psr/log": "For using the console logger",
+ "symfony/event-dispatcher": "",
+ "symfony/process": ""
},
- "time": "2015-05-30 16:52:28",
+ "time": "2015-06-10 15:30:22",
"type": "library",
"extra": {
"branch-alias": {
@@ -2718,7 +2678,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\HttpKernel\\": ""
+ "Symfony\\Component\\Console\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2735,47 +2695,31 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony HttpKernel Component",
+ "description": "Symfony Console Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/routing",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/css-selector",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Routing.git",
- "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9"
+ "url": "https://github.com/symfony/CssSelector.git",
+ "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Routing/zipball/6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
- "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/0b5c07b516226b7dd32afbbc82fe547a469c5092",
+ "reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
- "conflict": {
- "symfony/config": "<2.7"
- },
"require-dev": {
- "doctrine/annotations": "~1.0",
- "doctrine/common": "~2.2",
- "psr/log": "~1.0",
- "symfony/config": "~2.7",
- "symfony/expression-language": "~2.4",
- "symfony/http-foundation": "~2.3",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.0,>=2.0.5"
- },
- "suggest": {
- "doctrine/annotations": "For using the annotation loader",
- "symfony/config": "For using the all-in-one router or any loader",
- "symfony/expression-language": "For using expression matching",
- "symfony/yaml": "For using the YAML loader"
+ "symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-05-19 06:58:17",
+ "time": "2015-05-15 13:33:16",
"type": "library",
"extra": {
"branch-alias": {
@@ -2785,7 +2729,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Routing\\": ""
+ "Symfony\\Component\\CssSelector\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2793,6 +2737,10 @@
"MIT"
],
"authors": [
+ {
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
@@ -2802,49 +2750,42 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Routing Component",
- "homepage": "https://symfony.com",
- "keywords": [
- "router",
- "routing",
- "uri",
- "url"
- ]
+ "description": "Symfony CssSelector Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "symfony/serializer",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/dependency-injection",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Serializer.git",
- "reference": "634d3adf119396320fba4c14caa01390700e7f3b"
+ "url": "https://github.com/symfony/DependencyInjection.git",
+ "reference": "1a409e52a38ec891de0a7a61a191d1c62080b69d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Serializer/zipball/634d3adf119396320fba4c14caa01390700e7f3b",
- "reference": "634d3adf119396320fba4c14caa01390700e7f3b",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/1a409e52a38ec891de0a7a61a191d1c62080b69d",
+ "reference": "1a409e52a38ec891de0a7a61a191d1c62080b69d",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
+ "conflict": {
+ "symfony/expression-language": "<2.6"
+ },
"require-dev": {
- "doctrine/annotations": "~1.0",
- "doctrine/cache": "~1.0",
"symfony/config": "~2.2",
+ "symfony/expression-language": "~2.6",
"symfony/phpunit-bridge": "~2.7",
- "symfony/property-access": "~2.3",
- "symfony/yaml": "~2.0"
+ "symfony/yaml": "~2.1"
},
"suggest": {
- "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
- "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
- "symfony/config": "For using the XML mapping loader.",
- "symfony/property-access": "For using the ObjectNormalizer.",
- "symfony/yaml": "For using the default YAML mapping loader."
+ "symfony/config": "",
+ "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+ "symfony/yaml": ""
},
- "time": "2015-05-29 14:44:44",
+ "time": "2015-06-11 19:13:11",
"type": "library",
"extra": {
"branch-alias": {
@@ -2854,7 +2795,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Serializer\\": ""
+ "Symfony\\Component\\DependencyInjection\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2871,43 +2812,42 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Serializer Component",
+ "description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/translation",
- "version": "v2.7.0-BETA2",
- "version_normalized": "2.7.0.0-beta2",
+ "name": "symfony/debug",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Translation.git",
- "reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f"
+ "url": "https://github.com/symfony/Debug.git",
+ "reference": "075070230c5bbc65abde8241191655bbce0716e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
- "reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
+ "url": "https://api.github.com/repos/symfony/Debug/zipball/075070230c5bbc65abde8241191655bbce0716e2",
+ "reference": "075070230c5bbc65abde8241191655bbce0716e2",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.3.9",
+ "psr/log": "~1.0"
},
"conflict": {
- "symfony/config": "<2.7"
+ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/config": "~2.7",
- "symfony/intl": "~2.3",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.2"
+ "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": {
- "psr/log": "To use logging capability in translator",
- "symfony/config": "",
- "symfony/yaml": ""
+ "symfony/http-foundation": "",
+ "symfony/http-kernel": ""
},
- "time": "2015-05-11 02:35:29",
+ "time": "2015-06-08 09:37:21",
"type": "library",
"extra": {
"branch-alias": {
@@ -2917,7 +2857,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Translation\\": ""
+ "Symfony\\Component\\Debug\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2934,52 +2874,32 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Translation Component",
+ "description": "Symfony Debug Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/validator",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/http-foundation",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Validator.git",
- "reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824"
+ "url": "https://github.com/symfony/HttpFoundation.git",
+ "reference": "4f363c426b0ced57e3d14460022feb63937980ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Validator/zipball/3a5461a388ff8962790fd5a39e6e2da84ba1e824",
- "reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824",
+ "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/4f363c426b0ced57e3d14460022feb63937980ff",
+ "reference": "4f363c426b0ced57e3d14460022feb63937980ff",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "symfony/translation": "~2.4"
+ "php": ">=5.3.9"
},
"require-dev": {
- "doctrine/annotations": "~1.0",
- "doctrine/cache": "~1.0",
- "egulias/email-validator": "~1.2,>=1.2.1",
- "symfony/config": "~2.2",
"symfony/expression-language": "~2.4",
- "symfony/http-foundation": "~2.1",
- "symfony/intl": "~2.3",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/property-access": "~2.3",
- "symfony/yaml": "~2.0,>=2.0.5"
- },
- "suggest": {
- "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
- "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
- "egulias/email-validator": "Strict (RFC compliant) email validation",
- "symfony/config": "",
- "symfony/expression-language": "For using the 2.4 Expression validator",
- "symfony/http-foundation": "",
- "symfony/intl": "",
- "symfony/property-access": "For using the 2.4 Validator API",
- "symfony/yaml": ""
+ "symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-05-29 14:44:44",
+ "time": "2015-06-10 15:30:22",
"type": "library",
"extra": {
"branch-alias": {
@@ -2989,8 +2909,11 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Validator\\": ""
- }
+ "Symfony\\Component\\HttpFoundation\\": ""
+ },
+ "classmap": [
+ "Resources/stubs"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3006,31 +2929,40 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Validator Component",
+ "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/process",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/event-dispatcher",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process.git",
- "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1"
+ "url": "https://github.com/symfony/EventDispatcher.git",
+ "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
- "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
+ "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "psr/log": "~1.0",
+ "symfony/config": "~2.0,>=2.0.5",
+ "symfony/dependency-injection": "~2.6",
+ "symfony/expression-language": "~2.6",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/stopwatch": "~2.3"
},
- "time": "2015-05-15 13:33:16",
+ "suggest": {
+ "symfony/dependency-injection": "",
+ "symfony/http-kernel": ""
+ },
+ "time": "2015-06-08 09:37:21",
"type": "library",
"extra": {
"branch-alias": {
@@ -3040,7 +2972,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Process\\": ""
+ "Symfony\\Component\\EventDispatcher\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3057,31 +2989,62 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Process Component",
+ "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/yaml",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/http-kernel",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3"
+ "url": "https://github.com/symfony/HttpKernel.git",
+ "reference": "208101c7a11e31933183bd2a380486e528c74302"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/4a29a5248aed4fb45f626a7bbbd330291492f5c3",
- "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/208101c7a11e31933183bd2a380486e528c74302",
+ "reference": "208101c7a11e31933183bd2a380486e528c74302",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.3.9",
+ "psr/log": "~1.0",
+ "symfony/debug": "~2.6,>=2.6.2",
+ "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
+ "symfony/http-foundation": "~2.5,>=2.5.4"
+ },
+ "conflict": {
+ "symfony/config": "<2.7"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/browser-kit": "~2.3",
+ "symfony/class-loader": "~2.1",
+ "symfony/config": "~2.7",
+ "symfony/console": "~2.3",
+ "symfony/css-selector": "~2.0,>=2.0.5",
+ "symfony/dependency-injection": "~2.2",
+ "symfony/dom-crawler": "~2.0,>=2.0.5",
+ "symfony/expression-language": "~2.4",
+ "symfony/finder": "~2.0,>=2.0.5",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/process": "~2.0,>=2.0.5",
+ "symfony/routing": "~2.2",
+ "symfony/stopwatch": "~2.3",
+ "symfony/templating": "~2.2",
+ "symfony/translation": "~2.0,>=2.0.5",
+ "symfony/var-dumper": "~2.6"
},
- "time": "2015-05-02 15:21:08",
+ "suggest": {
+ "symfony/browser-kit": "",
+ "symfony/class-loader": "",
+ "symfony/config": "",
+ "symfony/console": "",
+ "symfony/dependency-injection": "",
+ "symfony/finder": "",
+ "symfony/var-dumper": ""
+ },
+ "time": "2015-06-11 21:15:28",
"type": "library",
"extra": {
"branch-alias": {
@@ -3091,7 +3054,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Yaml\\": ""
+ "Symfony\\Component\\HttpKernel\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3108,39 +3071,47 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Yaml Component",
+ "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/console",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/routing",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Console.git",
- "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399"
+ "url": "https://github.com/symfony/Routing.git",
+ "reference": "5581be29185b8fb802398904555f70da62f6d50d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
- "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/5581be29185b8fb802398904555f70da62f6d50d",
+ "reference": "5581be29185b8fb802398904555f70da62f6d50d",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
+ "conflict": {
+ "symfony/config": "<2.7"
+ },
"require-dev": {
+ "doctrine/annotations": "~1.0",
+ "doctrine/common": "~2.2",
"psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1",
+ "symfony/config": "~2.7",
+ "symfony/expression-language": "~2.4",
+ "symfony/http-foundation": "~2.3",
"symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.1"
+ "symfony/yaml": "~2.0,>=2.0.5"
},
"suggest": {
- "psr/log": "For using the console logger",
- "symfony/event-dispatcher": "",
- "symfony/process": ""
+ "doctrine/annotations": "For using the annotation loader",
+ "symfony/config": "For using the all-in-one router or any loader",
+ "symfony/expression-language": "For using expression matching",
+ "symfony/yaml": "For using the YAML loader"
},
- "time": "2015-05-29 16:22:24",
+ "time": "2015-06-11 17:20:40",
"type": "library",
"extra": {
"branch-alias": {
@@ -3150,7 +3121,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Console\\": ""
+ "Symfony\\Component\\Routing\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3167,42 +3138,49 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Console Component",
- "homepage": "https://symfony.com"
+ "description": "Symfony Routing Component",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "router",
+ "routing",
+ "uri",
+ "url"
+ ]
},
{
- "name": "symfony/debug",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/serializer",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Debug.git",
- "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d"
+ "url": "https://github.com/symfony/Serializer.git",
+ "reference": "edf2820c4948389e3f168a0160151806cefd6ac3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d",
- "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d",
+ "url": "https://api.github.com/repos/symfony/Serializer/zipball/edf2820c4948389e3f168a0160151806cefd6ac3",
+ "reference": "edf2820c4948389e3f168a0160151806cefd6ac3",
"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"
+ "php": ">=5.3.9"
+ },
+ "require-dev": {
+ "doctrine/annotations": "~1.0",
+ "doctrine/cache": "~1.0",
+ "symfony/config": "~2.2",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/property-access": "~2.3",
+ "symfony/yaml": "~2.0"
},
"suggest": {
- "symfony/http-foundation": "",
- "symfony/http-kernel": ""
+ "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+ "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+ "symfony/config": "For using the XML mapping loader.",
+ "symfony/property-access": "For using the ObjectNormalizer.",
+ "symfony/yaml": "For using the default YAML mapping loader."
},
- "time": "2015-05-22 14:54:25",
+ "time": "2015-06-08 09:37:21",
"type": "library",
"extra": {
"branch-alias": {
@@ -3212,7 +3190,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Debug\\": ""
+ "Symfony\\Component\\Serializer\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3229,35 +3207,43 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Debug Component",
+ "description": "Symfony Serializer Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/dom-crawler",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/translation",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/DomCrawler.git",
- "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3"
+ "url": "https://github.com/symfony/Translation.git",
+ "reference": "8349a2b0d11bd0311df9e8914408080912983a0b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3",
- "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/8349a2b0d11bd0311df9e8914408080912983a0b",
+ "reference": "8349a2b0d11bd0311df9e8914408080912983a0b",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
+ "conflict": {
+ "symfony/config": "<2.7"
+ },
"require-dev": {
- "symfony/css-selector": "~2.3",
- "symfony/phpunit-bridge": "~2.7"
+ "psr/log": "~1.0",
+ "symfony/config": "~2.7",
+ "symfony/intl": "~2.3",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/yaml": "~2.2"
},
"suggest": {
- "symfony/css-selector": ""
+ "psr/log": "To use logging capability in translator",
+ "symfony/config": "",
+ "symfony/yaml": ""
},
- "time": "2015-05-22 14:54:25",
+ "time": "2015-06-11 17:26:34",
"type": "library",
"extra": {
"branch-alias": {
@@ -3267,7 +3253,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\DomCrawler\\": ""
+ "Symfony\\Component\\Translation\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3284,37 +3270,52 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony DomCrawler Component",
+ "description": "Symfony Translation Component",
"homepage": "https://symfony.com"
},
{
- "name": "symfony/browser-kit",
- "version": "v2.7.0",
- "version_normalized": "2.7.0.0",
+ "name": "symfony/validator",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/BrowserKit.git",
- "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400"
+ "url": "https://github.com/symfony/Validator.git",
+ "reference": "3c58b1ef26ab2114f8f84d1808937b9b76bad8f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/70cdc18dd601a486a8cc69ee26367cbaedd60400",
- "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400",
+ "url": "https://api.github.com/repos/symfony/Validator/zipball/3c58b1ef26ab2114f8f84d1808937b9b76bad8f5",
+ "reference": "3c58b1ef26ab2114f8f84d1808937b9b76bad8f5",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
- "symfony/dom-crawler": "~2.0,>=2.0.5"
+ "symfony/translation": "~2.4"
},
"require-dev": {
- "symfony/css-selector": "~2.0,>=2.0.5",
+ "doctrine/annotations": "~1.0",
+ "doctrine/cache": "~1.0",
+ "egulias/email-validator": "~1.2,>=1.2.1",
+ "symfony/config": "~2.2",
+ "symfony/expression-language": "~2.4",
+ "symfony/http-foundation": "~2.1",
+ "symfony/intl": "~2.3",
"symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.0,>=2.0.5"
+ "symfony/property-access": "~2.3",
+ "symfony/yaml": "~2.0,>=2.0.5"
},
"suggest": {
- "symfony/process": ""
+ "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+ "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+ "egulias/email-validator": "Strict (RFC compliant) email validation",
+ "symfony/config": "",
+ "symfony/expression-language": "For using the 2.4 Expression validator",
+ "symfony/http-foundation": "",
+ "symfony/intl": "",
+ "symfony/property-access": "For using the 2.4 Validator API",
+ "symfony/yaml": ""
},
- "time": "2015-05-02 15:21:08",
+ "time": "2015-06-08 09:37:21",
"type": "library",
"extra": {
"branch-alias": {
@@ -3324,7 +3325,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\BrowserKit\\": ""
+ "Symfony\\Component\\Validator\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3341,38 +3342,41 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony BrowserKit Component",
+ "description": "Symfony Validator Component",
"homepage": "https://symfony.com"
},
{
- "name": "doctrine/lexer",
- "version": "v1.0.1",
- "version_normalized": "1.0.1.0",
+ "name": "symfony/process",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/lexer.git",
- "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+ "url": "https://github.com/symfony/Process.git",
+ "reference": "552d8efdc80980cbcca50b28d626ac8e36e3cdd1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
- "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/552d8efdc80980cbcca50b28d626ac8e36e3cdd1",
+ "reference": "552d8efdc80980cbcca50b28d626ac8e36e3cdd1",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.3.9"
},
- "time": "2014-09-09 13:34:57",
+ "require-dev": {
+ "symfony/phpunit-bridge": "~2.7"
+ },
+ "time": "2015-06-08 09:37:21",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Lexer\\": "lib/"
+ "psr-4": {
+ "Symfony\\Component\\Process\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3381,54 +3385,49 @@
],
"authors": [
{
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
},
{
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "lexer",
- "parser"
- ]
+ "description": "Symfony Process Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "psr/http-message",
- "version": "1.0",
- "version_normalized": "1.0.0.0",
+ "name": "symfony/yaml",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/http-message.git",
- "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
- "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/9808e75c609a14f6db02f70fccf4ca4aab53c160",
+ "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=5.3.9"
},
- "time": "2015-05-04 20:22:00",
+ "require-dev": {
+ "symfony/phpunit-bridge": "~2.7"
+ },
+ "time": "2015-06-10 15:30:22",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Psr\\Http\\Message\\": "src/"
+ "Symfony\\Component\\Yaml\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3437,52 +3436,53 @@
],
"authors": [
{
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Common interface for HTTP messages",
- "keywords": [
- "http",
- "http-message",
- "psr",
- "psr-7",
- "request",
- "response"
- ]
+ "description": "Symfony Yaml Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "symfony/psr-http-message-bridge",
- "version": "v0.2",
- "version_normalized": "0.2.0.0",
+ "name": "symfony/dom-crawler",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/psr-http-message-bridge.git",
- "reference": "dc7e308e1dc2898a46776e2221a643cb08315453"
+ "url": "https://github.com/symfony/DomCrawler.git",
+ "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453",
- "reference": "dc7e308e1dc2898a46776e2221a643cb08315453",
+ "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3",
+ "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "psr/http-message": "~1.0",
- "symfony/http-foundation": "~2.3|~3.0"
+ "php": ">=5.3.9"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7|~3.0"
+ "symfony/css-selector": "~2.3",
+ "symfony/phpunit-bridge": "~2.7"
},
"suggest": {
- "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
+ "symfony/css-selector": ""
+ },
+ "time": "2015-05-22 14:54:25",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
},
- "time": "2015-05-29 17:57:12",
- "type": "symfony-bridge",
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Bridge\\PsrHttpMessage\\": ""
+ "Symfony\\Component\\DomCrawler\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3490,73 +3490,73 @@
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "PSR HTTP message bridge",
- "homepage": "http://symfony.com",
- "keywords": [
- "http",
- "http-message",
- "psr-7"
- ]
+ "description": "Symfony DomCrawler Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "zendframework/zend-diactoros",
- "version": "1.1.0",
- "version_normalized": "1.1.0.0",
+ "name": "symfony/browser-kit",
+ "version": "v2.7.1",
+ "version_normalized": "2.7.1.0",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8"
+ "url": "https://github.com/symfony/BrowserKit.git",
+ "reference": "d0a144a1a96d5dc90bed2814b2096a1322761672"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
- "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
+ "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/d0a144a1a96d5dc90bed2814b2096a1322761672",
+ "reference": "d0a144a1a96d5dc90bed2814b2096a1322761672",
"shasum": ""
},
"require": {
- "php": ">=5.4",
- "psr/http-message": "~1.0"
- },
- "provide": {
- "psr/http-message-implementation": "~1.0.0"
+ "php": ">=5.3.9",
+ "symfony/dom-crawler": "~2.0,>=2.0.5"
},
"require-dev": {
- "phpunit/phpunit": "~4.6",
- "squizlabs/php_codesniffer": "^2.3.1"
+ "symfony/css-selector": "~2.0,>=2.0.5",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/process": "~2.0,>=2.0.5"
},
- "time": "2015-06-24 20:42:54",
+ "suggest": {
+ "symfony/process": ""
+ },
+ "time": "2015-06-04 20:11:48",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev",
- "dev-develop": "1.1-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Zend\\Diactoros\\": "src/"
+ "Symfony\\Component\\BrowserKit\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-2-Clause"
+ "MIT"
],
- "description": "PSR HTTP Message implementations",
- "homepage": "https://github.com/zendframework/zend-diactoros",
- "keywords": [
- "http",
- "psr",
- "psr-7"
- ]
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony BrowserKit Component",
+ "homepage": "https://symfony.com"
}
]
diff --git a/core/vendor/symfony/browser-kit/Client.php b/core/vendor/symfony/browser-kit/Client.php
index 90df108c8b51..f41f156ac4ce 100644
--- a/core/vendor/symfony/browser-kit/Client.php
+++ b/core/vendor/symfony/browser-kit/Client.php
@@ -547,7 +547,7 @@ public function restart()
protected function getAbsoluteUri($uri)
{
// already absolute?
- if (0 === strpos($uri, 'http')) {
+ if (0 === strpos($uri, 'http://') || 0 === strpos($uri, 'https://')) {
return $uri;
}
diff --git a/core/vendor/symfony/browser-kit/Cookie.php b/core/vendor/symfony/browser-kit/Cookie.php
index b225056f4b70..424f78bab4f4 100644
--- a/core/vendor/symfony/browser-kit/Cookie.php
+++ b/core/vendor/symfony/browser-kit/Cookie.php
@@ -69,11 +69,20 @@ public function __construct($name, $value, $expires = null, $path = null, $domai
$this->rawValue = urlencode($value);
}
$this->name = $name;
- $this->expires = null === $expires ? null : (int) $expires;
$this->path = empty($path) ? '/' : $path;
$this->domain = $domain;
$this->secure = (bool) $secure;
$this->httponly = (bool) $httponly;
+
+ if (null !== $expires) {
+ $timestampAsDateTime = \DateTime::createFromFormat('U', $expires);
+ if (false === $timestampAsDateTime) {
+ throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.'), $expires);
+ }
+
+ $this->expires = $timestampAsDateTime->getTimestamp();
+ }
+
}
/**
@@ -91,12 +100,6 @@ public function __toString()
if (null !== $this->expires) {
$dateTime = \DateTime::createFromFormat('U', $this->expires, new \DateTimeZone('GMT'));
-
- if ($dateTime === false) {
- // this throw will provoke PHP fatal
- throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.'), $this->expires);
- }
-
$cookie .= '; expires='.str_replace('+0000', '', $dateTime->format(self::$dateFormats[0]));
}
diff --git a/core/vendor/symfony/browser-kit/Tests/ClientTest.php b/core/vendor/symfony/browser-kit/Tests/ClientTest.php
index a6e5ba9e9afd..cc7db71fd2f9 100644
--- a/core/vendor/symfony/browser-kit/Tests/ClientTest.php
+++ b/core/vendor/symfony/browser-kit/Tests/ClientTest.php
@@ -207,6 +207,21 @@ public function testRequestURIConversion()
$client->request('GET', 'http://www.example.com/foo/foobar');
$client->request('GET', 'bar');
$this->assertEquals('http://www.example.com/foo/bar', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
+
+ $client = new TestClient();
+ $client->request('GET', 'http://www.example.com/foo/');
+ $client->request('GET', 'http');
+ $this->assertEquals('http://www.example.com/foo/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
+
+ $client = new TestClient();
+ $client->request('GET', 'http://www.example.com/foo');
+ $client->request('GET', 'http/bar');
+ $this->assertEquals('http://www.example.com/http/bar', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
+
+ $client = new TestClient();
+ $client->request('GET', 'http://www.example.com/');
+ $client->request('GET', 'http');
+ $this->assertEquals('http://www.example.com/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
}
public function testRequestURIConversionByServerHost()
@@ -332,7 +347,7 @@ public function testFollowRedirect()
$client->followRedirect();
$this->fail('->followRedirect() throws a \LogicException if the request was not redirected');
} catch (\Exception $e) {
- $this->assertInstanceof('LogicException', $e, '->followRedirect() throws a \LogicException if the request was not redirected');
+ $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was not redirected');
}
$client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
@@ -362,7 +377,7 @@ public function testFollowRedirect()
$client->followRedirect();
$this->fail('->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
} catch (\Exception $e) {
- $this->assertInstanceof('LogicException', $e, '->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
+ $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
}
}
@@ -392,7 +407,7 @@ public function testFollowRedirectWithMaxRedirects()
$client->followRedirect();
$this->fail('->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
} catch (\Exception $e) {
- $this->assertInstanceof('LogicException', $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
+ $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
}
$client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
@@ -562,7 +577,7 @@ public function testInsulatedRequests()
$client->request('GET', 'http://www.example.com/foo/foobar');
$this->fail('->request() throws a \RuntimeException if the script has an error');
} catch (\Exception $e) {
- $this->assertInstanceof('RuntimeException', $e, '->request() throws a \RuntimeException if the script has an error');
+ $this->assertInstanceOf('RuntimeException', $e, '->request() throws a \RuntimeException if the script has an error');
}
}
diff --git a/core/vendor/symfony/browser-kit/Tests/CookieTest.php b/core/vendor/symfony/browser-kit/Tests/CookieTest.php
index 8e3578a28e0a..e1dd0df2c153 100644
--- a/core/vendor/symfony/browser-kit/Tests/CookieTest.php
+++ b/core/vendor/symfony/browser-kit/Tests/CookieTest.php
@@ -74,30 +74,30 @@ public function testFromStringWithCapitalization()
public function testFromStringWithUrl()
{
- $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com/'));
- $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com'));
- $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com?foo'));
- $this->assertEquals('foo=bar; domain=www.example.com; path=/foo', (string) Cookie::FromString('foo=bar', 'http://www.example.com/foo/bar'));
- $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar; path=/', 'http://www.example.com/foo/bar'));
- $this->assertEquals('foo=bar; domain=www.myotherexample.com; path=/', (string) Cookie::FromString('foo=bar; domain=www.myotherexample.com', 'http://www.example.com/'));
+ $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::fromString('foo=bar', 'http://www.example.com/'));
+ $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::fromString('foo=bar', 'http://www.example.com'));
+ $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::fromString('foo=bar', 'http://www.example.com?foo'));
+ $this->assertEquals('foo=bar; domain=www.example.com; path=/foo', (string) Cookie::fromString('foo=bar', 'http://www.example.com/foo/bar'));
+ $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::fromString('foo=bar; path=/', 'http://www.example.com/foo/bar'));
+ $this->assertEquals('foo=bar; domain=www.myotherexample.com; path=/', (string) Cookie::fromString('foo=bar; domain=www.myotherexample.com', 'http://www.example.com/'));
}
public function testFromStringThrowsAnExceptionIfCookieIsNotValid()
{
$this->setExpectedException('InvalidArgumentException');
- Cookie::FromString('foo');
+ Cookie::fromString('foo');
}
public function testFromStringThrowsAnExceptionIfCookieDateIsNotValid()
{
$this->setExpectedException('InvalidArgumentException');
- Cookie::FromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
+ Cookie::fromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
}
public function testFromStringThrowsAnExceptionIfUrlIsNotValid()
{
$this->setExpectedException('InvalidArgumentException');
- Cookie::FromString('foo=bar', 'foobar');
+ Cookie::fromString('foo=bar', 'foobar');
}
public function testGetName()
diff --git a/core/vendor/symfony/browser-kit/Tests/HistoryTest.php b/core/vendor/symfony/browser-kit/Tests/HistoryTest.php
index 882b730ef484..d6d830e83ef0 100644
--- a/core/vendor/symfony/browser-kit/Tests/HistoryTest.php
+++ b/core/vendor/symfony/browser-kit/Tests/HistoryTest.php
@@ -54,7 +54,7 @@ public function testCurrent()
$history->current();
$this->fail('->current() throws a \LogicException if the history is empty');
} catch (\Exception $e) {
- $this->assertInstanceof('LogicException', $e, '->current() throws a \LogicException if the history is empty');
+ $this->assertInstanceOf('LogicException', $e, '->current() throws a \LogicException if the history is empty');
}
$history->add(new Request('http://www.example.com/', 'get'));
@@ -71,7 +71,7 @@ public function testBack()
$history->back();
$this->fail('->back() throws a \LogicException if the history is already on the first page');
} catch (\Exception $e) {
- $this->assertInstanceof('LogicException', $e, '->current() throws a \LogicException if the history is already on the first page');
+ $this->assertInstanceOf('LogicException', $e, '->current() throws a \LogicException if the history is already on the first page');
}
$history->add(new Request('http://www.example1.com/', 'get'));
@@ -90,7 +90,7 @@ public function testForward()
$history->forward();
$this->fail('->forward() throws a \LogicException if the history is already on the last page');
} catch (\Exception $e) {
- $this->assertInstanceof('LogicException', $e, '->forward() throws a \LogicException if the history is already on the last page');
+ $this->assertInstanceOf('LogicException', $e, '->forward() throws a \LogicException if the history is already on the last page');
}
$history->back();
diff --git a/core/vendor/symfony/class-loader/.gitignore b/core/vendor/symfony/class-loader/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/class-loader/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/class-loader/ApcUniversalClassLoader.php b/core/vendor/symfony/class-loader/ApcUniversalClassLoader.php
index dd95413caf10..898018ae767d 100644
--- a/core/vendor/symfony/class-loader/ApcUniversalClassLoader.php
+++ b/core/vendor/symfony/class-loader/ApcUniversalClassLoader.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\ClassLoader;
-trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
/**
* ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
diff --git a/core/vendor/symfony/class-loader/DebugClassLoader.php b/core/vendor/symfony/class-loader/DebugClassLoader.php
index 351869928c24..b3eb89a6ac21 100644
--- a/core/vendor/symfony/class-loader/DebugClassLoader.php
+++ b/core/vendor/symfony/class-loader/DebugClassLoader.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\ClassLoader;
-trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
/**
* Autoloader checking if the class is really defined in the file found.
diff --git a/core/vendor/symfony/class-loader/DebugUniversalClassLoader.php b/core/vendor/symfony/class-loader/DebugUniversalClassLoader.php
index 2a102dbbf423..807bcd15e2fb 100644
--- a/core/vendor/symfony/class-loader/DebugUniversalClassLoader.php
+++ b/core/vendor/symfony/class-loader/DebugUniversalClassLoader.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\ClassLoader;
-trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
/**
* Checks that the class is actually declared in the included file.
diff --git a/core/vendor/symfony/class-loader/UniversalClassLoader.php b/core/vendor/symfony/class-loader/UniversalClassLoader.php
index 781d3a29a931..5293a4cb72a7 100644
--- a/core/vendor/symfony/class-loader/UniversalClassLoader.php
+++ b/core/vendor/symfony/class-loader/UniversalClassLoader.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\ClassLoader;
-trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);
/**
* UniversalClassLoader implements a "universal" autoloader for PHP 5.3.
diff --git a/core/vendor/symfony/console/Application.php b/core/vendor/symfony/console/Application.php
index 1ee2831b7978..4fa5fb9f0d51 100644
--- a/core/vendor/symfony/console/Application.php
+++ b/core/vendor/symfony/console/Application.php
@@ -488,7 +488,7 @@ public function findNamespace($namespace)
if (empty($namespaces)) {
$message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
- if ($alternatives = $this->findAlternatives($namespace, $allNamespaces, array())) {
+ if ($alternatives = $this->findAlternatives($namespace, $allNamespaces)) {
if (1 == count($alternatives)) {
$message .= "\n\nDid you mean this?\n ";
} else {
@@ -537,7 +537,7 @@ public function find($name)
$message = sprintf('Command "%s" is not defined.', $name);
- if ($alternatives = $this->findAlternatives($name, $allCommands, array())) {
+ if ($alternatives = $this->findAlternatives($name, $allCommands)) {
if (1 == count($alternatives)) {
$message .= "\n\nDid you mean this?\n ";
} else {
@@ -628,7 +628,7 @@ public static function getAbbreviations($names)
*/
public function asText($namespace = null, $raw = false)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
$descriptor = new TextDescriptor();
$output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, !$raw);
@@ -649,7 +649,7 @@ public function asText($namespace = null, $raw = false)
*/
public function asXml($namespace = null, $asDom = false)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
$descriptor = new XmlDescriptor();
@@ -1086,7 +1086,7 @@ private function findAlternatives($name, $collection)
}
}
- $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2*$threshold; });
+ $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });
asort($alternatives);
return array_keys($alternatives);
diff --git a/core/vendor/symfony/console/Command/Command.php b/core/vendor/symfony/console/Command/Command.php
index 02e207eac775..e6642631c942 100644
--- a/core/vendor/symfony/console/Command/Command.php
+++ b/core/vendor/symfony/console/Command/Command.php
@@ -645,7 +645,7 @@ public function getHelper($name)
*/
public function asText()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
$descriptor = new TextDescriptor();
$output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
@@ -665,7 +665,7 @@ public function asText()
*/
public function asXml($asDom = false)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
$descriptor = new XmlDescriptor();
diff --git a/core/vendor/symfony/console/Command/HelpCommand.php b/core/vendor/symfony/console/Command/HelpCommand.php
index ae06af50e591..8c20b5706910 100644
--- a/core/vendor/symfony/console/Command/HelpCommand.php
+++ b/core/vendor/symfony/console/Command/HelpCommand.php
@@ -77,7 +77,7 @@ 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);
+ @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 c42a6f27d348..5f970e82e66d 100644
--- a/core/vendor/symfony/console/Command/ListCommand.php
+++ b/core/vendor/symfony/console/Command/ListCommand.php
@@ -69,7 +69,7 @@ public function getNativeDefinition()
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);
+ @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/Helper/DialogHelper.php b/core/vendor/symfony/console/Helper/DialogHelper.php
index 886baafd42a3..5bea3038da4d 100644
--- a/core/vendor/symfony/console/Helper/DialogHelper.php
+++ b/core/vendor/symfony/console/Helper/DialogHelper.php
@@ -31,7 +31,7 @@ class DialogHelper extends InputAwareHelper
public function __construct($triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
- trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
+ @trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
}
}
diff --git a/core/vendor/symfony/console/Helper/HelperSet.php b/core/vendor/symfony/console/Helper/HelperSet.php
index 52a669d48542..00354dd91ff6 100644
--- a/core/vendor/symfony/console/Helper/HelperSet.php
+++ b/core/vendor/symfony/console/Helper/HelperSet.php
@@ -79,11 +79,11 @@ public function get($name)
}
if ('dialog' === $name && $this->helpers[$name] instanceof DialogHelper) {
- trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
+ @trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
} elseif ('progress' === $name && $this->helpers[$name] instanceof ProgressHelper) {
- trigger_error('"Symfony\Component\Console\Helper\ProgressHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\ProgressBar" instead.', E_USER_DEPRECATED);
+ @trigger_error('"Symfony\Component\Console\Helper\ProgressHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\ProgressBar" instead.', E_USER_DEPRECATED);
} elseif ('table' === $name && $this->helpers[$name] instanceof TableHelper) {
- trigger_error('"Symfony\Component\Console\Helper\TableHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\Table" instead.', E_USER_DEPRECATED);
+ @trigger_error('"Symfony\Component\Console\Helper\TableHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\Table" instead.', E_USER_DEPRECATED);
}
return $this->helpers[$name];
diff --git a/core/vendor/symfony/console/Helper/ProgressBar.php b/core/vendor/symfony/console/Helper/ProgressBar.php
index ae1fdae88259..60308bc386f3 100644
--- a/core/vendor/symfony/console/Helper/ProgressBar.php
+++ b/core/vendor/symfony/console/Helper/ProgressBar.php
@@ -177,7 +177,7 @@ public function getMaxSteps()
*/
public function getStep()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getProgress() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getProgress() method instead.', E_USER_DEPRECATED);
return $this->getProgress();
}
@@ -368,7 +368,7 @@ public function advance($step = 1)
*/
public function setCurrent($step)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setProgress() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setProgress() method instead.', E_USER_DEPRECATED);
$this->setProgress($step);
}
diff --git a/core/vendor/symfony/console/Helper/ProgressHelper.php b/core/vendor/symfony/console/Helper/ProgressHelper.php
index fe67e9d02685..bd885662f43e 100644
--- a/core/vendor/symfony/console/Helper/ProgressHelper.php
+++ b/core/vendor/symfony/console/Helper/ProgressHelper.php
@@ -121,7 +121,7 @@ class ProgressHelper extends Helper
public function __construct($triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
- trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\ProgressBar class instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\ProgressBar class instead.', E_USER_DEPRECATED);
}
}
diff --git a/core/vendor/symfony/console/Helper/Table.php b/core/vendor/symfony/console/Helper/Table.php
index ff668a475e8c..392d4652ef58 100644
--- a/core/vendor/symfony/console/Helper/Table.php
+++ b/core/vendor/symfony/console/Helper/Table.php
@@ -385,7 +385,7 @@ private function fillNextRows($rows, $line)
$unmergedRows = array();
foreach ($rows[$line] as $column => $cell) {
if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
- $nbLines = $cell->getRowspan()-1;
+ $nbLines = $cell->getRowspan() - 1;
$lines = array($cell);
if (strstr($cell, "\n")) {
$lines = explode("\n", $cell);
@@ -412,7 +412,7 @@ private function fillNextRows($rows, $line)
array_splice($rows[$unmergedRowKey], $cellKey, 0, array($cell));
}
} else {
- $row = $this->copyRow($rows, $unmergedRowKey-1);
+ $row = $this->copyRow($rows, $unmergedRowKey - 1);
foreach ($unmergedRow as $column => $cell) {
if (!empty($cell)) {
$row[$column] = $unmergedRow[$column];
@@ -476,7 +476,7 @@ private function getNumberOfColumns(array $row)
{
$columns = count($row);
foreach ($row as $column) {
- $columns += $column instanceof TableCell ? ($column->getColspan()-1) : 0;
+ $columns += $column instanceof TableCell ? ($column->getColspan() - 1) : 0;
}
return $columns;
@@ -491,11 +491,11 @@ private function getNumberOfColumns(array $row)
*/
private function getRowColumns($row)
{
- $columns = range(0, $this->numberOfColumns-1);
+ $columns = range(0, $this->numberOfColumns - 1);
foreach ($row as $cellKey => $cell) {
if ($cell instanceof TableCell && $cell->getColspan() > 1) {
// exclude grouped columns.
- $columns = array_diff($columns, range($cellKey+1, $cellKey + $cell->getColspan()-1));
+ $columns = array_diff($columns, range($cellKey + 1, $cellKey + $cell->getColspan() - 1));
}
}
@@ -550,12 +550,13 @@ private function getCellWidth(array $row, $column)
{
if (isset($row[$column])) {
$cell = $row[$column];
+ $cellWidth = Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
if ($cell instanceof TableCell && $cell->getColspan() > 1) {
// we assume that cell value will be across more than one column.
- $cell = substr($cell, 0, strlen($cell)/$cell->getColspan());
+ $cellWidth = $cellWidth / $cell->getColspan();
}
- return Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
+ return $cellWidth;
}
return 0;
diff --git a/core/vendor/symfony/console/Helper/TableHelper.php b/core/vendor/symfony/console/Helper/TableHelper.php
index 06af5fad9b64..29535225a0c7 100644
--- a/core/vendor/symfony/console/Helper/TableHelper.php
+++ b/core/vendor/symfony/console/Helper/TableHelper.php
@@ -37,7 +37,7 @@ class TableHelper extends Helper
public function __construct($triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
- trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\Table class instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\Table class instead.', E_USER_DEPRECATED);
}
$this->table = new Table(new NullOutput());
diff --git a/core/vendor/symfony/console/Input/InputDefinition.php b/core/vendor/symfony/console/Input/InputDefinition.php
index 044ec265b246..21ac832c3cda 100644
--- a/core/vendor/symfony/console/Input/InputDefinition.php
+++ b/core/vendor/symfony/console/Input/InputDefinition.php
@@ -449,7 +449,7 @@ public function getSynopsis($short = false)
*/
public function asText()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
$descriptor = new TextDescriptor();
$output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
@@ -469,7 +469,7 @@ public function asText()
*/
public function asXml($asDom = false)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
$descriptor = new XmlDescriptor();
diff --git a/core/vendor/symfony/console/Input/StringInput.php b/core/vendor/symfony/console/Input/StringInput.php
index 40656b3c1488..40d1dfbc7d6a 100644
--- a/core/vendor/symfony/console/Input/StringInput.php
+++ b/core/vendor/symfony/console/Input/StringInput.php
@@ -40,7 +40,7 @@ class StringInput extends ArgvInput
public function __construct($input, InputDefinition $definition = null)
{
if ($definition) {
- trigger_error('The $definition argument of the '.__METHOD__.' method is deprecated and will be removed in 3.0. Set this parameter with the bind() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The $definition argument of the '.__METHOD__.' method is deprecated and will be removed in 3.0. Set this parameter with the bind() method instead.', E_USER_DEPRECATED);
}
parent::__construct(array(), null);
diff --git a/core/vendor/symfony/console/Style/SymfonyStyle.php b/core/vendor/symfony/console/Style/SymfonyStyle.php
index 6d69eca54af8..b3113a41e2d4 100644
--- a/core/vendor/symfony/console/Style/SymfonyStyle.php
+++ b/core/vendor/symfony/console/Style/SymfonyStyle.php
@@ -18,6 +18,7 @@
use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\BufferedOutput;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ChoiceQuestion;
use Symfony\Component\Console\Question\ConfirmationQuestion;
@@ -36,6 +37,7 @@ class SymfonyStyle extends OutputStyle
private $questionHelper;
private $progressBar;
private $lineLength;
+ private $bufferedOutput;
/**
* @param InputInterface $input
@@ -44,7 +46,9 @@ class SymfonyStyle extends OutputStyle
public function __construct(InputInterface $input, OutputInterface $output)
{
$this->input = $input;
- $this->lineLength = min($this->getTerminalWidth(), self::MAX_LINE_LENGTH);
+ $this->bufferedOutput = new BufferedOutput($output->getVerbosity(), false, clone $output->getFormatter());
+ // Windows cmd wraps lines as soon as the terminal width is reached, whether there are following chars or not.
+ $this->lineLength = min($this->getTerminalWidth() - (int) (DIRECTORY_SEPARATOR === '\\'), self::MAX_LINE_LENGTH);
parent::__construct($output);
}
@@ -60,6 +64,7 @@ public function __construct(InputInterface $input, OutputInterface $output)
*/
public function block($messages, $type = null, $style = null, $prefix = ' ', $padding = false)
{
+ $this->autoPrependBlock();
$messages = is_array($messages) ? array_values($messages) : array($messages);
$lines = array();
@@ -71,7 +76,7 @@ public function block($messages, $type = null, $style = null, $prefix = ' ', $pa
// wrap and add newlines for each element
foreach ($messages as $key => $message) {
$message = OutputFormatter::escape($message);
- $lines = array_merge($lines, explode("\n", wordwrap($message, $this->lineLength - Helper::strlen($prefix))));
+ $lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix), PHP_EOL, true)));
if (count($messages) > 1 && $key < count($messages) - 1) {
$lines[] = '';
@@ -92,7 +97,8 @@ public function block($messages, $type = null, $style = null, $prefix = ' ', $pa
}
}
- $this->writeln(implode("\n", $lines)."\n");
+ $this->writeln($lines);
+ $this->newLine();
}
/**
@@ -100,7 +106,12 @@ public function block($messages, $type = null, $style = null, $prefix = ' ', $pa
*/
public function title($message)
{
- $this->writeln(sprintf("\n<comment>%s</>\n<comment>%s</>\n", $message, str_repeat('=', strlen($message))));
+ $this->autoPrependBlock();
+ $this->writeln(array(
+ sprintf('<comment>%s</>', $message),
+ sprintf('<comment>%s</>', str_repeat('=', strlen($message))),
+ ));
+ $this->newLine();
}
/**
@@ -108,7 +119,12 @@ public function title($message)
*/
public function section($message)
{
- $this->writeln(sprintf("<comment>%s</>\n<comment>%s</>\n", $message, str_repeat('-', strlen($message))));
+ $this->autoPrependBlock();
+ $this->writeln(array(
+ sprintf('<comment>%s</>', $message),
+ sprintf('<comment>%s</>', str_repeat('-', strlen($message))),
+ ));
+ $this->newLine();
}
/**
@@ -116,13 +132,13 @@ public function section($message)
*/
public function listing(array $elements)
{
+ $this->autoPrependText();
$elements = array_map(function ($element) {
- return sprintf(' * %s', $element);
- },
- $elements
- );
+ return sprintf(' * %s', $element);
+ }, $elements);
- $this->writeln(implode("\n", $elements)."\n");
+ $this->writeln($elements);
+ $this->newLine();
}
/**
@@ -130,6 +146,8 @@ public function listing(array $elements)
*/
public function text($message)
{
+ $this->autoPrependText();
+
if (!is_array($message)) {
$this->writeln(sprintf(' // %s', $message));
@@ -205,7 +223,7 @@ public function ask($question, $default = null, $validator = null)
$question = new Question($question, $default);
$question->setValidator($validator);
- return $this->askQuestion($question, $validator);
+ return $this->askQuestion($question);
}
/**
@@ -214,9 +232,11 @@ public function ask($question, $default = null, $validator = null)
public function askHidden($question, $validator = null)
{
$question = new Question($question);
+
$question->setHidden(true);
+ $question->setValidator($validator);
- return $this->askQuestion($question, $validator);
+ return $this->askQuestion($question);
}
/**
@@ -290,17 +310,51 @@ public function createProgressBar($max = 0)
*/
public function askQuestion(Question $question)
{
+ if ($this->input->isInteractive()) {
+ $this->autoPrependBlock();
+ }
+
if (!$this->questionHelper) {
$this->questionHelper = new SymfonyQuestionHelper();
}
$answer = $this->questionHelper->ask($this->input, $this, $question);
- $this->newLine();
+ if ($this->input->isInteractive()) {
+ $this->newLine();
+ $this->bufferedOutput->write("\n");
+ }
return $answer;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function writeln($messages, $type = self::OUTPUT_NORMAL)
+ {
+ parent::writeln($messages, $type);
+ $this->bufferedOutput->writeln($this->reduceBuffer($messages), $type);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
+ {
+ parent::write($messages, $newline, $type);
+ $this->bufferedOutput->write($this->reduceBuffer($messages), $newline, $type);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function newLine($count = 1)
+ {
+ parent::newLine($count);
+ $this->bufferedOutput->write(str_repeat("\n", $count));
+ }
+
/**
* @return ProgressBar
*/
@@ -320,4 +374,33 @@ private function getTerminalWidth()
return $dimensions[0] ?: self::MAX_LINE_LENGTH;
}
+
+ private function autoPrependBlock()
+ {
+ $chars = substr(str_replace(PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);
+
+ if (false === $chars) {
+ return $this->newLine(); //empty history, so we should start with a new line.
+ }
+ //Prepend new line for each non LF chars (This means no blank line was output before)
+ $this->newLine(2 - substr_count($chars, "\n"));
+ }
+
+ private function autoPrependText()
+ {
+ $fetched = $this->bufferedOutput->fetch();
+ //Prepend new line if last char isn't EOL:
+ if ("\n" !== substr($fetched, -1)) {
+ $this->newLine();
+ }
+ }
+
+ private function reduceBuffer($messages)
+ {
+ // We need to know if the two last chars are PHP_EOL
+ // Preserve the last 4 chars inserted (PHP_EOL on windows is two chars) in the history buffer
+ return array_map(function ($value) {
+ return substr($value, -4);
+ }, array_merge(array($this->bufferedOutput->fetch()), (array) $messages));
+ }
}
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
new file mode 100644
index 000000000000..8fe7c0771288
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line at start when using block element
+return function (InputInterface $input, OutputInterface $output) {
+ $output = new SymfonyStyle($input, $output);
+ $output->caution('Lorem ipsum dolor sit amet');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
new file mode 100644
index 000000000000..e5c700d60eb5
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between titles and blocks
+return function (InputInterface $input, OutputInterface $output) {
+ $output = new SymfonyStyle($input, $output);
+ $output->title('Title');
+ $output->warning('Lorem ipsum dolor sit amet');
+ $output->title('Title');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
new file mode 100644
index 000000000000..791b626f24f4
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
@@ -0,0 +1,16 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between blocks
+return function (InputInterface $input, OutputInterface $output) {
+ $output = new SymfonyStyle($input, $output);
+ $output->warning('Warning');
+ $output->caution('Caution');
+ $output->error('Error');
+ $output->success('Success');
+ $output->note('Note');
+ $output->block('Custom block', 'CUSTOM', 'fg=white;bg=green', 'X ', true);
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
new file mode 100644
index 000000000000..99253a6c08a8
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between two titles
+return function (InputInterface $input, OutputInterface $output) {
+ $output = new SymfonyStyle($input, $output);
+ $output->title('First title');
+ $output->title('Second title');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
new file mode 100644
index 000000000000..0c5d3fb26cef
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
@@ -0,0 +1,34 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line after any text and a title
+return function (InputInterface $input, OutputInterface $output) {
+ $output = new SymfonyStyle($input, $output);
+
+ $output->write('Lorem ipsum dolor sit amet');
+ $output->title('First title');
+
+ $output->writeln('Lorem ipsum dolor sit amet');
+ $output->title('Second title');
+
+ $output->write('Lorem ipsum dolor sit amet');
+ $output->write('');
+ $output->title('Third title');
+
+ //Ensure edge case by appending empty strings to history:
+ $output->write('Lorem ipsum dolor sit amet');
+ $output->write(array('', '', ''));
+ $output->title('Fourth title');
+
+ //Ensure have manual control over number of blank lines:
+ $output->writeln('Lorem ipsum dolor sit amet');
+ $output->writeln(array('', '')); //Should append an extra blank line
+ $output->title('Fifth title');
+
+ $output->writeln('Lorem ipsum dolor sit amet');
+ $output->newLine(2); //Should append an extra blank line
+ $output->title('Fifth title');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
new file mode 100644
index 000000000000..4543ad8cd6b1
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
@@ -0,0 +1,29 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has proper line ending before outputing a text block like with SymfonyStyle::listing() or SymfonyStyle::text()
+return function (InputInterface $input, OutputInterface $output) {
+ $output = new SymfonyStyle($input, $output);
+
+ $output->writeln('Lorem ipsum dolor sit amet');
+ $output->listing(array(
+ 'Lorem ipsum dolor sit amet',
+ 'consectetur adipiscing elit',
+ ));
+
+ //Even using write:
+ $output->write('Lorem ipsum dolor sit amet');
+ $output->listing(array(
+ 'Lorem ipsum dolor sit amet',
+ 'consectetur adipiscing elit',
+ ));
+
+ $output->write('Lorem ipsum dolor sit amet');
+ $output->text(array(
+ 'Lorem ipsum dolor sit amet',
+ 'consectetur adipiscing elit',
+ ));
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
new file mode 100644
index 000000000000..8031ec9c30e5
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
@@ -0,0 +1,16 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has proper blank line after text block when using a block like with SymfonyStyle::success
+return function (InputInterface $input, OutputInterface $output) {
+ $output = new SymfonyStyle($input, $output);
+
+ $output->listing(array(
+ 'Lorem ipsum dolor sit amet',
+ 'consectetur adipiscing elit',
+ ));
+ $output->success('Lorem ipsum dolor sit amet');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
new file mode 100644
index 000000000000..203eb5b12e6b
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
@@ -0,0 +1,15 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure questions do not output anything when input is non-interactive
+return function (InputInterface $input, OutputInterface $output) {
+ $output = new SymfonyStyle($input, $output);
+ $output->title('Title');
+ $output->askHidden('Hidden question');
+ $output->choice('Choice question with default', array('choice1', 'choice2'), 'choice1');
+ $output->confirm('Confirmation with yes default', true);
+ $output->text('Duis aute irure dolor in reprehenderit in voluptate velit esse');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt
new file mode 100644
index 000000000000..a42e0f792aa6
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt
@@ -0,0 +1,3 @@
+
+ ! [CAUTION] Lorem ipsum dolor sit amet
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt
new file mode 100644
index 000000000000..334875f78918
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt
@@ -0,0 +1,9 @@
+
+Title
+=====
+
+ [WARNING] Lorem ipsum dolor sit amet
+
+Title
+=====
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt
new file mode 100644
index 000000000000..ca609760cc12
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt
@@ -0,0 +1,13 @@
+
+ [WARNING] Warning
+
+ ! [CAUTION] Caution
+
+ [ERROR] Error
+
+ [OK] Success
+
+ ! [NOTE] Note
+
+X [CUSTOM] Custom block
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt
new file mode 100644
index 000000000000..f4b6d58276c6
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt
@@ -0,0 +1,7 @@
+
+First title
+===========
+
+Second title
+============
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt
new file mode 100644
index 000000000000..2646d858e7cd
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt
@@ -0,0 +1,32 @@
+Lorem ipsum dolor sit amet
+
+First title
+===========
+
+Lorem ipsum dolor sit amet
+
+Second title
+============
+
+Lorem ipsum dolor sit amet
+
+Third title
+===========
+
+Lorem ipsum dolor sit amet
+
+Fourth title
+============
+
+Lorem ipsum dolor sit amet
+
+
+Fifth title
+===========
+
+Lorem ipsum dolor sit amet
+
+
+Fifth title
+===========
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
new file mode 100644
index 000000000000..910240fbfd7c
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
@@ -0,0 +1,11 @@
+Lorem ipsum dolor sit amet
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+Lorem ipsum dolor sit amet
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+Lorem ipsum dolor sit amet
+ // Lorem ipsum dolor sit amet
+ // consectetur adipiscing elit
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
new file mode 100644
index 000000000000..5f2d33c148a9
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
@@ -0,0 +1,6 @@
+
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+ [OK] Lorem ipsum dolor sit amet
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt
new file mode 100644
index 000000000000..ab18e5dc76ab
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt
@@ -0,0 +1,5 @@
+
+Title
+=====
+
+ // Duis aute irure dolor in reprehenderit in voluptate velit esse
diff --git a/core/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php b/core/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php
new file mode 100644
index 000000000000..2df4f40e4a13
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Style;
+
+use PHPUnit_Framework_TestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class SymfonyStyleTest extends PHPUnit_Framework_TestCase
+{
+ /** @var Command */
+ protected $command;
+ /** @var CommandTester */
+ protected $tester;
+
+ protected function setUp()
+ {
+ $this->command = new Command('sfstyle');
+ $this->tester = new CommandTester($this->command);
+ }
+
+ protected function tearDown()
+ {
+ $this->command = null;
+ $this->tester = null;
+ }
+
+ /**
+ * @dataProvider inputCommandToOutputFilesProvider
+ */
+ public function testOutputs($inputCommandFilepath, $outputFilepath)
+ {
+ $code = require $inputCommandFilepath;
+ $this->command->setCode($code);
+ $this->tester->execute(array(), array('interactive' => false, 'decorated' => false));
+ $this->assertStringEqualsFile($outputFilepath, $this->tester->getDisplay(true));
+ }
+
+ public function inputCommandToOutputFilesProvider()
+ {
+ $baseDir = __DIR__.'/../Fixtures/Style/SymfonyStyle';
+
+ return array_map(null, glob($baseDir.'/command/command_*.php'), glob($baseDir.'/output/output_*.txt'));
+ }
+
+ public function testLongWordsBlockWrapping()
+ {
+ $word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon';
+ $wordLength = strlen($word);
+ $maxLineLength = SymfonyStyle::MAX_LINE_LENGTH - 3;
+
+ $this->command->setCode(function (InputInterface $input, OutputInterface $output) use ($word) {
+ $sfStyle = new SymfonyStyle($input, $output);
+ $sfStyle->block($word, 'CUSTOM', 'fg=white;bg=blue', ' § ', false);
+ });
+
+ $this->tester->execute(array(), array('interactive' => false, 'decorated' => false));
+ $expectedCount = (int) ceil($wordLength / ($maxLineLength)) + (int) ($wordLength > $maxLineLength - 5);
+ $this->assertSame($expectedCount, substr_count($this->tester->getDisplay(true), ' § '));
+ }
+}
diff --git a/core/vendor/symfony/css-selector/.gitignore b/core/vendor/symfony/css-selector/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/css-selector/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/debug/DebugClassLoader.php b/core/vendor/symfony/debug/DebugClassLoader.php
index f26e12e663fa..01104ea21e0c 100644
--- a/core/vendor/symfony/debug/DebugClassLoader.php
+++ b/core/vendor/symfony/debug/DebugClassLoader.php
@@ -45,7 +45,7 @@ public function __construct($classLoader)
$this->wasFinder = is_object($classLoader) && method_exists($classLoader, 'findFile');
if ($this->wasFinder) {
- trigger_error('The '.__METHOD__.' method will no longer support receiving an object into its $classLoader argument in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method will no longer support receiving an object into its $classLoader argument in 3.0.', E_USER_DEPRECATED);
$this->classLoader = array($classLoader, 'loadClass');
$this->isFinder = true;
} else {
@@ -127,7 +127,7 @@ public static function disable()
*/
public function findFile($class)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
if ($this->wasFinder) {
return $this->classLoader[0]->findFile($class);
@@ -200,12 +200,12 @@ public function loadClass($class)
if (!$parent || strncmp($ns, $parent->name, $len)) {
if ($parent && isset(self::$deprecated[$parent->name]) && strncmp($ns, $parent->name, $len)) {
- trigger_error(sprintf('The %s class extends %s that is deprecated %s', $name, $parent->name, self::$deprecated[$parent->name]), E_USER_DEPRECATED);
+ @trigger_error(sprintf('The %s class extends %s that is deprecated %s', $name, $parent->name, self::$deprecated[$parent->name]), E_USER_DEPRECATED);
}
foreach ($refl->getInterfaceNames() as $interface) {
if (isset(self::$deprecated[$interface]) && strncmp($ns, $interface, $len) && !($parent && $parent->implementsInterface($interface))) {
- trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, $refl->isInterface() ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
+ @trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, $refl->isInterface() ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
}
}
}
diff --git a/core/vendor/symfony/debug/ErrorHandler.php b/core/vendor/symfony/debug/ErrorHandler.php
index 116ff4b5f3b7..112ba031cea7 100644
--- a/core/vendor/symfony/debug/ErrorHandler.php
+++ b/core/vendor/symfony/debug/ErrorHandler.php
@@ -611,7 +611,7 @@ protected function getFatalErrorHandlers()
*/
public function setLevel($level)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
$level = null === $level ? error_reporting() : $level;
$this->throwAt($level, true);
@@ -626,7 +626,7 @@ public function setLevel($level)
*/
public function setDisplayErrors($displayErrors)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
if ($displayErrors) {
$this->throwAt($this->displayErrors, true);
@@ -647,7 +647,7 @@ public function setDisplayErrors($displayErrors)
*/
public static function setLogger(LoggerInterface $logger, $channel = 'deprecation')
{
- trigger_error('The '.__METHOD__.' static method is deprecated since version 2.6 and will be removed in 3.0. Use the setLoggers() or setDefaultLogger() methods instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' static method is deprecated since version 2.6 and will be removed in 3.0. Use the setLoggers() or setDefaultLogger() methods instead.', E_USER_DEPRECATED);
$handler = set_error_handler('var_dump', 0);
$handler = is_array($handler) ? $handler[0] : null;
@@ -684,7 +684,7 @@ public function handle($level, $message, $file = 'unknown', $line = 0, $context
*/
public function handleFatal()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleFatalError() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleFatalError() method instead.', E_USER_DEPRECATED);
static::handleFatalError();
}
diff --git a/core/vendor/symfony/debug/Exception/DummyException.php b/core/vendor/symfony/debug/Exception/DummyException.php
index 378cbcc10f80..c836f876d3d9 100644
--- a/core/vendor/symfony/debug/Exception/DummyException.php
+++ b/core/vendor/symfony/debug/Exception/DummyException.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Debug\Exception;
-trigger_error('The '.__NAMESPACE__.'\DummyException class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DummyException class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
/**
* @author Fabien Potencier <fabien@symfony.com>
diff --git a/core/vendor/symfony/debug/ExceptionHandler.php b/core/vendor/symfony/debug/ExceptionHandler.php
index 02546b403d08..c883f15469e0 100644
--- a/core/vendor/symfony/debug/ExceptionHandler.php
+++ b/core/vendor/symfony/debug/ExceptionHandler.php
@@ -428,7 +428,7 @@ private function formatArgs(array $args)
*/
protected static function utf8Htmlize($str)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
}
diff --git a/core/vendor/symfony/dependency-injection/.gitignore b/core/vendor/symfony/dependency-injection/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/dependency-injection/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/dependency-injection/ContainerBuilder.php b/core/vendor/symfony/dependency-injection/ContainerBuilder.php
index b7104a06e746..e697814bb10f 100644
--- a/core/vendor/symfony/dependency-injection/ContainerBuilder.php
+++ b/core/vendor/symfony/dependency-injection/ContainerBuilder.php
@@ -982,7 +982,13 @@ public function createService(Definition $definition, $id, $tryProxy = true)
if ($callable = $definition->getConfigurator()) {
if (is_array($callable)) {
- $callable[0] = $callable[0] instanceof Reference ? $this->get((string) $callable[0]) : $parameterBag->resolveValue($callable[0]);
+ $callable[0] = $parameterBag->resolveValue($callable[0]);
+
+ if ($callable[0] instanceof Reference) {
+ $callable[0] = $this->get((string) $callable[0], $callable[0]->getInvalidBehavior());
+ } elseif ($callable[0] instanceof Definition) {
+ $callable[0] = $this->createService($callable[0], null);
+ }
}
if (!is_callable($callable)) {
@@ -1127,7 +1133,7 @@ private function getProxyInstantiator()
private function synchronize($id)
{
if ('request' !== $id) {
- trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
}
foreach ($this->definitions as $definitionId => $definition) {
diff --git a/core/vendor/symfony/dependency-injection/Definition.php b/core/vendor/symfony/dependency-injection/Definition.php
index 9d02be4f6907..71447fab12ae 100644
--- a/core/vendor/symfony/dependency-injection/Definition.php
+++ b/core/vendor/symfony/dependency-injection/Definition.php
@@ -98,7 +98,7 @@ public function getFactory()
*/
public function setFactoryClass($factoryClass)
{
- trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
+ @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
$this->factoryClass = $factoryClass;
@@ -116,7 +116,7 @@ public function setFactoryClass($factoryClass)
public function getFactoryClass($triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
}
return $this->factoryClass;
@@ -134,7 +134,7 @@ public function getFactoryClass($triggerDeprecationError = true)
*/
public function setFactoryMethod($factoryMethod)
{
- trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
+ @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
$this->factoryMethod = $factoryMethod;
@@ -187,7 +187,7 @@ public function getDecoratedService()
public function getFactoryMethod($triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
}
return $this->factoryMethod;
@@ -205,7 +205,7 @@ public function getFactoryMethod($triggerDeprecationError = true)
*/
public function setFactoryService($factoryService)
{
- trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
+ @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
$this->factoryService = $factoryService;
@@ -223,7 +223,7 @@ public function setFactoryService($factoryService)
public function getFactoryService($triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
}
return $this->factoryService;
@@ -667,7 +667,7 @@ public function isPublic()
public function setSynchronized($boolean, $triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
}
$this->synchronized = (bool) $boolean;
@@ -687,7 +687,7 @@ public function setSynchronized($boolean, $triggerDeprecationError = true)
public function isSynchronized($triggerDeprecationError = true)
{
if ($triggerDeprecationError) {
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
}
return $this->synchronized;
diff --git a/core/vendor/symfony/dependency-injection/Dumper/PhpDumper.php b/core/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
index 75c955ab3681..9c2b6dd54d3c 100644
--- a/core/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
+++ b/core/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
@@ -705,7 +705,7 @@ private function addServiceSynchronizer($id, Definition $definition)
}
if ('request' !== $id) {
- trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);
}
$code = '';
@@ -1414,7 +1414,7 @@ public function dumpParameter($name)
*/
public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
$this->expressionLanguageProviders[] = $provider;
}
diff --git a/core/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php b/core/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
index f81d8d693197..523c01cea493 100644
--- a/core/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
@@ -126,10 +126,11 @@ private function parseDefinitions(\DOMDocument $xml, $file)
* Parses an individual Definition.
*
* @param \DOMElement $service
+ * @param string $file
*
* @return Definition|null
*/
- private function parseDefinition(\DOMElement $service)
+ private function parseDefinition(\DOMElement $service, $file)
{
if ($alias = $service->getAttribute('alias')) {
$public = true;
@@ -149,13 +150,22 @@ private function parseDefinition(\DOMElement $service)
foreach (array('class', 'scope', 'public', 'factory-class', 'factory-method', 'factory-service', 'synthetic', 'lazy', 'abstract') as $key) {
if ($value = $service->getAttribute($key)) {
+ if (in_array($key, array('factory-class', 'factory-method', 'factory-service'))) {
+ @trigger_error(sprintf('The "%s" attribute in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use the "factory" element instead.', $key, $file), E_USER_DEPRECATED);
+ }
$method = 'set'.str_replace('-', '', $key);
$definition->$method(XmlUtils::phpize($value));
}
}
if ($value = $service->getAttribute('synchronized')) {
- $definition->setSynchronized(XmlUtils::phpize($value), 'request' !== (string) $service->getAttribute('id'));
+ $triggerDeprecation = 'request' !== (string) $service->getAttribute('id');
+
+ if ($triggerDeprecation) {
+ @trigger_error(sprintf('The "synchronized" attribute in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $file), E_USER_DEPRECATED);
+ }
+
+ $definition->setSynchronized(XmlUtils::phpize($value), $triggerDeprecation);
}
if ($files = $this->getChildren($service, 'file')) {
@@ -173,7 +183,7 @@ private function parseDefinition(\DOMElement $service)
$factoryService = $this->getChildren($factory, 'service');
if (isset($factoryService[0])) {
- $class = $this->parseDefinition($factoryService[0]);
+ $class = $this->parseDefinition($factoryService[0], $file);
} elseif ($childService = $factory->getAttribute('service')) {
$class = new Reference($childService, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false);
} else {
@@ -192,7 +202,7 @@ private function parseDefinition(\DOMElement $service)
$configuratorService = $this->getChildren($configurator, 'service');
if (isset($configuratorService[0])) {
- $class = $this->parseDefinition($configuratorService[0]);
+ $class = $this->parseDefinition($configuratorService[0], $file);
} elseif ($childService = $configurator->getAttribute('service')) {
$class = new Reference($childService, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false);
} else {
@@ -233,7 +243,7 @@ private function parseDefinition(\DOMElement $service)
}
/**
- * Parses a XML file to a \DOMDocument
+ * Parses a XML file to a \DOMDocument.
*
* @param string $file Path to a file
*
@@ -392,7 +402,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)
}
/**
- * Get child elements by name
+ * Get child elements by name.
*
* @param \DOMNode $node
* @param mixed $name
diff --git a/core/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php b/core/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
index ae9613a61274..e10cfe2a4bce 100644
--- a/core/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
@@ -172,6 +172,7 @@ private function parseDefinition($id, $service, $file)
}
if (isset($service['synchronized'])) {
+ @trigger_error(sprintf('The "synchronized" key in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $file), E_USER_DEPRECATED);
$definition->setSynchronized($service['synchronized'], 'request' !== $id);
}
@@ -201,14 +202,17 @@ private function parseDefinition($id, $service, $file)
}
if (isset($service['factory_class'])) {
+ @trigger_error(sprintf('The "factory_class" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
$definition->setFactoryClass($service['factory_class']);
}
if (isset($service['factory_method'])) {
+ @trigger_error(sprintf('The "factory_method" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
$definition->setFactoryMethod($service['factory_method']);
}
if (isset($service['factory_service'])) {
+ @trigger_error(sprintf('The "factory_service" key in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $file), E_USER_DEPRECATED);
$definition->setFactoryService($service['factory_service']);
}
diff --git a/core/vendor/symfony/dependency-injection/SimpleXMLElement.php b/core/vendor/symfony/dependency-injection/SimpleXMLElement.php
index 1b318fd9e423..63d44ea38fa8 100644
--- a/core/vendor/symfony/dependency-injection/SimpleXMLElement.php
+++ b/core/vendor/symfony/dependency-injection/SimpleXMLElement.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\DependencyInjection;
-trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
use Symfony\Component\Config\Util\XmlUtils;
use Symfony\Component\ExpressionLanguage\Expression;
diff --git a/core/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php b/core/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
index 5f6fdd1d1715..1e3f10340596 100644
--- a/core/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
@@ -405,9 +405,12 @@ public function testCreateServiceConfigurator()
$builder->register('foo3', 'Bar\FooClass')->setConfigurator(array(new Reference('baz'), 'configure'));
$this->assertTrue($builder->get('foo3')->configured, '->createService() calls the configurator');
- $builder->register('foo4', 'Bar\FooClass')->setConfigurator('foo');
+ $builder->register('foo4', 'Bar\FooClass')->setConfigurator(array($builder->getDefinition('baz'), 'configure'));
+ $this->assertTrue($builder->get('foo4')->configured, '->createService() calls the configurator');
+
+ $builder->register('foo5', 'Bar\FooClass')->setConfigurator('foo');
try {
- $builder->get('foo4');
+ $builder->get('foo5');
$this->fail('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
} catch (\InvalidArgumentException $e) {
$this->assertEquals('The configure callable for class "Bar\FooClass" is not a callable.', $e->getMessage(), '->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/legacy-services6.xml b/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/legacy-services6.xml
index 17fe00f8fe93..708e10fd5dcd 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/legacy-services6.xml
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/legacy-services6.xml
@@ -6,5 +6,6 @@
<services>
<service id="constructor" class="FooClass" factory-method="getInstance" />
<service id="factory_service" factory-method="getInstance" factory-service="baz_factory" />
+ <service id="request" class="Request" synthetic="true" synchronized="true" lazy="true"/>
</services>
</container>
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml b/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
index 3a68c6e39a33..9eb7b8915e62 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
@@ -47,7 +47,6 @@
</service>
<service id="alias_for_foo" alias="foo" />
<service id="another_alias_for_foo" alias="foo" public="false" />
- <service id="request" class="Request" synthetic="true" synchronized="true" lazy="true"/>
<service id="decorator_service" decorates="decorated" />
<service id="decorator_service_with_name" decorates="decorated" decoration-inner-name="decorated.pif-pouf"/>
<service id="new_factory1" class="FooBarClass">
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/legacy-services6.yml b/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/legacy-services6.yml
index d6ca937a5ede..46ac679940e1 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/legacy-services6.yml
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/legacy-services6.yml
@@ -1,3 +1,8 @@
services:
constructor: { class: FooClass, factory_method: getInstance }
factory_service: { class: BazClass, factory_method: getInstance, factory_service: baz_factory }
+ request:
+ class: Request
+ synthetic: true
+ synchronized: true
+ lazy: true
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml b/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
index 8820b274ee20..78abf4d15552 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
@@ -23,11 +23,6 @@ services:
another_alias_for_foo:
alias: foo
public: false
- request:
- class: Request
- synthetic: true
- synchronized: true
- lazy: true
decorator_service:
decorates: decorated
decorator_service_with_name:
diff --git a/core/vendor/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php b/core/vendor/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
index 501d680fcc41..56f599b7cccc 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
@@ -206,6 +206,10 @@ public function testLegacyLoadServices()
$this->assertNull($services['factory_service']->getClass());
$this->assertEquals('baz_factory', $services['factory_service']->getFactoryService());
$this->assertEquals('getInstance', $services['factory_service']->getFactoryMethod());
+ $this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
+ $this->assertTrue($services['request']->isSynchronized(), '->load() parses the synchronized flag');
+ $this->assertTrue($services['request']->isLazy(), '->load() parses the lazy flag');
+ $this->assertNull($services['request']->getDecoratedService());
}
public function testLoadServices()
@@ -231,10 +235,6 @@ public function testLoadServices()
$this->assertEquals(array(new Reference('baz', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
$this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
- $this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
- $this->assertTrue($services['request']->isSynchronized(false), '->load() parses the synchronized flag');
- $this->assertTrue($services['request']->isLazy(), '->load() parses the lazy flag');
-
$aliases = $container->getAliases();
$this->assertTrue(isset($aliases['alias_for_foo']), '->load() parses <service> elements');
$this->assertEquals('foo', (string) $aliases['alias_for_foo'], '->load() parses aliases');
@@ -243,7 +243,6 @@ public function testLoadServices()
$this->assertEquals('foo', (string) $aliases['another_alias_for_foo']);
$this->assertFalse($aliases['another_alias_for_foo']->isPublic());
- $this->assertNull($services['request']->getDecoratedService());
$this->assertEquals(array('decorated', null), $services['decorator_service']->getDecoratedService());
$this->assertEquals(array('decorated', 'decorated.pif-pouf'), $services['decorator_service_with_name']->getDecoratedService());
}
diff --git a/core/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php b/core/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
index 716aba558686..f329aace79d8 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
@@ -135,6 +135,10 @@ public function testLegacyLoadServices()
$this->assertEquals('BazClass', $services['factory_service']->getClass());
$this->assertEquals('baz_factory', $services['factory_service']->getFactoryService());
$this->assertEquals('getInstance', $services['factory_service']->getFactoryMethod());
+ $this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
+ $this->assertTrue($services['request']->isSynchronized(), '->load() parses the synchronized flag');
+ $this->assertTrue($services['request']->isLazy(), '->load() parses the lazy flag');
+ $this->assertNull($services['request']->getDecoratedService());
}
public function testLoadServices()
@@ -160,10 +164,6 @@ public function testLoadServices()
$this->assertEquals(array(new Reference('baz'), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
$this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
- $this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
- $this->assertTrue($services['request']->isSynchronized(false), '->load() parses the synchronized flag');
- $this->assertTrue($services['request']->isLazy(), '->load() parses the lazy flag');
-
$aliases = $container->getAliases();
$this->assertTrue(isset($aliases['alias_for_foo']), '->load() parses aliases');
$this->assertEquals('foo', (string) $aliases['alias_for_foo'], '->load() parses aliases');
@@ -172,7 +172,6 @@ public function testLoadServices()
$this->assertEquals('foo', (string) $aliases['another_alias_for_foo']);
$this->assertFalse($aliases['another_alias_for_foo']->isPublic());
- $this->assertNull($services['request']->getDecoratedService());
$this->assertEquals(array('decorated', null), $services['decorator_service']->getDecoratedService());
$this->assertEquals(array('decorated', 'decorated.pif-pouf'), $services['decorator_service_with_name']->getDecoratedService());
}
diff --git a/core/vendor/symfony/event-dispatcher/.gitignore b/core/vendor/symfony/event-dispatcher/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/event-dispatcher/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/event-dispatcher/Event.php b/core/vendor/symfony/event-dispatcher/Event.php
index e411ca81360a..048bf0ac62ee 100644
--- a/core/vendor/symfony/event-dispatcher/Event.php
+++ b/core/vendor/symfony/event-dispatcher/Event.php
@@ -97,7 +97,7 @@ public function setDispatcher(EventDispatcherInterface $dispatcher)
*/
public function getDispatcher()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
return $this->dispatcher;
}
@@ -113,7 +113,7 @@ public function getDispatcher()
*/
public function getName()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
return $this->name;
}
diff --git a/core/vendor/symfony/http-foundation/.gitignore b/core/vendor/symfony/http-foundation/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/http-foundation/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/http-foundation/Request.php b/core/vendor/symfony/http-foundation/Request.php
index d78bc1fb5976..c2b7640468c2 100644
--- a/core/vendor/symfony/http-foundation/Request.php
+++ b/core/vendor/symfony/http-foundation/Request.php
@@ -1557,8 +1557,8 @@ public function isMethodSafe()
*/
public function getContent($asResource = false)
{
- if (false === $this->content || (true === $asResource && null !== $this->content)) {
- throw new \LogicException('getContent() can only be called once when using the resource return type.');
+ if (PHP_VERSION_ID < 50600 && (false === $this->content || (true === $asResource && null !== $this->content))) {
+ throw new \LogicException('getContent() can only be called once when using the resource return type and PHP below 5.6.');
}
if (true === $asResource) {
diff --git a/core/vendor/symfony/http-foundation/Response.php b/core/vendor/symfony/http-foundation/Response.php
index 0421ceeae411..6641e5102359 100644
--- a/core/vendor/symfony/http-foundation/Response.php
+++ b/core/vendor/symfony/http-foundation/Response.php
@@ -1080,7 +1080,7 @@ public function isNotModified(Request $request)
$lastModified = $this->headers->get('Last-Modified');
$modifiedSince = $request->headers->get('If-Modified-Since');
- if ($etags = $request->getEtags()) {
+ if ($etags = $request->getETags()) {
$notModified = in_array($this->getEtag(), $etags) || in_array('*', $etags);
}
diff --git a/core/vendor/symfony/http-foundation/Session/Flash/FlashBag.php b/core/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
index bbe7561be7c7..0da77150944a 100644
--- a/core/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
+++ b/core/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
@@ -175,7 +175,7 @@ public function clear()
*/
public function getIterator()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
return new \ArrayIterator($this->all());
}
diff --git a/core/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php b/core/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
index fd0c58275df8..eefaf8d8fa0d 100644
--- a/core/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
+++ b/core/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
-trigger_error('The '.__NAMESPACE__.'\LegacyPdoSessionHandler class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyPdoSessionHandler class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler class instead.', E_USER_DEPRECATED);
/**
* Session handler using a PDO connection to read and write data.
diff --git a/core/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php b/core/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
index 9b3f4d92e152..47e4d4fed87b 100644
--- a/core/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
@@ -179,7 +179,7 @@ public function testXAccelMapping($realpath, $mapping, $virtual)
$file = new FakeFile($realpath, __DIR__.'/File/Fixtures/test');
- BinaryFileResponse::trustXSendFileTypeHeader();
+ BinaryFileResponse::trustXSendfileTypeHeader();
$response = new BinaryFileResponse($file);
$reflection = new \ReflectionObject($response);
$property = $reflection->getProperty('file');
diff --git a/core/vendor/symfony/http-foundation/Tests/RequestTest.php b/core/vendor/symfony/http-foundation/Tests/RequestTest.php
index 50cb448063b6..188aaf582bcf 100644
--- a/core/vendor/symfony/http-foundation/Tests/RequestTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/RequestTest.php
@@ -975,11 +975,40 @@ public function testGetContentReturnsResource()
*/
public function testGetContentCantBeCalledTwiceWithResources($first, $second)
{
+ if (PHP_VERSION_ID >= 50600) {
+ $this->markTestSkipped('PHP >= 5.6 allows to open php://input several times.');
+ }
+
$req = new Request();
$req->getContent($first);
$req->getContent($second);
}
+ /**
+ *
+ * @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
+ */
+ public function testGetContentCanBeCalledTwiceWithResources($first, $second)
+ {
+ if (PHP_VERSION_ID < 50600) {
+ $this->markTestSkipped('PHP < 5.6 does not allow to open php://input several times.');
+ }
+
+ $req = new Request();
+ $a = $req->getContent($first);
+ $b = $req->getContent($second);
+
+ if ($first) {
+ $a = stream_get_contents($a);
+ }
+
+ if ($second) {
+ $b = stream_get_contents($b);
+ }
+
+ $this->assertEquals($a, $b);
+ }
+
public function getContentCantBeCalledTwiceWithResourcesProvider()
{
return array(
diff --git a/core/vendor/symfony/http-kernel/.gitignore b/core/vendor/symfony/http-kernel/.gitignore
new file mode 100644
index 000000000000..94a6a2528878
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/.gitignore
@@ -0,0 +1,5 @@
+vendor/
+composer.lock
+phpunit.xml
+Tests/Fixtures/cache/
+Tests/Fixtures/logs/
diff --git a/core/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php b/core/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
index 4d83e9a849b9..0f06f87ca98c 100644
--- a/core/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
+++ b/core/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
@@ -129,7 +129,7 @@ public function collect(Request $request, Response $response, \Exception $except
$this->data['controller'] = array(
'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
'method' => $controller[1],
- 'file' => $r->getFilename(),
+ 'file' => $r->getFileName(),
'line' => $r->getStartLine(),
);
} catch (\ReflectionException $re) {
@@ -148,7 +148,7 @@ public function collect(Request $request, Response $response, \Exception $except
$this->data['controller'] = array(
'class' => $r->getName(),
'method' => null,
- 'file' => $r->getFilename(),
+ 'file' => $r->getFileName(),
'line' => $r->getStartLine(),
);
} elseif (is_object($controller)) {
diff --git a/core/vendor/symfony/http-kernel/Debug/ErrorHandler.php b/core/vendor/symfony/http-kernel/Debug/ErrorHandler.php
index 577265bfa04d..af714a308688 100644
--- a/core/vendor/symfony/http-kernel/Debug/ErrorHandler.php
+++ b/core/vendor/symfony/http-kernel/Debug/ErrorHandler.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpKernel\Debug;
-trigger_error('The '.__NAMESPACE__.'\ErrorHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ErrorHandler class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ErrorHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ErrorHandler class instead.', E_USER_DEPRECATED);
use Symfony\Component\Debug\ErrorHandler as DebugErrorHandler;
diff --git a/core/vendor/symfony/http-kernel/Debug/ExceptionHandler.php b/core/vendor/symfony/http-kernel/Debug/ExceptionHandler.php
index 6ffba89f891f..50755d97ff97 100644
--- a/core/vendor/symfony/http-kernel/Debug/ExceptionHandler.php
+++ b/core/vendor/symfony/http-kernel/Debug/ExceptionHandler.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpKernel\Debug;
-trigger_error('The '.__NAMESPACE__.'\ExceptionHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ExceptionHandler class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ExceptionHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ExceptionHandler class instead.', E_USER_DEPRECATED);
use Symfony\Component\Debug\ExceptionHandler as DebugExceptionHandler;
diff --git a/core/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php b/core/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
index 0a82d7652549..eb1d8a8e97ce 100644
--- a/core/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
+++ b/core/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
@@ -38,7 +38,7 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher
*/
public function setProfiler(Profiler $profiler = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
}
/**
diff --git a/core/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php b/core/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php
index c64c4c393998..97aa74096266 100644
--- a/core/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php
+++ b/core/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php
@@ -46,7 +46,7 @@ public function __construct(EventDispatcherInterface $dispatcher, ContainerInter
parent::__construct($dispatcher, $controllerResolver, $requestStack);
if ($triggerDeprecation) {
- trigger_error('The '.__CLASS__.' class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpKernel class instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__CLASS__.' class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpKernel class instead.', E_USER_DEPRECATED);
}
$this->container = $container;
diff --git a/core/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php b/core/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
index c0cd8d4d5da8..dc44b2d44922 100644
--- a/core/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
+++ b/core/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
@@ -60,7 +60,7 @@ public function process(ContainerBuilder $container)
foreach ($tags as $tag) {
if (!isset($tag['alias'])) {
- trigger_error(sprintf('Service "%s" will have to define the "alias" attribute on the "%s" tag as of Symfony 3.0.', $id, $this->rendererTag), E_USER_DEPRECATED);
+ @trigger_error(sprintf('Service "%s" will have to define the "alias" attribute on the "%s" tag as of Symfony 3.0.', $id, $this->rendererTag), E_USER_DEPRECATED);
// register the handler as a non-lazy-loaded one
$definition->addMethodCall('addRenderer', array(new Reference($id)));
diff --git a/core/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php b/core/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php
index 386476b3c9ed..f1c2247364f5 100644
--- a/core/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php
+++ b/core/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpKernel\DependencyInjection;
-trigger_error('The '.__NAMESPACE__.'\RegisterListenersPass is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\RegisterListenersPass is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass class instead.', E_USER_DEPRECATED);
use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass as BaseRegisterListenersPass;
diff --git a/core/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php b/core/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php
index 230a94943627..80c3fe597083 100644
--- a/core/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpKernel\EventListener;
-trigger_error('The '.__NAMESPACE__.'\ErrorsLoggerListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\DebugHandlersListener class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ErrorsLoggerListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\DebugHandlersListener class instead.', E_USER_DEPRECATED);
use Psr\Log\LoggerInterface;
use Symfony\Component\Debug\ErrorHandler;
diff --git a/core/vendor/symfony/http-kernel/EventListener/EsiListener.php b/core/vendor/symfony/http-kernel/EventListener/EsiListener.php
index 9bede00564ba..bceb67265493 100644
--- a/core/vendor/symfony/http-kernel/EventListener/EsiListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/EsiListener.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpKernel\EventListener;
-trigger_error('The '.__NAMESPACE__.'\EsiListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\SurrogateListener class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\EsiListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\SurrogateListener class instead.', E_USER_DEPRECATED);
/**
* EsiListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for ESI.
diff --git a/core/vendor/symfony/http-kernel/EventListener/FragmentListener.php b/core/vendor/symfony/http-kernel/EventListener/FragmentListener.php
index 3ff01ee1a3bd..302faa17d02f 100644
--- a/core/vendor/symfony/http-kernel/EventListener/FragmentListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/FragmentListener.php
@@ -94,7 +94,7 @@ protected function validateRequest(Request $request)
*/
protected function getLocalIpAddresses()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3.19 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3.19 and will be removed in 3.0.', E_USER_DEPRECATED);
return array('127.0.0.1', 'fe80::1', '::1');
}
diff --git a/core/vendor/symfony/http-kernel/EventListener/LocaleListener.php b/core/vendor/symfony/http-kernel/EventListener/LocaleListener.php
index ef3911694a97..564f6dc9b5fb 100644
--- a/core/vendor/symfony/http-kernel/EventListener/LocaleListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/LocaleListener.php
@@ -58,7 +58,7 @@ public function __construct($defaultLocale = 'en', RequestContextAwareInterface
*/
public function setRequest(Request $request = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
if (null === $request) {
return;
diff --git a/core/vendor/symfony/http-kernel/EventListener/ProfilerListener.php b/core/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
index 781475a9925d..06a5bbf08bbf 100644
--- a/core/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
@@ -53,7 +53,7 @@ public function __construct(Profiler $profiler, RequestMatcherInterface $matcher
// Prevent the deprecation notice to be triggered all the time.
// The onKernelRequest() method fires some logic only when the
// RequestStack instance is not provided as a dependency.
- trigger_error('Since version 2.4, the '.__METHOD__.' method must accept a RequestStack instance to get the request instead of using the '.__CLASS__.'::onKernelRequest method that will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('Since version 2.4, the '.__METHOD__.' method must accept a RequestStack instance to get the request instead of using the '.__CLASS__.'::onKernelRequest method that will be removed in 3.0.', E_USER_DEPRECATED);
}
$this->profiler = $profiler;
diff --git a/core/vendor/symfony/http-kernel/EventListener/RouterListener.php b/core/vendor/symfony/http-kernel/EventListener/RouterListener.php
index 9a49e2f3c857..00dc60ca3fa5 100644
--- a/core/vendor/symfony/http-kernel/EventListener/RouterListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/RouterListener.php
@@ -68,7 +68,7 @@ public function __construct($matcher, RequestContext $context = null, LoggerInte
}
if (!$requestStack instanceof RequestStack) {
- trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED);
}
$this->matcher = $matcher;
@@ -90,7 +90,7 @@ public function __construct($matcher, RequestContext $context = null, LoggerInte
*/
public function setRequest(Request $request = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be made private in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be made private in 3.0.', E_USER_DEPRECATED);
$this->setCurrentRequest($request);
}
diff --git a/core/vendor/symfony/http-kernel/Exception/FatalErrorException.php b/core/vendor/symfony/http-kernel/Exception/FatalErrorException.php
index 681d9d6199cc..0d2b4f92a91d 100644
--- a/core/vendor/symfony/http-kernel/Exception/FatalErrorException.php
+++ b/core/vendor/symfony/http-kernel/Exception/FatalErrorException.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpKernel\Exception;
-trigger_error('The '.__NAMESPACE__.'\FatalErrorException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FatalErrorException class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\FatalErrorException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FatalErrorException class instead.', E_USER_DEPRECATED);
/*
* Fatal Error Exception.
diff --git a/core/vendor/symfony/http-kernel/Exception/FlattenException.php b/core/vendor/symfony/http-kernel/Exception/FlattenException.php
index eb205a18efcd..599aa959fc75 100644
--- a/core/vendor/symfony/http-kernel/Exception/FlattenException.php
+++ b/core/vendor/symfony/http-kernel/Exception/FlattenException.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpKernel\Exception;
-trigger_error('The '.__NAMESPACE__.'\FlattenException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FlattenException class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\FlattenException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FlattenException class instead.', E_USER_DEPRECATED);
/*
* FlattenException wraps a PHP Exception to be able to serialize it.
diff --git a/core/vendor/symfony/http-kernel/Fragment/FragmentHandler.php b/core/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
index eae715e8acb5..774870a273a3 100644
--- a/core/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
+++ b/core/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
@@ -80,7 +80,7 @@ public function addRenderer(FragmentRendererInterface $renderer)
*/
public function setRequest(Request $request = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
$this->request = $request;
}
diff --git a/core/vendor/symfony/http-kernel/HttpCache/Esi.php b/core/vendor/symfony/http-kernel/HttpCache/Esi.php
index f7031b81fa32..adb7ff392512 100644
--- a/core/vendor/symfony/http-kernel/HttpCache/Esi.php
+++ b/core/vendor/symfony/http-kernel/HttpCache/Esi.php
@@ -87,7 +87,7 @@ public function hasSurrogateCapability(Request $request)
*/
public function hasSurrogateEsiCapability(Request $request)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasSurrogateCapability() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasSurrogateCapability() method instead.', E_USER_DEPRECATED);
return $this->hasSurrogateCapability($request);
}
@@ -114,7 +114,7 @@ public function addSurrogateCapability(Request $request)
*/
public function addSurrogateEsiCapability(Request $request)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addSurrogateCapability() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addSurrogateCapability() method instead.', E_USER_DEPRECATED);
$this->addSurrogateCapability($request);
}
@@ -160,7 +160,7 @@ public function needsParsing(Response $response)
*/
public function needsEsiParsing(Response $response)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the needsParsing() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the needsParsing() method instead.', E_USER_DEPRECATED);
return $this->needsParsing($response);
}
diff --git a/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php b/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php
index 0d855464a37e..636f60e93906 100644
--- a/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php
+++ b/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php
@@ -15,7 +15,7 @@
namespace Symfony\Component\HttpKernel\HttpCache;
-trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategy class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategy class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategy class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategy class instead.', E_USER_DEPRECATED);
/**
* EsiResponseCacheStrategy knows how to compute the Response cache HTTP header
diff --git a/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php b/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php
index 22abb88639c0..2320867d4398 100644
--- a/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php
+++ b/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php
@@ -15,7 +15,7 @@
namespace Symfony\Component\HttpKernel\HttpCache;
-trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategyInterface class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategyInterface class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategyInterface class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategyInterface class instead.', E_USER_DEPRECATED);
/**
* ResponseCacheStrategyInterface implementations know how to compute the
diff --git a/core/vendor/symfony/http-kernel/HttpCache/HttpCache.php b/core/vendor/symfony/http-kernel/HttpCache/HttpCache.php
index b6ccafc18815..445f59c6f0ff 100644
--- a/core/vendor/symfony/http-kernel/HttpCache/HttpCache.php
+++ b/core/vendor/symfony/http-kernel/HttpCache/HttpCache.php
@@ -174,7 +174,7 @@ public function getSurrogate()
*/
public function getEsi()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getSurrogate() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getSurrogate() method instead.', E_USER_DEPRECATED);
if (!$this->surrogate instanceof Esi) {
throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');
@@ -388,7 +388,7 @@ protected function validate(Request $request, Response $entry, $catch = false)
// We keep the etags from the client to handle the case when the client
// has a different private valid entry which is not cached here.
$cachedEtags = $entry->getEtag() ? array($entry->getEtag()) : array();
- $requestEtags = $request->getEtags();
+ $requestEtags = $request->getETags();
if ($etags = array_unique(array_merge($cachedEtags, $requestEtags))) {
$subRequest->headers->set('if_none_match', implode(', ', $etags));
}
diff --git a/core/vendor/symfony/http-kernel/Kernel.php b/core/vendor/symfony/http-kernel/Kernel.php
index 41defa20575c..25e5d3b26850 100644
--- a/core/vendor/symfony/http-kernel/Kernel.php
+++ b/core/vendor/symfony/http-kernel/Kernel.php
@@ -60,11 +60,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
- const VERSION = '2.7.0';
- const VERSION_ID = '20700';
+ const VERSION = '2.7.1';
+ const VERSION_ID = '20701';
const MAJOR_VERSION = '2';
const MINOR_VERSION = '7';
- const RELEASE_VERSION = '0';
+ const RELEASE_VERSION = '1';
const EXTRA_VERSION = '';
const END_OF_MAINTENANCE = '05/2018';
@@ -93,7 +93,7 @@ public function __construct($environment, $debug)
$defClass = $defClass->getDeclaringClass()->name;
if (__CLASS__ !== $defClass) {
- trigger_error(sprintf('Calling the %s::init() method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', $defClass), E_USER_DEPRECATED);
+ @trigger_error(sprintf('Calling the %s::init() method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', $defClass), E_USER_DEPRECATED);
$this->init();
}
}
@@ -103,7 +103,7 @@ public function __construct($environment, $debug)
*/
public function init()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', E_USER_DEPRECATED);
}
public function __clone()
@@ -225,7 +225,7 @@ public function getBundles()
*/
public function isClassInActiveBundle($class)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in version 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in version 3.0.', E_USER_DEPRECATED);
foreach ($this->getBundles() as $bundle) {
if (0 === strpos($class, $bundle->getNamespace())) {
diff --git a/core/vendor/symfony/http-kernel/Log/NullLogger.php b/core/vendor/symfony/http-kernel/Log/NullLogger.php
index 915773b0088f..b9e3ac495856 100644
--- a/core/vendor/symfony/http-kernel/Log/NullLogger.php
+++ b/core/vendor/symfony/http-kernel/Log/NullLogger.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpKernel\Log;
-trigger_error('The '.__NAMESPACE__.'\NullLogger class is deprecated since version 2.2 and will be removed in 3.0. Use the Psr\Log\NullLogger class instead from the psr/log Composer package.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\NullLogger class is deprecated since version 2.2 and will be removed in 3.0. Use the Psr\Log\NullLogger class instead from the psr/log Composer package.', E_USER_DEPRECATED);
use Psr\Log\NullLogger as PsrNullLogger;
@@ -29,7 +29,7 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
*/
public function emerg($message, array $context = array())
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new emergency() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new emergency() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
}
/**
@@ -37,7 +37,7 @@ public function emerg($message, array $context = array())
*/
public function crit($message, array $context = array())
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new critical() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new critical() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
}
/**
@@ -45,7 +45,7 @@ public function crit($message, array $context = array())
*/
public function err($message, array $context = array())
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new error() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new error() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
}
/**
@@ -53,6 +53,6 @@ public function err($message, array $context = array())
*/
public function warn($message, array $context = array())
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new warning() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new warning() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
}
}
diff --git a/core/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php b/core/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
index e90083fb7e2c..2727405cb1e0 100644
--- a/core/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
+++ b/core/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
@@ -41,7 +41,7 @@ protected function getMemcache()
$port = $matches[3];
$memcache = new \Memcache();
- $memcache->addServer($host, $port);
+ $memcache->addserver($host, $port);
$this->memcache = $memcache;
}
diff --git a/core/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php b/core/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
index 4aa01f0e7c37..4a0dc263b7d8 100644
--- a/core/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
+++ b/core/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -37,9 +37,9 @@ public function testCollect()
// if else clause because we don't know it
if (extension_loaded('xdebug')) {
- $this->assertTrue($c->hasXdebug());
+ $this->assertTrue($c->hasXDebug());
} else {
- $this->assertFalse($c->hasXdebug());
+ $this->assertFalse($c->hasXDebug());
}
// if else clause because we don't know it
diff --git a/core/vendor/symfony/process/.gitignore b/core/vendor/symfony/process/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/process/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/process/Process.php b/core/vendor/symfony/process/Process.php
index fdb395de825f..1474d6982764 100644
--- a/core/vendor/symfony/process/Process.php
+++ b/core/vendor/symfony/process/Process.php
@@ -1069,7 +1069,7 @@ public function setEnv(array $env)
*/
public function getStdin()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getInput() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getInput() method instead.', E_USER_DEPRECATED);
return $this->getInput();
}
@@ -1099,7 +1099,7 @@ public function getInput()
*/
public function setStdin($stdin)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the setInput() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the setInput() method instead.', E_USER_DEPRECATED);
return $this->setInput($stdin);
}
diff --git a/core/vendor/symfony/process/ProcessUtils.php b/core/vendor/symfony/process/ProcessUtils.php
index 488010bacf93..ef36a3f4ed52 100644
--- a/core/vendor/symfony/process/ProcessUtils.php
+++ b/core/vendor/symfony/process/ProcessUtils.php
@@ -97,7 +97,7 @@ public static function validateInput($caller, $input)
}
// deprecated as of Symfony 2.5, to be removed in 3.0
if (is_object($input) && method_exists($input, '__toString')) {
- trigger_error('Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
return (string) $input;
}
diff --git a/core/vendor/symfony/process/Tests/PhpExecutableFinderTest.php b/core/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
index 3acccacc3b1e..8f8623930ff8 100644
--- a/core/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
+++ b/core/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
@@ -91,7 +91,7 @@ public function testFindWithSuffix()
//TODO maybe php executable is custom or even Windows
if ('\\' === DIRECTORY_SEPARATOR) {
$this->assertTrue(is_executable($current));
- $this->assertTrue((bool) preg_match('/'.addSlashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable PHP with suffixes');
+ $this->assertTrue((bool) preg_match('/'.addslashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable PHP with suffixes');
}
}
}
diff --git a/core/vendor/symfony/routing/.gitignore b/core/vendor/symfony/routing/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/routing/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/routing/Annotation/Route.php b/core/vendor/symfony/routing/Annotation/Route.php
index af2158250c77..d5bfea576873 100644
--- a/core/vendor/symfony/routing/Annotation/Route.php
+++ b/core/vendor/symfony/routing/Annotation/Route.php
@@ -59,7 +59,7 @@ public function __construct(array $data)
*/
public function setPattern($pattern)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
$this->path = $pattern;
}
@@ -69,7 +69,7 @@ public function setPattern($pattern)
*/
public function getPattern()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
return $this->path;
}
@@ -106,6 +106,22 @@ public function getName()
public function setRequirements($requirements)
{
+ if (isset($requirements['_method'])) {
+ if (0 === count($this->methods)) {
+ $this->methods = explode('|', $requirements['_method']);
+ }
+
+ @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" option instead.', E_USER_DEPRECATED);
+ }
+
+ if (isset($requirements['_scheme'])) {
+ if (0 === count($this->schemes)) {
+ $this->schemes = explode('|', $requirements['_scheme']);
+ }
+
+ @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" option instead.', E_USER_DEPRECATED);
+ }
+
$this->requirements = $requirements;
}
diff --git a/core/vendor/symfony/routing/Loader/XmlFileLoader.php b/core/vendor/symfony/routing/Loader/XmlFileLoader.php
index 81bd5de6f12c..e8c7f6b14819 100644
--- a/core/vendor/symfony/routing/Loader/XmlFileLoader.php
+++ b/core/vendor/symfony/routing/Loader/XmlFileLoader.php
@@ -122,7 +122,7 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, $p
throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));
}
- trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
+ @trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
$node->setAttribute('path', $node->getAttribute('pattern'));
$node->removeAttribute('pattern');
@@ -133,6 +133,24 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, $p
list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);
+ if (isset($requirements['_method'])) {
+ if (0 === count($methods)) {
+ $methods = explode('|', $requirements['_method']);
+ }
+
+ unset($requirements['_method']);
+ @trigger_error(sprintf('The "_method" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" attribute instead.', $id, $path), E_USER_DEPRECATED);
+ }
+
+ if (isset($requirements['_scheme'])) {
+ if (0 === count($schemes)) {
+ $schemes = explode('|', $requirements['_scheme']);
+ }
+
+ unset($requirements['_scheme']);
+ @trigger_error(sprintf('The "_scheme" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" attribute instead.', $id, $path), E_USER_DEPRECATED);
+ }
+
$route = new Route($node->getAttribute('path'), $defaults, $requirements, $options, $node->getAttribute('host'), $schemes, $methods, $condition);
$collection->add($id, $route);
}
diff --git a/core/vendor/symfony/routing/Loader/YamlFileLoader.php b/core/vendor/symfony/routing/Loader/YamlFileLoader.php
index f004fd14ad65..d30da91d2a45 100644
--- a/core/vendor/symfony/routing/Loader/YamlFileLoader.php
+++ b/core/vendor/symfony/routing/Loader/YamlFileLoader.php
@@ -81,7 +81,7 @@ public function load($file, $type = null)
throw new \InvalidArgumentException(sprintf('The file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));
}
- trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
+ @trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
$config['path'] = $config['pattern'];
unset($config['pattern']);
@@ -127,6 +127,24 @@ protected function parseRoute(RouteCollection $collection, $name, array $config,
$methods = isset($config['methods']) ? $config['methods'] : array();
$condition = isset($config['condition']) ? $config['condition'] : null;
+ if (isset($requirements['_method'])) {
+ if (0 === count($methods)) {
+ $methods = explode('|', $requirements['_method']);
+ }
+
+ unset($requirements['_method']);
+ @trigger_error(sprintf('The "_method" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" option instead.', $name, $path), E_USER_DEPRECATED);
+ }
+
+ if (isset($requirements['_scheme'])) {
+ if (0 === count($schemes)) {
+ $schemes = explode('|', $requirements['_scheme']);
+ }
+
+ unset($requirements['_scheme']);
+ @trigger_error(sprintf('The "_scheme" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" option instead.', $name, $path), E_USER_DEPRECATED);
+ }
+
$route = new Route($config['path'], $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
$collection->add($name, $route);
diff --git a/core/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php b/core/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php
index 058ced4dedd5..c0474f22fd55 100644
--- a/core/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php
+++ b/core/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Routing\Matcher;
-trigger_error('The '.__NAMESPACE__.'\ApacheUrlMatcher class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApacheUrlMatcher class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
diff --git a/core/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php b/core/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php
index d1c14a6f815b..1eb51852a07d 100644
--- a/core/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php
+++ b/core/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Routing\Matcher\Dumper;
-trigger_error('The '.__NAMESPACE__.'\ApacheMatcherDumper class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApacheMatcherDumper class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
use Symfony\Component\Routing\Route;
diff --git a/core/vendor/symfony/routing/Route.php b/core/vendor/symfony/routing/Route.php
index a7b6ad1fd473..19a48f13bd1d 100644
--- a/core/vendor/symfony/routing/Route.php
+++ b/core/vendor/symfony/routing/Route.php
@@ -151,7 +151,7 @@ public function unserialize($serialized)
*/
public function getPattern()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead.', E_USER_DEPRECATED);
return $this->path;
}
@@ -169,7 +169,7 @@ public function getPattern()
*/
public function setPattern($pattern)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead.', E_USER_DEPRECATED);
return $this->setPath($pattern);
}
@@ -549,9 +549,9 @@ public function addRequirements(array $requirements)
public function getRequirement($key)
{
if ('_scheme' === $key) {
- trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getSchemes() instead.', E_USER_DEPRECATED);
+ @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getSchemes() instead.', E_USER_DEPRECATED);
} elseif ('_method' === $key) {
- trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getMethods() instead.', E_USER_DEPRECATED);
+ @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getMethods() instead.', E_USER_DEPRECATED);
}
return isset($this->requirements[$key]) ? $this->requirements[$key] : null;
@@ -655,11 +655,11 @@ private function sanitizeRequirement($key, $regex)
// this is to keep BC and will be removed in a future version
if ('_scheme' === $key) {
- trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setSchemes() method instead or the "schemes" option in the route definition.', E_USER_DEPRECATED);
+ @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setSchemes() method instead.', E_USER_DEPRECATED);
$this->setSchemes(explode('|', $regex));
} elseif ('_method' === $key) {
- trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setMethods() method instead or the "methods" option in the route definition.', E_USER_DEPRECATED);
+ @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setMethods() method instead.', E_USER_DEPRECATED);
$this->setMethods(explode('|', $regex));
}
diff --git a/core/vendor/symfony/serializer/.gitignore b/core/vendor/symfony/serializer/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/serializer/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/serializer/Encoder/JsonDecode.php b/core/vendor/symfony/serializer/Encoder/JsonDecode.php
index 14c1a752c946..1067296f9a58 100644
--- a/core/vendor/symfony/serializer/Encoder/JsonDecode.php
+++ b/core/vendor/symfony/serializer/Encoder/JsonDecode.php
@@ -62,7 +62,7 @@ public function __construct($associative = false, $depth = 512)
*/
public function getLastError()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
return $this->lastError;
}
diff --git a/core/vendor/symfony/serializer/Encoder/JsonEncode.php b/core/vendor/symfony/serializer/Encoder/JsonEncode.php
index 76345bed694b..37f384b25756 100644
--- a/core/vendor/symfony/serializer/Encoder/JsonEncode.php
+++ b/core/vendor/symfony/serializer/Encoder/JsonEncode.php
@@ -40,7 +40,7 @@ public function __construct($bitmask = 0)
*/
public function getLastError()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
return $this->lastError;
}
diff --git a/core/vendor/symfony/serializer/Encoder/JsonEncoder.php b/core/vendor/symfony/serializer/Encoder/JsonEncoder.php
index 1f7a1fb0e330..284f579a048e 100644
--- a/core/vendor/symfony/serializer/Encoder/JsonEncoder.php
+++ b/core/vendor/symfony/serializer/Encoder/JsonEncoder.php
@@ -45,7 +45,7 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
*/
public function getLastEncodingError()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonEncode::encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonEncode::encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
return $this->encodingImpl->getLastError();
}
@@ -59,7 +59,7 @@ public function getLastEncodingError()
*/
public function getLastDecodingError()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonDecode::decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonDecode::decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
return $this->decodingImpl->getLastError();
}
diff --git a/core/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php b/core/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
index 8e89dd509614..8d070d78bc1f 100644
--- a/core/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
+++ b/core/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
@@ -153,7 +153,7 @@ public function setIgnoredAttributes(array $ignoredAttributes)
*/
public function setCamelizedAttributes(array $camelizedAttributes)
{
- trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
+ @trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
if ($this->nameConverter && !$this->nameConverter instanceof CamelCaseToSnakeCaseNameConverter) {
throw new LogicException(sprintf('%s cannot be called if a custom Name Converter is defined.', __METHOD__));
@@ -232,7 +232,7 @@ protected function handleCircularReference($object)
*/
protected function formatAttribute($attributeName)
{
- trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
+ @trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
return $this->nameConverter ? $this->nameConverter->normalize($attributeName) : $attributeName;
}
diff --git a/core/vendor/symfony/translation/.gitignore b/core/vendor/symfony/translation/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/translation/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/translation/Loader/JsonFileLoader.php b/core/vendor/symfony/translation/Loader/JsonFileLoader.php
index 8327c63b57f1..09138835a607 100644
--- a/core/vendor/symfony/translation/Loader/JsonFileLoader.php
+++ b/core/vendor/symfony/translation/Loader/JsonFileLoader.php
@@ -35,10 +35,13 @@ public function load($resource, $locale, $domain = 'messages')
throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
}
- $messages = json_decode(file_get_contents($resource), true);
+ $messages = array();
+ if ($data = file_get_contents($resource)) {
+ $messages = json_decode($data, true);
- if (0 < $errorCode = json_last_error()) {
- throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
+ if (0 < $errorCode = json_last_error()) {
+ throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
+ }
}
if (null === $messages) {
diff --git a/core/vendor/symfony/translation/Loader/MoFileLoader.php b/core/vendor/symfony/translation/Loader/MoFileLoader.php
index ab4e7a9574cd..746fd5290434 100644
--- a/core/vendor/symfony/translation/Loader/MoFileLoader.php
+++ b/core/vendor/symfony/translation/Loader/MoFileLoader.php
@@ -116,7 +116,7 @@ private function parse($resource)
$messages = array();
- for ($i = 0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; ++$i) {
$singularId = $pluralId = null;
$translated = null;
diff --git a/core/vendor/symfony/translation/Loader/XliffFileLoader.php b/core/vendor/symfony/translation/Loader/XliffFileLoader.php
index 99761e7f246c..d2b5407f82e1 100644
--- a/core/vendor/symfony/translation/Loader/XliffFileLoader.php
+++ b/core/vendor/symfony/translation/Loader/XliffFileLoader.php
@@ -148,7 +148,7 @@ private function parseFile($file)
$source = str_replace('http://www.w3.org/2001/xml.xsd', $location, $source);
if (!@$dom->schemaValidateSource($source)) {
- throw new InvalidResourceException(implode("\n", $this->getXmlErrors($internalErrors)));
+ throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $file, implode("\n", $this->getXmlErrors($internalErrors))));
}
$dom->normalizeDocument();
diff --git a/core/vendor/symfony/translation/MessageSelector.php b/core/vendor/symfony/translation/MessageSelector.php
index 9f5430cfe29a..f7fde31ad909 100644
--- a/core/vendor/symfony/translation/MessageSelector.php
+++ b/core/vendor/symfony/translation/MessageSelector.php
@@ -57,7 +57,7 @@ public function choose($message, $number, $locale)
foreach ($parts as $part) {
$part = trim($part);
- if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/x', $part, $matches)) {
+ if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/xs', $part, $matches)) {
$explicitRules[$matches['interval']] = $matches['message'];
} elseif (preg_match('/^\w+\:\s*(.*?)$/', $part, $matches)) {
$standardRules[] = $matches[1];
diff --git a/core/vendor/symfony/translation/Tests/MessageSelectorTest.php b/core/vendor/symfony/translation/Tests/MessageSelectorTest.php
index d5a4f3e3d536..f89bed16d59b 100644
--- a/core/vendor/symfony/translation/Tests/MessageSelectorTest.php
+++ b/core/vendor/symfony/translation/Tests/MessageSelectorTest.php
@@ -93,6 +93,38 @@ public function getChooseTests()
array('There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
array('There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0.0),
array('There are no apples', '{0.0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
+
+ // Test texts with new-lines
+ // with double-quotes and \n in id & double-quotes and actual newlines in text
+ array("This is a text with a\n new-line in it. Selector = 0.", '{0}This is a text with a
+ new-line in it. Selector = 0.|{1}This is a text with a
+ new-line in it. Selector = 1.|[1,Inf]This is a text with a
+ new-line in it. Selector > 1.', 0),
+ // with double-quotes and \n in id and single-quotes and actual newlines in text
+ array("This is a text with a\n new-line in it. Selector = 1.", '{0}This is a text with a
+ new-line in it. Selector = 0.|{1}This is a text with a
+ new-line in it. Selector = 1.|[1,Inf]This is a text with a
+ new-line in it. Selector > 1.', 1),
+ array("This is a text with a\n new-line in it. Selector > 1.", '{0}This is a text with a
+ new-line in it. Selector = 0.|{1}This is a text with a
+ new-line in it. Selector = 1.|[1,Inf]This is a text with a
+ new-line in it. Selector > 1.', 5),
+ // with double-quotes and id split accros lines
+ array('This is a text with a
+ new-line in it. Selector = 1.', '{0}This is a text with a
+ new-line in it. Selector = 0.|{1}This is a text with a
+ new-line in it. Selector = 1.|[1,Inf]This is a text with a
+ new-line in it. Selector > 1.', 1),
+ // with single-quotes and id split accros lines
+ array('This is a text with a
+ new-line in it. Selector > 1.', '{0}This is a text with a
+ new-line in it. Selector = 0.|{1}This is a text with a
+ new-line in it. Selector = 1.|[1,Inf]This is a text with a
+ new-line in it. Selector > 1.', 5),
+ // with single-quotes and \n in text
+ array('This is a text with a\nnew-line in it. Selector = 0.', '{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.', 0),
+ // with double-quotes and id split accros lines
+ array("This is a text with a\nnew-line in it. Selector = 1.", "{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.", 1),
);
}
}
diff --git a/core/vendor/symfony/translation/Tests/PluralizationRulesTest.php b/core/vendor/symfony/translation/Tests/PluralizationRulesTest.php
index 1e8ee704fa95..066e07f5ab3f 100644
--- a/core/vendor/symfony/translation/Tests/PluralizationRulesTest.php
+++ b/core/vendor/symfony/translation/Tests/PluralizationRulesTest.php
@@ -112,7 +112,7 @@ protected function generateTestData($plural, $langCodes)
{
$matrix = array();
foreach ($langCodes as $langCode) {
- for ($count = 0; $count < 200; $count++) {
+ for ($count = 0; $count < 200; ++$count) {
$plural = PluralizationRules::get($count, $langCode);
$matrix[$langCode][$count] = $plural;
}
diff --git a/core/vendor/symfony/translation/Tests/TranslatorCacheTest.php b/core/vendor/symfony/translation/Tests/TranslatorCacheTest.php
index d5d4639984ce..abe364c7368c 100644
--- a/core/vendor/symfony/translation/Tests/TranslatorCacheTest.php
+++ b/core/vendor/symfony/translation/Tests/TranslatorCacheTest.php
@@ -74,41 +74,6 @@ public function testThatACacheIsUsed($debug)
$this->assertEquals('OK', $translator->trans($msgid), '-> caching does not work in '.($debug ? 'debug' : 'production'));
}
- public function testRefreshCacheWhenResourcesChange()
- {
- // prime the cache
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
- $loader
- ->method('load')
- ->will($this->returnValue($this->getCatalogue('fr', array(
- 'foo' => 'foo A',
- ))))
- ;
-
- $translator = new Translator('fr', null, $this->tmpDir, true);
- $translator->setLocale('fr');
- $translator->addLoader('loader', $loader);
- $translator->addResource('loader', 'foo', 'fr');
-
- $this->assertEquals('foo A', $translator->trans('foo'));
-
- // add a new resource to refresh the cache
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
- $loader
- ->method('load')
- ->will($this->returnValue($this->getCatalogue('fr', array(
- 'foo' => 'foo B',
- ))))
- ;
-
- $translator = new Translator('fr', null, $this->tmpDir, true);
- $translator->setLocale('fr');
- $translator->addLoader('loader', $loader);
- $translator->addResource('loader', 'bar', 'fr');
-
- $this->assertEquals('foo B', $translator->trans('foo'));
- }
-
public function testCatalogueIsReloadedWhenResourcesAreNoLongerFresh()
{
/*
@@ -150,32 +115,6 @@ public function testCatalogueIsReloadedWhenResourcesAreNoLongerFresh()
$translator->trans($msgid);
}
- /**
- * @dataProvider runForDebugAndProduction
- */
- public function testDifferentTranslatorsForSameLocaleDoNotInterfere($debug)
- {
- $locale = 'any_locale';
- $format = 'some_format';
- $msgid = 'test';
-
- // Create a Translator and prime its cache
- $translator = new Translator($locale, null, $this->tmpDir, $debug);
- $translator->addLoader($format, new ArrayLoader());
- $translator->addResource($format, array($msgid => 'FAIL'), $locale);
- $translator->trans($msgid);
-
- /*
- * Create another Translator with the same locale but a different resource.
- * It should not use the first translator's cache but return the value from its own resource.
- */
- $translator = new Translator($locale, null, $this->tmpDir, $debug);
- $translator->addLoader($format, new ArrayLoader());
- $translator->addResource($format, array($msgid => 'OK'), $locale);
-
- $this->assertEquals('OK', $translator->trans($msgid), '-> different translators for the same domain interfere in '.($debug ? 'debug' : 'production'));
- }
-
/**
* @dataProvider runForDebugAndProduction
*/
diff --git a/core/vendor/symfony/translation/Translator.php b/core/vendor/symfony/translation/Translator.php
index ec315066f7b0..9b1b73550c57 100644
--- a/core/vendor/symfony/translation/Translator.php
+++ b/core/vendor/symfony/translation/Translator.php
@@ -177,7 +177,7 @@ public function getLocale()
*/
public function setFallbackLocale($locales)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);
$this->setFallbackLocales(is_array($locales) ? $locales : array($locales));
}
@@ -419,12 +419,7 @@ private function getFallbackContent(MessageCatalogue $catalogue)
private function getCatalogueCachePath($locale)
{
- $catalogueHash = sha1(serialize(array(
- 'resources' => isset($this->resources[$locale]) ? $this->resources[$locale] : array(),
- 'fallback_locales' => $this->fallbackLocales,
- )));
-
- return $this->cacheDir.'/catalogue.'.$locale.'.'.$catalogueHash.'.php';
+ return $this->cacheDir.'/catalogue.'.$locale.'.'.sha1(serialize($this->fallbackLocales)).'.php';
}
private function doLoadCatalogue($locale)
diff --git a/core/vendor/symfony/validator/.gitignore b/core/vendor/symfony/validator/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/validator/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/validator/ConstraintValidator.php b/core/vendor/symfony/validator/ConstraintValidator.php
index 7a412737bd9a..3b5d6bc16471 100644
--- a/core/vendor/symfony/validator/ConstraintValidator.php
+++ b/core/vendor/symfony/validator/ConstraintValidator.php
@@ -65,7 +65,7 @@ public function initialize(ExecutionContextInterface $context)
*/
protected function buildViolation($message, array $parameters = array())
{
- trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
if ($this->context instanceof ExecutionContextInterface2Dot5) {
return $this->context->buildViolation($message, $parameters);
@@ -88,7 +88,7 @@ protected function buildViolation($message, array $parameters = array())
*/
protected function buildViolationInContext(ExecutionContextInterface $context, $message, array $parameters = array())
{
- trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
if ($context instanceof ExecutionContextInterface2Dot5) {
return $context->buildViolation($message, $parameters);
diff --git a/core/vendor/symfony/validator/ConstraintViolation.php b/core/vendor/symfony/validator/ConstraintViolation.php
index 7df3f3fadeef..31b44d23cd3d 100644
--- a/core/vendor/symfony/validator/ConstraintViolation.php
+++ b/core/vendor/symfony/validator/ConstraintViolation.php
@@ -147,7 +147,7 @@ public function getMessageTemplate()
*/
public function getMessageParameters()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getParameters() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getParameters() method instead.', E_USER_DEPRECATED);
return $this->parameters;
}
@@ -168,7 +168,7 @@ public function getParameters()
*/
public function getMessagePluralization()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getPlural() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getPlural() method instead.', E_USER_DEPRECATED);
return $this->plural;
}
diff --git a/core/vendor/symfony/validator/Constraints/Callback.php b/core/vendor/symfony/validator/Constraints/Callback.php
index bb8c076e0454..d1d05fa26b04 100644
--- a/core/vendor/symfony/validator/Constraints/Callback.php
+++ b/core/vendor/symfony/validator/Constraints/Callback.php
@@ -48,7 +48,7 @@ public function __construct($options = null)
}
if (is_array($options) && isset($options['methods'])) {
- trigger_error('The "methods" option of the '.__CLASS__.' class is deprecated since version 2.4 and will be removed in 3.0. Use the "callback" option instead.', E_USER_DEPRECATED);
+ @trigger_error('The "methods" option of the '.__CLASS__.' class is deprecated since version 2.4 and will be removed in 3.0. Use the "callback" option instead.', E_USER_DEPRECATED);
}
if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups'])) {
diff --git a/core/vendor/symfony/validator/Constraints/Collection/Optional.php b/core/vendor/symfony/validator/Constraints/Collection/Optional.php
index cd9af50b9acf..68471f925579 100644
--- a/core/vendor/symfony/validator/Constraints/Collection/Optional.php
+++ b/core/vendor/symfony/validator/Constraints/Collection/Optional.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Constraints\Collection;
-trigger_error('The '.__NAMESPACE__.'\Optional class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Optional class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Optional class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Optional class instead.', E_USER_DEPRECATED);
use Symfony\Component\Validator\Constraints\Optional as BaseOptional;
diff --git a/core/vendor/symfony/validator/Constraints/Collection/Required.php b/core/vendor/symfony/validator/Constraints/Collection/Required.php
index 55041020b7a5..4b062bb558db 100644
--- a/core/vendor/symfony/validator/Constraints/Collection/Required.php
+++ b/core/vendor/symfony/validator/Constraints/Collection/Required.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Constraints\Collection;
-trigger_error('The '.__NAMESPACE__.'\Required class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Required class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Required class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Required class instead.', E_USER_DEPRECATED);
use Symfony\Component\Validator\Constraints\Required as BaseRequired;
diff --git a/core/vendor/symfony/validator/Constraints/False.php b/core/vendor/symfony/validator/Constraints/False.php
index 166878863cf7..1e103ade514d 100644
--- a/core/vendor/symfony/validator/Constraints/False.php
+++ b/core/vendor/symfony/validator/Constraints/False.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Constraints;
-trigger_error('The '.__NAMESPACE__.'\False class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalse class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\False class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalse class in the same namespace instead.', E_USER_DEPRECATED);
/**
* @Annotation
diff --git a/core/vendor/symfony/validator/Constraints/FalseValidator.php b/core/vendor/symfony/validator/Constraints/FalseValidator.php
index 24eb91010feb..9614c3037fe9 100644
--- a/core/vendor/symfony/validator/Constraints/FalseValidator.php
+++ b/core/vendor/symfony/validator/Constraints/FalseValidator.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Constraints;
-trigger_error('The '.__NAMESPACE__.'\FalseValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalseValidator class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\FalseValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalseValidator class in the same namespace instead.', E_USER_DEPRECATED);
/**
* @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/core/vendor/symfony/validator/Constraints/GroupSequence.php b/core/vendor/symfony/validator/Constraints/GroupSequence.php
index 52d75394313a..b74f92caa8fd 100644
--- a/core/vendor/symfony/validator/Constraints/GroupSequence.php
+++ b/core/vendor/symfony/validator/Constraints/GroupSequence.php
@@ -107,7 +107,7 @@ public function __construct(array $groups)
*/
public function getIterator()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
return new \ArrayIterator($this->groups);
}
@@ -125,7 +125,7 @@ public function getIterator()
*/
public function offsetExists($offset)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
return isset($this->groups[$offset]);
}
@@ -145,7 +145,7 @@ public function offsetExists($offset)
*/
public function offsetGet($offset)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
if (!isset($this->groups[$offset])) {
throw new OutOfBoundsException(sprintf(
@@ -169,7 +169,7 @@ public function offsetGet($offset)
*/
public function offsetSet($offset, $value)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
if (null !== $offset) {
$this->groups[$offset] = $value;
@@ -191,7 +191,7 @@ public function offsetSet($offset, $value)
*/
public function offsetUnset($offset)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
unset($this->groups[$offset]);
}
@@ -207,7 +207,7 @@ public function offsetUnset($offset)
*/
public function count()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
return count($this->groups);
}
diff --git a/core/vendor/symfony/validator/Constraints/IsbnValidator.php b/core/vendor/symfony/validator/Constraints/IsbnValidator.php
index ccdf4e88d2e9..301a8217718d 100644
--- a/core/vendor/symfony/validator/Constraints/IsbnValidator.php
+++ b/core/vendor/symfony/validator/Constraints/IsbnValidator.php
@@ -49,10 +49,10 @@ public function validate($value, Constraint $constraint)
if (null === $constraint->type) {
if ($constraint->isbn10 && !$constraint->isbn13) {
- trigger_error('The "isbn10" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
+ @trigger_error('The "isbn10" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
$constraint->type = 'isbn10';
} elseif ($constraint->isbn13 && !$constraint->isbn10) {
- trigger_error('The "isbn13" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
+ @trigger_error('The "isbn13" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
$constraint->type = 'isbn13';
}
}
diff --git a/core/vendor/symfony/validator/Constraints/Null.php b/core/vendor/symfony/validator/Constraints/Null.php
index 934b8eedc61a..705d93fc41f3 100644
--- a/core/vendor/symfony/validator/Constraints/Null.php
+++ b/core/vendor/symfony/validator/Constraints/Null.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Constraints;
-trigger_error('The '.__NAMESPACE__.'\Null class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNull class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Null class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNull class in the same namespace instead.', E_USER_DEPRECATED);
/**
* @Annotation
diff --git a/core/vendor/symfony/validator/Constraints/NullValidator.php b/core/vendor/symfony/validator/Constraints/NullValidator.php
index 0900c8cd2d3e..bd17eab528c2 100644
--- a/core/vendor/symfony/validator/Constraints/NullValidator.php
+++ b/core/vendor/symfony/validator/Constraints/NullValidator.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Constraints;
-trigger_error('The '.__NAMESPACE__.'\NullValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNullValidator class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\NullValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNullValidator class in the same namespace instead.', E_USER_DEPRECATED);
/**
* @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/core/vendor/symfony/validator/Constraints/True.php b/core/vendor/symfony/validator/Constraints/True.php
index 376f69ff3f95..b9efff375e1b 100644
--- a/core/vendor/symfony/validator/Constraints/True.php
+++ b/core/vendor/symfony/validator/Constraints/True.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Constraints;
-trigger_error('The '.__NAMESPACE__.'\True class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrue class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\True class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrue class in the same namespace instead.', E_USER_DEPRECATED);
/**
* @Annotation
diff --git a/core/vendor/symfony/validator/Constraints/TrueValidator.php b/core/vendor/symfony/validator/Constraints/TrueValidator.php
index 1cb252ae3f22..14d879808da0 100644
--- a/core/vendor/symfony/validator/Constraints/TrueValidator.php
+++ b/core/vendor/symfony/validator/Constraints/TrueValidator.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Constraints;
-trigger_error('The '.__NAMESPACE__.'\TrueValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrueValidator class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\TrueValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrueValidator class in the same namespace instead.', E_USER_DEPRECATED);
/**
* @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/core/vendor/symfony/validator/Constraints/Valid.php b/core/vendor/symfony/validator/Constraints/Valid.php
index cb520c93d4c5..9fc001563282 100644
--- a/core/vendor/symfony/validator/Constraints/Valid.php
+++ b/core/vendor/symfony/validator/Constraints/Valid.php
@@ -41,7 +41,7 @@ public function __construct($options = null)
}
if (is_array($options) && array_key_exists('deep', $options)) {
- trigger_error('The "deep" option for the Valid constraint is deprecated since version 2.5 and will be removed in 3.0. When traversing arrays, nested arrays are always traversed. When traversing nested objects, their traversal strategy is used.', E_USER_DEPRECATED);
+ @trigger_error('The "deep" option for the Valid constraint is deprecated since version 2.5 and will be removed in 3.0. When traversing arrays, nested arrays are always traversed. When traversing nested objects, their traversal strategy is used.', E_USER_DEPRECATED);
}
parent::__construct($options);
diff --git a/core/vendor/symfony/validator/Context/ExecutionContext.php b/core/vendor/symfony/validator/Context/ExecutionContext.php
index 39f7d1506d64..39f92fbc6d2a 100644
--- a/core/vendor/symfony/validator/Context/ExecutionContext.php
+++ b/core/vendor/symfony/validator/Context/ExecutionContext.php
@@ -188,7 +188,7 @@ public function addViolation($message, array $parameters = array(), $invalidValu
// API, as they are not present in the new interface anymore.
// You should use buildViolation() instead.
if (func_num_args() > 2) {
- trigger_error('The parameters $invalidValue, $plural and $code in method '.__METHOD__.' are deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
+ @trigger_error('The parameters $invalidValue, $plural and $code in method '.__METHOD__.' are deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
$this
->buildViolation($message, $parameters)
@@ -317,7 +317,7 @@ public function getPropertyPath($subPath = '')
*/
public function addViolationAt($subPath, $message, array $parameters = array(), $invalidValue = null, $plural = null, $code = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
if (func_num_args() > 2) {
$this
@@ -344,7 +344,7 @@ public function addViolationAt($subPath, $message, array $parameters = array(),
*/
public function validate($value, $subPath = '', $groups = null, $traverse = false, $deep = false)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
if (is_array($value)) {
// The $traverse flag is ignored for arrays
@@ -382,7 +382,7 @@ public function validate($value, $subPath = '', $groups = null, $traverse = fals
*/
public function validateValue($value, $constraints, $subPath = '', $groups = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
return $this
->getValidator()
@@ -397,7 +397,7 @@ public function validateValue($value, $constraints, $subPath = '', $groups = nul
*/
public function getMetadataFactory()
{
- trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0. Use the new Symfony\Component\Validator\Context\ExecutionContext::getValidator method in combination with Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0. Use the new Symfony\Component\Validator\Context\ExecutionContext::getValidator method in combination with Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
$validator = $this->getValidator();
diff --git a/core/vendor/symfony/validator/Context/LegacyExecutionContext.php b/core/vendor/symfony/validator/Context/LegacyExecutionContext.php
index 5ee7a228c47d..4d5be451d91d 100644
--- a/core/vendor/symfony/validator/Context/LegacyExecutionContext.php
+++ b/core/vendor/symfony/validator/Context/LegacyExecutionContext.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Context;
-trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContext class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContext class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\MetadataFactoryInterface;
diff --git a/core/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php b/core/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php
index 31fb4cbdde0e..9e8498a6b9da 100644
--- a/core/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php
+++ b/core/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Context;
-trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\MetadataFactoryInterface;
diff --git a/core/vendor/symfony/validator/DefaultTranslator.php b/core/vendor/symfony/validator/DefaultTranslator.php
index 37c9c170fcd5..85853d8d858c 100644
--- a/core/vendor/symfony/validator/DefaultTranslator.php
+++ b/core/vendor/symfony/validator/DefaultTranslator.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator;
-trigger_error('The class '.__NAMESPACE__.'\DefaultTranslator is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Translation\IdentityTranslator instead.', E_USER_DEPRECATED);
+@trigger_error('The class '.__NAMESPACE__.'\DefaultTranslator is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Translation\IdentityTranslator instead.', E_USER_DEPRECATED);
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\Exception\BadMethodCallException;
diff --git a/core/vendor/symfony/validator/ExecutionContext.php b/core/vendor/symfony/validator/ExecutionContext.php
index d21dd780f1c0..5875e94ef45d 100644
--- a/core/vendor/symfony/validator/ExecutionContext.php
+++ b/core/vendor/symfony/validator/ExecutionContext.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator;
-trigger_error('The '.__NAMESPACE__.'\ExecutionContext class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Context\ExecutionContext class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ExecutionContext class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Context\ExecutionContext class instead.', E_USER_DEPRECATED);
use Symfony\Component\Translation\TranslatorInterface;
diff --git a/core/vendor/symfony/validator/ExecutionContextInterface.php b/core/vendor/symfony/validator/ExecutionContextInterface.php
index 3fedfe15de02..2b6cd01e18ef 100644
--- a/core/vendor/symfony/validator/ExecutionContextInterface.php
+++ b/core/vendor/symfony/validator/ExecutionContextInterface.php
@@ -91,6 +91,8 @@ interface ExecutionContextInterface
/**
* Adds a violation at the current node of the validation graph.
*
+ * Note: the parameters $invalidValue, $plural and $code are deprecated since version 2.5 and will be removed in 3.0.
+ *
* @param string $message The error message
* @param array $params The parameters substituted in the error message
* @param mixed $invalidValue The invalid, validated value
@@ -98,8 +100,6 @@ interface ExecutionContextInterface
* @param int|null $code The violation code
*
* @api
- *
- * @deprecated the parameters $invalidValue, $plural and $code are deprecated since version 2.5 and will be removed in 3.0.
*/
public function addViolation($message, array $params = array(), $invalidValue = null, $plural = null, $code = null);
diff --git a/core/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php b/core/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php
index ad5a980e4ca3..01b80138d590 100644
--- a/core/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php
+++ b/core/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Mapping;
-trigger_error('The '.__NAMESPACE__.'\BlackholeMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\BlackholeMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory class instead.', E_USER_DEPRECATED);
use Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory as MappingBlackHoleMetadataFactory;
diff --git a/core/vendor/symfony/validator/Mapping/Cache/ApcCache.php b/core/vendor/symfony/validator/Mapping/Cache/ApcCache.php
index 5dbe9f406a14..63fc8ac05a40 100644
--- a/core/vendor/symfony/validator/Mapping/Cache/ApcCache.php
+++ b/core/vendor/symfony/validator/Mapping/Cache/ApcCache.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Mapping\Cache;
-trigger_error('The '.__NAMESPACE__.'\ApcCache class is deprecated since version 2.5 and will be removed in 3.0. Use DoctrineCache with the Doctrine\Common\Cache\ApcCache class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApcCache class is deprecated since version 2.5 and will be removed in 3.0. Use DoctrineCache with the Doctrine\Common\Cache\ApcCache class instead.', E_USER_DEPRECATED);
use Symfony\Component\Validator\Mapping\ClassMetadata;
diff --git a/core/vendor/symfony/validator/Mapping/ClassMetadata.php b/core/vendor/symfony/validator/Mapping/ClassMetadata.php
index 5991f3489e51..3f4f51b83b41 100644
--- a/core/vendor/symfony/validator/Mapping/ClassMetadata.php
+++ b/core/vendor/symfony/validator/Mapping/ClassMetadata.php
@@ -133,7 +133,7 @@ public function __construct($class)
*/
public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath, $propagatedGroup = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
if (null === $propagatedGroup && Constraint::DEFAULT_GROUP === $group
&& ($this->hasGroupSequence() || $this->isGroupSequenceProvider())) {
@@ -377,7 +377,7 @@ public function mergeConstraints(ClassMetadata $source)
*/
protected function addMemberMetadata(MemberMetadata $metadata)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addPropertyMetadata() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addPropertyMetadata() method instead.', E_USER_DEPRECATED);
$this->addPropertyMetadata($metadata);
}
@@ -393,7 +393,7 @@ protected function addMemberMetadata(MemberMetadata $metadata)
*/
public function hasMemberMetadatas($property)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasPropertyMetadata() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasPropertyMetadata() method instead.', E_USER_DEPRECATED);
return $this->hasPropertyMetadata($property);
}
@@ -409,7 +409,7 @@ public function hasMemberMetadatas($property)
*/
public function getMemberMetadatas($property)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getPropertyMetadata() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getPropertyMetadata() method instead.', E_USER_DEPRECATED);
return $this->getPropertyMetadata($property);
}
diff --git a/core/vendor/symfony/validator/Mapping/ClassMetadataFactory.php b/core/vendor/symfony/validator/Mapping/ClassMetadataFactory.php
index 92cc85b2ef67..4069b3fbcad0 100644
--- a/core/vendor/symfony/validator/Mapping/ClassMetadataFactory.php
+++ b/core/vendor/symfony/validator/Mapping/ClassMetadataFactory.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Mapping;
-trigger_error('The '.__NAMESPACE__.'\ClassMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ClassMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory class instead.', E_USER_DEPRECATED);
use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
diff --git a/core/vendor/symfony/validator/Mapping/ElementMetadata.php b/core/vendor/symfony/validator/Mapping/ElementMetadata.php
index 1783864e0067..69fe8bfa7372 100644
--- a/core/vendor/symfony/validator/Mapping/ElementMetadata.php
+++ b/core/vendor/symfony/validator/Mapping/ElementMetadata.php
@@ -24,7 +24,7 @@ abstract class ElementMetadata extends GenericMetadata
public function __construct()
{
if (!$this instanceof MemberMetadata && !$this instanceof ClassMetadata) {
- trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);
}
}
}
diff --git a/core/vendor/symfony/validator/Mapping/MemberMetadata.php b/core/vendor/symfony/validator/Mapping/MemberMetadata.php
index 394fa2059fd8..0def248431f2 100644
--- a/core/vendor/symfony/validator/Mapping/MemberMetadata.php
+++ b/core/vendor/symfony/validator/Mapping/MemberMetadata.php
@@ -82,7 +82,7 @@ public function __construct($class, $name, $property)
*/
public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath, $propagatedGroup = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
$visitor->visit($this, $value, $group, $propertyPath);
@@ -192,7 +192,7 @@ public function isPrivate($objectOrClassName)
*/
public function isCascaded()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getCascadingStrategy() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getCascadingStrategy() method instead.', E_USER_DEPRECATED);
return (bool) ($this->cascadingStrategy & CascadingStrategy::CASCADE);
}
@@ -208,7 +208,7 @@ public function isCascaded()
*/
public function isCollectionCascaded()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
return (bool) ($this->traversalStrategy & (TraversalStrategy::IMPLICIT | TraversalStrategy::TRAVERSE));
}
@@ -224,7 +224,7 @@ public function isCollectionCascaded()
*/
public function isCollectionCascadedDeeply()
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
return !($this->traversalStrategy & TraversalStrategy::STOP_RECURSION);
}
diff --git a/core/vendor/symfony/validator/Tests/Constraints/AbstractConstraintValidatorTest.php b/core/vendor/symfony/validator/Tests/Constraints/AbstractConstraintValidatorTest.php
index 55ddbfe9c859..e23709f3fcfe 100644
--- a/core/vendor/symfony/validator/Tests/Constraints/AbstractConstraintValidatorTest.php
+++ b/core/vendor/symfony/validator/Tests/Constraints/AbstractConstraintValidatorTest.php
@@ -260,7 +260,7 @@ protected function assertNoViolation()
*/
protected function assertViolation($message, array $parameters = array(), $propertyPath = 'property.path', $invalidValue = 'InvalidValue', $plural = null, $code = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the buildViolation() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the buildViolation() method instead.', E_USER_DEPRECATED);
$this->buildViolation($message)
->setParameters($parameters)
@@ -279,7 +279,7 @@ protected function assertViolation($message, array $parameters = array(), $prope
*/
protected function assertViolations(array $expected)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the buildViolation() method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the buildViolation() method instead.', E_USER_DEPRECATED);
$violations = $this->context->getViolations();
diff --git a/core/vendor/symfony/validator/ValidationVisitor.php b/core/vendor/symfony/validator/ValidationVisitor.php
index c7e06554b8cb..838646260f36 100644
--- a/core/vendor/symfony/validator/ValidationVisitor.php
+++ b/core/vendor/symfony/validator/ValidationVisitor.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator;
-trigger_error('The '.__NAMESPACE__.'\ValidationVisitor class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ValidationVisitor class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\Exception\NoSuchMetadataException;
diff --git a/core/vendor/symfony/validator/Validator.php b/core/vendor/symfony/validator/Validator.php
index 8243f17acbf6..4da27e7b375a 100644
--- a/core/vendor/symfony/validator/Validator.php
+++ b/core/vendor/symfony/validator/Validator.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator;
-trigger_error('The '.__NAMESPACE__.'\Validator class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Validator\RecursiveValidator class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Validator class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Validator\RecursiveValidator class instead.', E_USER_DEPRECATED);
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\Constraints\Valid;
diff --git a/core/vendor/symfony/validator/Validator/LegacyValidator.php b/core/vendor/symfony/validator/Validator/LegacyValidator.php
index 6c5a10c35559..0b0934bd3e25 100644
--- a/core/vendor/symfony/validator/Validator/LegacyValidator.php
+++ b/core/vendor/symfony/validator/Validator/LegacyValidator.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Validator;
-trigger_error('The '.__NAMESPACE__.'\LegacyValidator class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyValidator class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
/**
* A validator that supports both the API of Symfony < 2.5 and Symfony 2.5+.
diff --git a/core/vendor/symfony/validator/Validator/RecursiveValidator.php b/core/vendor/symfony/validator/Validator/RecursiveValidator.php
index c825bfa6f48b..2d66a23fe365 100644
--- a/core/vendor/symfony/validator/Validator/RecursiveValidator.php
+++ b/core/vendor/symfony/validator/Validator/RecursiveValidator.php
@@ -124,7 +124,7 @@ public function validate($value, $groups = null, $traverse = false, $deep = fals
$constraints = $groups;
$groups = $traverse;
} else {
- trigger_error('The Symfony\Component\Validator\ValidatorInterface::validate method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
+ @trigger_error('The Symfony\Component\Validator\ValidatorInterface::validate method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
$constraints = new Valid(array('traverse' => $traverse, 'deep' => $deep));
}
@@ -160,7 +160,7 @@ public function validatePropertyValue($objectOrClass, $propertyName, $value, $gr
*/
public function validateValue($value, $constraints, $groups = null)
{
- trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
return $this->validate($value, $constraints, $groups);
}
@@ -170,7 +170,7 @@ public function validateValue($value, $constraints, $groups = null)
*/
public function getMetadataFactory()
{
- trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
return $this->metadataFactory;
}
diff --git a/core/vendor/symfony/validator/ValidatorBuilder.php b/core/vendor/symfony/validator/ValidatorBuilder.php
index dd772cf38325..4a69976ed2b1 100644
--- a/core/vendor/symfony/validator/ValidatorBuilder.php
+++ b/core/vendor/symfony/validator/ValidatorBuilder.php
@@ -300,7 +300,7 @@ public function setTranslationDomain($translationDomain)
*/
public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor)
{
- trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. The validator will function without a property accessor.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. The validator will function without a property accessor.', E_USER_DEPRECATED);
if (null !== $this->validatorFactory) {
throw new ValidatorException('You cannot set a property accessor after setting a custom validator factory. Configure your validator factory instead.');
@@ -318,7 +318,7 @@ public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor)
*/
public function setApiVersion($apiVersion)
{
- trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
+ @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
if (!in_array($apiVersion, array(Validation::API_VERSION_2_4, Validation::API_VERSION_2_5, Validation::API_VERSION_2_5_BC))) {
throw new InvalidArgumentException(sprintf('The requested API version is invalid: "%s"', $apiVersion));
diff --git a/core/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php b/core/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php
index 0ce6da90608e..7410b0a6fc2d 100644
--- a/core/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php
+++ b/core/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Validator\Violation;
-trigger_error('The '.__NAMESPACE__.'\LegacyConstraintViolationBuilder class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyConstraintViolationBuilder class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
use Symfony\Component\Validator\ExecutionContextInterface;
diff --git a/core/vendor/symfony/yaml/.gitignore b/core/vendor/symfony/yaml/.gitignore
new file mode 100644
index 000000000000..c49a5d8df5c6
--- /dev/null
+++ b/core/vendor/symfony/yaml/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/yaml/Yaml.php b/core/vendor/symfony/yaml/Yaml.php
index e17698a07c74..b6def51749e6 100644
--- a/core/vendor/symfony/yaml/Yaml.php
+++ b/core/vendor/symfony/yaml/Yaml.php
@@ -38,6 +38,8 @@ class Yaml
* you must validate the input before calling this method. Passing a file
* as an input is a deprecated feature and will be removed in 3.0.
*
+ * Note: the ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
+ *
* @param string $input Path to a YAML file or a string containing YAML
* @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
* @param bool $objectSupport True if object support is enabled, false otherwise
@@ -47,8 +49,6 @@ class Yaml
*
* @throws ParseException If the YAML is not valid
*
- * @deprecated The ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
- *
* @api
*/
public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
@@ -56,7 +56,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup
// if input is a file, process it
$file = '';
if (strpos($input, "\n") === false && is_file($input)) {
- trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
+ @trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
if (false === is_readable($input)) {
throw new ParseException(sprintf('Unable to parse "%s" as the file is not readable.', $input));
--
GitLab