Merge pull request #271 from thecodingmachine/fix/doctrine-inflector

homersimpsons · web-flow · commit e606c0e4b17b · 2022-04-29T16:13:19.000+02:00
🐛 Inflector::* has been removed in `doctrine/inflector@^2.0`
diff --git a/src/Utils/PivotTableMethodsDescriptor.php b/src/Utils/PivotTableMethodsDescriptor.php
@@ -3,7 +3,6 @@
 
 namespace TheCodingMachine\TDBM\Utils;
 
-use Doctrine\Common\Inflector\Inflector;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Table;
@@ -121,7 +120,7 @@ public function getResultIteratorClassName(): string
     private function getPluralName() : string
     {
         if ($this->isAutoPivot()) {
-            $name = Inflector::pluralize($this->namingStrategy->getAutoPivotEntityName($this->remoteFk, false));
+            $name = TDBMDaoGenerator::toPlural($this->namingStrategy->getAutoPivotEntityName($this->remoteFk, false));
             if ($this->useAlternateName) {
                 $name .= 'By_'.$this->pivotTable->getName();
             }
diff --git a/src/Utils/TDBMDaoGenerator.php b/src/Utils/TDBMDaoGenerator.php
@@ -477,6 +477,19 @@ public static function toSingular(string $str): string
         return self::$inflector->singularize($str);
     }
 
+    /**
+     * Tries to put string to the plural form (if it is singular).
+     * We assume the string is in english.
+     */
+    public static function toPlural(string $str): string
+    {
+        if (self::$inflector === null) {
+            self::$inflector = InflectorFactory::create()->build();
+        }
+
+        return self::$inflector->pluralize($str);
+    }
+
     /**
      * Put the first letter of the string in lower case.
      * Very useful to transform a class name into a variable name.

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`namespace TheCodingMachine\TDBM\Utils;`
`5`	`5`
`6`		`-use Doctrine\Common\Inflector\Inflector;`
`7`	`6`	`use Doctrine\DBAL\Schema\Column;`
`8`	`7`	`use Doctrine\DBAL\Schema\ForeignKeyConstraint;`
`9`	`8`	`use Doctrine\DBAL\Schema\Table;`
`@@ -121,7 +120,7 @@ public function getResultIteratorClassName(): string`
`121`	`120`	`private function getPluralName() : string`
`122`	`121`	`{`
`123`	`122`	`if ($this->isAutoPivot()) {`
`124`		`- $name = Inflector::pluralize($this->namingStrategy->getAutoPivotEntityName($this->remoteFk, false));`
	`123`	`+ $name = TDBMDaoGenerator::toPlural($this->namingStrategy->getAutoPivotEntityName($this->remoteFk, false));`
`125`	`124`	`if ($this->useAlternateName) {`
`126`	`125`	`$name .= 'By_'.$this->pivotTable->getName();`
`127`	`126`	`}`