$input_raw Removed

Author: MBoretto

src/Request.php

@@ -17,8 +17,6 @@ class Request
 {
     private static $telegram;
     private static $input;
-    private static $input_raw;
-    private static $server_response;
 
     private static $methods = array(
         'getMe',
@@ -46,10 +44,10 @@ public static function initialize(Telegram $telegram)
         }
     }
 
-    public static function setInputRaw($input_raw)
+    public static function setInputRaw($input)
     {
-        if (is_string($input_raw)) {
-            self::$input_raw = $input_raw;
+        if (is_string($input)) {
+            self::$input = $input;
         } else {
             throw new TelegramException("Log input is not a string");
         }
@@ -63,7 +61,7 @@ public static function getInput()
             self::setInputRaw(file_get_contents('php://input'));
         }
         self::log();
-        return self::$input_raw;
+        return self::$input;
     }
 
 
@@ -77,7 +75,7 @@ private static function log()
             return false;
         }
 
-        $status = file_put_contents($path, self::$input_raw . "\n", FILE_APPEND);
+        $status = file_put_contents($path, self::$input . "\n", FILE_APPEND);
 
         return $status;
     }
@@ -109,12 +107,12 @@ public static function generateGeneralFakeServerSesponse($data = null)
         return $fake_response;
     }
 
-    public static function executeCurl(i$action, array $data)
+    public static function executeCurl($action, array $data)
     {
 
         $ch = curl_init();
         if ($ch === false) {
-            throw new TelegramException('Curl Failed to initialize');
+            throw new TelegramException('Curl failed to initialize');
         }
 
         $curlConfig = array(
@@ -136,6 +134,11 @@ public static function executeCurl(i$action, array $data)
         if ($result === false) {
             throw new TelegramException(curl_error($ch), curl_errno($ch));
         }
+
+        if (empty($result)) {
+            throw new TelegramException('Empty server response');
+        }
+
         curl_close($ch);
         return $result;
     }
@@ -153,15 +156,6 @@ public static function send($action, array $data = null)
 
         $result = self::executeCurl($action, $data);
 
-        if (empty($result)) {
-            $response['ok'] = 1;
-            $response['error_code'] = 1;
-            $response['description'] = 'Empty server response';
-            $result =json_encode($response);
-        }
-        //For the getUpdate method log
-        //self::setInputRaw($result);
-
         $bot_name = self::$telegram->getBotName();
         return new ServerResponse(json_decode($result, true), $bot_name);
     }
@@ -193,7 +187,6 @@ public static function sendMessage(array $data)
     //sendVoice
     public static function sendLocation(array $data)
     {
-
         if (empty($data)) {
             throw new TelegramException('Data is empty!');
         }
@@ -221,15 +214,8 @@ public static function getUpdates($data)
         if ($update = self::$telegram->getCustomUpdate()) {
             self::setInputRaw($update);
         } else {
-
             $result = self::executeCurl('getUpdates', $data);
 
-            if (empty($result)) {
-                $response['ok'] = 1;
-                $response['error_code'] = 1;
-                $response['description'] = 'Empty server response';
-                $result =json_encode($response);
-            }
             self::setInputRaw($result);
 
         }