Skip to content

Commit d0c5727

Browse files
committed
Merge remote branch 'henrikbjorn/form' into henrik_merge
2 parents bc0efff + e687685 commit d0c5727

29 files changed

+134
-107
lines changed

src/Symfony/Bridge/Twig/Extension/FormExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function renderLabel(FormView $view, $label = null)
160160
protected function render(FormView $view, $section, array $variables = array(), array $resources = null)
161161
{
162162
$templates = $this->getTemplates($view, $resources);
163-
$blocks = $view->getVar('types');
163+
$blocks = $view->get('types');
164164
foreach ($blocks as &$block) {
165165
$block = $block.'__'.$section;
166166

@@ -169,7 +169,7 @@ protected function render(FormView $view, $section, array $variables = array(),
169169
$view->setRendered(true);
170170
}
171171

172-
return $templates[$block]->renderBlock($block, array_merge($view->getVars(), $variables));
172+
return $templates[$block]->renderBlock($block, array_merge($view->all(), $variables));
173173
}
174174
}
175175

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->render('form', 'widget', $renderer->getVars()); ?>
1+
<?php echo $view['form']->render('form', 'widget', $renderer->all()); ?>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php if ($form->getVar('multipart')): ?>enctype="multipart/form-data"<?php endif ?>
1+
<?php if ($form->get('multipart')): ?>enctype="multipart/form-data"<?php endif ?>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div<?php echo $view['form']->attributes() ?>>
22
<input type="file"
3-
id="<?php echo $view->escape($form['file']->getVar('id')) ?>"
4-
name="<?php echo $view->escape($form['file']->getVar('name')) ?>"
5-
<?php if ($form['file']->getVar('disabled')): ?>disabled="disabled"<?php endif ?>
6-
<?php if ($form['file']->getVar('required')): ?>required="required"<?php endif ?>
7-
<?php if ($form['file']->getVar('class')): ?>class="<?php echo $form['file']->getVar('class') ?>"<?php endif ?>
3+
id="<?php echo $view->escape($form['file']->get('id')) ?>"
4+
name="<?php echo $view->escape($form['file']->get('name')) ?>"
5+
<?php if ($form['file']->get('disabled')): ?>disabled="disabled"<?php endif ?>
6+
<?php if ($form['file']->get('required')): ?>required="required"<?php endif ?>
7+
<?php if ($form['file']->get('class')): ?>class="<?php echo $form['file']->get('class') ?>"<?php endif ?>
88
/>
99

1010
<?php echo $view['form']->widget($form['token']) ?>
1111
<?php echo $view['form']->widget($form['name']) ?>
12-
</div>
12+
</div>

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function rest(FormView $view, array $variables = array())
9898
protected function renderSection(FormView $view, $section, array $variables = array())
9999
{
100100
$template = null;
101-
$blocks = $view->getVar('types');
101+
$blocks = $view->get('types');
102102

103103
foreach ($blocks as &$block) {
104104
$block = $block.'_'.$section;
@@ -117,7 +117,7 @@ protected function renderSection(FormView $view, $section, array $variables = ar
117117
$view->setRendered(true);
118118
}
119119

120-
return $this->render($template, array_merge($view->getVars(), $variables));
120+
return $this->render($template, array_merge($view->all(), $variables));
121121
}
122122

123123
public function render($template, array $variables = array())

src/Symfony/Component/Form/FormView.php

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,56 @@ class FormView implements \ArrayAccess, \IteratorAggregate
3636
*/
3737
private $rendered = false;
3838

39-
public function setVar($name, $value)
39+
/**
40+
* @param string $name
41+
* @param mixed $value
42+
*/
43+
public function set($name, $value)
4044
{
4145
$this->vars[$name] = $value;
4246
}
4347

44-
public function hasVar($name)
48+
/**
49+
* @param $name
50+
* @return Boolean
51+
*/
52+
public function has($name)
4553
{
4654
return array_key_exists($name, $this->vars);
4755
}
4856

49-
public function getVar($name)
57+
/**
58+
* @param $name
59+
* @param $default
60+
* @return mixed
61+
*/
62+
public function get($name, $default = null)
5063
{
51-
if (!isset($this->vars[$name])) {
52-
return null;
64+
if (false === $this->has($name)) {
65+
return $default;
5366
}
5467

5568
return $this->vars[$name];
5669
}
5770

58-
public function getVars()
71+
/**
72+
* @return array
73+
*/
74+
public function all()
5975
{
6076
return $this->vars;
6177
}
6278

79+
/**
80+
* Alias of all so it is possible to do `form.vars.foo`
81+
*
82+
* @return array
83+
*/
84+
public function getVars()
85+
{
86+
return $this->all();
87+
}
88+
6389
public function setAttribute($name, $value)
6490
{
6591
$this->vars['attr'][$name] = $value;

src/Symfony/Component/Form/Type/CheckboxType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public function buildForm(FormBuilder $builder, array $options)
2626

2727
public function buildView(FormView $view, FormInterface $form)
2828
{
29-
$view->setVar('value', $form->getAttribute('value'));
30-
$view->setVar('checked', (bool)$form->getData());
29+
$view->set('value', $form->getAttribute('value'));
30+
$view->set('checked', (bool)$form->getData());
3131
}
3232

3333
public function getDefaultOptions(array $options)
@@ -46,4 +46,4 @@ public function getName()
4646
{
4747
return 'checkbox';
4848
}
49-
}
49+
}

src/Symfony/Component/Form/Type/ChoiceType.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,18 @@ public function buildView(FormView $view, FormInterface $form)
8181
$choices = $form->getAttribute('choice_list')->getChoices();
8282
$preferred = array_flip($form->getAttribute('preferred_choices'));
8383

84-
$view->setVar('multiple', $form->getAttribute('multiple'));
85-
$view->setVar('expanded', $form->getAttribute('expanded'));
86-
$view->setVar('preferred_choices', array_intersect_key($choices, $preferred));
87-
$view->setVar('choices', array_diff_key($choices, $preferred));
88-
$view->setVar('separator', '-------------------');
89-
$view->setVar('empty_value', '');
90-
91-
if ($view->getVar('multiple') && !$view->getVar('expanded')) {
84+
$view->set('multiple', $form->getAttribute('multiple'));
85+
$view->set('expanded', $form->getAttribute('expanded'));
86+
$view->set('preferred_choices', array_intersect_key($choices, $preferred));
87+
$view->set('choices', array_diff_key($choices, $preferred));
88+
$view->set('separator', '-------------------');
89+
$view->set('empty_value', '');
90+
91+
if ($view->get('multiple') && !$view->get('expanded')) {
9292
// Add "[]" to the name in case a select tag with multiple options is
9393
// displayed. Otherwise only one of the selected options is sent in the
9494
// POST request.
95-
$view->setVar('name', $view->getVar('name').'[]');
95+
$view->set('name', $view->get('name').'[]');
9696
}
9797
}
9898

@@ -121,4 +121,4 @@ public function getName()
121121
{
122122
return 'choice';
123123
}
124-
}
124+
}

