Add doctrine/persistence v2 support and ecommit/util-bundle v3 support

Author: hlecorche

Form/DataTransformer/Entity/AbstractEntityTransformer.php

@@ -11,7 +11,7 @@
 namespace Ecommit\JavascriptBundle\Form\DataTransformer\Entity;
 
 use Doctrine\ORM\QueryBuilder;
-use Ecommit\UtilBundle\Util\Util;
+use Ecommit\ScalarValues\ScalarValues;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
@@ -55,7 +55,7 @@ protected function init(QueryBuilder $queryBuilder, $identifier, $property)
     protected function getCacheHash($id)
     {
         if (is_array($id)) {
-            $id = Util::filterScalarValues($id);
+            $id = ScalarValues::filterScalarValues($id);
             $id = array_map(
                 function ($child) {
                     return (string)$child; //Converts ids from integer to string => Parameters for transform and reverse functions must be identicals

Form/DataTransformer/Entity/EntitiesToIdsTransformer.php

@@ -13,7 +13,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\QueryBuilder;
-use Ecommit\UtilBundle\Util\Util;
+use Ecommit\ScalarValues\ScalarValues;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
@@ -79,7 +79,7 @@ public function reverseTransform($values)
         if (!is_array($values)) {
             throw new UnexpectedTypeException($values, 'array');
         }
-        $values = Util::filterScalarValues($values);
+        $values = ScalarValues::filterScalarValues($values);
 
         if (count($values) == 0) {
             return $collection;

Form/Type/EntityNormalizerTrait.php

@@ -10,8 +10,8 @@
 
 namespace Ecommit\JavascriptBundle\Form\Type;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
 use Symfony\Component\Form\Exception\InvalidConfigurationException;
 use Symfony\Component\OptionsResolver\Options;

composer.json

@@ -13,8 +13,9 @@
         "doctrine/common": "*",
         "doctrine/doctrine-bundle": "^1.6|^2.0",
         "doctrine/orm": "~2.3",
-        "doctrine/persistence": "^1.0",
-        "ecommit/util-bundle": "2.5.*@dev",
+        "doctrine/persistence": "^1.0|^2.0",
+        "ecommit/util-bundle": "3.0.*@dev",
+        "ecommit/scalar-values": "^1.0",
         "symfony/config": "^4.2|^5.0",
         "symfony/dependency-injection": "^4.2|^5.0",
         "symfony/doctrine-bridge": "^4.2|^5.0",