Merge pull request #25 from noplanman/use_stable_ip_library

Use more stable `longman/ip-tools` for IP matching.

Author: noplanman

CHANGELOG.md

@@ -6,6 +6,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ## [Unreleased]
 ### Added
 ### Changed
+- Use more stable `longman/ip-tools` for IP matching.
 ### Deprecated
 ### Removed
 ### Fixed

README.md

@@ -158,7 +158,7 @@ try {
 
 ### Set vital bot parameters
 
-The only vital parameters is the API key:
+The only vital parameter is the API key:
 
 ```php
 $bot = new BotManager([

composer.json

@@ -17,16 +17,10 @@
             "role": "Developer"
         }
     ],
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/noplanman/Utils-IP-Tools"
-        }
-    ],
     "require": {
         "php": "^7.0",
         "longman/telegram-bot": "^0.44",
-        "allty/utils-ip": "dev-master"
+        "longman/ip-tools": "^1.2"
     },
     "require-dev": {
         "jakub-onderka/php-parallel-lint": "^0.9.2",

composer.lock

@@ -10,7 +10,7 @@
 
 namespace TelegramBot\TelegramBotManager;
 
-use Allty\Utils\IpTools;
+use Longman\IPTools\Ip;
 use Longman\TelegramBot\Entities;
 use Longman\TelegramBot\Request;
 use Longman\TelegramBot\Telegram;
@@ -519,16 +519,9 @@ public function isValidRequest(): bool
             }
         }
 
-        $valid_ips = array_merge(
+        return Ip::match($ip, array_merge(
             [self::TELEGRAM_IP_RANGE],
             (array) $this->params->getBotParam('valid_ips', [])
-        );
-        foreach ($valid_ips as $valid_ip) {
-            if (IpTools::ipInRange($ip, $valid_ip)) {
-                return true;
-            }
-        }
-
-        return false;
+        ));
     }
 }