Merge pull request #98 from sherlockode/feature/sf-4-sf-5-compatibility

Symfony 4.4 & Symfony 5.0 compatibility
sherlockode · Jul 13, 2022 · 19a27d0 · 19a27d0
2 parents dd21304 + fcaa0b2
commit 19a27d0
Show file tree

Hide file tree

Showing 25 changed files with 181 additions and 160 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -20,11 +20,10 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $tb = new TreeBuilder('sherlockode_advanced_form');
-        // BC layer for symfony/config < 4.2
-        $root = \method_exists($tb, 'getRootNode') ? $tb->getRootNode() : $tb->root('sherlockode_advanced_form');
+        $root = $tb->getRootNode();
 
         $this->addStorageSection($root);
         $this->addUploaderSection($root);

diff --git a/DependencyInjection/SherlockodeAdvancedFormExtension.php b/DependencyInjection/SherlockodeAdvancedFormExtension.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
@@ -76,12 +76,12 @@ private function getStorageDefinition($name, $config)
      */
     private function loadServices(ContainerBuilder $container)
     {
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $toBeLoaded = [
-            'command.yml',
-            'controller.yml',
-            'form.yml',
-            'manager.yml',
+            'command.xml',
+            'controller.xml',
+            'form.xml',
+            'manager.xml',
         ];
         foreach ($toBeLoaded as $file) {
             $loader->load($file);

diff --git a/Form/DataTransformer/TemporaryUploadFileTransformer.php b/Form/DataTransformer/TemporaryUploadFileTransformer.php
@@ -65,7 +65,6 @@ public function reverseTransform($data)
             $data->getFilename(),
             null,
             null,
-            null,
             true
         );
     }

diff --git a/Form/Type/DependentEntityType.php b/Form/Type/DependentEntityType.php
@@ -61,7 +61,7 @@ public function __construct(
         $this->router = $router;
     }
 
-    public function getParent()
+    public function getParent(): ?string
     {
         return EntityType::class;
     }

diff --git a/Form/Type/FileCollectionType.php b/Form/Type/FileCollectionType.php
@@ -59,7 +59,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setRequired('mapping');
     }
 
-    public function getParent()
+    public function getParent(): ?string
     {
         return CollectionType::class;
     }

diff --git a/Form/Type/FileType.php b/Form/Type/FileType.php
@@ -168,7 +168,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'afb_file';
     }

diff --git a/Form/Type/RemoveFileType.php b/Form/Type/RemoveFileType.php
@@ -38,7 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'afb_remove_file';
     }

diff --git a/Form/Type/TemporaryUploadedFileType.php b/Form/Type/TemporaryUploadedFileType.php
@@ -76,7 +76,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'afb_temporary_uploaded_file';
     }

