From 983d70a402a12796e85caba9d365d39c2777b4ff Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Wed, 8 Nov 2017 12:06:13 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/danog/MadelineProto/API.php | 1 + src/danog/MadelineProto/Serialization.php | 83 ++++++++++++----------- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/src/danog/MadelineProto/API.php b/src/danog/MadelineProto/API.php index 02cbf187..77790ce8 100644 --- a/src/danog/MadelineProto/API.php +++ b/src/danog/MadelineProto/API.php @@ -68,6 +68,7 @@ class API extends APIFactory $this->API = $unserialized->API; $this->APIFactory(); } + return; } $this->API = new MTProto($params); diff --git a/src/danog/MadelineProto/Serialization.php b/src/danog/MadelineProto/Serialization.php index 5d5643e3..c40b181b 100644 --- a/src/danog/MadelineProto/Serialization.php +++ b/src/danog/MadelineProto/Serialization.php @@ -58,48 +58,51 @@ class Serialization */ public static function deserialize($filename, $no_updates = false) { - if (file_exists($filename)) { - if (!file_exists($lock = $filename.'.lock')) { - touch($lock); - clearstatcache(); - } - $lock = fopen($lock, 'r'); - flock($lock, LOCK_SH); - $unserialized = file_get_contents($filename); - flock($lock, LOCK_UN); - fclose($lock); - - $tounserialize = str_replace('O:26:"danog\MadelineProto\Button":', 'O:35:"danog\MadelineProto\TL\Types\Button":', $unserialized); - foreach (['RSA', 'TL\TLMethod', 'TL\TLConstructor', 'MTProto', 'API', 'DataCenter', 'Connection', 'TL\Types\Button', 'TL\Types\Bytes', 'APIFactory'] as $class) { - class_exists('\danog\MadelineProto\\'.$class); - } - class_exists('\Volatile'); - \danog\MadelineProto\Logger::class_exists(); - - try { - // $unserialized = \danog\Serialization::unserialize($tounserialize); - $unserialized = unserialize($tounserialize); - } catch (\danog\MadelineProto\Bug74586Exception $e) { - $unserialized = \danog\Serialization::unserialize($tounserialize); - } catch (\danog\MadelineProto\Exception $e) { - if (Logger::$constructed) { - Logger::log([(string) $e], Logger::ERROR); - } - if (strpos($e->getMessage(), "Erroneous data format for unserializing 'phpseclib\Math\BigInteger'") === 0) { - $tounserialize = str_replace('phpseclib\Math\BigInteger', 'phpseclib\Math\BigIntegor', $unserialized); - } - $unserialized = \danog\Serialization::unserialize($tounserialize); - } - if ($unserialized instanceof \danog\PlaceHolder) { - $unserialized = \danog\Serialization::unserialize($tounserialize); - } - } else { - throw new Exception(\danog\MadelineProto\Lang::$current_lang['file_not_exist']); + if (file_exists($filename)) { + if (!file_exists($lock = $filename.'.lock')) { + touch($lock); + clearstatcache(); } - if ($unserialized === false) { - throw new Exception(\danog\MadelineProto\Lang::$current_lang['deserialization_error']); + $lock = fopen($lock, 'r'); + flock($lock, LOCK_SH); + $unserialized = file_get_contents($filename); + flock($lock, LOCK_UN); + fclose($lock); + + $tounserialize = str_replace('O:26:"danog\MadelineProto\Button":', 'O:35:"danog\MadelineProto\TL\Types\Button":', $unserialized); + foreach (['RSA', 'TL\TLMethod', 'TL\TLConstructor', 'MTProto', 'API', 'DataCenter', 'Connection', 'TL\Types\Button', 'TL\Types\Bytes', 'APIFactory'] as $class) { + class_exists('\danog\MadelineProto\\'.$class); } - if ($unserialized instanceof \danog\MadelineProto\API) $unserialized->session = $filename; + class_exists('\Volatile'); + \danog\MadelineProto\Logger::class_exists(); + + try { + // $unserialized = \danog\Serialization::unserialize($tounserialize); + $unserialized = unserialize($tounserialize); + } catch (\danog\MadelineProto\Bug74586Exception $e) { + $unserialized = \danog\Serialization::unserialize($tounserialize); + } catch (\danog\MadelineProto\Exception $e) { + if (Logger::$constructed) { + Logger::log([(string) $e], Logger::ERROR); + } + if (strpos($e->getMessage(), "Erroneous data format for unserializing 'phpseclib\Math\BigInteger'") === 0) { + $tounserialize = str_replace('phpseclib\Math\BigInteger', 'phpseclib\Math\BigIntegor', $unserialized); + } + $unserialized = \danog\Serialization::unserialize($tounserialize); + } + if ($unserialized instanceof \danog\PlaceHolder) { + $unserialized = \danog\Serialization::unserialize($tounserialize); + } + } else { + throw new Exception(\danog\MadelineProto\Lang::$current_lang['file_not_exist']); + } + if ($unserialized === false) { + throw new Exception(\danog\MadelineProto\Lang::$current_lang['deserialization_error']); + } + if ($unserialized instanceof \danog\MadelineProto\API) { + $unserialized->session = $filename; + } + return $unserialized; } }