Remove default type fallback in compilerpass (#513)

* Remove default type fallback in compilerpass * Update sulu/sulu requirement version Co-authored-by: Niklas Natter <niklas@sulu.io>
sulu · Sep 17, 2020 · e258004 · e258004
1 parent 2fdda87
commit e258004
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/DependencyInjection/StructureValidatorCompilerPass.php b/DependencyInjection/StructureValidatorCompilerPass.php
@@ -28,27 +28,14 @@ public function process(ContainerBuilder $container)
     {
         $types = ['article', 'article_page'];
         $defaultTypes = $container->getParameter('sulu.content.structure.default_types');
-        $newDefaultTypes = $defaultTypes;
         /** @var StructureMetadataFactory $structureFactory */
         $structureFactory = $container->get('sulu_page.structure.factory');
 
         foreach ($types as $type) {
             $defaultType = $defaultTypes[$type] ?? null;
 
-            // this should be removed when is released https://github.com/sulu/sulu/pull/5381
-            // see https://github.com/sulu/SuluArticleBundle/pull/498 for more information
             if (!$defaultType) {
-                $metadatas = $structureFactory->getStructures($type);
-
-                foreach ($metadatas as $metadata) {
-                    $defaultType = $metadata->getName();
-
-                    break;
-                }
-
-                unset($defaultTypes[$type]);
-                $container->setParameter('sulu.content.structure.default_types', $defaultTypes);
-                $newDefaultTypes[$type] = $defaultType;
+                continue;
             }
 
             try {
@@ -57,10 +44,5 @@ public function process(ContainerBuilder $container)
                 throw new DefaultArticleTypeNotFoundException($type, $defaultType, $exception);
             }
         }
-
-        // this should be removed when is released https://github.com/sulu/sulu/pull/5381
-        // see https://github.com/sulu/SuluArticleBundle/pull/498 for more information
-        $definition = $container->getDefinition('sulu_page.structure.factory');
-        $definition->setArgument(2, $newDefaultTypes);
     }
 }
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "handcraftedinthealps/elasticsearch-dsl": "^5.0.7.1 || ^6.2.0.1 || ^7.2.0.1",
         "jms/serializer": "^3.3",
         "jms/serializer-bundle": "^3.3",
-        "sulu/sulu": "^2.0.6",
+        "sulu/sulu": "^2.0.10",
         "symfony/config": "^4.3",
         "symfony/dependency-injection": "^4.3",
         "symfony/http-foundation": "^4.3",