diff --git a/Form/Type/UploadFileType.php b/Form/Type/UploadFileType.php
@@ -115,7 +115,7 @@ public function configureOptions(OptionsResolver $optionsResolver)
     /**
      * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'afb_upload_file';
     }

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Import the routing in `config/routes.yml`
 
 ```yaml
 sherlockode_advanced_form:
-    resource: "@SherlockodeAdvancedFormBundle/Resources/config/routing/all.yml"
+    resource: "@SherlockodeAdvancedFormBundle/Resources/config/routing/all.xml"
 ```
 
 ### Step 4: Publish assets

diff --git a/Resources/config/command.xml b/Resources/config/command.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
+    <services>
+        <service id="sherlockode_afb.command.remove_tmp_files" class="Sherlockode\AdvancedFormBundle\Command\RemoveTemporaryFileCommand">
+            <argument type="service" id="doctrine.orm.entity_manager"/>
+            <argument type="service" id="sherlockode_afb.storage.tmp_storage"/>
+            <argument>%sherlockode_afb.tmp_uploaded_file_class%</argument>
+            <tag name="console.command"/>
+        </service>
+    </services>
+</container>
diff --git a/Resources/config/command.yml b/Resources/config/command.yml
diff --git a/Resources/config/controller.xml b/Resources/config/controller.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
+    <services>
+        <service id="sherlockode_afb.file_upload.controller" class="Sherlockode\AdvancedFormBundle\Controller\FileUploadController" public="true">
+            <argument type="service" id="sherlockode_afb.upload_manager"/>
+            <argument type="service" id="sherlockode_afb.mapping_manager"/>
+            <argument type="service" id="doctrine.orm.entity_manager"/>
+            <argument type="service" id="event_dispatcher"/>
+            <call method="setContainer">
+                <argument type="service" id="service_container"/>
+            </call>
+        </service>
+        <service id="sherlockode_afb.file_upload.temporary_upload_controller" class="Sherlockode\AdvancedFormBundle\Controller\TemporaryFileUploadController" public="true">
+            <argument type="service" id="sherlockode_afb.upload_manager"/>
+            <argument>%sherlockode_afb.tmp_uploaded_file_class%</argument>
+            <argument type="service" id="sherlockode_afb.storage.tmp_storage"/>
+            <argument type="service" id="event_dispatcher"/>
+            <call method="setContainer">
+                <argument type="service" id="service_container"/>
+            </call>
+        </service>
+        <service id="sherlockode_afb.dependent_entity.controller" class="Sherlockode\AdvancedFormBundle\Controller\DependentEntityController" public="true">
+            <argument type="service" id="event_dispatcher"/>
+            <argument type="service" id="sherlockode_afb.dependent_entity.mapper_pool"/>
+            <call method="setContainer">
+                <argument type="service" id="service_container"/>
+            </call>
+        </service>
+    </services>
+</container>
diff --git a/Resources/config/controller.yml b/Resources/config/controller.yml
diff --git a/Resources/config/form.xml b/Resources/config/form.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
+    <services>
+        <service id="sherlockode_afb.file.form_entity_type" class="Sherlockode\AdvancedFormBundle\Form\Type\EntityMappingType">
+            <argument type="service" id="doctrine.orm.entity_manager"/>
+            <argument type="service" id="sherlockode_afb.mapping_manager"/>
+            <tag name="form.type"/>
+        </service>
+        <service id="sherlockode_afb.file.form_type" class="Sherlockode\AdvancedFormBundle\Form\Type\FileType">
+            <argument type="service" id="router"/>
+            <argument type="service" id="sherlockode_afb.upload_manager"/>
+            <argument type="service" id="sherlockode_afb.mapping_manager"/>
+            <argument>%sherlockode_afb.tmp_uploaded_file_dir%</argument>
+            <tag name="form.type"/>
+        </service>
+        <service id="sherlockode_afb.file.collection_type" class="Sherlockode\AdvancedFormBundle\Form\Type\FileCollectionType">
+            <tag name="form.type"/>
+        </service>
+        <service id="sherlockode_afb.file.tmp_type" class="Sherlockode\AdvancedFormBundle\Form\Type\TemporaryUploadedFileType">
+            <argument type="service" id="doctrine.orm.entity_manager"/>
+            <argument>%sherlockode_afb.tmp_uploaded_file_class%</argument>
+            <tag name="form.type"/>
+        </service>
+        <service id="sherlockode_afb.file.upload_type" class="Sherlockode\AdvancedFormBundle\Form\Type\UploadFileType">
+            <argument type="service" id="sherlockode_afb.mapping_manager"/>
+            <argument type="service" id="translator"/>
+            <tag name="form.type"/>
+        </service>
+        <service id="sherlockode_afb.form.dependent_entity_type" class="Sherlockode\AdvancedFormBundle\Form\Type\DependentEntityType">
+            <argument type="service" id="doctrine.orm.entity_manager"/>
+            <argument type="service" id="translator"/>
+            <argument type="service" id="sherlockode_afb.dependent_entity.mapper_pool"/>
+            <argument type="service" id="router"/>
+            <tag name="form.type"/>
+        </service>
+    </services>
+</container>
diff --git a/Resources/config/form.yml b/Resources/config/form.yml
diff --git a/Resources/config/manager.xml b/Resources/config/manager.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
+    <services>
+        <service id="sherlockode_afb.upload_handler.vich" class="Sherlockode\AdvancedFormBundle\UploadHandler\VichUploadHandler">
+            <argument type="service" id="vich_uploader.upload_handler"/>
+            <argument type="service" id="annotation_reader"/>
+            <tag name="sherlockode_afb.upload_handler" alias="vich"/>
+        </service>
+        <service id="sherlockode_afb.upload_handler.property" class="Sherlockode\AdvancedFormBundle\UploadHandler\PropertyUploadHandler">
+            <argument type="service" id="sherlockode_afb.mapping_manager"/>
+            <argument/>
+            <tag name="sherlockode_afb.upload_handler" alias="property"/>
+        </service>
+        <service id="sherlockode_afb.upload_manager" class="Sherlockode\AdvancedFormBundle\Manager\UploadManager">
+            <argument type="service" id="doctrine.orm.entity_manager"/>
+            <argument type="service" id="sherlockode_afb.storage.tmp_storage"/>
+            <argument>%sherlockode_afb.tmp_uploaded_file_class%</argument>
+        </service>
+        <service id="sherlockode_afb.mapping_manager" class="Sherlockode\AdvancedFormBundle\Manager\MappingManager">
+            <call method="setMappingData">
+                <argument>%sherlockode_afb.uploader_mappings%</argument>
+            </call>
+        </service>
+        <service id="sherlockode_afb.storage.tmp_storage" class="Sherlockode\AdvancedFormBundle\Storage\FilesystemStorage">
+            <argument>%sherlockode_afb.tmp_uploaded_file_dir%</argument>
+        </service>
+        <service id="sherlockode_afb.twig_extension" class="Sherlockode\AdvancedFormBundle\Twig\Extension\UploaderExtension">
+            <argument type="service" id="router"/>
+            <argument type="service" id="sherlockode_afb.mapping_manager"/>
+            <argument type="service" id="sherlockode_afb.upload_manager"/>
+            <tag name="twig.extension"/>
+        </service>
+        <service id="sherlockode_afb.dependent_entity.mapper_pool" class="Sherlockode\AdvancedFormBundle\DependentEntity\DependentMapperPool">
+        </service>
+    </services>
+</container>
diff --git a/Resources/config/manager.yml b/Resources/config/manager.yml
diff --git a/Resources/config/routing/all.xml b/Resources/config/routing/all.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd"
+>
+    <import resource="@SherlockodeAdvancedFormBundle/Resources/config/routing/dependent_entity.xml" />
+    <import resource="@SherlockodeAdvancedFormBundle/Resources/config/routing/upload.xml" />
+</routes>
diff --git a/Resources/config/routing/all.yml b/Resources/config/routing/all.yml
diff --git a/Resources/config/routing/dependent_entity.xml b/Resources/config/routing/dependent_entity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd"
+>
+    <route id="sherlockode_afb_dependent_results" path="/sherlockodeadvancedform/dependent-result">
+        <default key="_controller">sherlockode_afb.dependent_entity.controller:getDependentResultsAction</default>
+    </route>
+</routes>
diff --git a/Resources/config/routing/dependent_entity.yml b/Resources/config/routing/dependent_entity.yml