diff --git a/aldarien/asset/composer.json b/aldarien/asset/composer.json index ebf36ce..dd2c217 100644 --- a/aldarien/asset/composer.json +++ b/aldarien/asset/composer.json @@ -7,7 +7,7 @@ "aldarien/contract" : "*" }, "require-dev" : { - "phpunit/phpunit" : "^6.3" + "phpunit/phpunit" : "*" }, "license" : "MIT", "authors" : [{ diff --git a/aldarien/config/composer.json b/aldarien/config/composer.json index b37bdbc..ff4255b 100644 --- a/aldarien/config/composer.json +++ b/aldarien/config/composer.json @@ -12,7 +12,7 @@ "require": { "aldarien/contract": "*", "aldarien/root": "*", - "symfony/yaml": "^3.3" + "symfony/yaml": "*" }, "autoload": { "psr-4": { diff --git a/aldarien/format/composer.json b/aldarien/format/composer.json index d897165..59d058d 100644 --- a/aldarien/format/composer.json +++ b/aldarien/format/composer.json @@ -3,7 +3,7 @@ "description" : "Module for formatting data, mostly numbers", "type" : "library", "require-dev" : { - "phpunit/phpunit" : "^6", + "phpunit/phpunit" : "*", "aldarien/config": "*" }, "license" : "MIT", diff --git a/aldarien/response/composer.json b/aldarien/response/composer.json index 8db86c3..72ebcc0 100644 --- a/aldarien/response/composer.json +++ b/aldarien/response/composer.json @@ -3,11 +3,11 @@ "description" : "Response handler module for my apps", "type" : "library", "require" : { - "wixel/gump" : "^1.5", + "wixel/gump" : "*", "aldarien/contract" : "*" }, "require-dev" : { - "phpunit/phpunit" : "^6.3" + "phpunit/phpunit" : "*" }, "license" : "MIT", "authors" : [{ diff --git a/aldarien/root/composer.json b/aldarien/root/composer.json index 3898988..784dfb7 100644 --- a/aldarien/root/composer.json +++ b/aldarien/root/composer.json @@ -7,8 +7,8 @@ ], "license": "MIT", "require-dev" : { - "phpunit/phpunit" : "~6", - "kint-php/kint" : "~2" + "phpunit/phpunit" : "*", + "kint-php/kint" : "*" }, "autoload" : { "psr-4" : { @@ -18,4 +18,4 @@ "app/Helper/functions.php" ] } -} \ No newline at end of file +} diff --git a/aldarien/session/composer.json b/aldarien/session/composer.json index f588b42..7fe764d 100644 --- a/aldarien/session/composer.json +++ b/aldarien/session/composer.json @@ -3,11 +3,11 @@ "description": "Session wrapper for aura/session", "type": "library", "require": { - "aura/session": "^2.1", + "aura/session": "*", "aldarien/contract": "*" }, "require-dev": { - "phpunit/phpunit": "^6.3" + "phpunit/phpunit": "*" }, "license": "MIT", "authors": [ diff --git a/aldarien/url/app/Service/URL.php b/aldarien/url/app/Service/URL.php index e504acd..4c70ae1 100644 --- a/aldarien/url/app/Service/URL.php +++ b/aldarien/url/app/Service/URL.php @@ -19,7 +19,8 @@ class URL protected function findRoot() { $base = $_SERVER['HTTP_HOST'] . ((isset($_SERVER['HTTP_PORT'])) ? ':' . $_SERVER['HTTP_PORT'] : ''); - $uri = Http::createFromString(\Sabre\Uri\resolve($_SERVER['REQUEST_SCHEME'] . '://' . $base, $_SERVER['SCRIPT_NAME'])); + $scheme = $_SERVER['HTTPS'] ? 'https' : 'http'; + $uri = Http::createFromString(\Sabre\Uri\resolve($scheme . '://' . $base, $_SERVER['SCRIPT_NAME'])); $host = new Host($uri->getHost()); if ($host->isAbsolute()) { return $host->getRegistrableDomain(); @@ -73,4 +74,4 @@ class URL return $url; } } -?> \ No newline at end of file +?> diff --git a/aldarien/url/composer.json b/aldarien/url/composer.json index 7e69e9a..78837f1 100644 --- a/aldarien/url/composer.json +++ b/aldarien/url/composer.json @@ -5,11 +5,11 @@ "require" : { "aldarien/contract" : "*", "aldarien/root" : "*", - "league/uri": "^5.2", - "sabre/uri": "^2.1" + "league/uri": "*", + "sabre/uri": "*" }, "require-dev" : { - "phpunit/phpunit" : "^6.3" + "phpunit/phpunit" : "*" }, "license" : "MIT", "authors" : [{ diff --git a/aldarien/view/composer.json b/aldarien/view/composer.json index b8e353e..b41c138 100644 --- a/aldarien/view/composer.json +++ b/aldarien/view/composer.json @@ -3,7 +3,7 @@ "description": "View module for my apps", "type": "library", "require": { - "philo/laravel-blade": "^3.1", + "philo/laravel-blade": "*", "aldarien/contract": "*", "aldarien/config": "*" }, @@ -23,6 +23,6 @@ ] }, "require-dev": { - "phpunit/phpunit": "^6.3" + "phpunit/phpunit": "*" } }