Merge pull request #11 from noplanman/fix_for_cli

Fix script to work from CLI…

Author: noplanman

src/BotManager.php

@@ -66,6 +66,16 @@ public function __construct(array $params)
         $this->action = new Action($this->params->getScriptParam('a'));
     }
 
+    /**
+     * Check if we're busy running the PHPUnit tests.
+     *
+     * @return bool
+     */
+    public static function inTest(): bool
+    {
+        return defined('PHPUNIT_TEST') && PHPUNIT_TEST === true;
+    }
+
     /**
      * Return the Telegram object.
      *
@@ -221,7 +231,7 @@ private function handleOutput($output): self
     {
         $this->output .= $output;
 
-        if (!(defined('PHPUNIT_TEST') && PHPUNIT_TEST === true)) {
+        if (!self::inTest()) {
             echo $output;
         }
 
@@ -433,13 +443,13 @@ public function getOutput(): string
      */
     public function isValidRequest(): bool
     {
-        if (false === $this->params->getBotParam('validate_request')) {
+        if ((!self::inTest() && 'cli' === PHP_SAPI) || false === $this->params->getBotParam('validate_request')) {
             return true;
         }
 
-        $ip = @$_SERVER['REMOTE_ADDR'];
+        $ip = $_SERVER['REMOTE_ADDR'] ?? '0.0.0.0';
         foreach (['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR'] as $key) {
-            $addr = @$_SERVER[$key];
+            $addr = $_SERVER[$key] ?? null;
             if (filter_var($addr, FILTER_VALIDATE_IP)) {
                 $ip = $addr;
                 break;

tests/TelegramBotManager/Tests/BotManagerTest.php

@@ -56,6 +56,11 @@ public function testSetParameters()
         self::assertNull($params->getBotParam('paramX'));
     }
 
+    public function testInTest()
+    {
+        self::assertTrue(BotManager::inTest());
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Some vital info is missing: api_key
@@ -383,7 +388,7 @@ public function testIsValidRequestFailValidation()
 
         unset($_SERVER['HTTP_X_FORWARDED_FOR'], $_SERVER['HTTP_CLIENT_IP'], $_SERVER['REMOTE_ADDR']);
 
-        foreach(['HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'REMOTE_ADDR'] as $key) {
+        foreach (['HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'REMOTE_ADDR'] as $key) {
             $_SERVER[$key] = '1.1.1.1';
             self::assertFalse($botManager->isValidRequest());
             unset($_SERVER[$key]);