Skip to content

Commit 7439915

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: allow to skip tests based on the supported version Update validators.bg.xlf Update validators.ca.xlf fixed CS Updated validators.eu.xlf with missing translations fixed typo backported a translation [Validator] added missing translation for UK validator Validator: add the Persian translations Update validators.sq.xlf fixed CS forward valid numeric values to transform() add constraint validators before optimizations
2 parents d9f6db4 + 1aeddfc commit 7439915

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

FrameworkBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function build(ContainerBuilder $container)
9595
// but as late as possible to get resolved parameters
9696
$container->addCompilerPass((new RegisterListenersPass())->setHotPathEvents($hotPathEvents), PassConfig::TYPE_BEFORE_REMOVING);
9797
$container->addCompilerPass(new TemplatingPass());
98-
$this->addCompilerPassIfExists($container, AddConstraintValidatorsPass::class, PassConfig::TYPE_BEFORE_REMOVING);
98+
$this->addCompilerPassIfExists($container, AddConstraintValidatorsPass::class);
9999
$container->addCompilerPass(new AddAnnotationsCachedReaderPass(), PassConfig::TYPE_AFTER_REMOVING, -255);
100100
$this->addCompilerPassIfExists($container, AddValidatorInitializersPass::class);
101101
$this->addCompilerPassIfExists($container, AddConsoleCommandPass::class, PassConfig::TYPE_BEFORE_REMOVING);

Tests/Templating/Helper/FormHelperDivLayoutTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest
2727
*/
2828
protected $engine;
2929

30+
protected static $supportedFeatureSetVersion = 304;
31+
3032
protected function getExtensions()
3133
{
3234
// should be moved to the Form component once absolute file paths are supported

Tests/Templating/Helper/FormHelperTableLayoutTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class FormHelperTableLayoutTest extends AbstractTableLayoutTest
2727
*/
2828
protected $engine;
2929

30+
protected static $supportedFeatureSetVersion = 304;
31+
3032
public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
3133
{
3234
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, [

0 commit comments

Comments
 (0)