Merge 38310d8 into 59c1688

sonata-project · Nov 18, 2019 · 88d433e · 88d433e
2 parents 59c1688 + 38310d8
commit 88d433e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/src/Resources/config/doctrine/BaseCategory.mongodb.xml b/src/Resources/config/doctrine/BaseCategory.mongodb.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping                     http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping.xsd">
+<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
+                  http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <mapped-superclass name="Sonata\ClassificationBundle\Document\BaseCategory">
-        <field name="name" type="string" fieldName="name"/>
-        <field name="enabled" type="boolean" fieldName="enabled"/>
-        <field name="slug" type="string" fieldName="slug"/>
-        <field name="description" type="string" fieldName="description"/>
-        <field name="createdAt" type="timestamp" fieldName="createdAt"/>
-        <field name="updatedAt" type="timestamp" fieldName="updatedAt"/>
+        <field name="name" type="string" field-name="name"/>
+        <field name="enabled" type="boolean" field-name="enabled"/>
+        <field name="slug" type="string" field-name="slug"/>
+        <field name="description" type="string" field-name="description"/>
+        <field name="position" type="integer" field-name="position"/>
+        <field name="createdAt" type="timestamp" field-name="createdAt"/>
+        <field name="updatedAt" type="timestamp" field-name="updatedAt"/>
         <lifecycle-callbacks>
             <lifecycle-callback type="prePersist" method="prePersist"/>
             <lifecycle-callback type="preUpdate" method="preUpdate"/>

diff --git a/src/Resources/config/doctrine/BaseContext.mongodb.xml b/src/Resources/config/doctrine/BaseContext.mongodb.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping                     http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping.xsd">
+<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
+                  http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <mapped-superclass name="Sonata\ClassificationBundle\Document\BaseContext">
-        <field name="name" type="string" column="name"/>
-        <field name="enabled" type="boolean" fieldName="enabled"/>
-        <field name="createdAt" type="timestamp" fieldName="createdAt"/>
-        <field name="updatedAt" type="timestamp" fieldName="updatedAt"/>
+        <field name="name" type="string" field-name="name"/>
+        <field name="enabled" type="boolean" field-name="enabled"/>
+        <field name="createdAt" type="timestamp" field-name="createdAt"/>
+        <field name="updatedAt" type="timestamp" field-name="updatedAt"/>
         <lifecycle-callbacks>
             <lifecycle-callback type="prePersist" method="prePersist"/>
             <lifecycle-callback type="preUpdate" method="preUpdate"/>

diff --git a/src/Resources/config/doctrine/BaseTag.mongodb.xml b/src/Resources/config/doctrine/BaseTag.mongodb.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping                     http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping.xsd">
+<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
+                  http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <mapped-superclass name="Sonata\ClassificationBundle\Document\BaseTag">
-        <field name="name" type="string" fieldName="name"/>
-        <field name="enabled" type="boolean" fieldName="enabled"/>
-        <field name="slug" type="string" fieldName="slug"/>
-        <field name="createdAt" type="timestamp" fieldName="createdAt"/>
-        <field name="updatedAt" type="timestamp" fieldName="updatedAt"/>
+        <field name="name" type="string" field-name="name"/>
+        <field name="enabled" type="boolean" field-name="enabled"/>
+        <field name="slug" type="string" field-name="slug"/>
+        <field name="createdAt" type="timestamp" field-name="createdAt"/>
+        <field name="updatedAt" type="timestamp" field-name="updatedAt"/>
         <lifecycle-callbacks>
             <lifecycle-callback type="prePersist" method="prePersist"/>
             <lifecycle-callback type="preUpdate" method="preUpdate"/>