Services: migrate absoluteURL declaration

* Move absoluteURL declaration into CoreServiceProvider.
GibbonEdu · Nov 7, 2023 · 1e7168d · 1e7168d
1 parent c8d50c3
commit 1e7168d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 28 deletions.
diff --git a/gibbon.php b/gibbon.php
@@ -67,6 +67,9 @@
 $session = $container->get('session');
 $gibbon->session = $session;
 
+// Setup global absoluteURL for all urls.
+Url::setBaseURL($container->get('absoluteURL'));
+
 // Handle Gibbon installation redirect
 if (!$gibbon->isInstalled() && !$gibbon->isInstalling()) {
     header("Location: ./installer/install.php");
@@ -102,25 +105,6 @@
     }
 }
 
-// Setup global absoluteURL for all urls.
-if ($gibbon->isInstalled() && $session->has('absoluteURL')) {
-    Url::setBaseUrl($session->get('absoluteURL'));
-} else {
-    // TODO: put this absoluteURL detection somewhere?
-    $absoluteURL = (function () {
-        // Find out the base installation URL path.
-        $prefixLength = strlen(realpath($_SERVER['DOCUMENT_ROOT']));
-        $baseDir = realpath(__DIR__) . '/';
-        $urlBasePath = substr($baseDir, $prefixLength);
-
-        // Construct the full URL to the base URL path.
-        $host = $_SERVER['HTTP_HOST'] ?? 'localhost';
-        $protocol = !empty($_SERVER['HTTPS']) ? 'https' : 'http';
-        return "{$protocol}://{$host}{$urlBasePath}";
-    })();
-    Url::setBaseUrl($absoluteURL);
-}
-
 // Autoload the current module namespace
 if (!empty($session->get('module'))) {
     $moduleNamespace = preg_replace('/[^a-zA-Z0-9]/', '', $session->get('module'));

diff --git a/src/Services/CoreServiceProvider.php b/src/Services/CoreServiceProvider.php
@@ -136,6 +136,16 @@ public function boot()
             return !empty($hasSessionTable);
         }, false);
 
+        // Define how session can be created.
+        $container->share('session', function () {
+            return $this->getContainer()->get(SessionInterface::class);
+        });
+        $container->share(SessionInterface::class, function () {
+            $container = $this->getContainer();
+            $sessionTableHasSetup = $container->has('sessionTableHasSetup') && $container->get('sessionTableHasSetup');
+            return SessionFactory::create($this->getContainer(), $sessionTableHasSetup);
+        });
+
         // Define locale object.
         $container->share('locale', function () {
             // Get dependencies.
@@ -155,6 +165,24 @@ public function boot()
             }
             return $locale;
         });
+
+        // Setup global absoluteURL of all URLs.
+        $container->share('absoluteURL', function () use ($core) {
+            $session = $this->getContainer()->get(SessionInterface::class);
+            if ($core->isInstalled() && $session->has('absoluteURL')) {
+                return $session->get('absoluteURL');
+            }
+
+            // Find out the base installation URL path.
+            $prefixLength = strlen(realpath($_SERVER['DOCUMENT_ROOT']));
+            $baseDir = realpath(__DIR__ . '/../../') . '/';
+            $urlBasePath = substr($baseDir, $prefixLength);
+
+            // Construct the full URL to the base URL path.
+            $host = $_SERVER['HTTP_HOST'] ?? 'localhost';
+            $protocol = !empty($_SERVER['HTTPS']) ? 'https' : 'http';
+            return "{$protocol}://{$host}{$urlBasePath}";
+        });
     }
 
     /**
@@ -182,15 +210,6 @@ public function register()
 
         // $pdo->setLogger($container->get('mysql_logger'));
 
-        $container->share('session', function () {
-            return $this->getContainer()->get(SessionInterface::class);
-        });
-        $container->share(SessionInterface::class, function () {
-            $container = $this->getContainer();
-            $sessionTableHasSetup = $container->has('sessionTableHasSetup') && $container->get('sessionTableHasSetup');
-            return SessionFactory::create($this->getContainer(), $sessionTableHasSetup);
-        });
-
         $container->share('twig', function () use ($absolutePath) {
             $session = $this->getLeagueContainer()->get('session');
             $loader = new \Twig\Loader\FilesystemLoader($absolutePath.'/resources/templates');