Pimcore 11

Author: AlexanderHeidrich

.gitignore

@@ -4,3 +4,4 @@
 # webpack
 vendor
 .phpunit.*
+composer.lock

composer.json

@@ -16,9 +16,10 @@
     }
   },
   "require": {
-    "php": ">=8.0",
-    "pimcore/pimcore": ">=10",
-    "phpoffice/phpspreadsheet": "^1.28"
+    "php": ">=8.1",
+    "pimcore/pimcore": "^11.0",
+    "phpoffice/phpspreadsheet": "^1.28",
+    "pimcore/admin-ui-classic-bundle": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5"

src/EventSubscriber/ClassDefinitionSubscriber.php

@@ -26,7 +26,7 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    public function onClassDefinitionPostUpdate(ClassDefinitionEvent $event)
+    public function onClassDefinitionPostUpdate(ClassDefinitionEvent $event): void
     {
         $classDefinition = $event->getClassDefinition();
 

src/EventSubscriber/DataObjectSubscriber.php

@@ -4,12 +4,11 @@
 
 use Basilicom\AdvancedCustomLayoutBundle\Model\CustomLayoutConfig;
 use Basilicom\AdvancedCustomLayoutBundle\Service\ConfigurationService;
-use Basilicom\AdvancedCustomLayoutBundle\Service\CustomLayoutService;
-use Pimcore\Bundle\AdminBundle\Security\User\User;
-use Pimcore\Event\AdminEvents;
+use Pimcore\Bundle\AdminBundle\Event\AdminEvents;
 use Pimcore\Model\DataObject\ClassDefinition\CustomLayout;
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Service;
+use Pimcore\Security\User\User;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;

src/Service/CustomLayoutService.php

@@ -94,12 +94,7 @@ private function editLayout(?ClassDefinition $classDefinition, CustomLayoutConfi
         $fieldDefinitions = $classDefinition->getFieldDefinitions();
 
         foreach ($layoutConfig->getFields() as $fieldConfig) {
-            foreach ($fieldDefinitions as $fieldDefinition) {
-                if ($fieldDefinition->getName() === $fieldConfig->getFieldId()) {
-                    $this->adaptFieldDefinition($fieldDefinition, $fieldConfig);
-                    continue 2;
-                }
-            }
+            $this->handleFieldDefinitions($fieldDefinitions, $fieldConfig);
         }
 
         foreach ($layoutConfig->getLayoutElements() as $layoutElementConfig) {
@@ -109,6 +104,20 @@ private function editLayout(?ClassDefinition $classDefinition, CustomLayoutConfi
         return $layoutDefinition;
     }
 
+    private function handleFieldDefinitions(array $fieldDefinitions, CustomLayoutConfig\FieldConfig $fieldConfig) {
+        foreach ($fieldDefinitions as $fieldDefinition) {
+            if($fieldDefinition instanceof Data\Localizedfields) {
+                $this->handleFieldDefinitions($fieldDefinition->getFieldDefinitions(), $fieldConfig);
+                continue;
+            }
+
+            if ($fieldDefinition->getName() === $fieldConfig->getFieldId()) {
+                $this->adaptFieldDefinition($fieldDefinition, $fieldConfig);
+            }
+        }
+    }
+
+
     private function adaptLayoutDefinition(LayoutElementConfig $config, Layout $layoutDefinition): Layout
     {
         if ($layoutDefinition->getName() === $config->getElementId()) {