Use safe baraja-core/url.

Author: janbarasek

composer.json

@@ -14,7 +14,8 @@
 		"nette/utils": "^3.2",
 		"nette/application": "^3.1",
 		"nette/di": "^3.0",
-		"league/commonmark": "^1.5"
+		"league/commonmark": "^1.5",
+		"baraja-core/url": "^1.0"
 	},
 	"require-dev": {
 		"phpstan/phpstan": "^0.12.18",

src/BaseRenderer.php

@@ -5,6 +5,7 @@
 namespace Baraja\Markdown;
 
 
+use Baraja\Url\Url;
 use Nette\Application\LinkGenerator;
 use Nette\Application\UI\InvalidLinkException;
 use Nette\Localization\Translator;
@@ -120,18 +121,7 @@ function (array $match): string {
 
 	protected function resolveBaseUrl(): string
 	{
-		if ($this->baseUrl === null) {
-			if (($baseUrl = Helpers::getBaseUrl()) === null) {
-				throw new \LogicException(
-					'BaseUrl can not be null.' . "\n"
-					. 'To solve this issue: BaseUrl is automatically detected according to the current HTTP request. '
-					. 'In CLI mode (when there is no HTTP request), you need to manually define the BaseUrl by the setBaseUrl() method.'
-				);
-			}
-			$this->baseUrl = $baseUrl;
-		}
-
-		return $this->baseUrl;
+		return $this->baseUrl ?? Url::get()->getBaseUrl();
 	}
 
 

src/Helpers.php

@@ -15,43 +15,6 @@ public function __construct()
 	}
 
 
-	/**
-	 * Return current absolute URL.
-	 * Return null, if current URL does not exist (for example in CLI mode).
-	 */
-	public static function getCurrentUrl(): ?string
-	{
-		if (!isset($_SERVER['REQUEST_URI'], $_SERVER['HTTP_HOST'])) {
-			return null;
-		}
-
-		return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https' : 'http')
-			. '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-	}
-
-
-	public static function getBaseUrl(): ?string
-	{
-		static $return;
-
-		if ($return !== null) {
-			return $return;
-		}
-		if (($currentUrl = self::getCurrentUrl()) !== null) {
-			if (preg_match('/^(https?:\/\/.+)\/www\//', $currentUrl, $localUrlParser)) {
-				$return = $localUrlParser[0];
-			} elseif (preg_match('/^(https?:\/\/[^\/]+)/', $currentUrl, $publicUrlParser)) {
-				$return = $publicUrlParser[1];
-			}
-		}
-		if ($return !== null) {
-			$return = rtrim($return, '/');
-		}
-
-		return $return;
-	}
-
-
 	/**
 	 * Sanitizes string for use inside href attribute.
 	 */