Merge branch 'master' into master

unreal4u · Sep 9, 2017 · 0b725cd · 0b725cd
2 parents d0e8a65 + 1298c99
commit 0b725cd
Show file tree

Hide file tree

Showing 28 changed files with 83 additions and 70 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/examples/00.send-message.php b/examples/00.send-message.php
@@ -5,12 +5,12 @@
 include __DIR__.'/basics.php';
 
 use \React\EventLoop\Factory;
-use \unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use \unreal4u\TelegramAPI\HttpClientRequestHandler;
 use \unreal4u\TelegramAPI\TgLog;
 use \unreal4u\TelegramAPI\Telegram\Methods\SendMessage;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendMessage = new SendMessage();
 $sendMessage->chat_id = A_USER_CHAT_ID;

diff --git a/examples/01.blocking-get-me.php b/examples/01.blocking-get-me.php
@@ -5,12 +5,12 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use \unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use \unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\GetMe;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $response = Clue\React\Block\await($tgLog->performApiRequest(new GetMe()), $loop);
 var_dump($response);
diff --git a/examples/get-chat-member.php b/examples/get-chat-member.php
@@ -5,12 +5,12 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use \unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use \unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\GetChatMember;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $getChatMember = new GetChatMember();
 $getChatMember->chat_id = A_GROUP_CHAT_ID;
@@ -25,7 +25,7 @@ function ($response) {
     },
     function (\Exception $exception) {
         // Onoes, an exception occurred...
-        echo 'Exception ' . get_class($exception) . ' caught, message: ' . $exception->getMessage();
+        echo 'Exception ' . get_class($exception) . ' caught, message: ' . $exception->getMessage().PHP_EOL;
     }
 );
 

diff --git a/examples/get-chat-members-count.php b/examples/get-chat-members-count.php
@@ -6,13 +6,13 @@
 
 use React\EventLoop\Factory;
 use unreal4u\TelegramAPI\Exceptions\ClientException;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\GetChatMembersCount;
 use unreal4u\TelegramAPI\TgLog;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\ResultInt;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $getCMC = new GetChatMembersCount();
 $getCMC->chat_id = A_GROUP_CHAT_ID;

diff --git a/examples/get-file.php b/examples/get-file.php
@@ -5,14 +5,14 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\InternalFunctionality\TelegramDocument;
 use unreal4u\TelegramAPI\Telegram\Methods\GetFile;
 use unreal4u\TelegramAPI\Telegram\Types\File;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $getFile = new GetFile();
 // You can get a file id from an update, webhook or any other message object

diff --git a/examples/get-me.php b/examples/get-me.php
@@ -5,13 +5,13 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\GetMe;
 use unreal4u\TelegramAPI\TgLog;
 use \unreal4u\TelegramAPI\Abstracts\TelegramTypes;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $getMePromise = $tgLog->performApiRequest(new GetMe());
 $getMePromise->then(

diff --git a/examples/get-updates.php b/examples/get-updates.php
@@ -5,13 +5,13 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use \unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use \unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\GetUpdates;
 use \unreal4u\TelegramAPI\Abstracts\TraversableCustomType;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $getUpdates = new GetUpdates();
 

diff --git a/examples/get-user-profile-photos.php b/examples/get-user-profile-photos.php
@@ -5,12 +5,12 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\GetUserProfilePhotos;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $userProfilePhotos = new GetUserProfilePhotos();
 $userProfilePhotos->user_id = A_USER_ID;

diff --git a/examples/get-webhookinfo.php b/examples/get-webhookinfo.php
@@ -5,13 +5,13 @@
 include __DIR__ . '/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\GetWebhookInfo;
 use unreal4u\TelegramAPI\Telegram\Types\WebhookInfo;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $webHookInfo = new GetWebhookInfo();
 $promise = $tgLog->performApiRequest($webHookInfo);

diff --git a/examples/send-audio.php b/examples/send-audio.php
@@ -5,13 +5,13 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendAudio;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\InputFile;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendAudio = new SendAudio();
 $sendAudio->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-chat-action.php b/examples/send-chat-action.php
@@ -5,13 +5,13 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendChatAction;
 use unreal4u\TelegramAPI\Telegram\Methods\SendMessage;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendMessage = new SendMessage();
 $sendMessage->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-document.php b/examples/send-document.php
@@ -5,13 +5,13 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendDocument;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\InputFile;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendDocument = new SendDocument();
 $sendDocument->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-invoice.php b/examples/send-invoice.php
@@ -5,13 +5,13 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendInvoice;
 use unreal4u\TelegramAPI\Telegram\Types\LabeledPrice;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendInvoice = new SendInvoice();
 $sendInvoice->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-location.php b/examples/send-location.php
@@ -5,12 +5,12 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendLocation;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $location = new SendLocation();
 $location->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-message-and-edit.php b/examples/send-message-and-edit.php
@@ -5,7 +5,7 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use unreal4u\TelegramAPI\Telegram\Methods\EditMessageText;
@@ -17,7 +17,7 @@
 $logger->pushHandler(new StreamHandler('logs/custom-example.log'));
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop), $logger);
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop), $logger);
 $sendMessage = new SendMessage();
 $sendMessage->chat_id = A_USER_CHAT_ID;
 $sendMessage->text = 'Hello world, this is a test';

diff --git a/examples/send-message-with-inlinekeyboard.php b/examples/send-message-with-inlinekeyboard.php
@@ -5,13 +5,13 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendMessage;
 use unreal4u\TelegramAPI\Telegram\Types\Inline\Keyboard\Markup;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendMessage = new SendMessage();
 $sendMessage->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-message-with-keyboard-options.php b/examples/send-message-with-keyboard-options.php
@@ -5,14 +5,14 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendMessage;
 use unreal4u\TelegramAPI\Telegram\Types\KeyboardButton;
 use unreal4u\TelegramAPI\Telegram\Types\ReplyKeyboardMarkup;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendMessage = new SendMessage();
 $sendMessage->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-message.php b/examples/send-message.php
@@ -5,12 +5,12 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendMessage;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendMessage = new SendMessage();
 $sendMessage->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-photo.php b/examples/send-photo.php
@@ -5,13 +5,13 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendPhoto;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\InputFile;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendPhoto = new SendPhoto();
 $sendPhoto->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-sticker.php b/examples/send-sticker.php
@@ -5,12 +5,12 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendSticker;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendSticker = new SendSticker();
 $sendSticker->chat_id = A_USER_CHAT_ID;

diff --git a/examples/send-video.php b/examples/send-video.php
@@ -5,14 +5,14 @@
 include __DIR__.'/basics.php';
 
 use React\EventLoop\Factory;
-use unreal4u\TelegramAPI\HttpClientRequestHandlerReact;
+use unreal4u\TelegramAPI\HttpClientRequestHandler;
 use unreal4u\TelegramAPI\Telegram\Methods\SendChatAction;
 use unreal4u\TelegramAPI\Telegram\Methods\SendVideo;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\InputFile;
 use unreal4u\TelegramAPI\TgLog;
 
 $loop = Factory::create();
-$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandlerReact($loop));
+$tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 // Let the user know we are doing some intensive stuff
 $sendChatAction = new SendChatAction();