From 9fd4b22c428e4aa422538e508a40a5a588e61c16 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Mon, 19 Dec 2016 17:58:09 +0000 Subject: [PATCH] Apply fixes from StyleCI --- build_docs.php | 58 +++++++++---------- src/danog/MadelineProto/MTProto.php | 2 - .../MTProtoTools/MessageHandler.php | 1 - 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/build_docs.php b/build_docs.php index 8a96d913..5f5f754b 100755 --- a/build_docs.php +++ b/build_docs.php @@ -51,7 +51,6 @@ mkdir('methods'); $methods = []; - $types = []; \danog\MadelineProto\Logger::log('Generating methods documentation...'); @@ -59,10 +58,11 @@ foreach ($TL->methods->method as $key => $method) { $type = str_replace(['.', '<', '>'], ['_', '_of_', ''], $TL->methods->type[$key]); $real_type = preg_replace('/.*_of_/', '', $type); - $params = ''; foreach ($TL->methods->params[$key] as $param) { - if ($param['name'] == 'flags') continue; + if ($param['name'] == 'flags') { + continue; + } $stype = 'type'; $link_type = 'types'; if (isset($param['subtype'])) { @@ -77,32 +77,32 @@ foreach ($TL->methods->method as $key => $method) { case 'false': $ptype = 'Bool'; } - $params .= "'".$param['name'] . "' => "; - $params .= (isset($param['subtype']) ? '[' : '') . '['.$ptype.'](../'.$link_type.'/'.$ptype.'.md)'.(isset($param['subtype']) ? ']' : '').', '; + $params .= "'".$param['name']."' => "; + $params .= (isset($param['subtype']) ? '[' : '').'['.$ptype.'](../'.$link_type.'/'.$ptype.'.md)'.(isset($param['subtype']) ? ']' : '').', '; } - $methods [$method]= str_replace(['_', '\[\]'],['\_', ''], '$MadelineProto->['.str_replace('.', '->', $method).']('.$method.'.md)(\['.$params.'\]) == [$'.$type.'](../types/'.$real_type.'.md); + $methods[$method] = str_replace(['_', '\[\]'], ['\_', ''], '$MadelineProto->['.str_replace('.', '->', $method).']('.$method.'.md)(\['.$params.'\]) == [$'.$type.'](../types/'.$real_type.'.md); '); - $params = ''; $table = '| Name | Type | Required | |----------|:-------------:|---------:| '; foreach ($TL->methods->params[$key] as $param) { - if ($param['name'] == 'flags') continue; + if ($param['name'] == 'flags') { + continue; + } $ptype = str_replace('.', '_', $param[isset($param['subtype']) ? 'subtype' : 'type']); switch ($ptype) { case 'true': case 'false': $ptype = 'Bool'; } - $table .= '|'.$param['name'] . '|' . (isset($param['subtype']) ? 'Array of ' : ''). '['.$ptype.'](../types/'.$ptype.'.md) | '.($param['flag'] ? 'Optional' : 'Required').'| + $table .= '|'.$param['name'].'|'.(isset($param['subtype']) ? 'Array of ' : '').'['.$ptype.'](../types/'.$ptype.'.md) | '.($param['flag'] ? 'Optional' : 'Required').'| '; - $params .= "'".$param['name'] . "' => "; + $params .= "'".$param['name']."' => "; $params .= (isset($param['subtype']) ? '['.$ptype.']' : $ptype).', '; - } $example = str_replace('[]', '', ' ``` @@ -151,9 +151,7 @@ file_put_contents('methods/index.md', '# Methods }
-'.join('', $methods).'
'); - - +'.implode('', $methods).''); foreach (glob('constructors/*') as $unlink) { unlink($unlink); @@ -171,13 +169,15 @@ $constructors = []; foreach ($TL->constructors->predicate as $key => $constructor) { $constructor = str_replace('.', '_', $constructor); - + $type = str_replace(['.', '<', '>'], ['_', '_of_', ''], $TL->constructors->type[$key]); $real_type = preg_replace('/.*_of_/', '', $type); - + $params = ''; foreach ($TL->constructors->params[$key] as $param) { - if ($param['name'] == 'flags') continue; + if ($param['name'] == 'flags') { + continue; + } $stype = 'type'; $link_type = 'types'; if (isset($param['subtype'])) { @@ -187,22 +187,20 @@ foreach ($TL->constructors->predicate as $key => $constructor) { } } - $ptype = str_replace('.', '_', $param[$stype]); switch ($ptype) { case 'true': case 'false': $ptype = 'Bool'; } - $params .= "'".$param['name'] . "' => "; - $params .= (isset($param['subtype']) ? '[' : '') . '['.$ptype.'](../'.$link_type.'/'.$ptype.'.md)'.(isset($param['subtype']) ? ']' : '').', '; + $params .= "'".$param['name']."' => "; + $params .= (isset($param['subtype']) ? '[' : '').'['.$ptype.'](../'.$link_type.'/'.$ptype.'.md)'.(isset($param['subtype']) ? ']' : '').', '; } - $constructors [$constructor]= str_replace(['_', '\[\]'],['\_', ''], '[$'.$real_type.'](../types/'.$real_type.'.md)\[\'['.str_replace('.', '->', $constructor).']('.$constructor.'.md)\'\] = \['.$params.'\] + $constructors[$constructor] = str_replace(['_', '\[\]'], ['\_', ''], '[$'.$real_type.'](../types/'.$real_type.'.md)\[\'['.str_replace('.', '->', $constructor).']('.$constructor.'.md)\'\] = \['.$params.'\] '); - if (!isset($types[$real_type])) { $types[$real_type] = []; } @@ -215,9 +213,11 @@ foreach ($TL->constructors->predicate as $key => $constructor) { |----------|:-------------:|---------:| '; foreach ($TL->constructors->params[$key] as $param) { - if ($param['name'] == 'flags') continue; + if ($param['name'] == 'flags') { + continue; + } $ptype = str_replace('.', '_', $param[isset($param['subtype']) ? 'subtype' : 'type']); - + $link_type = 'types'; if (isset($param['subtype'])) { if ($param['type'] == 'vector') { @@ -229,12 +229,11 @@ foreach ($TL->constructors->predicate as $key => $constructor) { case 'false': $ptype = 'Bool'; } - $table .= '|'.$param['name'] . '|' . (isset($param['subtype']) ? 'Array of ' : ''). '['.$ptype.'](../'.$link_type.'/'.$ptype.'.md) | '.($param['flag'] ? 'Optional' : 'Required').'| + $table .= '|'.$param['name'].'|'.(isset($param['subtype']) ? 'Array of ' : '').'['.$ptype.'](../'.$link_type.'/'.$ptype.'.md) | '.($param['flag'] ? 'Optional' : 'Required').'| '; - $params .= "'".$param['name'] . "' => "; + $params .= "'".$param['name']."' => "; $params .= (isset($param['subtype']) ? '['.$ptype.']' : $ptype).', '; - } $example = str_replace('[]', '', ' ``` @@ -254,7 +253,6 @@ $'.$constructor.' = ['.$params.']; file_put_contents('constructors/'.$constructor.'.md', $header.$example); } - \danog\MadelineProto\Logger::log('Generating constructors index...'); ksort($constructors); @@ -270,8 +268,7 @@ file_put_contents('constructors/index.md', '# Constructors }
-'.join('', $constructors).'
'); - +'.implode('', $constructors).''); foreach (glob('types/*') as $unlink) { unlink($unlink); @@ -316,7 +313,6 @@ foreach ($types as $type => $keys) { file_put_contents('types/'.$type.'.md', $header); } - \danog\MadelineProto\Logger::log('Generating additional types...'); file_put_contents('types/string.md', '## Type: string diff --git a/src/danog/MadelineProto/MTProto.php b/src/danog/MadelineProto/MTProto.php index 71d4833b..fa1b6104 100644 --- a/src/danog/MadelineProto/MTProto.php +++ b/src/danog/MadelineProto/MTProto.php @@ -27,7 +27,6 @@ class MTProto extends PrimeModule use \danog\MadelineProto\MTProtoTools\SaltHandler; use \danog\MadelineProto\MTProtoTools\SeqNoHandler; - public $settings = []; public $authorized = false; public $waiting_code = false; @@ -284,7 +283,6 @@ Slv8kg9qv1m6XHVQY3PnEw+QQtqSIXklHwIDAQAB \danog\MadelineProto\Logger::log('Generating temporary authorization key...'); $this->datacenter->temp_auth_key = $this->create_auth_key($this->settings['authorization']['default_temp_auth_key_expires_in']); $this->bind_temp_auth_key($this->settings['authorization']['default_temp_auth_key_expires_in']); - } } diff --git a/src/danog/MadelineProto/MTProtoTools/MessageHandler.php b/src/danog/MadelineProto/MTProtoTools/MessageHandler.php index aa9c4425..5dfd280e 100644 --- a/src/danog/MadelineProto/MTProtoTools/MessageHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/MessageHandler.php @@ -65,7 +65,6 @@ trait MessageHandler $this->parse_config(); throw new \danog\MadelineProto\Exception('I had to recreate the temporary authorization key'); } - } throw new \danog\MadelineProto\RPCErrorException($error, $error); }