Merge pull request #346 from MightyCreak/refactor/move-http-request

refactor: move HttpRequest member to RssController

Author: MightyCreak

src/Controller/RssController.php

@@ -6,10 +6,18 @@
 use Suin\RSSWriter\Feed as RSSFeed;
 use Suin\RSSWriter\Channel as RSSChannel;
 use Suin\RSSWriter\Item as RSSItem;
+use Symfony\Component\HttpFoundation\Request as HttpRequest;
 use Symfony\Component\HttpFoundation\Response as HttpResponse;
 
 class RssController
 {
+    private readonly HttpRequest $request;
+
+    public function __construct()
+    {
+        $this->request = HttpRequest::createFromGlobals();
+    }
+
     public function run(): void
     {
         $featuresXmlFilepath = Mesamatrix::path(Mesamatrix::$config->getValue("info", "xml_file"));
@@ -43,7 +51,7 @@ public function run(): void
             ['Content-Type' => 'text/xml']
         );
 
-        $response->prepare(Mesamatrix::$request);
+        $response->prepare($this->request);
         $response->send();
     }
 
@@ -79,8 +87,8 @@ private function generateRss(string $featuresXmlFilepath): ?string
         // prepare RSS
         $rss = new RSSFeed();
 
-        $baseUrl = Mesamatrix::$request->getSchemeAndHttpHost()
-            . Mesamatrix::$request->getBasePath();
+        $baseUrl = $this->request->getSchemeAndHttpHost()
+            . $this->request->getBasePath();
 
         $channel = new RSSChannel();
         $channel

src/Mesamatrix.php

@@ -26,15 +26,13 @@
 use Monolog\ErrorHandler;
 use Monolog\Handler\ErrorLogHandler;
 use Monolog\Handler\StreamHandler;
-use Symfony\Component\HttpFoundation\Request as HttpRequest;
 
 class Mesamatrix
 {
     public static string $serverRoot; // Path to root of installation
     public static string $configDir; // Path to configuration directory
     public static Config $config;
     public static Logger $logger;
-    public static HttpRequest $request;
 
     public static function init()
     {
@@ -82,9 +80,6 @@ public static function init()
             exit(1);
         }
 
-        // Initialize request
-        self::$request = HttpRequest::createFromGlobals();
-
         self::$logger->debug('Base initialization complete');
 
         self::$logger->debug('Log level: ' . Logger::toMonologLevel($logLevel)->getName());