Fixes #13: Remove Group Value For Empty Money Block (#14)

Author: Tochukwu Nkemdilim

src/Grammar/SentenceGenerator.php

@@ -55,11 +55,28 @@ private static function _generateSentence(array $moneyValueArray)
                 $sentence .= "{$hundredth} {$tensAndUnit} ";
             }
 
-            if ($groupValue != "") {
-                $sentence .= $groupValue . ", ";
+            if ($groupValue != "" && ($tensAndUnit != "" || $hundredth != "")) {
+                $sentence = rtrim($sentence) . " " . $groupValue . ", ";
             }
         }
 
+        return static::_trimGeneratedSentence($sentence);
+    }
+
+    /**
+     * Trim end of sentence generated by removing unwanted 
+     * characters, symbols, and whitespaces.
+     *
+     * @param String $sentence
+     * @return String
+     */
+    private static function _trimGeneratedSentence($sentence): string
+    {
+        $sentence = rtrim($sentence);
+        if (Str::endsWith($sentence, ",")) {
+            $sentence = substr($sentence, 0, strlen($sentence) - 1);
+        }
+
         return trim($sentence);
     }
 }

src/Helpers/StringProcessing.php

@@ -4,6 +4,24 @@
 
 class StringProcessing
 {
+    /**
+     * Checks if a string ends with
+     *
+     * @param [type] $haystack
+     * @param [type] $needle
+     * @param boolean $case
+     * @return void
+     */
+    public static function endsWith($haystack, $needle, $case = true)
+    {
+        $length = strlen($needle);
+        if ($length == 0) {
+            return true;
+        }
+
+        return (substr($haystack, -$length) === $needle);
+    }
+
     /**
      * Prefix a given string with a fixed amount of zero.
      * 
@@ -68,4 +86,4 @@ public static function splitIntoArrayOfSizeThree(String $stringVal)
 
         return $colletion;
     }
-}
+}

tests/EnglishConversionTest.php

@@ -4,16 +4,15 @@
  * Autoload files using Composer autoload
  */
 
+use PHPUnit\Framework\TestCase;
 use TNkemdilim\MoneyToWords\Converter;
 use TNkemdilim\MoneyToWords\Languages as Language;
-use TNkemdilim\MoneyToWords\Exception;
-use PHPUnit\Framework\TestCase;
 
 class EnglishConversionTest extends TestCase
 {
     protected $converter;
 
-    protected function setUp() : void
+    protected function setUp(): void
     {
         $this->converter = new Converter("naira", "kobo", Language::ENGLISH);
     }
@@ -42,6 +41,24 @@ public function testWholeNumber()
         );
     }
 
+    public function testLargeNumbers()
+    {
+        $this->assertEquals(
+            $this->converter->convert("50000000"),
+            "fifty million naira only"
+        );
+
+        $this->assertEquals(
+            $this->converter->convert("900000000000"),
+            "nine hundred billion naira only"
+        );
+
+        $this->assertEquals(
+            $this->converter->convert("900070000000"),
+            "nine hundred billion, seventy million naira only"
+        );
+    }
+
     public function testNumberWithZeroPrefix()
     {
         $this->assertEquals($this->converter->convert("0000000"), "");
@@ -79,4 +96,3 @@ public function testDecimalNumber()
 // $money = "八百七十二万七千八百二十四";
 
 // echo ($this->converter->convert($money) . "\n");
-?>