Using ICanBoogie/Inflector in place of Inflect.php

enobrev · Aug 25, 2020 · 0bb2801 · 0bb2801
1 parent 426ebcc
commit 0bb2801
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 204 deletions.
diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
         "php": ">=7.2",
         "ext-json": "*",
         "adbario/php-dot-notation": "~2.2",
+        "icanboogie/inflector": "^2.0",
         "laminas/laminas-diactoros": "^2.2",
         "laminas/laminas-httphandlerrunner": "^1.1",
         "monolog/monolog": "^2.0"

diff --git a/composer.lock b/composer.lock
diff --git a/src/Inflect.php b/src/Inflect.php
diff --git a/src/Strings.php b/src/Strings.php
@@ -1,18 +1,20 @@
 <?php
     namespace Enobrev;
 
+    use ICanBoogie\Inflector;
+
     /**
      * @param string $sWord
      * @return string
      */
     function depluralize(string $sWord) : string {
-        return Inflect::singularize($sWord);
+        return Inflector::get()->singularize($sWord);
     }
 
     /**
      * @param string $sWord
      * @return string
      */
     function pluralize(string $sWord): string {
-        return Inflect::pluralize($sWord);
+        return Inflector::get()->pluralize($sWord);
     }
diff --git a/tests/DepluralizeTest.php b/tests/DepluralizeTest.php
@@ -17,7 +17,7 @@ public function setUp():void {
                 'geese'       => 'goose',
                 'languages'   => 'language',
                 'media'       => 'medium',
-                'mooses'      => 'moose',
+                'moose'       => 'moose',
                 'prices'      => 'price',
                 'processings' => 'processing',
                 'states'      => 'state',