Update doctrine/inflector to v2, add proxies for all former methods

Author: Hackwar

Tests/InflectorTest.php

@@ -92,20 +92,6 @@ protected function setUp(): void
         parent::setUp();
 
         $this->inflector = new Inflector();
-        DoctrineInflector::reset();
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @return  void
-     */
-    protected function tearDown(): void
-    {
-        DoctrineInflector::reset();
-
-        parent::tearDown();
     }
 
     /**
@@ -214,7 +200,7 @@ public function testIsSingular(string $singular, string $plural)
         }
     }
 
-    private function checkInflectorImplementation(DoctrineInflector $inflector): bool
+    private function checkInflectorImplementation(Inflector $inflector): bool
     {
         $reflectionClass = new \ReflectionClass($inflector);
 

composer.json

@@ -11,7 +11,7 @@
         "symfony/polyfill-mbstring": "^1.31.0"
     },
     "require-dev": {
-        "doctrine/inflector": "^1.2",
+        "doctrine/inflector": "^2.0.10",
         "joomla/test": "dev-4.x-dev",
         "phpunit/phpunit": "^12.2.6",
         "squizlabs/php_codesniffer": "^3.7.2",

src/Inflector.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\String;
 
-use Doctrine\Common\Inflector\Inflector as DoctrineInflector;
+use Doctrine\Inflector\InflectorFactory;
 
 /**
  * Joomla Framework String Inflector Class
@@ -19,7 +19,7 @@
  * @since  1.0
  * @deprecated  5.0  Use doctrine/inflector package as complete replacement instead.
  */
-class Inflector extends DoctrineInflector
+class Inflector
 {
     /**
      * The inflector rules for countability.
@@ -123,4 +123,76 @@ public function isSingular($word)
     {
         return static::singularize($word) === $word;
     }
+
+    /**
+     * Proxy for Inflector::tableize()
+     */
+    public static function tableize(string $word) : string
+    {
+        $inflector = InflectorFactory::create()->build();
+
+        return $inflector->tableize($word);
+    }
+
+    /**
+     * Proxy for Inflector::classify()
+     */
+    public static function classify(string $word) : string
+    {
+        $inflector = InflectorFactory::create()->build();
+
+        return $inflector->classify($word);
+    }
+
+    /**
+     * Proxy for Inflector::camelize()
+     */
+    public static function camelize(string $word) : string
+    {
+        $inflector = InflectorFactory::create()->build();
+
+        return $inflector->camelize($word);
+    }
+
+    /**
+     * Proxy for Inflector::ucwords()
+     */
+    public static function ucwords(string $string, string $delimiters = " \n\t\r\0\x0B-") : string
+    {
+        return ucwords($string, $delimiters);
+    }
+
+    /**
+     * Empty method to suffice the former interface
+     */
+    public static function reset() : void
+    {
+    }
+
+    /**
+     * Empty method to suffice the former interface
+     */
+    public static function rules(string $type, iterable $rules, bool $reset = false) : void
+    {
+    }
+
+    /**
+     * Proxy for Inflector::pluralize()
+     */
+    public static function pluralize(string $word) : string
+    {
+        $inflector = InflectorFactory::create()->build();
+
+        return $inflector->pluralize($word);
+    }
+
+    /**
+     * Proxy for Inflector::singularize()
+     */
+    public static function singularize(string $word) : string
+    {
+        $inflector = InflectorFactory::create()->build();
+
+        return $inflector->singularize($word);
+    }
 }