fix: add back some lint rules & simplify sub log model

composer.lock

@@ -123,16 +123,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.283.17",
+            "version": "3.284.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "b1a52f85e9eb3952d8f1909d5404849fc2f2af4e"
+                "reference": "1b7e926acc990509e3d13fa708cdede686b40d90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b1a52f85e9eb3952d8f1909d5404849fc2f2af4e",
-                "reference": "b1a52f85e9eb3952d8f1909d5404849fc2f2af4e",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1b7e926acc990509e3d13fa708cdede686b40d90",
+                "reference": "1b7e926acc990509e3d13fa708cdede686b40d90",
                 "shasum": ""
             },
             "require": {
@@ -212,9 +212,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.17"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.284.0"
             },
-            "time": "2023-11-01T18:11:41+00:00"
+            "time": "2023-11-03T18:13:48+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",

db/migrations/2023021600-drop_user_token.php

@@ -16,7 +16,7 @@ return new class() implements MigrationInterface {
     public function down(): int
     {
         DB::getPdo()->exec(
-            "CREATE TABLE IF NOT EXISTS `user_token` (
+            'CREATE TABLE IF NOT EXISTS `user_token` (
                 `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
                 `token` varchar(255) DEFAULT NULL,
                 `user_id` bigint(20) unsigned DEFAULT NULL,
@@ -24,7 +24,7 @@ return new class() implements MigrationInterface {
                 `expire_time` bigint(20) DEFAULT NULL,
                 PRIMARY KEY (`id`),
                 KEY `user_id` (`user_id`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;"
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;'
         );
 
         return 2023020100;

db/migrations/2023081800-add_user_contact_method.php

@@ -17,9 +17,9 @@ return new class() implements MigrationInterface {
 
     public function down(): int
     {
-        DB::getPdo()->exec("
+        DB::getPdo()->exec('
             ALTER TABLE user DROP COLUMN IF EXISTS `contact_method`;
-        ");
+        ');
 
         return 2023080900;
     }

db/migrations/2023082000-remove_user_expire_in.php

@@ -8,10 +8,10 @@ use App\Services\DB;
 return new class() implements MigrationInterface {
     public function up(): int
     {
-        DB::getPdo()->exec("
+        DB::getPdo()->exec('
             ALTER TABLE user DROP COLUMN IF EXISTS `expire_in`;
             ALTER TABLE user DROP COLUMN IF EXISTS `telegram_id`;
-        ");
+        ');
 
         return 2023082000;
     }

db/migrations/2023102200-add_node_dynamic_rate.php

@@ -18,10 +18,10 @@ return new class() implements MigrationInterface {
 
     public function down(): int
     {
-        DB::getPdo()->exec("
+        DB::getPdo()->exec('
             ALTER TABLE node DROP COLUMN IF EXISTS `is_dynamic_rate`;
             ALTER TABLE node DROP COLUMN IF EXISTS `dynamic_rate_config`;
-        ");
+        ');
 
         return 2023082000;
     }

phpinsights.php

@@ -12,10 +12,8 @@ return [
         NunoMaduro\PhpInsights\Domain\Insights\ForbiddenGlobals::class,
         PHP_CodeSniffer\Standards\Generic\Sniffs\Commenting\TodoSniff::class,
         PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff::class,
-        PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\EvalSniff::class,
         PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\GlobalKeywordSniff::class,
         PhpCsFixer\Fixer\Import\OrderedImportsFixer::class,
-        PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer::class,
         SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff::class,
         SlevomatCodingStandard\Sniffs\ControlStructures\DisallowShortTernaryOperatorSniff::class,
         SlevomatCodingStandard\Sniffs\Classes\ForbiddenPublicPropertySniff::class,

src/Command/Update.php

@@ -100,7 +100,7 @@ END;
             $client = new Client([
                 'license_key' => $_ENV['maxmind_license_key'],
                 'dir' => BASE_PATH . '/storage/',
-                'editions' => ['GeoLite2-City', "GeoLite2-Country"],
+                'editions' => ['GeoLite2-City', 'GeoLite2-Country'],
             ]);
 
             try {

src/Controllers/Admin/CouponController.php

@@ -17,9 +17,6 @@ use function json_encode;
 use function property_exists;
 use function time;
 
-/*
- *  Coupon Controller
- */
 final class CouponController extends BaseController
 {
     private static array $details = [

src/Controllers/AdminController.php

@@ -10,9 +10,6 @@ use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Response;
 use Slim\Http\ServerRequest;
 
-/*
- *  Admin Controller
- */
 final class AdminController extends BaseController
 {
     /**

src/Controllers/AuthController.php

@@ -36,9 +36,6 @@ use function strtolower;
 use function time;
 use function trim;
 
-/**
- *  AuthController
- */
 final class AuthController extends BaseController
 {
     /**

src/Controllers/BaseController.php

@@ -9,9 +9,6 @@ use App\Services\Auth;
 use App\Services\View;
 use Smarty;
 
-/**
- * BaseController
- */
 abstract class BaseController
 {
     /**

src/Controllers/CallbackController.php

@@ -14,9 +14,6 @@ use Slim\Http\ServerRequest;
 use SmartyException;
 use Telegram\Bot\Exceptions\TelegramSDKException;
 
-/**
- *  CallbackController
- */
 final class CallbackController extends BaseController
 {
     /**

src/Controllers/HomeController.php

@@ -10,9 +10,6 @@ use Slim\Http\Response;
 use Slim\Http\ServerRequest;
 use SmartyException;
 
-/**
- *  HomeController
- */
 final class HomeController extends BaseController
 {
     /**

src/Controllers/OAuthController.php

@@ -27,9 +27,6 @@ use function json_decode;
 use function strcmp;
 use function time;
 
-/**
- *  OAuthController
- */
 final class OAuthController extends BaseController
 {
     private static string $err_msg = 'OAuth 请求失败';

src/Controllers/PasswordController.php

@@ -21,12 +21,6 @@ use Slim\Http\ServerRequest;
 use voku\helper\AntiXSS;
 use function strlen;
 
-/*
- * Class Password
- *
- * @package App\Controllers
- * 密码重置
- */
 final class PasswordController extends BaseController
 {
     /**

src/Controllers/SubController.php

@@ -78,7 +78,7 @@ final class SubController extends BaseController
         . '; expire=' . strtotime($user->class_expire);
 
         if (Config::obtain('subscribe_log')) {
-            (new SubscribeLog())->add($user, $subtype, $request->getHeaderLine('User-Agent'));
+            (new SubscribeLog())->add($user, $subtype, $antiXss->xss_clean($request->getHeaderLine('User-Agent')));
         }
 
         return $response->withHeader('Subscription-Userinfo', $sub_details)
@@ -148,7 +148,7 @@ final class SubController extends BaseController
 
         // 记录订阅日志
         if (Config::obtain('subscribe_log')) {
-            (new SubscribeLog())->add($user, $sub_type, $request->getHeaderLine('User-Agent'));
+            (new SubscribeLog())->add($user, $sub_type, $antiXss->xss_clean($request->getHeaderLine('User-Agent')));
         }
 
         $sub_details = ' upload=' . $user->u

src/Controllers/User/InfoController.php

@@ -25,9 +25,6 @@ use function strlen;
 use function strtolower;
 use const BASE_PATH;
 
-/**
- *  InfoController
- */
 final class InfoController extends BaseController
 {
     /**

src/Controllers/User/InvoiceController.php

@@ -86,7 +86,7 @@ final class InvoiceController extends BaseController
         $antiXss = new AntiXSS();
         $invoice_id = $antiXss->xss_clean($request->getParam('invoice_id'));
 
-        $invoice = Invoice::where("user_id", $this->user->id)->where("id", $invoice_id)->first();
+        $invoice = Invoice::where('user_id', $this->user->id)->where('id', $invoice_id)->first();
 
         if ($invoice === null) {
             return $response->withJson([

src/Controllers/User/MoneyController.php

@@ -15,9 +15,6 @@ use Slim\Http\ServerRequest;
 use voku\helper\AntiXSS;
 use function time;
 
-/**
- *  User MoneyController
- */
 final class MoneyController extends BaseController
 {
     /**

src/Controllers/User/ServerController.php

@@ -12,9 +12,6 @@ use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Response;
 use Slim\Http\ServerRequest;
 
-/**
- *  User ServerController
- */
 final class ServerController extends BaseController
 {
     /**

src/Controllers/User/TicketController.php

@@ -25,9 +25,6 @@ use function json_decode;
 use function json_encode;
 use function time;
 
-/**
- *  TicketController
- */
 final class TicketController extends BaseController
 {
     private static string $err_msg = '请求失败';

src/Controllers/UserController.php

@@ -23,9 +23,6 @@ use function str_replace;
 use function strtotime;
 use function time;
 
-/**
- *  HomeController
- */
 final class UserController extends BaseController
 {
     /**

src/Models/SubscribeLog.php

@@ -12,7 +12,6 @@ use Illuminate\Database\Query\Builder;
 use MaxMind\Db\Reader\InvalidDatabaseException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Telegram\Bot\Exceptions\TelegramSDKException;
-use voku\helper\AntiXSS;
 use function time;
 
 /**
@@ -52,22 +51,19 @@ final class SubscribeLog extends Model
 
     /**
      * 记录订阅日志
-     *
-     * @throws TelegramSDKException
-     * @throws GuzzleException
-     * @throws ClientExceptionInterface
      */
     public function add(User $user, string $type, string $ua): void
     {
-        $antiXss = new AntiXSS();
         $this->user_id = $user->id;
-        $this->type = $antiXss->xss_clean($type);
+        $this->type = $type;
         $this->request_ip = $_SERVER['REMOTE_ADDR'];
-        $this->request_user_agent = $antiXss->xss_clean($ua);
+        $this->request_user_agent = $ua;
         $this->request_time = time();
 
         if (Config::obtain('notify_new_subscribe') &&
-            SubscribeLog::where('user_id', $this->user_id)->where('request_ip', 'like', $this->request_ip)->count() === 0
+            SubscribeLog::where('user_id', $this->user_id)
+                ->where('request_ip', 'like', '%' . $this->request_ip . '%')
+                ->count() === 0
         ) {
             try {
                 Notification::notifyUser(

src/Services/Captcha.php

@@ -36,7 +36,7 @@ final class Captcha
         switch (Config::obtain('captcha_provider')) {
             case 'turnstile':
                 if (isset($param['turnstile'])) {
-                    $turnstile_url = "https://challenges.cloudflare.com/turnstile/v0/siteverify";
+                    $turnstile_url = 'https://challenges.cloudflare.com/turnstile/v0/siteverify';
 
                     $turnstile_headers = [
                         'Content-Type' => 'application/x-www-form-urlencoded',

src/Services/Gateway/PayPal.php

@@ -85,14 +85,14 @@ final class PayPal extends Base
         $exchange_amount = Exchange::exchange($price, 'CNY', Config::obtain('paypal_currency'));
 
         $order_data = [
-            "intent" => "CAPTURE",
-            "purchase_units" => [
+            'intent' => 'CAPTURE',
+            'purchase_units' => [
                 [
-                    "amount" => [
-                        "currency_code" => Config::obtain('paypal_currency'),
-                        "value" => $exchange_amount,
+                    'amount' => [
+                        'currency_code' => Config::obtain('paypal_currency'),
+                        'value' => $exchange_amount,
                     ],
-                    "reference_id" => $trade_no,
+                    'reference_id' => $trade_no,
                 ],
             ],
         ];

src/Services/IM/Discord.php

@@ -27,7 +27,7 @@ final class Discord extends Base
      */
     public function send($to, $msg): void
     {
-        $dm_url = "https://discord.com/api/v10/users/@me/channels";
+        $dm_url = 'https://discord.com/api/v10/users/@me/channels';
 
         $headers = [
             'Authorization' => "Bot {$this->token}",

src/Services/IM/Slack.php

@@ -26,7 +26,7 @@ final class Slack extends Base
      */
     public function send($to, $msg): void
     {
-        $url = "https://slack.com/api/chat.postMessage";
+        $url = 'https://slack.com/api/chat.postMessage';
 
         $headers = [
             'Authorization' => 'Bearer '.$this->token,

src/Services/LLM.php

@@ -71,40 +71,40 @@ final class LLM
         ];
 
         $data = [
-            "prompt" => [
-                "text" => $q,
+            'prompt' => [
+                'text' => $q,
             ],
-            "temperature" => 1,
-            "candidate_count" => 1,
-            "top_k" => 40,
-            "top_p" => 0.95,
-            "max_output_tokens" => 1024,
-            "stop_sequences" => [
+            'temperature' => 1,
+            'candidate_count' => 1,
+            'top_k' => 40,
+            'top_p' => 0.95,
+            'max_output_tokens' => 1024,
+            'stop_sequences' => [
             ],
-            "safety_settings" => [
+            'safety_settings' => [
                 [
-                    "category" => "HARM_CATEGORY_DEROGATORY",
-                    "threshold" => 3,
+                    'category' => 'HARM_CATEGORY_DEROGATORY',
+                    'threshold' => 3,
                 ],
                 [
-                    "category" => "HARM_CATEGORY_TOXICITY",
-                    "threshold" => 3,
+                    'category' => 'HARM_CATEGORY_TOXICITY',
+                    'threshold' => 3,
                 ],
                 [
-                    "category" => "HARM_CATEGORY_VIOLENCE",
-                    "threshold" => 3,
+                    'category' => 'HARM_CATEGORY_VIOLENCE',
+                    'threshold' => 3,
                 ],
                 [
-                    "category" => "HARM_CATEGORY_SEXUAL",
-                    "threshold" => 3,
+                    'category' => 'HARM_CATEGORY_SEXUAL',
+                    'threshold' => 3,
                 ],
                 [
-                    "category" => "HARM_CATEGORY_MEDICAL",
-                    "threshold" => 3,
+                    'category' => 'HARM_CATEGORY_MEDICAL',
+                    'threshold' => 3,
                 ],
                 [
-                    "category" => "HARM_CATEGORY_DANGEROUS",
-                    "threshold" => 3,
+                    'category' => 'HARM_CATEGORY_DANGEROUS',
+                    'threshold' => 3,
                 ],
             ],
         ];