Allow Symfony 3.x

Fix NeonFileDumper
Fix Translator

[Closes #137] [Closes #118]

Author: enumag

composer.json

@@ -28,8 +28,8 @@
 		"nette/utils": "^2.4@dev|^3.0@dev",
 
 		"psr/log": "^1.0",
-		"symfony/translation": "~2.5",
-		"symfony/config": "~2.5"
+		"symfony/translation": "^2.5|^3.0",
+		"symfony/config": "^2.5|^3.0"
 	},
 	"suggest": {
 		"kdyby/console": "If you wanna use extract command and much others, install also console.",
@@ -45,7 +45,7 @@
 		"tracy/tracy": "^2.4@dev",
 
 		"kdyby/monolog": "^1.2@dev",
-		"symfony/console": "~2.3",
+		"symfony/console": "^2.3|^3.0",
 		"nette/tester": "~1.4",
 		"mockery/mockery": "~0.9"
 	},

src/Kdyby/Translation/Dumper/NeonFileDumper.php

@@ -24,6 +24,16 @@
 class NeonFileDumper extends FileDumper
 {
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
+	{
+		return Neon::encode($messages->all($domain), Neon::BLOCK);
+	}
+
+
+
 	/**
 	 * {@inheritDoc}
 	 */

src/Kdyby/Translation/Translator.php

@@ -327,11 +327,11 @@ public function getAvailableLocales()
 	 */
 	public function getLocale()
 	{
-		if ($this->locale === NULL) {
+		if (parent::getLocale() === NULL) {
 			$this->setLocale($this->localeResolver->resolve($this));
 		}
 
-		return $this->locale;
+		return parent::getLocale();
 	}