composer update

This commit is contained in:
2019-12-01 06:37:45 +00:00
parent fa199eef05
commit 3115ab75a5
3650 changed files with 72361 additions and 147137 deletions

View File

@@ -5,7 +5,7 @@
"require": {
"php": ">= 7.1",
"guzzlehttp/guzzle": "^6.2",
"nesbot/carbon": "^1.21",
"nesbot/carbon": "^1.21|^2.6",
"monolog/monolog": "^1.22",
"predis/predis": "^1.1"
},

View File

@@ -43,11 +43,18 @@ class EsiConfiguration extends AbstractArrayAccess
*/
protected $data = [
'http_user_agent' => 'Eseye Default Library',
// Esi
'datasource' => 'tranquility',
'esi_scheme' => 'https',
'esi_host' => 'esi.evetech.net',
'esi_port' => 443,
// Eve Online SSO
'sso_scheme' => 'https',
'sso_host' => 'login.eveonline.com',
'sso_port' => 443,
// Fetcher
'fetcher' => GuzzleFetcher::class,

View File

@@ -59,7 +59,7 @@ class GuzzleFetcher implements FetcherInterface
/**
* @var string
*/
protected $sso_base = 'https://login.eveonline.com/oauth';
protected $sso_base;
/**
* EseyeFetcher constructor.
@@ -75,6 +75,10 @@ class GuzzleFetcher implements FetcherInterface
// Setup the logger
$this->logger = Configuration::getInstance()->getLogger();
$this->sso_base = sprintf('%s://%s:%d/oauth',
Configuration::getInstance()->sso_scheme,
Configuration::getInstance()->sso_host,
Configuration::getInstance()->sso_port);
}
/**