Merge pull request #3 from mamyraoby/develop

Add billions support and helper function

Author: mamyraoby

README.md

@@ -29,6 +29,12 @@ echo $converter->toWords(7);       // fito
 echo $converter->toWords(69);      // sivy amby enimpolo
 echo $converter->toWords(2025);    // dimy amby roapolo sy roa arivo
 echo $converter->toWords(3429267); // fito amby enimpolo sy roanjato sy sivy arivo sy roa alina sy efatra hetsy sy telo tapitrisa
-```
+
+// You can also use the global helper function if you've configured autoloading in Composer:
+echo phanisana_convert_number(7);       // fito
+echo phanisana_convert_number(69);      // sivy amby enimpolo
+echo phanisana_convert_number(2025);    // dimy amby roapolo sy roa arivo
+echo phanisana_convert_number(3429267); // fito amby enimpolo sy roanjato sy sivy arivo sy roa alina sy efatra hetsy sy telo tapitrisa
+``` 
 
 This demonstrates how to convert various number ranges into Malagasy words using the `NumberConverter`.

composer.json

@@ -7,7 +7,10 @@
         "psr-4": {
             "MamyRaoby\\Phanisana\\": "src",
             "MamyRaoby\\Phanisana\\Test\\": "test"
-        }
+        },
+        "files": [
+            "helpers/converter.php"
+        ]
     },
     "authors": [
         {

helpers/converter.php

@@ -0,0 +1,10 @@
+<?php
+
+use MamyRaoby\Phanisana\Converter\NumberConverter;
+
+if (!function_exists('phanisana_convert_number')) {
+    function phanisana_convert_number(int $number): string {
+        $converter = new NumberConverter();
+        return $converter->toWords($number);
+    }
+}

src/Converter/NumberConverter.php

@@ -8,6 +8,15 @@ class NumberConverter
 {
     public function toWords(int $number): string
     {
+        if ($number >= 1000000000) {
+            $millions = $number % 1000000000;
+            if ($millions === 0) {
+                return $this->convertBillions($number);
+            }
+
+            return $this->toWords($millions) . Dictionary::GLUE_SY->value . $this->convertBillions($number - $millions);
+        }
+
         if ($number >= 1000000) {
             $hundredThousands = $number % 1000000;
             if ($hundredThousands === 0) {
@@ -182,17 +191,49 @@ protected function convertHundredThousands(int $number): string
     }
 
     protected function convertMillions(int $number): string
+    {
+        $beforeMillions = $number / 1000000;
+
+        if($beforeMillions >= 1 && $beforeMillions <= 9){
+            return match ($number) {
+                1000000   => Dictionary::MILLION->value,
+                2000000   => Dictionary::TWO_MILLION->value,
+                3000000   => Dictionary::THREE_MILLION->value,
+                4000000   => Dictionary::FOUR_MILLION->value,
+                5000000   => Dictionary::FIVE_MILLION->value,
+                6000000   => Dictionary::SIX_MILLION->value,
+                7000000   => Dictionary::SEVEN_MILLION->value,
+                8000000   => Dictionary::EIGHT_MILLION->value,
+                9000000   => Dictionary::NINE_MILLION->value,
+                default   => '',
+            };
+        }
+
+        if($beforeMillions >= 10 && $beforeMillions <= 99)
+        {
+            return $this->toWords($beforeMillions).' tapitrisa';
+        }
+
+        if($beforeMillions >= 100 && $beforeMillions <= 999)
+        {
+            return $this->toWords($beforeMillions).' tapitrisa';
+        }
+
+        return '';
+    }
+
+    protected function convertBillions(int $number): string
     {
         return match ($number) {
-            1000000   => Dictionary::MILLION->value,
-            2000000   => Dictionary::TWO_MILLION->value,
-            3000000   => Dictionary::THREE_MILLION->value,
-            4000000   => Dictionary::FOUR_MILLION->value,
-            5000000   => Dictionary::FIVE_MILLION->value,
-            6000000   => Dictionary::SIX_MILLION->value,
-            7000000   => Dictionary::SEVEN_MILLION->value,
-            8000000   => Dictionary::EIGHT_MILLION->value,
-            9000000   => Dictionary::NINE_MILLION->value,
+            1000000000   => Dictionary::BILLION->value,
+            2000000000   => Dictionary::TWO_BILLION->value,
+            3000000000   => Dictionary::THREE_BILLION->value,
+            4000000000   => Dictionary::FOUR_BILLION->value,
+            5000000000   => Dictionary::FIVE_BILLION->value,
+            6000000000   => Dictionary::SIX_BILLION->value,
+            7000000000   => Dictionary::SEVEN_BILLION->value,
+            8000000000   => Dictionary::EIGHT_BILLION->value,
+            9000000000   => Dictionary::NINE_BILLION->value,
             default   => '',
         };
     }

src/Enum/Dictionary.php

@@ -79,4 +79,14 @@ enum Dictionary: string
     case SEVEN_MILLION = 'fito tapitrisa';
     case EIGHT_MILLION = 'valo tapitrisa';
     case NINE_MILLION  = 'sivy tapitrisa';
+    
+    case BILLION       = 'iray lavitrisa';
+    case TWO_BILLION   = 'roa lavitrisa';
+    case THREE_BILLION = 'telo lavitrisa';
+    case FOUR_BILLION  = 'efatra lavitrisa';
+    case FIVE_BILLION  = 'dimy lavitrisa';
+    case SIX_BILLION   = 'enina lavitrisa';
+    case SEVEN_BILLION = 'fito lavitrisa';
+    case EIGHT_BILLION = 'valo lavitrisa';
+    case NINE_BILLION  = 'sivy lavitrisa';
 }

test/Converter/NumberConverterTest.php

@@ -37,6 +37,7 @@ public function testHundreds()
         $this->assertEquals('efajato', $converter->toWords(400));
         $this->assertEquals('efatra amby efajato', $converter->toWords(404));
         $this->assertEquals('iraika amby folo amby zato', $converter->toWords(111));
+        $this->assertEquals('sivy amby roapolo sy efajato', $converter->toWords(429));
         $this->assertEquals('sivy amby sivifolo sy sivinjato', $converter->toWords(999));
     }
 
@@ -76,4 +77,17 @@ public function testMillions()
         $this->assertEquals('dimanjato sy dimy arivo sy valo alina sy efatra hetsy sy sivy tapitrisa', $converter->toWords(9485500));
         $this->assertEquals('fito amby enimpolo sy roanjato sy sivy arivo sy roa alina sy efatra hetsy sy telo tapitrisa', $converter->toWords(3429267));
     }
+
+    public function testBillions()
+    {
+        $converter = new NumberConverter();
+        $this->assertEquals('iray lavitrisa', $converter->toWords(1000000000));
+        $this->assertEquals('dimy arivo sy efatra alina sy telopolo tapitrisa sy sivy lavitrisa', $converter->toWords(9030045000));
+        $this->assertEquals('fito arivo sy enina alina sy roa hetsy sy sivy amby roapolo sy efajato tapitrisa sy telo lavitrisa', $converter->toWords(3429267000));
+    }
+
+    public function testHelper()
+    {
+        $this->assertEquals('iraika amby folo', phanisana_convert_number(11));
+    }
 }