Update aldarien dependencies
This commit is contained in:
@ -7,7 +7,7 @@
|
|||||||
"aldarien/contract" : "*"
|
"aldarien/contract" : "*"
|
||||||
},
|
},
|
||||||
"require-dev" : {
|
"require-dev" : {
|
||||||
"phpunit/phpunit" : "^6.3"
|
"phpunit/phpunit" : "*"
|
||||||
},
|
},
|
||||||
"license" : "MIT",
|
"license" : "MIT",
|
||||||
"authors" : [{
|
"authors" : [{
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"aldarien/contract": "*",
|
"aldarien/contract": "*",
|
||||||
"aldarien/root": "*",
|
"aldarien/root": "*",
|
||||||
"symfony/yaml": "^3.3"
|
"symfony/yaml": "*"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
"description" : "Module for formatting data, mostly numbers",
|
"description" : "Module for formatting data, mostly numbers",
|
||||||
"type" : "library",
|
"type" : "library",
|
||||||
"require-dev" : {
|
"require-dev" : {
|
||||||
"phpunit/phpunit" : "^6",
|
"phpunit/phpunit" : "*",
|
||||||
"aldarien/config": "*"
|
"aldarien/config": "*"
|
||||||
},
|
},
|
||||||
"license" : "MIT",
|
"license" : "MIT",
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
"description" : "Response handler module for my apps",
|
"description" : "Response handler module for my apps",
|
||||||
"type" : "library",
|
"type" : "library",
|
||||||
"require" : {
|
"require" : {
|
||||||
"wixel/gump" : "^1.5",
|
"wixel/gump" : "*",
|
||||||
"aldarien/contract" : "*"
|
"aldarien/contract" : "*"
|
||||||
},
|
},
|
||||||
"require-dev" : {
|
"require-dev" : {
|
||||||
"phpunit/phpunit" : "^6.3"
|
"phpunit/phpunit" : "*"
|
||||||
},
|
},
|
||||||
"license" : "MIT",
|
"license" : "MIT",
|
||||||
"authors" : [{
|
"authors" : [{
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"require-dev" : {
|
"require-dev" : {
|
||||||
"phpunit/phpunit" : "~6",
|
"phpunit/phpunit" : "*",
|
||||||
"kint-php/kint" : "~2"
|
"kint-php/kint" : "*"
|
||||||
},
|
},
|
||||||
"autoload" : {
|
"autoload" : {
|
||||||
"psr-4" : {
|
"psr-4" : {
|
||||||
@ -18,4 +18,4 @@
|
|||||||
"app/Helper/functions.php"
|
"app/Helper/functions.php"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
"description": "Session wrapper for aura/session",
|
"description": "Session wrapper for aura/session",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"require": {
|
"require": {
|
||||||
"aura/session": "^2.1",
|
"aura/session": "*",
|
||||||
"aldarien/contract": "*"
|
"aldarien/contract": "*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^6.3"
|
"phpunit/phpunit": "*"
|
||||||
},
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"authors": [
|
"authors": [
|
||||||
|
@ -19,7 +19,8 @@ class URL
|
|||||||
protected function findRoot()
|
protected function findRoot()
|
||||||
{
|
{
|
||||||
$base = $_SERVER['HTTP_HOST'] . ((isset($_SERVER['HTTP_PORT'])) ? ':' . $_SERVER['HTTP_PORT'] : '');
|
$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());
|
$host = new Host($uri->getHost());
|
||||||
if ($host->isAbsolute()) {
|
if ($host->isAbsolute()) {
|
||||||
return $host->getRegistrableDomain();
|
return $host->getRegistrableDomain();
|
||||||
@ -73,4 +74,4 @@ class URL
|
|||||||
return $url;
|
return $url;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
"require" : {
|
"require" : {
|
||||||
"aldarien/contract" : "*",
|
"aldarien/contract" : "*",
|
||||||
"aldarien/root" : "*",
|
"aldarien/root" : "*",
|
||||||
"league/uri": "^5.2",
|
"league/uri": "*",
|
||||||
"sabre/uri": "^2.1"
|
"sabre/uri": "*"
|
||||||
},
|
},
|
||||||
"require-dev" : {
|
"require-dev" : {
|
||||||
"phpunit/phpunit" : "^6.3"
|
"phpunit/phpunit" : "*"
|
||||||
},
|
},
|
||||||
"license" : "MIT",
|
"license" : "MIT",
|
||||||
"authors" : [{
|
"authors" : [{
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
"description": "View module for my apps",
|
"description": "View module for my apps",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"require": {
|
"require": {
|
||||||
"philo/laravel-blade": "^3.1",
|
"philo/laravel-blade": "*",
|
||||||
"aldarien/contract": "*",
|
"aldarien/contract": "*",
|
||||||
"aldarien/config": "*"
|
"aldarien/config": "*"
|
||||||
},
|
},
|
||||||
@ -23,6 +23,6 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^6.3"
|
"phpunit/phpunit": "*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user