src/Symfony/Component/Form/Type/DateType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function buildForm(FormBuilder $builder, array $options)
8080

8181
public function buildViewBottomUp(FormView $view, FormInterface $form)
8282
{
83-
$view->setVar('widget', $form->getAttribute('widget'));
83+
$view->set('widget', $form->getAttribute('widget'));
8484

8585
if ($view->hasChildren()) {
8686

@@ -95,7 +95,7 @@ public function buildViewBottomUp(FormView $view, FormInterface $form)
9595
$pattern = '{{ year }}-{{ month }}-{{ day }}';
9696
}
9797

98-
$view->setVar('date_pattern', $pattern);
98+
$view->set('date_pattern', $pattern);
9999
}
100100
}
101101

@@ -127,4 +127,4 @@ public function getName()
127127
{
128128
return 'date';
129129
}
130-
}
130+
}

src/Symfony/Component/Form/Type/FieldType.php

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,34 +69,35 @@ public function buildForm(FormBuilder $builder, array $options)
6969
public function buildView(FormView $view, FormInterface $form)
7070
{
7171
if ($view->hasParent()) {
72-
$parentId = $view->getParent()->getVar('id');
73-
$parentName = $view->getParent()->getVar('name');
72+
$parentId = $view->getParent()->get('id');
73+
$parentName = $view->getParent()->get('name');
7474
$id = sprintf('%s_%s', $parentId, $form->getName());
7575
$name = sprintf('%s[%s]', $parentName, $form->getName());
7676
} else {
7777
$id = $form->getName();
7878
$name = $form->getName();
7979
}
8080

81-
$view->setVar('form', $view);
82-
$view->setVar('id', $id);
83-
$view->setVar('name', $name);
84-
$view->setVar('errors', $form->getErrors());
85-
$view->setVar('value', $form->getClientData());
86-
$view->setVar('read_only', $form->isReadOnly());
87-
$view->setVar('required', $form->isRequired());
88-
$view->setVar('class', null);
89-
$view->setVar('max_length', $form->getAttribute('max_length'));
90-
$view->setVar('size', null);
91-
$view->setVar('label', $form->getAttribute('label'));
92-
$view->setVar('multipart', false);
93-
$view->setVar('attr', array());
81+
$view->set('form', $view);
82+
$view->set('id', $id);
83+
$view->set('name', $name);
84+
$view->set('errors', $form->getErrors());
85+
$view->set('value', $form->getClientData());
86+
$view->set('read_only', $form->isReadOnly());
87+
$view->set('required', $form->isRequired());
88+
$view->set('class', null);
89+
$view->set('max_length', $form->getAttribute('max_length'));
90+
$view->set('size', null);
91+
$view->set('label', ucfirst(strtolower(str_replace('_', ' ', $form->getName()))));
92+
$view->set('label', $form->getAttribute('label'));
93+
$view->set('multipart', false);
94+
$view->set('attr', array());
9495

9596
$types = array();
9697
foreach (array_reverse((array) $form->getTypes()) as $type) {
9798
$types[] = $type->getName();
9899
}
99-
$view->setVar('types', $types);
100+
$view->set('types', $types);
100101
}
101102

