add sulu 3.0 support

Author: wachterjohannes

Controller/FormWebsiteController.php

@@ -228,8 +228,6 @@ public function load(array $configs, ContainerBuilder $container): void
         }
 
         if (SuluKernel::CONTEXT_WEBSITE === $container->getParameter('sulu.context')) {
-            $container->setAlias(FormWebsiteController::class, 'sulu_form.form_website_controller')
-                ->setPublic(true);
             $container->setAlias(FormTokenController::class, 'sulu_form.form_token_controller')
                 ->setPublic(true);
         }

DependencyInjection/SuluFormExtension.php

@@ -12,7 +12,7 @@
 namespace Sulu\Bundle\FormBundle\Metadata;
 
 use Sulu\Bundle\AdminBundle\FormMetadata\FormMetadataMapper;
-use Sulu\Bundle\AdminBundle\FormMetadata\FormXmlLoader;
+use Sulu\Bundle\AdminBundle\Metadata\FormMetadata\Loader\FormXmlLoader;
 use Sulu\Bundle\AdminBundle\Metadata\FormMetadata\FieldMetadata;
 use Sulu\Bundle\AdminBundle\Metadata\FormMetadata\FormMetadata;
 use Sulu\Bundle\AdminBundle\Metadata\FormMetadata\FormMetadataLoaderInterface;
@@ -45,6 +45,8 @@ class DynamicFormMetadataLoader implements FormMetadataLoaderInterface, CacheWar
 
     /**
      * @var FormMetadataMapper
+     *
+     * TODO REMOVE
      */
     private $formMetadataMapper;
 
@@ -90,7 +92,7 @@ public function warmUp($cacheDir, ?string $buildDir = null): array
         $formMetadataCollection = $this->formXmlLoader->load($resource);
         foreach ($formMetadataCollection->getItems() as $locale => $formMetadata) {
             $section = new SectionMetadata('formFields');
-            $section->setLabel($this->translator->trans('sulu_form.form_fields', [], 'admin', $locale));
+            $section->setLabel($this->translator->trans('sulu_form.form_fields', [], 'admin', $locale), $locale);
             $fields = new FieldMetadata('fields');
             $fields->setType('block');
 
@@ -101,8 +103,8 @@ public function warmUp($cacheDir, ?string $buildDir = null): array
                 $fieldTypeMetaDataCollection[] = $this->loadFieldTypeMetadata($typeKey, $type, $locale);
             }
 
-            \usort($fieldTypeMetaDataCollection, static function(FormMetadata $a, FormMetadata $b): int {
-                return \strcmp($a->getTitle(), $b->getTitle());
+            \usort($fieldTypeMetaDataCollection, static function(FormMetadata $a, FormMetadata $b)use($locale): int {
+                return \strcmp($a->getTitle($locale), $b->getTitle($locale));
             });
 
             foreach ($fieldTypeMetaDataCollection as $fieldTypeMetaData) {
@@ -111,11 +113,13 @@ public function warmUp($cacheDir, ?string $buildDir = null): array
 
             $fields->setDefaultType(\current($fields->getTypes())->getName());
             $section->addItem($fields);
+            /* TODO HOW?
             $formItems = $formMetadata->getItems();
             $this->arrayInsertAtPosition($formItems, 1, [$section->getName() => $section]);
             $formMetadata->setItems($formItems);
             $configCache = $this->getConfigCache($formMetadata->getKey(), $locale);
             $configCache->write(\serialize($formMetadata), [new FileResource($resource)]);
+            */
         }
 
         return [];
@@ -151,11 +155,12 @@ private function loadFieldTypeMetadata(string $typeKey, FormFieldTypeInterface $
     {
         $form = new FormMetadata();
         $configuration = $type->getConfiguration();
+
         $properties = $this->propertiesXmlLoader->load($configuration->getXmlPath());
 
-        $form->setItems($this->formMetadataMapper->mapChildren($properties->getProperties(), $locale));
-        $form->setName($typeKey);
-        $form->setTitle($this->translator->trans($configuration->getTitle(), [], 'admin', $locale));
+        $form->setItems($properties);
+        $form->setKey($typeKey);
+        $form->setTitle($this->translator->trans($configuration->getTitle(), [], 'admin', $locale), $locale);
 
         return $form;
     }

Metadata/DynamicFormMetadataLoader.php

@@ -11,8 +11,8 @@
 
 namespace Sulu\Bundle\FormBundle\Metadata;
 
-use Sulu\Component\Content\Metadata\Loader\AbstractLoader;
-use Sulu\Component\Content\Metadata\Parser\PropertiesXmlParser;
+use Sulu\Bundle\AdminBundle\Metadata\FormMetadata\Loader\AbstractLoader;
+use Sulu\Bundle\AdminBundle\Metadata\FormMetadata\Parser\PropertiesXmlParser;
 use Sulu\Component\Content\Metadata\PropertiesMetadata;
 
 class PropertiesXmlLoader extends AbstractLoader
@@ -40,25 +40,17 @@ public function __construct(
      * @param string $resource
      * @param string $type
      */
-    protected function parse($resource, \DOMXPath $xpath, $type): PropertiesMetadata
+    protected function parse($resource, \DOMXPath $xpath, $type): array
     {
-        $tags = [];
-
         $propertiesMetadata = new PropertiesMetadata();
         $propertiesMetadata->setResource($resource);
 
         $propertiesNode = $xpath->query('/x:properties')->item(0);
         $properties = $this->propertiesXmlParser->load(
-            $tags,
             $xpath,
-            $propertiesNode
+            $propertiesNode,
         );
 
-        foreach ($properties as $property) {
-            $propertiesMetadata->addChild($property);
-        }
-        $propertiesMetadata->burnProperties();
-
-        return $propertiesMetadata;
+        return $properties;
     }
 }

Metadata/PropertiesXmlLoader.php

@@ -174,7 +174,7 @@
                 id="sulu_form.metadata.properties_xml_loader"
                 class="Sulu\Bundle\FormBundle\Metadata\PropertiesXmlLoader"
         >
-            <argument type="service" id="sulu_page.structure.properties_xml_parser"/>
+            <argument type="service" id="sulu_admin.properties_xml_parser"/>
         </service>
 
         <!-- Dynamic Form Metadata Loader -->
@@ -226,19 +226,6 @@
             <tag name="sulu.context" context="admin"/>
         </service>
 
-        <!-- Form Website Controller -->
-        <service id="sulu_form.form_website_controller"
-            class="Sulu\Bundle\FormBundle\Controller\FormWebsiteController"
-            public="true">
-            <tag name="container.service_subscriber" />
-            <tag name="controller.service_arguments" />
-            <tag name="sulu.context" context="website"/>
-
-            <call method="setContainer">
-                <argument type="service" id="Psr\Container\ContainerInterface" />
-            </call>
-        </service>
-
         <!-- Form Website Controller -->
         <service id="sulu_form.form_token_controller"
                  class="Sulu\Bundle\FormBundle\Controller\FormTokenController"