Skip to content

Commit a906d0a

Browse files
solveratsolverat
authored
[ORM] use xml mapping, resolves #501 (#503)
* [ORM] use xml mapping, resolves #501 * [TEST] fix intl icu formatting
1 parent 6e90eb8 commit a906d0a

12 files changed

+145
-261
lines changed

‎config/doctrine/model/DoubleOptInSession.orm.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
5+
<entity name="FormBuilderBundle\Model\DoubleOptInSession" table="formbuilder_double_opt_in_session">
6+
<indexes>
7+
<index name="token_form" columns="token,form_definition,applied"/>
8+
</indexes>
9+
<id name="token" type="uuid" column="token">
10+
<generator strategy="CUSTOM"/>
11+
<custom-id-generator class="Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator"/>
12+
</id>
13+
<field name="email" type="string" column="email" length="190" nullable="false"/>
14+
<field name="additionalData" type="array" column="additional_data" nullable="true"/>
15+
<field name="dispatchLocation" type="text" column="dispatch_location" nullable="true"/>
16+
<field name="applied" type="boolean" column="applied">
17+
<options>
18+
<option name="default">0</option>
19+
</options>
20+
</field>
21+
<field name="creationDate" type="datetime" column="creationDate" nullable="false"/>
22+
<many-to-one field="formDefinition" target-entity="FormBuilderBundle\Model\FormDefinition" fetch="LAZY">
23+
<join-columns>
24+
<join-column name="form_definition" referenced-column-name="id" on-delete="CASCADE"/>
25+
</join-columns>
26+
</many-to-one>
27+
</entity>
28+
</doctrine-mapping>

‎config/doctrine/model/DoubleOptInSession.orm.yml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎config/doctrine/model/FormDefinition.orm.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
5+
<entity name="FormBuilderBundle\Model\FormDefinition" table="formbuilder_forms">
6+
<id name="id" type="integer" column="id">
7+
<generator strategy="AUTO"/>
8+
</id>
9+
<field name="name" type="string" column="`name`" length="190" unique="true" nullable="true"/>
10+
<field name="group" type="string" column="`group`" length="190" nullable="true"/>
11+
<field name="creationDate" type="datetime" column="creationDate" nullable="false"/>
12+
<field name="modificationDate" type="datetime" column="modificationDate" nullable="false"/>
13+
<field name="createdBy" type="integer" column="createdBy"/>
14+
<field name="modifiedBy" type="integer" column="modifiedBy"/>
15+
<field name="configuration" type="object" column="configuration" nullable="true"/>
16+
<field name="conditionalLogic" type="object" column="conditionalLogic" nullable="true"/>
17+
<field name="fields" type="form_builder_fields" column="fields" nullable="true"/>
18+
<one-to-many field="outputWorkflows" target-entity="FormBuilderBundle\Model\OutputWorkflow" mapped-by="formDefinition"
19+
fetch="LAZY">
20+
<cascade>
21+
<cascade-all/>
22+
</cascade>
23+
</one-to-many>
24+
</entity>
25+
</doctrine-mapping>

‎config/doctrine/model/FormDefinition.orm.yml‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎config/doctrine/model/OutputWorkflow.orm.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
5+
<entity name="FormBuilderBundle\Model\OutputWorkflow" table="formbuilder_output_workflow">
6+
<unique-constraints>
7+
<unique-constraint name="name_form" columns="name,form_definition"/>
8+
</unique-constraints>
9+
<id name="id" type="integer" column="id">
10+
<generator strategy="AUTO"/>
11+
</id>
12+
<field name="name" type="string" column="`name`" length="190" nullable="true"/>
13+
<field name="funnelWorkflow" type="boolean" column="funnel_workflow" nullable="false"/>
14+
<field name="successManagement" type="object" column="success_management" nullable="true"/>
15+
<one-to-many field="channels" target-entity="FormBuilderBundle\Model\OutputWorkflowChannel" mapped-by="outputWorkflow"
16+
orphan-removal="true" fetch="LAZY">
17+
<cascade>
18+
<cascade-all/>
19+
</cascade>
20+
<order-by>
21+
<order-by-field name="id" direction="ASC"/>
22+
</order-by>
23+
</one-to-many>
24+
<many-to-one field="formDefinition" target-entity="FormBuilderBundle\Model\FormDefinition" inversed-by="outputWorkflows"
25+
fetch="LAZY">
26+
<join-columns>
27+
<join-column name="form_definition" referenced-column-name="id"/>
28+
</join-columns>
29+
</many-to-one>
30+
</entity>
31+
</doctrine-mapping>

‎config/doctrine/model/OutputWorkflow.orm.yml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎config/doctrine/model/OutputWorkflowChannel.orm.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
5+
<entity name="FormBuilderBundle\Model\OutputWorkflowChannel" table="formbuilder_output_workflow_channel">
6+
<unique-constraints>
7+
<unique-constraint name="ow_name" columns="output_workflow,name"/>
8+
</unique-constraints>
9+
<id name="id" type="integer" column="id">
10+
<generator strategy="AUTO"/>
11+
</id>
12+
<field name="type" type="string" column="type" length="190"/>
13+
<field name="name" type="string" column="name" length="190"/>
14+
<field name="configuration" type="object" column="configuration" nullable="true"/>
15+
<field name="funnelActions" type="object" column="funnel_actions" nullable="true"/>
16+
<many-to-one field="outputWorkflow" target-entity="FormBuilderBundle\Model\OutputWorkflow" inversed-by="channels"
17+
fetch="LAZY">
18+
<join-columns>
19+
<join-column name="output_workflow" referenced-column-name="id"/>
20+
</join-columns>
21+
</many-to-one>
22+
</entity>
23+
</doctrine-mapping>

‎config/doctrine/model/OutputWorkflowChannel.orm.yml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/FormBuilderBundle.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected function getComposerPackageName(): string
9191
protected function configureDoctrineExtension(ContainerBuilder $container): void
9292
{
9393
$container->addCompilerPass(
94-
DoctrineOrmMappingsPass::createYamlMappingDriver(
94+
DoctrineOrmMappingsPass::createXmlMappingDriver(
9595
[$this->getNameSpacePath() => $this->getNamespaceName()],
9696
['form_builder.persistence.doctrine.manager'],
9797
'form_builder.persistence.doctrine.enabled'

‎tests/Functional/Fields/AbstractFieldCest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function setupField(FunctionalTester $I, $options = [], $optional = []
3131
$testFormBuilder = (new TestFormBuilder('dachcom_test'))->setUseAjax(false);
3232

3333
if ($this->type === 'container') {
34-
$subFields = isset($optional['subFields']) ? $optional['subFields'] : [];
34+
$subFields = $optional['subFields'] ?? [];
3535
$testFormBuilder->addFormFieldContainer(
3636
$this->subType,
3737
$this->name,

0 commit comments

Comments
 (0)