centralize the use of $_SERVER to easier refactor later

Author: ylebre

lib/Routes/SolidStorage.php

@@ -4,6 +4,7 @@
 	use Pdsinterop\PhpSolid\StorageServer;
 	use Pdsinterop\PhpSolid\ClientRegistration;
 	use Pdsinterop\PhpSolid\SolidNotifications;
+	use Pdsinterop\PhpSolid\Util
 	use Pdsinterop\Solid\Auth\WAC;
 	use Pdsinterop\Solid\Resources\Server as ResourceServer;
 	use Laminas\Diactoros\ServerRequestFactory;
@@ -23,8 +24,7 @@ public static function respondToStorage() {
 
 			$wac = new WAC($filesystem);
 
-			$baseUrl = $_SERVER['REQUEST_SCHEME'] . "://" . $_SERVER['SERVER_NAME']; // FIXME: get this from the rawRequest instead?
-			
+			$baseUrl = Util::getServerBaseUrl();
 			$resourceServer->setBaseUrl($baseUrl);
 			$wac->setBaseUrl($baseUrl);
 

lib/Routes/SolidUserProfile.php

@@ -2,10 +2,11 @@
 	namespace Pdsinterop\PhpSolid\Routes;
 
 	use Pdsinterop\PhpSolid\User;
+	use Pdsinterop\PhpSolid\Util;
 
 	class SolidUserProfile {
 		public static function respondToProfile() {
-			$serverName = $_SERVER['SERVER_NAME'];
+			$serverName = Util::getServerName();
 			[$idPart, $rest] = explode(".", $serverName, 2);
 			$userId = preg_replace("/^id-/", "", $idPart);
 

lib/StorageServer.php

@@ -3,6 +3,7 @@
 
 	use Pdsinterop\PhpSolid\Server;
 	use Pdsinterop\PhpSolid\User;
+	use Pdsinterop\PhpSolid\Util;
 
 	class StorageServer extends Server {
 		public static function getFileSystem() {
@@ -17,11 +18,7 @@ public static function getFileSystem() {
 			$graph = new \EasyRdf\Graph();
 			// Create Formats objects
 			$formats = new \Pdsinterop\Rdf\Formats();
-
-			$scheme = $_SERVER['REQUEST_SCHEME'];
-			$domain = $_SERVER['SERVER_NAME'];
-			$path = $_SERVER['REQUEST_URI'];
-			$serverUri = "{$scheme}://{$domain}{$path}"; // FIXME: doublecheck that this is the correct url;
+			$serverUri = Util::getServerUri();
 
 			// Create the RDF Adapter
 			$rdfAdapter = new \Pdsinterop\Rdf\Flysystem\Adapter\Rdf($adapter, $graph, $formats, $serverUri);
@@ -62,7 +59,7 @@ public static function getWebId($rawRequest) {
 		}
 
 		private static function getStorageId() {
-			$serverName = $_SERVER['SERVER_NAME'];
+			$serverName = Util::getServerName();
 			$idParts = explode(".", $serverName, 2);
 			$storageId = preg_replace("/^storage-/", "", $idParts[0]);
 			return $storageId;

lib/Util.php

@@ -9,4 +9,19 @@ public static function base64_url_encode($text) {
 		public static function base64_url_decode($text) {
 			return base64_decode(str_replace(['-', '_', ''], ['+', '/', '='], $text));
 		}
+		public static function getServerName() {
+			// FIXME: Depending on the setup, SERVER_NAME might not be the domain of the server.
+			return $_SERVER['SERVER_NAME'];
+		}
+		public static function getServerUri() {
+			$scheme = $_SERVER['REQUEST_SCHEME'];
+			$domain = $_SERVER['SERVER_NAME'];
+			$path = $_SERVER['REQUEST_URI'];
+			return "{$scheme}://{$domain}{$path}";
+		}
+		public static function getServerBaseUrl() {
+			$scheme = $_SERVER['REQUEST_SCHEME'];
+			$domain = $_SERVER['SERVER_NAME'];
+			return "{$scheme}://{$domain}";
+		}
 	}