From 172f574155cc3e8dc084e2be5f447a8494b6ae83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Mon, 4 Dec 2017 23:30:16 +0100 Subject: [PATCH 1/2] Update dependencies --- composer.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 2adc4449..a616b2bf 100644 --- a/composer.json +++ b/composer.json @@ -19,15 +19,15 @@ "require": { "php": "^5.6 || ^7.0", "kdyby/strict-objects": "^1.0", - "latte/latte": "^2.4@dev", - "nette/caching": "^2.4@dev", - "nette/di": "^2.4@dev", - "nette/finder": "^2.4@dev", - "nette/http": "^2.4@dev", - "nette/neon": "^2.4@dev", - "nette/php-generator": "^2.4@dev || ^3.0@dev", - "nette/reflection": "^2.4@dev", - "nette/utils": "^2.4@dev || ^3.0@dev", + "latte/latte": "^2.4.6@dev", + "nette/caching": "^2.5@dev", + "nette/di": "^2.4.10@dev", + "nette/finder": "^2.4.1@dev", + "nette/http": "^2.4.7@dev", + "nette/neon": "^2.4.2@dev", + "nette/php-generator": "^2.6.3@dev || ^3.0.1@dev", + "nette/reflection": "^2.4.2@dev", + "nette/utils": "^2.4.5@dev || ^3.0@dev", "psr/log": "^1.0", "symfony/translation": "^3.4 || ^4.0", "symfony/config": "^3.4 || ^4.0" @@ -40,16 +40,16 @@ "symfony/yaml": "If you wanna store translations in YAML format - supports multiline strings." }, "require-dev": { - "nette/application": "^2.4@dev", - "nette/bootstrap": "^2.4@dev", - "nette/forms": "^2.4@dev", - "tracy/tracy": "^2.4@dev", - "kdyby/console": "^2.7@dev", - "kdyby/monolog": "^1.2@dev", + "nette/application": "^2.4.9@dev", + "nette/bootstrap": "^2.4.5@dev", + "nette/forms": "^2.4.6@dev", + "tracy/tracy": "^2.4.9@dev", + "kdyby/console": "^2.7.1@dev", + "kdyby/monolog": "^1.3.2@dev", "symfony/yaml": "^3.4 || ^4.0", "symfony/console": "^3.4 || ^4.0", - "nette/tester": "~1.7", - "mockery/mockery": "~0.9" + "nette/tester": "^2.0", + "mockery/mockery": "^1.0" }, "minimum-stability": "dev", "autoload": { From becc0bf1b13883d66c7c9c4fd3f37ce34f66210b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Mon, 4 Dec 2017 23:38:51 +0100 Subject: [PATCH 2/2] Fix cs --- src/Translator.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Translator.php b/src/Translator.php index a0ec4de3..8494fcb0 100644 --- a/src/Translator.php +++ b/src/Translator.php @@ -18,10 +18,7 @@ use Symfony\Component\Translation\Formatter\MessageFormatter; use Symfony\Component\Translation\Loader\LoaderInterface; -/** - * Translator. - */ -class Translator extends \Symfony\Component\Translation\Translator implements ITranslator +class Translator extends \Symfony\Component\Translation\Translator implements \Kdyby\Translation\ITranslator { use \Kdyby\StrictObjects\Scream;