Merge pull request #963 from jdreesen/fix-doctrine-inflector-deprecat…

…ions Fix doctrine/inflector deprecations and allow to install v2
ongr-io · Dec 7, 2020 · 6fe42dd · 6fe42dd
2 parents ac771ff + 043a7ec
commit 6fe42dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Mapping/Caser.php b/Mapping/Caser.php
@@ -11,13 +11,19 @@
 
 namespace ONGR\ElasticsearchBundle\Mapping;
 
-use Doctrine\Common\Inflector\Inflector;
+use Doctrine\Inflector\Inflector;
+use Doctrine\Inflector\InflectorFactory;
 
 /**
  * Utility for string case transformations.
  */
 class Caser
 {
+    /**
+     * @var Inflector|null
+     */
+    private static $inflector;
+
     /**
      * Transforms string to camel case (e.g., resultString).
      *
@@ -27,7 +33,11 @@ class Caser
      */
     public static function camel($string)
     {
-        return Inflector::camelize($string);
+        if (!self::$inflector) {
+            self::$inflector = InflectorFactory::create()->build();
+        }
+
+        return self::$inflector->camelize($string);
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "symfony/property-access": "^4.4|^5.0",
         "doctrine/annotations": "^1.6",
         "doctrine/cache": "^1.7",
-        "doctrine/inflector": "^1.3",
+        "doctrine/inflector": "^1.4 || ^2.0",
         "doctrine/collections": "^1.5",
         "monolog/monolog": "^1.24",
         "elasticsearch/elasticsearch": "^6.0",