rework to extension

composer.json

@@ -11,10 +11,12 @@
 	],
 	"require": {
 		"php": ">=7.1",
+		"nette/di": "^3.0",
 		"nette/utils": "^3.0"
 	},
 	"require-dev": {
 		"nette/tester": "^2.3",
+		"nette/bootstrap": "^3.0",
 		"tracy/tracy": "^2.7"
 	},
 	"replace": {

src/Drago/Localization/DI/TranslatorExtension.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types = 1);
+
+/**
+ * Drago Extension
+ * Package built on Nette Framework
+ */
+
+namespace Drago\Localization\DI;
+
+use Drago\Localization\Translator;
+use Nette\DI\CompilerExtension;
+
+
+/**
+ * Register services.
+ */
+class TranslatorExtension extends CompilerExtension
+{
+	/** @var string */
+	private $translateDir;
+
+
+	public function __construct(string $translateDir)
+	{
+		$this->translateDir = $translateDir;
+	}
+
+
+	public function loadConfiguration(): void
+	{
+		$builder = $this->getContainerBuilder();
+		$builder->addDefinition($this->prefix('translator'))
+			->setFactory(Translator::class, [$this->translateDir]);
+	}
+}

src/Drago/Localization/Translator.php

@@ -23,18 +23,22 @@ class Translator implements ITranslator
 	/** @var array */
 	private $message;
 
+	/** @var string */
+	private $translateDir;
+
+
+	public function __construct(string $translateDir)
+	{
+		$this->translateDir = $translateDir;
+	}
+
 
 	/**
-	 * Path to the translation file.
 	 * @throws \Exception
 	 */
-	public function setFile(string $file): array
+	public function setTranslate(string $translate): array
 	{
-		$file = $file . '.ini';
-		if (!is_file($file)) {
-			throw new \Exception('The translation file was not found.');
-		}
-
+		$file = $this->translateDir . '/' . $translate . '.ini';
 		$this->message = parse_ini_file($file);
 		return $this->message;
 	}

src/Drago/Localization/Locale.php → src/Drago/Localization/TranslatorAdapter.php

@@ -13,29 +13,30 @@
 /**
  * Simple translator.
  */
-trait Locale
+trait TranslatorAdapter
 {
 	/**
 	 * @var string
 	 * @persistent
 	 */
 	public $lang;
 
-	/**
-	 * @var Translator
-	 * @inject
-	 */
+	/** @var Translator */
 	public $translator;
 
 
+	public function injectTranslator(Translator $translator): void
+	{
+		$this->translator = $translator;
+	}
+
+
 	/**
-	 * Create a translation.
 	 * @throws \Exception
 	 */
-	public function createTranslator(string $file): Translator
+	public function getTranslator(): Translator
 	{
-		$translator = $this->translator;
-		$translator->setFile($file);
-		return $translator;
+		$this->translator->setTranslate($this->lang);
+		return $this->translator;
 	}
 }

src/Drago/Localization/TranslateControl.php → src/Drago/Localization/TranslatorControl.php

@@ -13,13 +13,13 @@
 /**
  * Simple translator.
  */
-trait TranslateControl
+trait TranslatorControl
 {
 	/** @var Translator */
 	private $translator;
 
 
-	public function setTranslator(Translator $translator)
+	public function setTranslator(Translator $translator): void
 	{
 		$this->translator = $translator;
 	}

tests/TestContainer.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Test;
+
+use Nette\DI\Container;
+use Tester\TestCase;
+
+
+abstract class TestContainer extends TestCase
+{
+	/** @var Container */
+	protected $container;
+
+
+	public function __construct(Container $container)
+	{
+		$this->container = $container;
+	}
+}

tests/Translator/Control.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types = 1);
+
+use Drago\Localization;
+
+class Control
+{
+	use Localization\TranslatorControl;
+}

tests/Translator/DI/TranslatorExtension.php

@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Test\DI;
+
+use Drago\Localization;
+use Nette\DI;
+use Test\TestContainer;
+use Tester\Assert;
+
+$container = require __DIR__ . '/../../bootstrap.php';
+
+
+class TranslatorExtension extends TestContainer
+{
+	private function createContainer(): DI\Container
+	{
+		$params = $this->container->getParameters();
+		$loader = new DI\ContainerLoader($params['tempDir'], true);
+
+		$class = $loader->load(function (DI\Compiler $compiler) use ($params): void {
+			$compiler->addExtension('translator', new Localization\DI\TranslatorExtension(
+				$params['appDir'] . '/locale'
+			));
+		});
+		return new $class;
+	}
+
+
+	private function getTranslatorByType(): Localization\Translator
+	{
+		$translator = $this->createContainer();
+		return $translator->getByType(Localization\Translator::class);
+	}
+
+
+	public function test01(): void
+	{
+		Assert::type(Localization\Translator::class, $this->getTranslatorByType());
+	}
+
+
+	public function test02(): void
+	{
+		$class = $this->getTranslatorByType();
+
+		Assert::type('array', $class->setTranslate('en'));
+		Assert::type('string', $class->translate('hello.world'));
+		Assert::same('Hello, world!', $class->translate('hello.world'));
+	}
+
+
+	public function test03(): void
+	{
+		$class = $this->getTranslatorByType();
+		$presenter = new \Presenter;
+		$presenter->lang = 'en';
+		$presenter->translator = $class;
+
+		Assert::type($presenter->getTranslator(), $class);
+
+	}
+
+
+	public function test04(): void
+	{
+		$class = $this->getTranslatorByType();
+		$control = new \Control;
+		$control->setTranslator($class);
+
+		Assert::type($control->getTranslator(), $class);
+	}
+}
+
+$extension = new TranslatorExtension($container);
+$extension->run();

tests/Translator/Presenter.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types = 1);
+
+use Drago\Localization;
+
+class Presenter
+{
+	use Localization\TranslatorAdapter;
+}

tests/bootstrap.php

@@ -6,3 +6,13 @@
 
 Tester\Environment::setup();
 date_default_timezone_set('Europe/Prague');
+define('TEMP_DIR', __DIR__ . '/tmp');
+
+$boot = new Nette\Configurator;
+$boot->setTempDirectory(TEMP_DIR);
+$boot->createRobotLoader()
+	->addDirectory(__DIR__)
+	->addDirectory(__DIR__ . '/../src')
+	->register();
+
+return $boot->createContainer();