102103
public function getDefaultOptions(array $options)
@@ -147,4 +148,4 @@ private function humanize($text)
147148
{
148149
return ucfirst(strtolower(str_replace('_', ' ', $text)));
149150
}
150-
}
151+
}

src/Symfony/Component/Form/Type/FileType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public function buildForm(FormBuilder $builder, array $options)
5050

5151
public function buildViewBottomUp(FormView $view, FormInterface $form)
5252
{
53-
$view->setVar('multipart', true);
54-
$view['file']->setVar('type', 'file');
53+
$view->set('multipart', true);
54+
$view['file']->set('type', 'file');
5555
}
5656

5757
public function getDefaultOptions(array $options)

src/Symfony/Component/Form/Type/FormType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ public function buildViewBottomUp(FormView $view, FormInterface $form)
4141
$multipart = false;
4242

4343
foreach ($view as $child) {
44-
if ($child->getVar('multipart')) {
44+
if ($child->get('multipart')) {
4545
$multipart = true;
4646
break;
4747
}
4848
}
4949

50-
$view->setVar('multipart', $multipart);
50+
$view->set('multipart', $multipart);
5151
}
5252

5353
public function getDefaultOptions(array $options)
@@ -79,4 +79,4 @@ public function getName()
7979
{
8080
return 'form';
8181
}
82-
}
82+
}

src/Symfony/Component/Form/Type/MoneyType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function buildForm(FormBuilder $builder, array $options)
2828

2929
public function buildView(FormView $view, FormInterface $form)
3030
{
31-
$view->setVar('money_pattern', self::getPattern($form->getAttribute('currency')));
31+
$view->set('money_pattern', self::getPattern($form->getAttribute('currency')));
3232
}
3333

3434
public function getDefaultOptions(array $options)
@@ -90,4 +90,4 @@ private static function getPattern($currency)
9090

9191
return self::$patterns[\Locale::getDefault()];
9292
}
93-
}
93+
}

src/Symfony/Component/Form/Type/PasswordType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function buildForm(FormBuilder $builder, array $options)
2525
public function buildView(FormView $view, FormInterface $form)
2626
{
2727
if ($form->getAttribute('always_empty') || !$form->isBound()) {
28-
$view->setVar('value', '');
28+
$view->set('value', '');
2929
}
3030
}
3131

@@ -45,4 +45,4 @@ public function getName()
4545
{
4646
return 'password';
4747
}
48-
}
48+
}

src/Symfony/Component/Form/Type/RadioType.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public function buildForm(FormBuilder $builder, array $options)
2626

2727
public function buildView(FormView $view, FormInterface $form)
2828
{
29-
$view->setVar('value', $form->getAttribute('value'));
30-
$view->setVar('checked', (bool)$form->getData());
29+
$view->set('value', $form->getAttribute('value'));
30+
$view->set('checked', (bool)$form->getData());
3131

3232
if ($view->hasParent()) {
33-
$view->setVar('name', $view->getParent()->getVar('name'));
33+
$view->set('name', $view->getParent()->get('name'));
3434
}
3535
}
3636

@@ -50,4 +50,4 @@ public function getName()
5050
{
5151
return 'radio';
5252
}
53-
}
53+
}

src/Symfony/Component/Form/Type/TextType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function buildForm(FormBuilder $builder, array $options)
2424

2525
public function buildView(FormView $view, FormInterface $form)
2626
{
27-
$view->setVar('max_length', $form->getAttribute('max_length'));
27+
$view->set('max_length', $form->getAttribute('max_length'));
2828
}
2929

3030
public function getParent(array $options)
@@ -36,4 +36,4 @@ public function getName()
3636
{
3737
return 'text';
3838
}
39-
}
39+
}

src/Symfony/Component/Form/Type/TimeType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public function buildForm(FormBuilder $builder, array $options)
7373

7474
public function buildView(FormView $view, FormInterface $form)
7575
{
76-
$view->setVar('widget', $form->getAttribute('widget'));
77-
$view->setVar('with_seconds', $form->getAttribute('with_seconds'));
76+
$view->set('widget', $form->getAttribute('widget'));
77+
$view->set('with_seconds', $form->getAttribute('with_seconds'));
7878
}
7979

8080
public function getDefaultOptions(array $options)
@@ -100,4 +100,4 @@ public function getName()
100100
{
101101
return 'time';
102102
}
103-
}
103+
}

0 commit comments

Comments
 (0)