Merge pull request #3877 from greg0ire/enable_and_fix_jms_tests

Enable and fix jms tests

Tests/Translator/Extractor/JMSTranslatorBundle/AdminExtractorTest.php

@@ -70,7 +70,7 @@ class AdminExtractorTest extends \PHPUnit_Framework_TestCase
                 return;
             }));
 
-        $logger = $this->getMock('Symfony\Component\HttpKernel\Log\LoggerInterface');
+        $logger = $this->getMock('Psr\Log\LoggerInterface');
 
         $this->pool = new Pool($container, '', '');
         $this->pool->setAdminServiceIds(array('foo_admin', 'bar_admin'));

Translator/Extractor/JMSTranslatorBundle/AdminExtractor.php

@@ -15,11 +15,11 @@ use JMS\TranslationBundle\Model\FileSource;
 use JMS\TranslationBundle\Model\Message;
 use JMS\TranslationBundle\Model\MessageCatalogue;
 use JMS\TranslationBundle\Translation\ExtractorInterface;
+use Psr\Log\LoggerInterface;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\Pool;
 use Sonata\AdminBundle\Security\Handler\SecurityHandlerInterface;
 use Sonata\AdminBundle\Translator\LabelTranslatorStrategyInterface;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
 class AdminExtractor implements ExtractorInterface, TranslatorInterface, SecurityHandlerInterface, LabelTranslatorStrategyInterface

composer.json

@@ -44,11 +44,12 @@
     },
     "require-dev": {
         "jms/di-extra-bundle": "^1.7",
+        "jms/translation-bundle": "^1.2",
         "sensio/generator-bundle": "^2.3 || ^3.0",
-        "symfony/yaml": "^2.3 || ^3.0",
+        "sllh/php-cs-fixer-styleci-bridge": "^2.0",
         "sonata-project/intl-bundle": "^2.2.4",
         "symfony/phpunit-bridge": "^2.7 || ^3.0",
-        "sllh/php-cs-fixer-styleci-bridge": "^2.0"
+        "symfony/yaml": "^2.3 || ^3.0"
     },
     "conflict": {
         "jms/di-extra-bundle": "<1.7.0"