From 2c76c6bad24d62051f9498da9efee2c55c038fe1 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Sun, 20 Apr 2025 11:04:45 +0500 Subject: [PATCH] wip --- app/Helpers/helpers.php | 19 ++++++++++--------- app/Models/Order/Card/CardOrder.php | 5 ++++- phpstan.neon | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index d7b1202..52a8460 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -7,6 +7,7 @@ use GuzzleHttp\Psr7\Request as GuzzleRequest; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; use Stevebauman\Location\Facades\Location; +use Symfony\Component\HttpFoundation\IpUtils; /** * Application locales @@ -49,15 +50,15 @@ function isLocalIp(string $ip = ''): bool */ function isTurkmenIp(string $ip = ''): bool { - $patterns = ['95.85', '216']; - - foreach ($patterns as $pattern) { - if (strpos($ip, $pattern) === 0) { - return true; - } - } - - return false; + return IpUtils::checkIp($ip, [ + '95.85.192.0/19', + '95.85.224.0/20', + '95.85.240.0/21', + '95.85.248.0/22', + '95.85.252.0/22', + '217.174.224.0/19', + '91.207.136.0/22', + ]); } /** diff --git a/app/Models/Order/Card/CardOrder.php b/app/Models/Order/Card/CardOrder.php index ef620d6..05e0f4d 100644 --- a/app/Models/Order/Card/CardOrder.php +++ b/app/Models/Order/Card/CardOrder.php @@ -128,7 +128,10 @@ class CardOrder extends Model return $this->cardState->price ?? 32; } - public function really() + /** + * Return ID )) + */ + public function really(): int { return $this->id; } diff --git a/phpstan.neon b/phpstan.neon index c14d4b4..365fb7e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,7 +7,7 @@ parameters: - app/ # Level 9 is the highest level - level: 6 + level: 7 # ignoreErrors: # - '#PHPDoc tag @var#'