Skip to content

Commit 86b97c3

Browse files
committed
Merge branch '2.8' into 3.2
* 2.8: fixed CS [DI] Fix PhpDumper blank lines around namespace fixed CS Filesystem: annotate the one network test with a "network" group. [DependencyInjection] Don't store default deprecation template in every service definition instance
2 parents 48f35ab + 32323fa commit 86b97c3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Tests/Fixtures/Resources/views/translation.html.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@
3232
array('%count%' => 10)
3333
) ?>
3434

35-
<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', [], 'not_messages'); ?>
35+
<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', array(), 'not_messages'); ?>
3636

3737
<?php echo $view['translator']->trans('other-domain-test-no-params-long-array', array(), 'not_messages'); ?>
3838

39-
<?php echo $view['translator']->trans('other-domain-test-params-short-array', ['foo' => 'bar'], 'not_messages'); ?>
39+
<?php echo $view['translator']->trans('other-domain-test-params-short-array', array('foo' => 'bar'), 'not_messages'); ?>
4040

4141
<?php echo $view['translator']->trans('other-domain-test-params-long-array', array('foo' => 'bar'), 'not_messages'); ?>
4242

43-
<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, ['%count%' => 10], 'not_messages'); ?>
43+
<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
4444

4545
<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-long-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
4646

47-
<?php echo $view['translator']->trans('typecast', ['a' => (int) '123'], 'not_messages'); ?>
48-
<?php echo $view['translator']->transChoice('msg1', 10 + 1, [], 'not_messages'); ?>
49-
<?php echo $view['translator']->transChoice('msg2', ceil(4.5), [], 'not_messages'); ?>
47+
<?php echo $view['translator']->trans('typecast', array('a' => (int) '123'), 'not_messages'); ?>
48+
<?php echo $view['translator']->transChoice('msg1', 10 + 1, array(), 'not_messages'); ?>
49+
<?php echo $view['translator']->transChoice('msg2', ceil(4.5), array(), 'not_messages'); ?>

0 commit comments

Comments
 (0)