bugfix: [inherited-properties] add inherited field to export and skip inherited properties on import (#25)

* [inherited-properties] skip inherited properties and set inheritable on merge

* [inherited-properties] added inherited property to Document Property in Import

---------

Co-authored-by: Michael Albrecht <m.albrecht@neusta.de>
Co-authored-by: Jacob Dreesen <jacob@hdreesen.de>

Author: 3 people

config/pimcore/export/documents/converters_populators.yaml

@@ -70,6 +70,7 @@ neusta_converter:
       properties:
         key: name
         type: ~
+        inherited: ~
 
 services:
   _defaults:

src/Import/Strategy/Document/UpdateExistingPageStrategy.php

@@ -34,10 +34,11 @@ public function mergeAndSave(AbstractElement $oldElement, AbstractElement $newEl
         foreach ($newElement->getProperties() as $property) {
             $name = $property->getName();
             $type = $property->getType();
-            if (null === $name || null === $type) {
-                continue; // Skip invalid properties
+            $inherited = $property->getInherited();
+            if (null === $name || null === $type || true === $inherited) {
+                continue; // Skip invalid and inherited properties
             }
-            $oldElement->setProperty($name, $type, $property->getData());
+            $oldElement->setProperty($name, $type, $property->getData(), false, $property->getInheritable());
         }
         $oldElement->save(['versionNote' => 'overwritten by pimcore-import-export-bundle']);
     }

src/Model/Property.php

@@ -7,4 +7,5 @@ class Property
     public string $key;
     public string $type;
     public mixed $value;
+    public bool $inherited;
 }

src/Populator/Document/PropertiesPopulator.php

@@ -38,7 +38,7 @@ public function populate(object $target, object $source, ?object $ctx = null): v
             } else {
                 $value = $property['value'];
             }
-            $target->setProperty($property['key'], $property['type'], $value);
+            $target->setProperty($property['key'], $property['type'], $value, $property['inherited'] ?? false);
         }
     }
 }

tests/Integration/Export/ExporterTest.php

@@ -141,7 +141,7 @@ private function createPageWithInputEditable(): Page
         $page->setPublished(false);
         $page->setPath('/test/');
         $page->setKey('test_document_1');
-        $page->setProperty('language', 'string', 'en');
+        $page->setProperty('language', 'string', 'en', true);
         $page->setProperty('navigation_name', 'string', 'My Document');
         $page->setProperty('navigation_title', 'string', 'My Document - Title');
         $page->setTitle('The Title of my document');

tests/Integration/Export/__snapshots__/ExporterTest__test_single_page_export__1.yaml

@@ -232,23 +232,29 @@ elements:
                     key: language
                     type: text
                     value: ''
+                    inherited: false
                 neusta_trinity_pimcore_footer:
                     key: neusta_trinity_pimcore_footer
                     type: document
                     value: ~
+                    inherited: false
                 neusta_trinity_pimcore_footer_visible:
                     key: neusta_trinity_pimcore_footer_visible
                     type: bool
                     value: true
+                    inherited: false
                 neusta_trinity_pimcore_header:
                     key: neusta_trinity_pimcore_header
                     type: document
                     value: ~
+                    inherited: false
                 neusta_trinity_pimcore_header_visible:
                     key: neusta_trinity_pimcore_header_visible
                     type: bool
                     value: true
+                    inherited: false
                 slotName:
                     key: slotName
                     type: text
                     value: footer
+                    inherited: true