From e4fa5d8cc39a5d0865174a4775d4dcb2b87c2873 Mon Sep 17 00:00:00 2001 From: Charles Sarrazin Date: Fri, 16 May 2014 13:58:11 +0200 Subject: [PATCH 1/2] Updated form dev dependencies --- src/Symfony/Component/Form/composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 024298b0f3..d52484a375 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -25,7 +25,9 @@ "require-dev": { "symfony/validator": "~2.2", "symfony/http-foundation": "~2.2", - "symfony/security-csrf": "~2.4" + "symfony/http-kernel": "~2.4", + "symfony/security-csrf": "~2.4", + "doctrine/collections": "~1.0" }, "suggest": { "symfony/validator": "For form validation.", From 7b5857ca615de8377a6426a4e9cddf08285123d3 Mon Sep 17 00:00:00 2001 From: Charles Sarrazin Date: Fri, 16 May 2014 13:59:23 +0200 Subject: [PATCH 2/2] Fixed FormDataExtractorTest_SimpleValueExporter::exportValue not implementing the interface correctly --- .../Tests/Extension/DataCollector/FormDataExtractorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php index bf3cd71975..6f6ca2f265 100644 --- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php @@ -25,7 +25,7 @@ class FormDataExtractorTest_SimpleValueExporter extends ValueExporter /** * {@inheritdoc} */ - public function exportValue($value) + public function exportValue($value, $depth = 1, $deep = false) { return var_export($value, true); }