Merge pull request #310 from NobletSolutions/hotfix-injectRequest

injected request into controller action

Controller/TranslateController.php

@@ -24,6 +24,7 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Translate Controller.
@@ -32,9 +33,6 @@
  */
 class TranslateController
 {
-    /** @DI\Inject */
-    private $request;
-
     /** @DI\Inject("jms_translation.config_factory") */
     private $configFactory;
 
@@ -47,12 +45,13 @@ class TranslateController
     /**
      * @Route("/", name="jms_translation_index", options = {"i18n" = false})
      * @Template
+     * @param Request $request
      * @return array
      */
-    public function indexAction()
+    public function indexAction(Request $request)
     {
         $configs = $this->configFactory->getNames();
-        $config = $this->request->query->get('config') ?: reset($configs);
+        $config = $request->query->get('config') ?: reset($configs);
         if (!$config) {
             throw new RuntimeException('You need to configure at least one config under "jms_translation.configs".');
         }
@@ -64,15 +63,15 @@ public function indexAction()
         }
 
         $domains = array_keys($files);
-        if ((!$domain = $this->request->query->get('domain')) || !isset($files[$domain])) {
+        if ((!$domain = $request->query->get('domain')) || !isset($files[$domain])) {
             $domain = reset($domains);
         }
 
         $locales = array_keys($files[$domain]);
 
         natsort($locales);
 
-        if ((!$locale = $this->request->query->get('locale')) || !isset($files[$domain][$locale])) {
+        if ((!$locale = $request->query->get('locale')) || !isset($files[$domain][$locale])) {
             $locale = reset($locales);
         }