Cleaner way to build the redirect

classes/Controller/BaseController.php

@@ -10,12 +10,12 @@
 use Alltube\Library\Downloader;
 use Alltube\Library\Video;
 use Alltube\LocaleManager;
-use Alltube\SessionFactory;
 use Aura\Session\Segment;
 use Consolidation\Log\Logger;
 use Psr\Container\ContainerInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
+use Slim\Router;
 
 /**
  * Abstract class used by every controller.
@@ -76,6 +76,11 @@ abstract class BaseController
      */
     protected $logger;
 
+    /**
+     * @var Router
+     */
+    protected $router;
+
     /**
      * BaseController constructor.
      *
@@ -89,6 +94,7 @@ public function __construct(ContainerInterface $container)
         $this->sessionSegment = $session->getSegment(self::class);
         $this->localeManager = $this->container->get('locale');
         $this->downloader = $this->config->getDownloader();
+        $this->router = $this->container->get('router');
         $this->logger = $this->container->get('logger');
         $this->downloader->setLogger($this->logger);
 

classes/Controller/DownloadController.php

@@ -86,7 +86,7 @@ public function download(Request $request, Response $response)
                 }
             }
         } else {
-            return $response->withRedirect($this->container->get('router')->pathFor('index'));
+            return $response->withRedirect($this->router->pathFor('index'));
         }
     }
 

classes/Controller/FrontController.php

@@ -13,6 +13,7 @@
 use Alltube\Middleware\CspMiddleware;
 use Exception;
 use Slim\Http\StatusCode;
+use Slim\Http\Uri;
 use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
 use Throwable;
 use Psr\Container\ContainerInterface;
@@ -82,7 +83,7 @@ public function locale(Request $request, Response $response, array $data)
     {
         $this->localeManager->setLocale(new Locale($data['locale']));
 
-        return $response->withRedirect($this->container->get('router')->pathFor('index'));
+        return $response->withRedirect($this->router->pathFor('index'));
     }
 
     /**
@@ -209,14 +210,13 @@ public function info(Request $request, Response $response)
             if ($this->config->convert && $request->getQueryParam('audio')) {
                 // We skip the info page and get directly to the download.
                 return $response->withRedirect(
-                    $this->container->get('router')->pathFor('download') .
-                    '?' . http_build_query($request->getQueryParams())
+                    $this->router->pathFor('download', [], $request->getQueryParams())
                 );
             } else {
                 return $this->getInfoResponse($request, $response);
             }
         } else {
-            return $response->withRedirect($this->container->get('router')->pathFor('index'));
+            return $response->withRedirect($this->router->pathFor('index'));
         }
     }