Skip to content

Commit e88613a

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: [TwigBridge] Remove `VersionAwareTest` from `AbstractLayoutTestCase` [DependencyInjection] Add coverage for error cases of `LazyClosure` and `AutowireLocator` [TwigBridge] Fixed a parameterized choice label translation Fix extracting of message from ->trans() method with named params Add missing Albanian translations for Security and Validator components [HttpClient] Add `crypto_method` to scoped client options suppress proc_open errors [DependencyInjection] Fix `XmlFileLoader` not respecting when env for services
2 parents 23e1b9d + 5818e14 commit e88613a

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

Test/FormPerformanceTestCase.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
*/
2424
abstract class FormPerformanceTestCase extends FormIntegrationTestCase
2525
{
26-
use VersionAwareTest;
27-
2826
protected int $maxRunningTime = 0;
2927

3028
protected function runTest(): mixed

Tests/Extension/Core/Type/BaseTypeTestCase.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
*/
2020
abstract class BaseTypeTestCase extends TypeTestCase
2121
{
22-
use VersionAwareTest;
23-
2422
public const TESTED_TYPE = '';
2523

2624
public function testPassDisabledAsOption()
@@ -114,8 +112,6 @@ public function testDefaultTranslationDomain()
114112

115113
public function testPassLabelTranslationParametersToView()
116114
{
117-
$this->requiresFeatureSet(403);
118-
119115
$view = $this->factory->create($this->getTestedType(), null, array_merge($this->getTestOptions(), [
120116
'label_translation_parameters' => ['%param%' => 'value'],
121117
]))
@@ -126,8 +122,6 @@ public function testPassLabelTranslationParametersToView()
126122

127123
public function testPassAttrTranslationParametersToView()
128124
{
129-
$this->requiresFeatureSet(403);
130-
131125
$view = $this->factory->create($this->getTestedType(), null, array_merge($this->getTestOptions(), [
132126
'attr_translation_parameters' => ['%param%' => 'value'],
133127
]))
@@ -138,8 +132,6 @@ public function testPassAttrTranslationParametersToView()
138132

139133
public function testInheritLabelTranslationParametersFromParent()
140134
{
141-
$this->requiresFeatureSet(403);
142-
143135
$view = $this->factory
144136
->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
145137
'label_translation_parameters' => ['%param%' => 'value'],
@@ -153,8 +145,6 @@ public function testInheritLabelTranslationParametersFromParent()
153145

154146
public function testInheritAttrTranslationParametersFromParent()
155147
{
156-
$this->requiresFeatureSet(403);
157-
158148
$view = $this->factory
159149
->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
160150
'attr_translation_parameters' => ['%param%' => 'value'],
@@ -168,8 +158,6 @@ public function testInheritAttrTranslationParametersFromParent()
168158

169159
public function testPreferOwnLabelTranslationParameters()
170160
{
171-
$this->requiresFeatureSet(403);
172-
173161
$view = $this->factory
174162
->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
175163
'label_translation_parameters' => ['%parent_param%' => 'parent_value', '%override_param%' => 'parent_override_value'],
@@ -185,8 +173,6 @@ public function testPreferOwnLabelTranslationParameters()
185173

186174
public function testPreferOwnAttrTranslationParameters()
187175
{
188-
$this->requiresFeatureSet(403);
189-
190176
$view = $this->factory
191177
->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, [
192178
'attr_translation_parameters' => ['%parent_param%' => 'parent_value', '%override_param%' => 'parent_override_value'],
@@ -202,8 +188,6 @@ public function testPreferOwnAttrTranslationParameters()
202188

203189
public function testDefaultLabelTranslationParameters()
204190
{
205-
$this->requiresFeatureSet(403);
206-
207191
$view = $this->factory->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE)
208192
->add('child', $this->getTestedType(), $this->getTestOptions())
209193
->getForm()
@@ -214,8 +198,6 @@ public function testDefaultLabelTranslationParameters()
214198

215199
public function testDefaultAttrTranslationParameters()
216200
{
217-
$this->requiresFeatureSet(403);
218-
219201
$view = $this->factory->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE)
220202
->add('child', $this->getTestedType(), $this->getTestOptions())
221203
->getForm()

0 commit comments

Comments
 (0)