Switch to new Doctine Inflector API to support versions 1.4 and 2.0

robgridley · Oct 13, 2022 · 065b401 · 065b401
1 parent 1727959
commit 065b401
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "ext-fileinfo": "*",
         "ext-soap": "*",
         "nesbot/carbon": "^1.20 || ^2.0",
-        "doctrine/inflector": "~1.0"
+        "doctrine/inflector": "^1.4 || ^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5",

diff --git a/src/Type.php b/src/Type.php
@@ -2,7 +2,7 @@
 
 namespace Pace;
 
-use Doctrine\Common\Inflector\Inflector;
+use Doctrine\Inflector\InflectorFactory;
 
 class Type
 {
@@ -62,6 +62,13 @@ class Type
         'FileAttachment' => 'attachment',
     ];
 
+    /**
+     * The Doctrine Inflector instance.
+     *
+     * @var \Doctrine\Inflector\Inflector|null
+     */
+    protected static $inflector;
+
     /**
      * Convert a name to camel case.
      *
@@ -92,7 +99,11 @@ public static function modelify($name)
      */
     public static function singularize($name)
     {
-        return Inflector::singularize($name);
+        if (is_null(static::$inflector)) {
+            static::$inflector = InflectorFactory::create()->build();
+        }
+
+        return static::$inflector->singularize($name);
     }
 
     /**