Skip to content

Commit 6830d9f

Browse files
committed
fixed typo
1 parent 5176f97 commit 6830d9f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+134
-149
lines changed

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ class FooTestCase
3131
public function testLegacyFoo()
3232
{
3333
@trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
34-
trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
35-
trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
34+
@trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
35+
@trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
3636
}
3737

3838
public function testNonLegacyBar()
3939
{
4040
@trigger_error('silenced bar deprecation', E_USER_DEPRECATED);
41-
trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);
41+
@trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);
4242
}
4343
}
4444

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class FooTestCase
2323
public function testLegacyFoo()
2424
{
2525
@trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
26-
trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
26+
@trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
2727
}
2828
}
2929

src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ public function getTransTests()
8787

8888
// transchoice
8989
array('{% transchoice count from "messages" %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
90-
'There is no apples', array('count' => 0)),
90+
'There is no apples', array('count' => 0), ),
9191
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
92-
'There is 5 apples', array('count' => 5)),
92+
'There is 5 apples', array('count' => 5), ),
9393
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
94-
'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony')),
94+
'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony'), ),
9595
array('{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
96-
'There is 5 apples (Symfony)', array('count' => 5)),
96+
'There is 5 apples (Symfony)', array('count' => 5), ),
9797
array('{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
98-
'There is no apples', array('count' => 0)),
98+
'There is no apples', array('count' => 0), ),
9999
array('{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
100-
'There is 5 apples'),
100+
'There is 5 apples', ),
101101

102102
// trans filter
103103
array('{{ "Hello"|trans }}', 'Hello'),
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'widget_attributes') ?>
1+
<?php echo $view['form']->block($form, 'widget_attributes');
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php if (!$label) { $label = isset($label_format)
1+
<?php if (!$label) {
2+
$label = isset($label_format)
23
? strtr($label_format, array('%name%' => $name, '%id%' => $id))
3-
: $view['form']->humanize($name); } ?>
4+
: $view['form']->humanize($name);
5+
} ?>
46
<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></button>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'choice_widget_options') ?>
1+
<?php echo $view['form']->block($form, 'choice_widget_options');

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
22

3-
$translatorHelper = $view['translator']; // outside of the loop for performance reasons! ?>
3+
$translatorHelper = $view['translator']; // outside of the loop for performance reasons!?>
44
<?php $formHelper = $view['form']; ?>
55
<?php foreach ($choices as $group_label => $choice): ?>
66
<?php if (is_array($choice) || $choice instanceof ChoiceGroupView): ?>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'widget_container_attributes') ?>
1+
<?php echo $view['form']->block($form, 'widget_container_attributes');
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'email')) ?>
1+
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'email'));
Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
<?php if (false !== $label): ?>
2-
<?php if ($required) { $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required'); } ?>
3-
<?php if (!$compound) { $label_attr['for'] = $id; } ?>
4-
<?php if (!$label) { $label = isset($label_format)
2+
<?php if ($required) {
3+
$label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required');
4+
} ?>
5+
<?php if (!$compound) {
6+
$label_attr['for'] = $id;
7+
} ?>
8+
<?php if (!$label) {
9+
$label = isset($label_format)
510
? strtr($label_format, array('%name%' => $name, '%id%' => $id))
6-
: $view['form']->humanize($name); } ?>
7-
<label <?php foreach ($label_attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
11+
: $view['form']->humanize($name);
12+
} ?>
13+
<label <?php foreach ($label_attr as $k => $v) {
14+
printf('%s="%s" ', $view->escape($k), $view->escape($v));
15+
} ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
816
<?php endif ?>

0 commit comments

Comments
 (0)