danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Workaround for async init

Browse Source
This commit is contained in:
Daniil Gentili 2019-06-08 13:29:54 +02:00
parent 7929e8053e
commit 3b4d45bd34
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs

@ -1 +1 @@
Subproject commit dc05dc5cebfcec90ac7851928c522a4d635dbab6 Subproject commit d06f79a1848bd380d6ad9a71a3ead0c2c2ded4a1

18
src/danog/MadelineProto/API.php
View File

@ -43,14 +43,28 @@ class API extends APIFactory
$this->asyncAPIPromise = null; $this->asyncAPIPromise = null;
}); });
$this->setInitPromise($this->__construct_async($params, $settings, $deferred)); $this->setInitPromise($this->__construct_async($params, $settings, $deferred));
foreach (get_object_vars(new APIFactory('', $this, $this->async)) as $key => $var) {
if (in_array($key, ['namespace', 'API', 'lua', 'async', 'asyncAPIPromise', 'methods', 'asyncInitPromise'])) {
continue;
}
if (is_null($this->{$key})) {
$this->{$key} = new APIFactory($key, $this->API, $this->async);
}
}
} }
public function __construct_async($params, $settings, $deferred) public function __construct_async($params, $settings, $deferred)
{ {
if (is_string($params)) { if (is_string($params)) {
if (!\danog\MadelineProto\Logger::$default) { if (!\danog\MadelineProto\Logger::$default) {
if (!isset($settings['logger']['logger_param'])) $settings['logger']['logger_param'] = Magic::$script_cwd.'/MadelineProto.log'; if (!isset($settings['logger']['logger_param'])) {
if (!isset($settings['logger']['logger'])) $settings['logger']['logger'] = php_sapi_name() === 'cli' ? 3 : 2; $settings['logger']['logger_param'] = Magic::$script_cwd.'/MadelineProto.log';
}
if (!isset($settings['logger']['logger'])) {
$settings['logger']['logger'] = php_sapi_name() === 'cli' ? 3 : 2;
}
\danog\MadelineProto\Logger::constructor($settings['logger']['logger'], $settings['logger']['logger_param'], '', isset($settings['logger']['logger_level']) ? $settings['logger']['logger_level'] : Logger::VERBOSE, isset($settings['logger']['max_size']) ? $settings['logger']['max_size'] : 100 * 1024 * 1024); \danog\MadelineProto\Logger::constructor($settings['logger']['logger'], $settings['logger']['logger_param'], '', isset($settings['logger']['logger_level']) ? $settings['logger']['logger_level'] : Logger::VERBOSE, isset($settings['logger']['max_size']) ? $settings['logger']['max_size'] : 100 * 1024 * 1024);
} }
$realpaths = Serialization::realpaths($params); $realpaths = Serialization::realpaths($params);

4
src/danog/MadelineProto/APIFactory.php
View File

@ -123,10 +123,10 @@ class APIFactory extends AsyncConstruct
protected $methods = []; protected $methods = [];
public function __construct($namespace, $API, &$async) public function __construct($namespace, &$API, &$async)
{ {
$this->namespace = $namespace.'.'; $this->namespace = $namespace.'.';
$this->API = $API; $this->API = &$API;
$this->async = &$async; $this->async = &$async;
} }