Added translator instance from 'handler' config option

phpunit.xml

@@ -15,4 +15,10 @@
             <directory suffix=".php">./tests/unit/</directory>
         </testsuite>
     </testsuites>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+    </php>
 </phpunit>

src/Xinax/LaravelGettext/LaravelGettextServiceProvider.php

@@ -10,7 +10,6 @@
  * Class LaravelGettextServiceProvider
  * @package Xinax\LaravelGettext
  *
- * TODO: Use providers
  */
 class LaravelGettextServiceProvider extends ServiceProvider
 {
@@ -53,20 +52,21 @@ public function register()
 
             $fileSystem = new FileSystem($configuration->get(), app_path(), storage_path());
 
-            // php-gettext mod implementation
-            /*$translator = new Translators\Gettext(
-                $configuration->get(),
-                new Session\SessionHandler($configuration->get()->getSessionIdentifier()),
-                new Adapters\LaravelAdapter,
-                $fileSystem
-            );*/
-
-            // symfony translator implementation
-            $translator = new Translators\Symfony(
-                $configuration->get(),
-                new Adapters\LaravelAdapter,
-                $fileSystem
-            );
+            if ('symfony' == $configuration->get()->getHandler()) {
+                // symfony translator implementation
+                $translator = new Translators\Symfony(
+                    $configuration->get(),
+                    new Adapters\LaravelAdapter,
+                    $fileSystem
+                );
+            } else {
+                // GNU/Gettext php extension
+                $translator = new Translators\Gettext(
+                    $configuration->get(),
+                    new Adapters\LaravelAdapter,
+                    $fileSystem
+                );
+            }
 
             return new LaravelGettext($translator);
         });

src/Xinax/LaravelGettext/Translators/Symfony.php

@@ -97,10 +97,10 @@ protected function createTranslator()
     public function translatePlural($singular, $plural, $amount)
     {
         return $this->symfonyTranslator->transChoice(
-            // Symfony translator looks for 'singular|plural' message, and obviously doesn't exists in catalog
-            // @see https://github.com/symfony/symfony/issues/10152
+            // Symfony translator looks for 'singular|plural' message id in catalog,
+            // and obviously doesn't exists, so always the fallback string will be returned.
+            // $singular . '|' . $plural, //<-- this just doesn't works, idk wtf is wrong.
             $amount >1 ? $plural : $singular,
-            // $singular . '|' . $plural, <-- this just doesn't works, idk wtf is wrong.
             $amount,
             ['%count%' => $amount],
             $this->getDomain(),

tests/unit/LaravelGettextTest.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Xinax\LaravelGettext\Test;
+
+use \Mockery as m;
+use \Xinax\LaravelGettext\LaravelGettext;
+use \Xinax\LaravelGettext\Config\ConfigManager;
+use \Xinax\LaravelGettext\Adapters\LaravelAdapter;
+use \Xinax\LaravelGettext\FileSystem;
+use Xinax\LaravelGettext\Translators\Symfony;
+
+class LaravelGettextTest extends BaseTestCase
+{
+    /**
+     * Gettext wrapper
+     * @var \Xinax\LaravelGettext\Gettext
+     */
+    protected $gettext;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $config = ConfigManager::create();
+        $adapter = new LaravelAdapter;
+
+        $fileSystem = new FileSystem($config->get(), app_path(), storage_path());
+
+        $translator = new Symfony(
+            $config->get(),
+            $adapter,
+            $fileSystem
+        );
+
+        $this->gettext = $translator;
+    }
+
+    /**
+     * Test setting locale.
+     */
+    public function testSetLocale()
+    {
+        $response = $this->gettext->setLocale('en_US');
+
+        $this->assertEquals('en_US', $response);
+    }
+
+    /**
+     * Test getting locale.
+     * It should receive locale from mocked config.
+     */
+    public function testGetLocale()
+    {
+        $response = $this->gettext->getLocale();
+
+        $this->assertEquals('en_US', $response);
+    }
+
+    public function testIsLocaleSupported()
+    {
+        $this->assertTrue($this->gettext->isLocaleSupported('en_US'));
+    }
+
+    /**
+     * Test dumping locale to string
+     */
+    public function testToString()
+    {
+        $response = $this->gettext->__toString();
+
+        $this->assertEquals('en_US', $response);
+    }
+
+    public function testGetEncoding()
+    {
+        $response = $this->gettext->getEncoding();
+        $this->assertNotEmpty($response);
+        $this->assertEquals('UTF-8', $response);
+    }
+
+    public function testSetEncoding()
+    {
+        $response = $this->gettext->setEncoding('UTF-8');
+        $this->assertNotEmpty($response);
+        $this->assertInstanceOf('Xinax\LaravelGettext\Gettext', $response);
+    }
+
+    public function tearDown()
+    {
+        m::close();
+    }
+}