Skip to content

Commit e7f13b0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.3' into 7.4
* 7.3: [Scheduler] Fix `scheduler.task` tag arguments optionality use false instead of null to hide the currency symbol [FrameworkBundle] Fix block type from `OK` to `ERROR` when local vault is disabled in `SecretsRemoveCommand` Fix wrong boolean values minor symfony#61328 [FrameworkBundle] Decouple ControllerResolverTest from HttpKernel (nicolas-grekas) [Messenger] Fix NoAutoAckStamp handling in Worker::flush()
2 parents f435f54 + c08f8c6 commit e7f13b0

File tree

23 files changed

+194
-80
lines changed

23 files changed

+194
-80
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
5959
$vault = $input->getOption('local') ? $this->localVault : $this->vault;
6060

6161
if (null === $vault) {
62-
$io->success('The local vault is disabled.');
62+
$io->error('The local vault is disabled.');
6363

6464
return 1;
6565
}

‎src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,7 @@ public function testClosureProxy()
18741874
{
18751875
$container = new ContainerBuilder();
18761876
$container->register('closure_proxy', SingleMethodInterface::class)
1877-
->setPublic('true')
1877+
->setPublic(true)
18781878
->setFactory(['Closure', 'fromCallable'])
18791879
->setArguments([[new Reference('foo'), 'cloneFoo']])
18801880
->setLazy(true);
@@ -1896,12 +1896,12 @@ public function testClosure()
18961896
{
18971897
$container = new ContainerBuilder();
18981898
$container->register('closure', 'Closure')
1899-
->setPublic('true')
1899+
->setPublic(true)
19001900
->setFactory(['Closure', 'fromCallable'])
19011901
->setArguments([new Reference('bar')]);
19021902
$container->register('bar', 'stdClass');
19031903
$container->register('closure_of_service_closure', 'Closure')
1904-
->setPublic('true')
1904+
->setPublic(true)
19051905
->setFactory(['Closure', 'fromCallable'])
19061906
->setArguments([new ServiceClosureArgument(new Reference('bar2'))]);
19071907
$container->register('bar2', 'stdClass');
@@ -1915,15 +1915,15 @@ public function testAutowireClosure()
19151915
{
19161916
$container = new ContainerBuilder();
19171917
$container->register('foo', Foo::class)
1918-
->setPublic('true');
1918+
->setPublic(true);
19191919
$container->register('my_callable', MyCallable::class)
1920-
->setPublic('true');
1920+
->setPublic(true);
19211921
$container->register('baz', \Closure::class)
19221922
->setFactory(['Closure', 'fromCallable'])
19231923
->setArguments(['var_dump'])
1924-
->setPublic('true');
1924+
->setPublic(true);
19251925
$container->register('bar', LazyClosureConsumer::class)
1926-
->setPublic('true')
1926+
->setPublic(true)
19271927
->setAutowired(true);
19281928
$container->compile();
19291929
$dumper = new PhpDumper($container);
@@ -1949,12 +1949,12 @@ public function testLazyClosure()
19491949
{
19501950
$container = new ContainerBuilder();
19511951
$container->register('closure1', 'Closure')
1952-
->setPublic('true')
1952+
->setPublic(true)
19531953
->setFactory(['Closure', 'fromCallable'])
19541954
->setLazy(true)
19551955
->setArguments([[new Reference('foo'), 'cloneFoo']]);
19561956
$container->register('closure2', 'Closure')
1957-
->setPublic('true')
1957+
->setPublic(true)
19581958
->setFactory(['Closure', 'fromCallable'])
19591959
->setLazy(true)
19601960
->setArguments([[new Reference('foo_void'), '__invoke']]);
@@ -1988,10 +1988,10 @@ public function testLazyAutowireAttribute()
19881988
{
19891989
$container = new ContainerBuilder();
19901990
$container->register('foo', Foo::class)
1991-
->setPublic('true');
1991+
->setPublic(true);
19921992
$container->setAlias(Foo::class, 'foo');
19931993
$container->register('bar', LazyServiceConsumer::class)
1994-
->setPublic('true')
1994+
->setPublic(true)
19951995
->setAutowired(true);
19961996
$container->compile();
19971997
$dumper = new PhpDumper($container);
@@ -2017,7 +2017,7 @@ public function testLazyAutowireAttributeWithIntersection()
20172017
{
20182018
$container = new ContainerBuilder();
20192019
$container->register('foo', AAndIInterfaceConsumer::class)
2020-
->setPublic('true')
2020+
->setPublic(true)
20212021
->setAutowired(true);
20222022

20232023
$container->compile();
@@ -2045,7 +2045,7 @@ public function testCallableAdapterConsumer()
20452045
$container = new ContainerBuilder();
20462046
$container->register('foo', Foo::class);
20472047
$container->register('bar', CallableAdapterConsumer::class)
2048-
->setPublic('true')
2048+
->setPublic(true)
20492049
->setAutowired(true);
20502050
$container->compile();
20512051
$dumper = new PhpDumper($container);

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function testTransformWithRounding($input, $output, $roundingMode)
9494
public function testReverseTransform()
9595
{
9696
// Since we test against "de_AT", we need the full implementation
97-
IntlTestHelper::requireFullIntl($this, false);
97+
IntlTestHelper::requireFullIntl($this);
9898

9999
\Locale::setDefault('de_AT');
100100

@@ -114,7 +114,7 @@ public function testReverseTransformEmpty()
114114
public function testReverseTransformWithGrouping()
115115
{
116116
// Since we test against "de_DE", we need the full implementation
117-
IntlTestHelper::requireFullIntl($this, false);
117+
IntlTestHelper::requireFullIntl($this);
118118

119119
\Locale::setDefault('de_DE');
120120

@@ -205,7 +205,7 @@ public function testReverseTransformExpectsValidNumber()
205205
public function testReverseTransformExpectsInteger($number, $locale)
206206
{
207207
$this->expectException(TransformationFailedException::class);
208-
IntlTestHelper::requireFullIntl($this, false);
208+
IntlTestHelper::requireFullIntl($this);
209209

210210
\Locale::setDefault($locale);
211211

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected function tearDown(): void
3636
public function testTransform()
3737
{
3838
// Since we test against "de_AT", we need the full implementation
39-
IntlTestHelper::requireFullIntl($this, false);
39+
IntlTestHelper::requireFullIntl($this);
4040

4141
\Locale::setDefault('de_AT');
4242

@@ -71,7 +71,7 @@ public function testTransformEmpty()
7171
public function testReverseTransform()
7272
{
7373
// Since we test against "de_AT", we need the full implementation
74-
IntlTestHelper::requireFullIntl($this, false);
74+
IntlTestHelper::requireFullIntl($this);
7575

7676
\Locale::setDefault('de_AT');
7777

@@ -99,7 +99,7 @@ public function testReverseTransformEmpty()
9999
public function testFloatToIntConversionMismatchOnReverseTransform()
100100
{
101101
$transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
102-
IntlTestHelper::requireFullIntl($this, false);
102+
IntlTestHelper::requireFullIntl($this);
103103
\Locale::setDefault('de_AT');
104104

105105
$this->assertSame(3655, (int) $transformer->reverseTransform('36,55'));
@@ -108,7 +108,7 @@ public function testFloatToIntConversionMismatchOnReverseTransform()
108108
public function testFloatToIntConversionMismatchOnTransform()
109109
{
110110
$transformer = new MoneyToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_DOWN, 100);
111-
IntlTestHelper::requireFullIntl($this, false);
111+
IntlTestHelper::requireFullIntl($this);
112112
\Locale::setDefault('de_AT');
113113

114114
$this->assertSame('10,20', $transformer->transform(1020));
@@ -120,7 +120,7 @@ public function testValidNumericValuesWithNonDotDecimalPointCharacter()
120120
setlocale(\LC_ALL, 'de_AT.UTF-8');
121121

122122
$transformer = new MoneyToLocalizedStringTransformer(4, null, null, 100);
123-
IntlTestHelper::requireFullIntl($this, false);
123+
IntlTestHelper::requireFullIntl($this);
124124
\Locale::setDefault('de_AT');
125125

126126
$this->assertSame('0,0035', $transformer->transform(12 / 34));

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static function provideTransformations()
6565
public function testTransform($from, $to, $locale)
6666
{
6767
// Since we test against other locales, we need the full implementation
68-
IntlTestHelper::requireFullIntl($this, false);
68+
IntlTestHelper::requireFullIntl($this);
6969

7070
\Locale::setDefault($locale);
7171

@@ -89,7 +89,7 @@ public static function provideTransformationsWithGrouping()
8989
public function testTransformWithGrouping($from, $to, $locale)
9090
{
9191
// Since we test against other locales, we need the full implementation
92-
IntlTestHelper::requireFullIntl($this, false);
92+
IntlTestHelper::requireFullIntl($this);
9393

9494
\Locale::setDefault($locale);
9595

@@ -101,7 +101,7 @@ public function testTransformWithGrouping($from, $to, $locale)
101101
public function testTransformWithScale()
102102
{
103103
// Since we test against "de_AT", we need the full implementation
104-
IntlTestHelper::requireFullIntl($this, false);
104+
IntlTestHelper::requireFullIntl($this);
105105

106106
\Locale::setDefault('de_AT');
107107

@@ -204,7 +204,7 @@ public static function transformWithRoundingProvider()
204204
public function testTransformWithRounding($scale, $input, $output, $roundingMode)
205205
{
206206
// Since we test against "de_AT", we need the full implementation
207-
IntlTestHelper::requireFullIntl($this, false);
207+
IntlTestHelper::requireFullIntl($this);
208208

209209
\Locale::setDefault('de_AT');
210210

@@ -216,7 +216,7 @@ public function testTransformWithRounding($scale, $input, $output, $roundingMode
216216
public function testTransformDoesNotRoundIfNoScale()
217217
{
218218
// Since we test against "de_AT", we need the full implementation
219-
IntlTestHelper::requireFullIntl($this, false);
219+
IntlTestHelper::requireFullIntl($this);
220220

221221
\Locale::setDefault('de_AT');
222222

@@ -229,7 +229,7 @@ public function testTransformDoesNotRoundIfNoScale()
229229
public function testReverseTransform($to, $from, $locale)
230230
{
231231
// Since we test against other locales, we need the full implementation
232-
IntlTestHelper::requireFullIntl($this, false);
232+
IntlTestHelper::requireFullIntl($this);
233233

234234
\Locale::setDefault($locale);
235235

@@ -257,7 +257,7 @@ public function testReverseTransformWithGrouping($to, $from, $locale)
257257
public function testReverseTransformWithGroupingAndFixedSpaces()
258258
{
259259
// Since we test against other locales, we need the full implementation
260-
IntlTestHelper::requireFullIntl($this, false);
260+
IntlTestHelper::requireFullIntl($this);
261261

262262
\Locale::setDefault('ru');
263263

@@ -269,7 +269,7 @@ public function testReverseTransformWithGroupingAndFixedSpaces()
269269
public function testReverseTransformWithGroupingButWithoutGroupSeparator()
270270
{
271271
// Since we test against "de_AT", we need the full implementation
272-
IntlTestHelper::requireFullIntl($this, false);
272+
IntlTestHelper::requireFullIntl($this);
273273

274274
\Locale::setDefault('de_AT');
275275

@@ -432,7 +432,7 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGro
432432
public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupingUsed()
433433
{
434434
// Since we test against other locales, we need the full implementation
435-
IntlTestHelper::requireFullIntl($this, false);
435+
IntlTestHelper::requireFullIntl($this);
436436

437437
\Locale::setDefault('fr');
438438
$transformer = new NumberToLocalizedStringTransformer();
@@ -577,7 +577,7 @@ public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
577577
$this->expectException(TransformationFailedException::class);
578578
$this->expectExceptionMessage('The number contains unrecognized characters: "foo8"');
579579
// Since we test against other locales, we need the full implementation
580-
IntlTestHelper::requireFullIntl($this, false);
580+
IntlTestHelper::requireFullIntl($this);
581581

582582
\Locale::setDefault('ru');
583583

@@ -591,7 +591,7 @@ public function testReverseTransformIgnoresTrailingSpacesInExceptionMessage()
591591
$this->expectException(TransformationFailedException::class);
592592
$this->expectExceptionMessage('The number contains unrecognized characters: "foo8"');
593593
// Since we test against other locales, we need the full implementation
594-
IntlTestHelper::requireFullIntl($this, false);
594+
IntlTestHelper::requireFullIntl($this);
595595

596596
\Locale::setDefault('ru');
597597

@@ -614,7 +614,7 @@ public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
614614
$this->expectException(TransformationFailedException::class);
615615
$this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
616616
// Since we test against other locales, we need the full implementation
617-
IntlTestHelper::requireFullIntl($this, false);
617+
IntlTestHelper::requireFullIntl($this);
618618

619619
\Locale::setDefault('ru');
620620

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function testTransformWithInteger()
7777
public function testTransformWithScale()
7878
{
7979
// Since we test against "de_AT", we need the full implementation
80-
IntlTestHelper::requireFullIntl($this, false);
80+
IntlTestHelper::requireFullIntl($this);
8181

8282
\Locale::setDefault('de_AT');
8383

@@ -224,7 +224,7 @@ public function testReverseTransformWithInteger()
224224
public function testReverseTransformWithScale()
225225
{
226226
// Since we test against "de_AT", we need the full implementation
227-
IntlTestHelper::requireFullIntl($this, false);
227+
IntlTestHelper::requireFullIntl($this);
228228

229229
\Locale::setDefault('de_AT');
230230

@@ -296,7 +296,7 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGro
296296
public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupingUsed()
297297
{
298298
// Since we test against other locales, we need the full implementation
299-
IntlTestHelper::requireFullIntl($this, false);
299+
IntlTestHelper::requireFullIntl($this);
300300

301301
\Locale::setDefault('fr');
302302
$transformer = new PercentToLocalizedStringTransformer(1, 'integer', \NumberFormatter::ROUND_HALFUP);
@@ -373,7 +373,7 @@ public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
373373
$this->expectException(TransformationFailedException::class);
374374
$this->expectExceptionMessage('The number contains unrecognized characters: "foo8"');
375375
// Since we test against other locales, we need the full implementation
376-
IntlTestHelper::requireFullIntl($this, false);
376+
IntlTestHelper::requireFullIntl($this);
377377

378378
\Locale::setDefault('ru');
379379

@@ -397,7 +397,7 @@ public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
397397
$this->expectException(TransformationFailedException::class);
398398
$this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
399399
// Since we test against other locales, we need the full implementation
400-
IntlTestHelper::requireFullIntl($this, false);
400+
IntlTestHelper::requireFullIntl($this);
401401

402402
\Locale::setDefault('ru');
403403

@@ -411,7 +411,7 @@ public function testTransformForHtml5Format()
411411
$transformer = new PercentToLocalizedStringTransformer(null, null, \NumberFormatter::ROUND_HALFUP, true);
412412

413413
// Since we test against "de_CH", we need the full implementation
414-
IntlTestHelper::requireFullIntl($this, false);
414+
IntlTestHelper::requireFullIntl($this);
415415

416416
\Locale::setDefault('de_CH');
417417

@@ -425,7 +425,7 @@ public function testTransformForHtml5FormatWithInteger()
425425
$transformer = new PercentToLocalizedStringTransformer(null, 'integer', \NumberFormatter::ROUND_HALFUP, true);
426426

427427
// Since we test against "de_CH", we need the full implementation
428-
IntlTestHelper::requireFullIntl($this, false);
428+
IntlTestHelper::requireFullIntl($this);
429429

430430
\Locale::setDefault('de_CH');
431431

@@ -436,7 +436,7 @@ public function testTransformForHtml5FormatWithInteger()
436436
public function testTransformForHtml5FormatWithScale()
437437
{
438438
// Since we test against "de_CH", we need the full implementation
439-
IntlTestHelper::requireFullIntl($this, false);
439+
IntlTestHelper::requireFullIntl($this);
440440

441441
\Locale::setDefault('de_CH');
442442

@@ -448,7 +448,7 @@ public function testTransformForHtml5FormatWithScale()
448448
public function testReverseTransformForHtml5Format()
449449
{
450450
// Since we test against "de_CH", we need the full implementation
451-
IntlTestHelper::requireFullIntl($this, false);
451+
IntlTestHelper::requireFullIntl($this);
452452

453453
\Locale::setDefault('de_CH');
454454

@@ -462,7 +462,7 @@ public function testReverseTransformForHtml5Format()
462462
public function testReverseTransformForHtml5FormatWithInteger()
463463
{
464464
// Since we test against "de_CH", we need the full implementation
465-
IntlTestHelper::requireFullIntl($this, false);
465+
IntlTestHelper::requireFullIntl($this);
466466

467467
\Locale::setDefault('de_CH');
468468

@@ -477,7 +477,7 @@ public function testReverseTransformForHtml5FormatWithInteger()
477477
public function testReverseTransformForHtml5FormatWithScale()
478478
{
479479
// Since we test against "de_CH", we need the full implementation
480-
IntlTestHelper::requireFullIntl($this, false);
480+
IntlTestHelper::requireFullIntl($this);
481481

482482
\Locale::setDefault('de_CH');
483483

@@ -536,7 +536,7 @@ class PercentToLocalizedStringTransformerWithoutGrouping extends PercentToLocali
536536
protected function getNumberFormatter(): \NumberFormatter
537537
{
538538
$formatter = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::DECIMAL);
539-
$formatter->setAttribute(\NumberFormatter::GROUPING_USED, false);
539+
$formatter->setAttribute(\NumberFormatter::GROUPING_USED, 0);
540540

541541
return $formatter;
542542
}

0 commit comments

Comments
 (0)