unreal4u / telegram-api

src/TgLog.php

Indentation +17 added lines, -17 removed lines

@@ -174,15 +174,15 @@ 
         return $this;
     }
 
-	/**
-	 * This is the method that actually makes the call, which can be easily overwritten so that our unit tests can work
-	 *
-	 * @param TelegramMethods $method
-	 * @param array $formData
-	 *
-	 * @return TelegramRawData
-	 * @throws \Exception
-	 */
+ /**
+  * This is the method that actually makes the call, which can be easily overwritten so that our unit tests can work
+  *
+  * @param TelegramMethods $method
+  * @param array $formData
+  *
+  * @return TelegramRawData
+  * @throws \Exception
+  */
     protected function sendRequestToTelegram(TelegramMethods $method, array $formData): TelegramRawData
     {
         $e = null;
@@ -190,13 +190,13 @@ 
         try {
             $response = $this->requestHandler->post($this->composeApiMethodUrl($method), $formData);
             $this->logger->debug('Got response back from Telegram');
-	        return $response;
+         return $response;
         } catch (\Exception $e) {
             // It can happen that we have a network problem, in such case, we can't do nothing about it, so rethrow
             if (!method_exists($e, 'getResponse') || empty($e->getResponse())) {
                 throw $e;
             }
-	        return new TelegramRawData((string)$e->getResponse()->getBody(), $e);
+         return new TelegramRawData((string)$e->getResponse()->getBody(), $e);
         }
     }
 
@@ -257,9 +257,9 @@ 
             case 'application/x-www-form-urlencoded':
                 $this->logger->debug('Creating x-www-form-urlencoded form (AKA fast request)');
                 $formData = [
-	                'headers' =>  [
-	                	'Content-Type' => 'application/x-www-form-urlencoded',
-	                ],
+                 'headers' =>  [
+                  'Content-Type' => 'application/x-www-form-urlencoded',
+                 ],
                     'body' => http_build_query($method->export(), '', '&'),
                 ];
                 break;
@@ -275,8 +275,8 @@ 
                     $this->formType
                 ]);
                 $formData = [
-                	'headers' => [
-	                    'Content-Type' => $this->formType
+                 'headers' => [
+                     'Content-Type' => $this->formType
                     ]
                 ];
                 break;
@@ -349,7 +349,7 @@ 
     {
         $this->logger->debug('Creating multi-part form array data (complex and expensive)');
         $formData = [
-        	'body' => null
+         'body' => null
         ];
 
         $multiPartArray = [];

Spacing +10 added lines, -10 removed lines

@@ -132,7 +132,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));
     }
@@ -145,16 +145,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 Deferred();
 
-        return $this->requestHandler->getAsync($url)->then(function (ResponseInterface $response) use ($deferred)
+        return $this->requestHandler->getAsync($url)->then(function(ResponseInterface $response) use ($deferred)
         {
             $deferred->resolve(new TelegramDocument($response));
         },
-            function (\Exception $exception) use ($deferred)
+            function(\Exception $exception) use ($deferred)
             {
                 if (method_exists($exception, 'getResponse') && !empty($exception->getResponse()->getBody()))
                     $deferred->resolve(new TelegramDocument($exception->getResponse()));
@@ -169,7 +169,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;
     }
@@ -212,14 +212,14 @@ 
         $deferred = new Deferred();
 
         $promise = $this->requestHandler->postAsync($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 (\Exception $exception) use ($deferred)
+            function(\Exception $exception) use ($deferred)
             {
                 if (method_exists($exception, 'getResponse') && !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);
             });
@@ -334,7 +334,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

@@ -156,10 +156,11 @@ 
         },
             function (\Exception $exception) use ($deferred)
             {
-                if (method_exists($exception, 'getResponse') && !empty($exception->getResponse()->getBody()))
-                    $deferred->resolve(new TelegramDocument($exception->getResponse()));
-                else
-                    $deferred->reject($exception);
+                if (method_exists($exception, 'getResponse') && !empty($exception->getResponse()->getBody())) {
+                                    $deferred->resolve(new TelegramDocument($exception->getResponse()));
+                } else {
+                                    $deferred->reject($exception);
+                }
             });
     }
 
