Merge pull request #120 from Log1x/log1x/inflector

Add support for doctrine/inflector ^2.0
StoutLogic · Jul 2, 2020 · 1fbdb58 · 1fbdb58
2 parents c6c066f + d2edd23
commit 1fbdb58
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 64 deletions.
diff --git a/composer.json b/composer.json
@@ -3,8 +3,7 @@
     "description": "An Advanced Custom Field Configuration Builder",
     "require": {
         "php": ">=5.4.0",
-        "doctrine/inflector": "^1.1",
-        "doctrine/instantiator": "^1.0"
+        "doctrine/inflector": "^1.1|^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "4.*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/FlexibleContentBuilder.php b/src/FlexibleContentBuilder.php
@@ -2,15 +2,15 @@
 
 namespace StoutLogic\AcfBuilder;
 
-use Doctrine\Common\Inflector\Inflector;
-
 /**
  * Create a configuration array for an ACF Flexible Content field.
  * A flexible content field can have many different `layouts` which are
  * groups of fields.
  */
 class FlexibleContentBuilder extends FieldBuilder
 {
+    use Traits\CanSingularize;
+
     /**
      * @var array
      */
@@ -145,6 +145,6 @@ public function getLayouts()
      */
     private function getDefaultButtonLabel()
     {
-        return 'Add '.Inflector::singularize($this->getLabel());
+        return 'Add ' . $this->singularize($this->getLabel());
     }
 }