Skip to content

Commit b796176

Browse files
committed
Merge branch '2.7'
* 2.7: fixed tests [OptionsResolver] replaced some exception messages Added i18n support to ConfirmationQuestion [HttpKernel] [WebProfilerBundle] added HTTP status to profiler search result [Form] fixed form tests when using 2.7 deps [2.3] [HttpFoundation] [MimeTypeGuesser] [Routing] merge instead of replace class and method scheme/method annotations [TwigBridge] Fix bootstrap rendering when user explicitly use form_label Removed dead code and various cleaning Removed dead code and various cleaning Fixed HtmlDumper with long string Removed dead code and various cleaning [FrameworkBundle][xsd] added missing logging attribute. [Console] Make it clear that the second argument is not about command options. Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes [Yaml] fixed parse shortcut Key after unindented collection. [Console] fixed #10531 Make the container considered non-fresh if the environment parameters are changed Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig src/Symfony/Component/HttpKernel/CHANGELOG.md src/Symfony/Component/Process/Process.php
2 parents 3ae4062 + 19255f2 commit b796176

File tree

3 files changed

+1
-2
lines changed

3 files changed

+1
-2
lines changed

Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Symfony\Component\Form\DataTransformerInterface;
1515
use Symfony\Component\Form\Exception\TransformationFailedException;
16-
use Symfony\Component\Form\Deprecated\NumberToLocalizedStringTransformer as Deprecated;
1716

1817
/**
1918
* Transforms between a number type and a localized number with grouping

Extension/Validator/Constraints/Form.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Form\Extension\Validator\Constraints;
1313

14-
use Symfony\Component\Form\Extension\Validator\Constraints\Deprecated\Form as Deprecated;
1514
use Symfony\Component\Validator\Constraint;
1615

1716
/**

Tests/Extension/Validator/Constraints/FormValidatorTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
1919
use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
2020
use Symfony\Component\Form\SubmitButtonBuilder;
21+
use Symfony\Component\Validator\Context\ExecutionContextInterface;
2122
use Symfony\Component\Validator\Constraints\NotNull;
2223
use Symfony\Component\Validator\Constraints\NotBlank;
2324
use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;

0 commit comments

Comments
 (0)