@@ -218,10 +219,11 @@ 
         },
             function (\Exception $exception) use ($deferred)
             {
-                if (method_exists($exception, 'getResponse') && !empty($exception->getResponse()->getBody()))
-                    $deferred->resolve(new TelegramRawData((string) $exception->getResponse()->getBody(), $exception));
-                else
-                    $deferred->reject($exception);
+                if (method_exists($exception, 'getResponse') && !empty($exception->getResponse()->getBody())) {
+                                    $deferred->resolve(new TelegramRawData((string) $exception->getResponse()->getBody(), $exception));
+                } else {
+                                    $deferred->reject($exception);
+                }
             });
 
         return $deferred->promise();

src/GuzzleRequestHandler.php

Indentation +25 added lines, -25 removed lines

@@ -49,11 +49,11 @@ 
         $this->httpClient = $client;
     }
 
-	/**
-	 * @param string $uri
-	 *
-	 * @return ResponseInterface
-	 */
+ /**
+  * @param string $uri
+  *
+  * @return ResponseInterface
+  */
     public function get(string $uri): ResponseInterface
     {
         return $this->httpClient->get($uri);
@@ -112,27 +112,27 @@ 
         return $deferred->promise();
     }
 
-	/**
-	 * @param string $uri
-	 *
-	 * @return PromiseInterface
-	 */
+ /**
+  * @param string $uri
+  *
+  * @return PromiseInterface
+  */
     public function getAsync(string $uri): PromiseInterface
     {
-	    $this->logger->debug('About to perform async HTTP call to Telegram\'s API');
-	    $deferred = new Deferred();
-
-	    $promise = $this->httpClient->getAsync($uri);
-	    $promise->then(function (ResponseInterface $response) use ($deferred) {
-		    $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);
-		    });
-
-	    return $deferred->promise();
+     $this->logger->debug('About to perform async HTTP call to Telegram\'s API');
+     $deferred = new Deferred();
+
+     $promise = $this->httpClient->getAsync($uri);
+     $promise->then(function (ResponseInterface $response) use ($deferred) {
+      $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);
+      });
+
+     return $deferred->promise();
     }
 }
\ No newline at end of file

Spacing +11 added lines, -11 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)
         {
@@ -83,7 +83,7 @@ 
             }
         }
         finally {
-            return new TelegramRawData((string) $response->getBody(), $e);
+            return new TelegramRawData((string)$response->getBody(), $e);
         }
     }
 
@@ -99,12 +99,12 @@ 
         $deferred = new Deferred();
 
         $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);
             });
@@ -123,12 +123,12 @@ 
 	    $deferred = new Deferred();
 
 	    $promise = $this->httpClient->getAsync($uri);
-	    $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 +12 added lines, -12 removed lines

@@ -74,15 +74,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);
         }
     }
@@ -103,10 +101,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->promise();
@@ -127,10 +126,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->promise();

src/RequestHandlerInterface.php

Indentation +15 added lines, -15 removed lines

@@ -10,15 +10,15 @@ 
 
 interface RequestHandlerInterface
 {
-	/**
-	 * This is the method that actually makes the call, which can be easily overwritten so that our unit tests can work
-	 *
-	 * @param string $uri
-	 * @param array $formFields
-	 *
-	 * @return TelegramRawData
-	 *
-	 */
+ /**
+  * This is the method that actually makes the call, which can be easily overwritten so that our unit tests can work
+  *
+  * @param string $uri
+  * @param array $formFields
+  *
+  * @return TelegramRawData
+  *
+  */
     public function post(string $uri, array $formFields): TelegramRawData;
 
     /**
@@ -36,10 +36,10 @@ 
      */
     public function postAsync(string $uri, array $formFields): PromiseInterface;
 
-	/**
-	 * @param string $uri
-	 *
-	 * @return PromiseInterface
-	 */
-	public function getAsync(string $uri): PromiseInterface;
+ /**
+  * @param string $uri
+  *
+  * @return PromiseInterface
+  */
+ public function getAsync(string $uri): PromiseInterface;
 }
\ No newline at end of file