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

Symfony 4.4 & Symfony 5.0 compatibility

Author: juchi

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);

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);

Form/DataTransformer/TemporaryUploadFileTransformer.php

@@ -65,7 +65,6 @@ public function reverseTransform($data)
             $data->getFilename(),
             null,
             null,
-            null,
             true
         );
     }

Form/Type/DependentEntityType.php

@@ -61,7 +61,7 @@ public function __construct(
         $this->router = $router;
     }
 
-    public function getParent()
+    public function getParent(): ?string
     {
         return EntityType::class;
     }

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;
     }

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';
     }

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';
     }

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';
     }

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';
     }

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