unreal4u / telegram-api

src/TgLog.php

Spacing +10 added lines, -10 removed lines

@@ -133,7 +133,7 @@ 
     public function downloadFile(File $file): TelegramDocument
     {
         $this->logger->debug('Downloading file from Telegram, creating URL');
-        $url = 'https://api.telegram.org/file/bot' . $this->botToken . '/' . $file->file_path;
+        $url = 'https://api.telegram.org/file/bot'.$this->botToken.'/'.$file->file_path;
         $this->logger->debug('About to perform request to begin downloading file');
         return new TelegramDocument($this->requestHandler->get($url));
     }
@@ -146,16 +146,16 @@ 
     public function downloadFileAsync(File $file): PromiseInterface
     {
         $this->logger->debug('Downloading file async from Telegram, creating URL');
-        $url = 'https://api.telegram.org/file/bot' . $this->botToken . '/' . $file->file_path;
+        $url = 'https://api.telegram.org/file/bot'.$this->botToken.'/'.$file->file_path;
         $this->logger->debug('About to perform request to begin downloading file');
 
         $deferred = new Promise();
 
-        return $this->requestHandler->requestAsync($url)->then(function (ResponseInterface $response) use ($deferred)
+        return $this->requestHandler->requestAsync($url)->then(function(ResponseInterface $response) use ($deferred)
         {
             $deferred->resolve(new TelegramDocument($response));
         },
-            function (RequestException $exception) use ($deferred)
+            function(RequestException $exception) use ($deferred)
             {
                 if (!empty($exception->getResponse()->getBody()))
                     $deferred->resolve(new TelegramDocument($exception->getResponse()));
@@ -170,7 +170,7 @@ 
      */
     final private function constructApiUrl(): TgLog
     {
-        $this->apiUrl = 'https://api.telegram.org/bot' . $this->botToken . '/';
+        $this->apiUrl = 'https://api.telegram.org/bot'.$this->botToken.'/';
         $this->logger->debug('Built up the API URL');
         return $this;
     }
@@ -213,14 +213,14 @@ 
         $deferred = new Promise();
 
         $promise = $this->requestHandler->requestAsync($this->composeApiMethodUrl($method), $formData);
-        $promise->then(function (ResponseInterface $response) use ($deferred)
+        $promise->then(function(ResponseInterface $response) use ($deferred)
         {
-            $deferred->resolve(new TelegramRawData((string) $response->getBody()));
+            $deferred->resolve(new TelegramRawData((string)$response->getBody()));
         },
-            function (RequestException $exception) use ($deferred)
+            function(RequestException $exception) use ($deferred)
             {
                 if (!empty($exception->getResponse()->getBody()))
-                    $deferred->resolve(new TelegramRawData((string) $exception->getResponse()->getBody(), $exception));
+                    $deferred->resolve(new TelegramRawData((string)$exception->getResponse()->getBody(), $exception));
                 else
                     $deferred->reject($exception);
             });
@@ -328,7 +328,7 @@ 
         $this->methodName = substr($completeClassName, strrpos($completeClassName, '\\') + 1);
         $this->logger->info('About to perform API request', ['method' => $this->methodName]);
 
-        return $this->apiUrl . $this->methodName;
+        return $this->apiUrl.$this->methodName;
     }
 
     /**

Braces +10 added lines, -8 removed lines

@@ -157,10 +157,11 @@ 
         },
             function (RequestException $exception) use ($deferred)
             {
-                if (!empty($exception->getResponse()->getBody()))
-                    $deferred->resolve(new TelegramDocument($exception->getResponse()));
-                else
-                    $deferred->reject($exception);
+                if (!empty($exception->getResponse()->getBody())) {
+                                    $deferred->resolve(new TelegramDocument($exception->getResponse()));
+                } else {
+                                    $deferred->reject($exception);
+                }
             });
     }
 
@@ -219,10 +220,11 @@ 
         },
             function (RequestException $exception) use ($deferred)
             {
-                if (!empty($exception->getResponse()->getBody()))
-                    $deferred->resolve(new TelegramRawData((string) $exception->getResponse()->getBody(), $exception));
-                else
-                    $deferred->reject($exception);
+                if (!empty($exception->getResponse()->getBody())) {
+                                    $deferred->resolve(new TelegramRawData((string) $exception->getResponse()->getBody(), $exception));
+                } else {
+                                    $deferred->reject($exception);
+                }
             });
 
         return $deferred;

src/GuzzleRequestHandler.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace unreal4u\TelegramAPI;
 
@@ -34,7 +34,7 @@ 
      * @param ClientInterface $client
      * @param LoggerInterface $logger
      */
-    public function __construct(?ClientInterface $client = null, LoggerInterface $logger = null)
+    public function __construct(? ClientInterface $client = null, LoggerInterface $logger = null)
     {
         if ($logger === null)
         {
@@ -78,7 +78,7 @@ 
             }
         }
         finally {
-            return new TelegramRawData((string) $response->getBody(), $e);
+            return new TelegramRawData((string)$response->getBody(), $e);
         }
     }
 
@@ -94,12 +94,12 @@ 
         $deferred = new Promise();
 
         $promise = $this->httpClient->postAsync($uri, $formData);
-        $promise->then(function (ResponseInterface $response) use ($deferred) {
-            $deferred->resolve(new TelegramRawData((string) $response->getBody()));
+        $promise->then(function(ResponseInterface $response) use ($deferred) {
+            $deferred->resolve(new TelegramRawData((string)$response->getBody()));
         },
-            function (RequestException $exception) use ($deferred) {
+            function(RequestException $exception) use ($deferred) {
                 if (!empty($exception->getResponse()->getBody()))
-                    $deferred->resolve(new TelegramRawData((string) $exception->getResponse()->getBody(), $exception));
+                    $deferred->resolve(new TelegramRawData((string)$exception->getResponse()->getBody(), $exception));
                 else
                     $deferred->reject($exception);
             });

Braces +7 added lines, -8 removed lines

@@ -69,15 +69,13 @@ 
         try {
             $response = $this->httpClient->post($uri, $formData);
             $this->logger->debug('Got response back from Telegram, applying json_decode');
-        }
-        catch (ClientException $e) {
+        } catch (ClientException $e) {
             $response = $e->getResponse();
             // It can happen that we have a network problem, in such case, we can't do nothing about it, so rethrow
             if (empty($response)) {
                 throw $e;
             }
-        }
-        finally {
+        } finally {
             return new TelegramRawData((string) $response->getBody(), $e);
         }
     }
@@ -98,10 +96,11 @@ 
             $deferred->resolve(new TelegramRawData((string) $response->getBody()));
         },
             function (RequestException $exception) use ($deferred) {
-                if (!empty($exception->getResponse()->getBody()))
-                    $deferred->resolve(new TelegramRawData((string) $exception->getResponse()->getBody(), $exception));
-                else
-                    $deferred->reject($exception);
+                if (!empty($exception->getResponse()->getBody())) {
+                                    $deferred->resolve(new TelegramRawData((string) $exception->getResponse()->getBody(), $exception));
+                } else {
+                                    $deferred->reject($exception);
+                }
             });
 
         return $deferred;