Merge pull request #2 from MirazMac/refactor

Refactored and improved

.gitignore

@@ -1,2 +1,3 @@
 vendor
-.phpunit.result.cache
+.phpunit.result.cache
+composer.lock

composer.json

@@ -26,7 +26,10 @@
     "require": {
         "php": ">=5.4.0"
     },
+    "scripts": {
+        "phpunit": "vendor/bin/phpunit --configuration phpunit.xml"
+    },
     "require-dev": {
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "4.8.36"
     }
 }

phpunit.xml

@@ -14,4 +14,4 @@
             </exclude>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>

src/BanglaString.php

@@ -2,10 +2,15 @@
 
 namespace MirazMac\BanglaString;
 
+use MirazMac\BanglaString\Translator\AvroToBijoy\Translator as AvroToBijoyTranslator;
+use MirazMac\BanglaString\Translator\BijoyToAvro\Translator as BijoyToAvroTranslator;
+
 /**
 * BanglaString
 *
-* A wannabe all-in-all Bangla String Manupulation Library!
+* This is not an ideal way to use this, but when I created this I knew very little about OOP.
+* You should directly import the Translator classes and use them as such.
+* However this will stay as is for backwards compatibility reasons.
 *
 * @author Miraz Mac <mirazmac@gmail.com>
 * @link https://mirazmac.info Author Homepage
@@ -23,6 +28,13 @@ class BanglaString
      */
     protected $string;
 
+    /**
+     * Translator instances
+     *
+     * @var        array
+     */
+    protected $translators = [];
+
     /**
      * Create a new BanglaString instance
      *
@@ -42,21 +54,37 @@ public function __construct($string)
      * This is identical as self::__construct(), but the difference is it allows to call the method  statically
      *
      * @param string $string The text to be converted
-     * @return object
+     * @return self
      */
     public static function translate($string)
     {
         return new self($string);
     }
 
+    /**
+     * Gets the translator.
+     *
+     * @param      string  $name   The name
+     *
+     * @return      \MirazMac\BanglaString\Contracts\TranslatorContract
+     */
+    protected function getTranslator($name)
+    {
+        if (!isset($this->translators[$name])) {
+            $this->translators[$name] = new $name();
+        }
+
+        return $this->translators[$name];
+    }
+
     /**
      * Translate the loaded string to Bijoy ANSI
      *
      * @return string
      */
     public function toBijoy()
     {
-        return Translator\AvroUnicode::getInstance()->translate($this->string);
+        return $this->getTranslator(AvroToBijoyTranslator::class)->translate($this->string);
     }
 
     /**
@@ -66,6 +94,6 @@ public function toBijoy()
      */
     public function toAvro()
     {
-        return Translator\BijoyAnsi::getInstance()->translate($this->string);
+        return $this->getTranslator(BijoyToAvroTranslator::class)->translate($this->string);
     }
 }

src/Contracts/TranslatorContract.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace MirazMac\BanglaString\Contracts;
+
+/**
+ * TranslatorContract
+ */
+interface TranslatorContract
+{
+    /**
+     * Translates a given string
+     *
+     * @param      string  $string  The string
+     *
+     * @return     string
+     */
+    public function translate($string);
+}