Skip to content

Commit 42a5f0c

Browse files
Merge pull request #3 from LinioIT/feature/get-json-configuration
Feature/get json configuration
2 parents b02212d + 2cb2632 commit 42a5f0c

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

Form/FormFactory.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public function setConfiguration(array $configuration)
3535
$this->configuration = $configuration;
3636
}
3737

38-
3938
/**
4039
* This method genetates a form based on the configuration file.
4140
* @param string $name The name of the Form
4241
* @param array $data
4342
* @param array $options
43+
*
4444
* @return \Symfony\Component\Form\Form
4545
* @throws InexistentFormException
4646
*/
@@ -50,7 +50,7 @@ public function createForm($name, $data = [], $options = [])
5050
throw new InexistentFormException();
5151
}
5252

53-
$formBuilder = $this->formFactory->createBuilder('form', $data, $options);
53+
$formBuilder = $this->formFactory->createNamedBuilder($name, 'form', $data, $options);
5454

5555

5656
foreach ($this->configuration[$name] as $name => $fieldConfiguration) {
@@ -60,10 +60,10 @@ public function createForm($name, $data = [], $options = [])
6060

6161
$fieldOptions = isset($fieldConfiguration['options']) ? $fieldConfiguration['options'] : [];
6262

63-
if (isset($fieldConfiguration['validators'])) {
63+
if (isset($fieldConfiguration['validation'])) {
6464
$constraints = [];
6565

66-
foreach ($fieldConfiguration['validators'] as $validatorName => $options) {
66+
foreach ($fieldConfiguration['validation'] as $validatorName => $options) {
6767
$constraints[] = new $validatorName($options);
6868
}
6969

@@ -72,7 +72,6 @@ public function createForm($name, $data = [], $options = [])
7272

7373
$field = $formBuilder->create($name, $fieldConfiguration['type'], $fieldOptions);
7474

75-
7675
if (isset($fieldConfiguration['transformer'])) {
7776
$transformerConfiguration = $fieldConfiguration['transformer'];
7877
$transformer = new $transformerConfiguration['class']();
@@ -91,7 +90,7 @@ public function createForm($name, $data = [], $options = [])
9190

9291
return $formBuilder->getForm();
9392
}
94-
93+
9594
/**
9695
* @return string
9796
* @throws InexistentFormException

Tests/Form/FormFactoryTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testIsCreatingASimpleForm()
5656
->willReturn('foo_form');
5757

5858
$formFactoryMock = $this->prophesize('\Symfony\Component\Form\FormFactory');
59-
$formFactoryMock->createBuilder('form', ['foo_form_data'], ['foo_form_options'])
59+
$formFactoryMock->createNamedBuilder('foo', 'form', ['foo_form_data'], ['foo_form_options'])
6060
->shouldBeCalled()
6161
->willReturn($formBuilderMock->reveal());
6262

@@ -76,7 +76,7 @@ public function testIsCreatingFormWithValidators()
7676
'field1' => [
7777
'enabled' => true,
7878
'type' => 'field1_type',
79-
'validators' => [
79+
'validation' => [
8080
'Symfony\Component\Validator\Constraints\IsTrue' => [
8181
'message' => 'The token is invalid.',
8282
],
@@ -103,7 +103,7 @@ public function testIsCreatingFormWithValidators()
103103
->willReturn('foo_form');
104104

105105
$formFactoryMock = $this->prophesize('\Symfony\Component\Form\FormFactory');
106-
$formFactoryMock->createBuilder('form', [], [])
106+
$formFactoryMock->createNamedBuilder('foo', 'form', [], [])
107107
->shouldBeCalled()
108108
->willReturn($formBuilderMock->reveal());
109109

@@ -146,7 +146,7 @@ public function testIsCreatingFormWithTransformers()
146146
$formFactory->setFormFactory($formFactoryMock->reveal());
147147
$formFactory->setConfiguration($formConfiguration);
148148

149-
$formFactoryMock->createBuilder('form', [], [])
149+
$formFactoryMock->createNamedBuilder('foo', 'form', [], [])
150150
->shouldBeCalled()
151151
->willReturn($formBuilderMock->reveal());
152152

0 commit comments

Comments
 (0)