From 30f52aad15f273132655e65d8a5d1254678ee74e Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Wed, 18 Sep 2019 21:49:26 +0200 Subject: [PATCH] Avoid problems with sync APIs --- .../MadelineProto/AnnotationsBuilder.php | 3 ++- src/danog/MadelineProto/InternalDoc.php | 22 +++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/danog/MadelineProto/AnnotationsBuilder.php b/src/danog/MadelineProto/AnnotationsBuilder.php index 55fe8402..d1ff70af 100644 --- a/src/danog/MadelineProto/AnnotationsBuilder.php +++ b/src/danog/MadelineProto/AnnotationsBuilder.php @@ -19,6 +19,7 @@ namespace danog\MadelineProto; +use Amp\Promise; use phpDocumentor\Reflection\DocBlockFactory; class AnnotationsBuilder @@ -224,7 +225,7 @@ class AnnotationsBuilder $doc = \rtrim($doc, ', '); $paramList = \rtrim($paramList, ', '); $doc .= ")"; - if ($type = $method->getReturnType()) { + if (($type = $method->getReturnType()) && !\in_array($type->getName(), [\Generator::class, Promise::class])) { $doc .= ': '; if ($type->allowsNull()) { $doc .= '?'; diff --git a/src/danog/MadelineProto/InternalDoc.php b/src/danog/MadelineProto/InternalDoc.php index d403b71e..fcc2104c 100644 --- a/src/danog/MadelineProto/InternalDoc.php +++ b/src/danog/MadelineProto/InternalDoc.php @@ -4043,7 +4043,7 @@ class InternalDoc extends APIFactory return $this->__call(__FUNCTION__, [$extra]); } - public function fileGetContents($url, array $extra = []): Generator + public function fileGetContents($url, array $extra = []) { return $this->__call(__FUNCTION__, [$url, $extra]); } @@ -4116,7 +4116,7 @@ class InternalDoc extends APIFactory return $this->__call(__FUNCTION__, [$datacenter, $extra]); } - public function connectToAllDcs(bool $reconnectAll = true, array $extra = []): Generator + public function connectToAllDcs(bool $reconnectAll = true, array $extra = []) { return $this->__call(__FUNCTION__, [$reconnectAll, $extra]); } @@ -4210,7 +4210,7 @@ class InternalDoc extends APIFactory * * @return \Generator */ - public function createAuthKey(int $expires_in, string $datacenter, array $extra = []): Generator + public function createAuthKey(int $expires_in, string $datacenter, array $extra = []) { return $this->__call(__FUNCTION__, [$expires_in, $datacenter, $extra]); } @@ -4243,7 +4243,7 @@ class InternalDoc extends APIFactory * * @return \Generator */ - public function getDhConfig(array $extra = []): Generator + public function getDhConfig(array $extra = []) { return $this->__call(__FUNCTION__, [$extra]); } @@ -4255,7 +4255,7 @@ class InternalDoc extends APIFactory * * @return \Generator */ - public function bindTempAuthKey(int $expires_in, string $datacenter, array $extra = []): Generator + public function bindTempAuthKey(int $expires_in, string $datacenter, array $extra = []) { return $this->__call(__FUNCTION__, [$expires_in, $datacenter, $extra]); } @@ -4266,7 +4266,7 @@ class InternalDoc extends APIFactory * * @return \Generator */ - public function wolframSingle($what, array $extra = []): Generator + public function wolframSingle($what, array $extra = []) { return $this->__call(__FUNCTION__, [$what, $extra]); } @@ -4275,7 +4275,7 @@ class InternalDoc extends APIFactory * * @return \Generator */ - public function initAuthorization(array $extra = []): Generator + public function initAuthorization(array $extra = []) { return $this->__call(__FUNCTION__, [$extra]); } @@ -4287,7 +4287,7 @@ class InternalDoc extends APIFactory * * @return \Generator */ - public function initAuthorizationSocket(string $id, \danog\MadelineProto\DataCenterConnection $socket, array $extra = []): Generator + public function initAuthorizationSocket(string $id, \danog\MadelineProto\DataCenterConnection $socket, array $extra = []) { return $this->__call(__FUNCTION__, [$id, $socket, $extra]); } @@ -4298,7 +4298,7 @@ class InternalDoc extends APIFactory * * @return \Generator */ - public function syncAuthorization(string $id, array $extra = []): Generator + public function syncAuthorization(string $id, array $extra = []) { return $this->__call(__FUNCTION__, [$id, $extra]); } @@ -4316,7 +4316,7 @@ class InternalDoc extends APIFactory public function methodCall(string $method, $args = [ ], array $aargs = [ 'msg_id' => null, - ], array $extra = []): Amp\Promise + ], array $extra = []) { return $this->__call(__FUNCTION__, [$method, $args, $aargs, $extra]); } @@ -4332,7 +4332,7 @@ class InternalDoc extends APIFactory public function methodCallWrite(string $method, $args = [ ], array $aargs = [ 'msg_id' => null, - ], array $extra = []): Amp\Promise + ], array $extra = []) { return $this->__call(__FUNCTION__, [$method, $args, $aargs, $extra]); }