Removing deprecated calls to doctrine/inflector API

Author: moufmouf

composer.json

@@ -23,7 +23,7 @@
         "mouf/schema-analyzer": "^1.1.4",
         "doctrine/dbal": "^2.9.2",
         "psr/log": "~1.0",
-        "doctrine/inflector": "~1.0",
+        "doctrine/inflector": "^1.4.3 || ^2",
         "beberlei/porpaginas": "~1.0",
         "mouf/classname-mapper": "~1.0",
         "doctrine/cache": "^1.6",
@@ -58,7 +58,7 @@
         "mouf/database.tdbm": "~5.0.0"
     },
     "suggest" : {
-        "ext/weakref" : "Allows efficient memory management. Useful for batches."
+        "ext/weakref" : "Allows efficient memory management (in PHP 7.2 only). Useful for batches."
     },
     "autoload" : {
         "psr-4" : {

src/Utils/DefaultNamingStrategy.php

@@ -4,11 +4,11 @@
 
 namespace TheCodingMachine\TDBM\Utils;
 
-use Doctrine\Common\Inflector\Inflector;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Inflector\Inflector;
+use Doctrine\Inflector\InflectorFactory;
 use TheCodingMachine\TDBM\TDBMException;
 use TheCodingMachine\TDBM\Utils\Annotation\AnnotationParser;
 use TheCodingMachine\TDBM\Utils\Annotation\Bean;
@@ -40,11 +40,16 @@ class DefaultNamingStrategy extends AbstractNamingStrategy
      * @var Schema
      */
     private $schema;
+    /**
+     * @var Inflector
+     */
+    private $inflector;
 
     public function __construct(AnnotationParser $annotationParser, AbstractSchemaManager $schemaManager)
     {
         $this->annotationParser = $annotationParser;
         $this->schemaManager = $schemaManager;
+        $this->inflector = InflectorFactory::create()->build();
     }
 
     /**
@@ -233,7 +238,7 @@ private function toSingularCamelCase(string $str): string
 
         $str = '';
         foreach ($tokens as $token) {
-            $str .= ucfirst(Inflector::singularize($token));
+            $str .= ucfirst($this->inflector->singularize($token));
         }
 
         return $str;

src/Utils/TDBMDaoGenerator.php

@@ -3,10 +3,11 @@
 
 namespace TheCodingMachine\TDBM\Utils;
 
-use Doctrine\Common\Inflector\Inflector;
+use Doctrine\Inflector\Inflector;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\Inflector\InflectorFactory;
 use Psr\Container\ContainerInterface;
 use TheCodingMachine\TDBM\Schema\ForeignKeys;
 use TheCodingMachine\TDBM\TDBMService;
@@ -51,6 +52,10 @@ class TDBMDaoGenerator
      * @var ConfigurationInterface
      */
     private $configuration;
+    /**
+     * @var Inflector
+     */
+    private static $inflector;
 
     /**
      * Constructor.
@@ -470,7 +475,11 @@ public static function toCamelCase(string $str) : string
      */
     public static function toSingular(string $str): string
     {
-        return Inflector::singularize($str);
+        if (self::$inflector === null) {
+            self::$inflector = InflectorFactory::create()->build();
+        }
+
+        return self::$inflector->singularize($str);
     }
 
     /**