Merge pull request #2 from rakibdevs/hotfix/bncommalakh-protected

Fixed Protected Method Issue and Refactor
rakibdevs · Sep 24, 2022 · 50f240b · 50f240b
2 parents c8cedd2 + b632daa
commit 50f240b
Show file tree

Hide file tree

Showing 8 changed files with 275 additions and 140 deletions.
diff --git a/src/Exceptions/InvalidNumber.php b/src/Exceptions/InvalidNumber.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Rakibhstu\Banglanumber\Exceptions;
 
 use Exception;
@@ -9,4 +10,4 @@ public static function message()
 	{
 		return new static("The given value is not a valid number.");
 	}
-}
+}
diff --git a/src/Exceptions/InvalidRange.php b/src/Exceptions/InvalidRange.php
@@ -1,12 +1,13 @@
 <?php
+
 namespace Rakibhstu\Banglanumber\Exceptions;
 
 use Exception;
 
-class InvalidRange extends Exception 
+class InvalidRange extends Exception
 {
 	public static function message($max = 999999999999999)
 	{
-		return new static("The given value is not in valid range. Maximum accepted value is ".$max);
+		return new static("The given value is not in valid range. Maximum accepted value is " . $max);
 	}
-}
+}
diff --git a/src/NumberToBangla.php b/src/NumberToBangla.php
@@ -13,35 +13,32 @@ class NumberToBangla
 
     public function __construct()
     {
-        $this->process = new ProcessNumber;
-        $this->date    = new ProcessDate;
+        $this->process = new ProcessNumber();
+        $this->date    = new ProcessDate();
     }
 
     public function bnNum($number)
     {
         return $this->process->bnNum($number);
     }
 
-
     public  function bnWord($number)
-    { 
+    {
         return $this->process->bnWord($number);
     }
 
     public  function bnMoney($number)
-    {    
+    {
         return $this->process->bnMoney($number);
     }
 
     public function bnCommaLakh($number)
     {
-         return $this->process->bnCommaLakh($number);
+        return $this->process->bnCommaLakh($number);
     }
 
-    public  function bnMonth($number)
+    public function bnMonth($number)
     {
         return $this->date->bnMonth($number);
-
     }
-
 }
diff --git a/src/NumberToBanglaServiceProvider.php b/src/NumberToBanglaServiceProvider.php
@@ -15,7 +15,7 @@ class NumberToBanglaServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton(NumberToBangla::class);
-        
+
         $this->app->alias(NumberToBangla::class, 'bangla-number');
     }
 

diff --git a/src/ProcessDate.php b/src/ProcessDate.php
@@ -7,48 +7,55 @@
 
 class ProcessDate
 {
-
-    protected  $bn_month = array(
-                                    '1' => 'জানুয়ারি', 
-                                    '2' => 'ফেব্রুয়ারি', 
-                                    '3' => 'মার্চ', 
-                                    '4' => 'এপ্রিল', 
-                                    '5' => 'মে',
-                                    '6' => 'জুন', 
-                                    '7' => 'জুলাই', 
-                                    '8' => 'আগস্ট', 
-                                    '9' => 'সেপ্টেম্বর',
-                                    '10' => 'অক্টোবর', 
-                                    '11' => 'নভেম্বর', 
-                                    '12' => 'ডিসেম্বর'
-                                );
-
-    protected  $numbers = array('০','১','২','৩','৪','৫','৬','৭','৮','৯');
-
-
-    public  function isValid($number)
+    protected  $bn_month = [
+        '1' => 'জানুয়ারি',
+        '2' => 'ফেব্রুয়ারি',
+        '3' => 'মার্চ',
+        '4' => 'এপ্রিল',
+        '5' => 'মে',
+        '6' => 'জুন',
+        '7' => 'জুলাই',
+        '8' => 'আগস্ট',
+        '9' => 'সেপ্টেম্বর',
+        '10' => 'অক্টোবর',
+        '11' => 'নভেম্বর',
+        '12' => 'ডিসেম্বর'
+    ];
+
+    protected  $numbers = [
+        '০',
+        '১',
+        '২',
+        '৩',
+        '৪',
+        '৫',
+        '৬',
+        '৭',
+        '৮',
+        '৯'
+    ];
+
+
+    public function isValid($number)
     {
-        if(!is_numeric($number)){
+        if (!is_numeric($number)) {
             throw InvalidNumber::message();
         }
 
-        if($number > 999999999999999 || strpos($number, 'E') !== false){
+        if ($number > 999999999999999 || strpos($number, 'E') !== false) {
             throw InvalidRange::message();
         }
     }
 
 
-    public  function bnMonth($number)
+    public function bnMonth($number)
     {
         $this->isValid($number);
 
-        if($number >= 1 && $number <= 12 ){
+        if ($number >= 1 && $number <= 12) {
             return $this->bn_month[(int)$number];
-        }else{
-            throw InvalidRange::message(12);
         }
-
-    }
 
-
-}
+        throw InvalidRange::message(12);
+    }
+}