Skip to content

Commit

Permalink
Merge pull request #145 from Kdyby/feature/php-7.2
Browse files Browse the repository at this point in the history
Fix tests with PHP 7.2
  • Loading branch information
enumag authored Dec 4, 2017
2 parents 4ccb8cb + becc0bf commit bfc666f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 21 deletions.
34 changes: 17 additions & 17 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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": {
Expand Down
5 changes: 1 addition & 4 deletions src/Translator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bfc666f

Please sign in to comment.