use EnglishInflector instead of inflector

Author: jrushlow

src/Maker/MakeCrud.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\MakerBundle\Maker;
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Doctrine\Inflector\InflectorFactory;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
@@ -31,6 +30,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Csrf\CsrfTokenManager;
+use Symfony\Component\String\Inflector\EnglishInflector;
 use Symfony\Component\Validator\Validation;
 
 /**
@@ -50,7 +50,8 @@ public function __construct(DoctrineHelper $doctrineHelper, FormTypeRenderer $fo
     {
         $this->doctrineHelper = $doctrineHelper;
         $this->formTypeRenderer = $formTypeRenderer;
-        $this->inflector = InflectorFactory::create()->build();
+
+        $this->inflector = new EnglishInflector();
     }
 
     public static function getCommandName(): string
@@ -120,7 +121,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $repositoryVars = [
                 'repository_full_class_name' => $repositoryClassDetails->getFullName(),
                 'repository_class_name' => $repositoryClassDetails->getShortName(),
-                'repository_var' => lcfirst($this->inflector->singularize($repositoryClassDetails->getShortName())),
+                'repository_var' => lcfirst($this->inflector->singularize($repositoryClassDetails->getShortName())[0]),
             ];
         }
 
@@ -140,8 +141,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             ++$iter;
         } while (class_exists($formClassDetails->getFullName()));
 
-        $entityVarPlural = lcfirst($this->inflector->pluralize($entityClassDetails->getShortName()));
-        $entityVarSingular = lcfirst($this->inflector->singularize($entityClassDetails->getShortName()));
+        $entityVarPlural = lcfirst($this->inflector->pluralize($entityClassDetails->getShortName())[0]);
+        $entityVarSingular = lcfirst($this->inflector->singularize($entityClassDetails->getShortName())[0]);
 
         $entityTwigVarPlural = Str::asTwigVariable($entityVarPlural);
         $entityTwigVarSingular = Str::asTwigVariable($entityVarSingular);

src/Str.php

@@ -11,19 +11,15 @@
 
 namespace Symfony\Bundle\MakerBundle;
 
-use Doctrine\Inflector\Inflector;
-use Doctrine\Inflector\InflectorFactory;
 use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\String\Inflector\EnglishInflector;
 
 /**
  * @author Javier Eguiluz <[email protected]>
  * @author Ryan Weaver <[email protected]>
  */
 final class Str
 {
-    /** @var Inflector|null */
-    private static $inflector;
-
     /**
      * Looks for suffixes in strings in a case-insensitive way.
      */
@@ -219,20 +215,15 @@ public static function asHumanWords(string $variableName): string
 
     private static function pluralize(string $word): string
     {
-        return static::getInflector()->pluralize($word);
-    }
+        $result = (new EnglishInflector())->pluralize($word);
 
-    private static function singularize(string $word): string
-    {
-        return static::getInflector()->singularize($word);
+        return $result[0];
     }
 
-    private static function getInflector(): Inflector
+    private static function singularize(string $word): string
     {
-        if (null === static::$inflector) {
-            static::$inflector = InflectorFactory::create()->build();
-        }
+        $result = (new EnglishInflector())->singularize($word);
 
-        return static::$inflector;
+        return $result[0];
     }
 }