FEATURE: NodeType allow unsetting inherited properties

neos · Oct 15, 2023 · e204c51 · e204c51
1 parent f51830a
commit e204c51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/NodeType/NodeType.php b/Neos.ContentRepository.Core/Classes/NodeType/NodeType.php
@@ -152,6 +152,11 @@ protected function buildFullConfiguration(): array
         }
         $this->fullConfiguration = Arrays::arrayMergeRecursiveOverrule($mergedConfiguration, $this->localConfiguration);
 
+        // Remove unset properties
+        $this->fullConfiguration['properties'] = array_filter($this->fullConfiguration['properties'] ?? [], function ($propertyConfiguration) {
+            return $propertyConfiguration !== null;
+        });
+
         if (
             isset($this->fullConfiguration['childNodes'])
             && is_array($this->fullConfiguration['childNodes'])

diff --git a/Neos.ContentRepository.Core/Classes/NodeType/NodeTypeManager.php b/Neos.ContentRepository.Core/Classes/NodeType/NodeTypeManager.php
@@ -220,20 +220,6 @@ protected function loadNodeType(string $nodeTypeName, array &$completeNodeTypeCo
             );
         }
 
-        // Remove unset properties
-        $properties = [];
-        if (isset($nodeTypeConfiguration['properties']) && is_array($nodeTypeConfiguration['properties'])) {
-            $properties = $nodeTypeConfiguration['properties'];
-        }
-
-        $nodeTypeConfiguration['properties'] = array_filter($properties, function ($propertyConfiguration) {
-            return $propertyConfiguration !== null;
-        });
-
-        if ($nodeTypeConfiguration['properties'] === []) {
-            unset($nodeTypeConfiguration['properties']);
-        }
-
         $nodeType = new NodeType(
             NodeTypeName::fromString($nodeTypeName),
             $superTypes,