Add Symfony 5 support

Author: hlecorche

DependencyInjection/Compiler/TwigFormPass.php

@@ -28,8 +28,8 @@ public function process(ContainerBuilder $container)
             array_merge(
                 $container->getParameter('twig.form.resources'),
                 array(
-                    'EcommitJavascriptBundle:Form:fields.html.twig',
-                    'EcommitJavascriptBundle:Form:select2.html.twig',
+                    '@EcommitJavascript/Form/fields.html.twig',
+                    '@EcommitJavascript/Form/select2.html.twig',
                 )
             )
         );

Form/Type/JqueryAutocompleteEntityAjaxType.php

@@ -10,7 +10,7 @@
 
 namespace Ecommit\JavascriptBundle\Form\Type;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntityToArrayTransformer;
 use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntityToIdTransformer;
 use Symfony\Component\Form\AbstractType;

Form/Type/Select2/Select2EntityAjaxType.php

@@ -10,7 +10,7 @@
 
 namespace Ecommit\JavascriptBundle\Form\Type\Select2;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntitiesToIdsTransformer;
 use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntitiesToJsonTransformer;
 use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntityToIdTransformer;

Form/Type/TokenInputEntitiesAjaxType.php

@@ -10,10 +10,10 @@
 
 namespace Ecommit\JavascriptBundle\Form\Type;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntitiesToIdsTransformer;
 use Ecommit\JavascriptBundle\Form\DataTransformer\Entity\EntitiesToJsonTransformer;
 use Ecommit\JavascriptBundle\Form\EventListener\FixMultiAutocomplete;
-use Symfony\Bridge\Doctrine\ManagerRegistry;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;

Resources/config/services.xml

@@ -14,13 +14,13 @@
     </service>
 
     <service id="Ecommit\JavascriptBundle\Form\Type\JqueryAutocompleteEntityAjaxType" class="Ecommit\JavascriptBundle\Form\Type\JqueryAutocompleteEntityAjaxType">
-        <argument type="service" id="Symfony\Bridge\Doctrine\RegistryInterface" />
+        <argument type="service" id="Doctrine\Persistence\ManagerRegistry" />
         <argument type="service" id="Symfony\Component\Routing\RouterInterface" />
         <tag name="form.type" />
     </service>
 
     <service id="Ecommit\JavascriptBundle\Form\Type\TokenInputEntitiesAjaxType" class="Ecommit\JavascriptBundle\Form\Type\TokenInputEntitiesAjaxType">
-        <argument type="service" id="Symfony\Bridge\Doctrine\RegistryInterface" />
+        <argument type="service" id="Doctrine\Persistence\ManagerRegistry" />
         <argument type="service" id="Symfony\Component\Routing\RouterInterface" />
         <tag name="form.type" />
     </service>
@@ -43,7 +43,7 @@
     </service>
 
     <service id="Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityAjaxType" class="Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityAjaxType">
-      <argument type="service" id="Symfony\Bridge\Doctrine\RegistryInterface" />
+      <argument type="service" id="Doctrine\Persistence\ManagerRegistry" />
       <argument type="service" id="Symfony\Component\Routing\RouterInterface" />
       <tag name="form.type" />
     </service>

composer.json

@@ -11,20 +11,20 @@
     ],
     "require": {
         "doctrine/common": "*",
-        "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/doctrine-bundle": "^1.6|^2.0",
         "doctrine/orm": "~2.3",
         "ecommit/util-bundle": "2.5.*@dev",
-        "symfony/config": "^4.2",
-        "symfony/dependency-injection": "^4.2",
-        "symfony/doctrine-bridge": "^4.2",
-        "symfony/event-dispatcher": "^4.2",
-        "symfony/form": "^4.2",
-        "symfony/framework-bundle": "^4.2",
-        "symfony/http-kernel": "^4.2",
-        "symfony/options-resolver": "^4.2",
-        "symfony/property-access": "^4.2",
-        "symfony/translation": "^4.2",
-        "symfony/twig-bundle": "^4.2",
+        "symfony/config": "^4.2|^5.0",
+        "symfony/dependency-injection": "^4.2|^5.0",
+        "symfony/doctrine-bridge": "^4.2|^5.0",
+        "symfony/event-dispatcher": "^4.2|^5.0",
+        "symfony/form": "^4.2|^5.0",
+        "symfony/framework-bundle": "^4.2|^5.0",
+        "symfony/http-kernel": "^4.2|^5.0",
+        "symfony/options-resolver": "^4.2|^5.0",
+        "symfony/property-access": "^4.2|^5.0",
+        "symfony/translation": "^4.2|^5.0",
+        "symfony/twig-bundle": "^4.2|^5.0",
         "twig/extensions": "^1.0"
     },
     "autoload": {