From ed028fc4f491b2b2606b1f155614e59bbce3f606 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 19 Mar 2018 23:30:33 +0100 Subject: [PATCH] [Form] fix tests and deps --- src/Symfony/Bridge/Twig/composer.json | 4 ++-- .../Component/Form/Tests/AbstractBootstrap4LayoutTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 8a531dcc62..40c6767dbb 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -23,7 +23,7 @@ "symfony/asset": "~2.8|~3.0|~4.0", "symfony/dependency-injection": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/form": "^3.4.5|^4.0.5", + "symfony/form": "^3.4.7|^4.0.7", "symfony/http-foundation": "^3.3.11|~4.0", "symfony/http-kernel": "~3.2|~4.0", "symfony/polyfill-intl-icu": "~1.0", @@ -41,7 +41,7 @@ "symfony/workflow": "~3.3|~4.0" }, "conflict": { - "symfony/form": "<3.4.5|<4.0.5,>=4.0", + "symfony/form": "<3.4.7|<4.0.7,>=4.0", "symfony/console": "<3.4" }, "suggest": { diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php index 6e448c413a..beabaa21cd 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php @@ -166,10 +166,10 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest ./span[@class="mb-0 d-block"] [./span[.="[trans]Error[/trans]"]] [./span[.="[trans]Error 1[/trans]"]] - + /following-sibling::span[@class="mb-0 d-block"] [./span[.="[trans]Error[/trans]"]] - [./span[.="[trans]Error 2[/trans]"]] + [./span[.="[trans]Error 2[/trans]"]] ] [count(./span)=2] '