Fix verbs without 'л' at the end in RussianLanguage::verb()

wapmorgan · Oct 22, 2018 · d55ee40 · d55ee40
1 parent 082bc34
commit d55ee40
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Russian/RussianLanguage.php b/src/Russian/RussianLanguage.php
@@ -218,11 +218,16 @@ public static function verb($verb, $gender)
         $verb = S::lower($verb);
         // возвратный глагол
         if (S::slice($verb, -2) == 'ся') {
-            return ($gender == Gender::MALE ? $verb : mb_substr($verb, 0, -2).'ась');
+
+            return ($gender == Gender::MALE
+                ? $verb
+                : S::slice($verb, 0, -2).(S::slice($verb, -3, -2) === 'л' ? null : 'л').'ась');
         }
 
         // обычный глагол
-        return ($gender == Gender::MALE ? $verb : $verb.'а');
+        return ($gender == Gender::MALE
+            ? $verb
+            : $verb.(S::slice($verb, -1) === 'л' ? null : 'л').'а');
     }
 
     /**

diff --git a/tests/Russian/RussianLanguageTest.php b/tests/Russian/RussianLanguageTest.php
@@ -27,6 +27,8 @@ public function verbsProvider()
             ['попал', Gender::FEMALE, 'попала'],
             ['попался', Gender::MALE, 'попался'],
             ['попался', Gender::FEMALE, 'попалась'],
+            ['внес', Gender::FEMALE, 'внесла'],
+            ['внесся', Gender::FEMALE, 'внеслась'],
         ];
     }