浏览代码

feat: bump for php8

Anankke 3 年之前
父节点
当前提交
6925ebfe1d

+ 3 - 3
flake.nix

@@ -16,11 +16,11 @@
     in
     in
     {
     {
       devShell = (pkgs.mkShell {
       devShell = (pkgs.mkShell {
-        buildInputs = with pkgs; let
-          phpWithExtensions = php74.withExtensions ({ enabled, all }:
+        buildInputs = with pkgs; with php80Packages; let
+          phpWithExtensions = php.withExtensions ({ enabled, all }:
             enabled ++ [ all.imagick all.xdebug ]);
             enabled ++ [ all.imagick all.xdebug ]);
         in [
         in [
-          phpWithExtensions php74Packages.composer
+          phpWithExtensions composer
         ];
         ];
       });
       });
     }
     }

+ 0 - 2
src/Controllers/Admin/SettingController.php

@@ -6,8 +6,6 @@ namespace App\Controllers\Admin;
 
 
 use App\Controllers\BaseController;
 use App\Controllers\BaseController;
 use App\Models\Setting;
 use App\Models\Setting;
-use Slim\Http\Request;
-use Slim\Http\Response;
 use App\Services\Mail;
 use App\Services\Mail;
 
 
 final class SettingController extends BaseController
 final class SettingController extends BaseController

+ 1 - 1
src/Controllers/AdminController.php

@@ -6,13 +6,13 @@ namespace App\Controllers;
 
 
 use App\Models\Coupon;
 use App\Models\Coupon;
 use App\Models\User;
 use App\Models\User;
+use App\Services\Analytics;
 use App\Utils\DatatablesHelper;
 use App\Utils\DatatablesHelper;
 use App\Utils\ResponseHelper;
 use App\Utils\ResponseHelper;
 use App\Utils\Tools;
 use App\Utils\Tools;
 use Ozdemir\Datatables\Datatables;
 use Ozdemir\Datatables\Datatables;
 use Slim\Http\Request;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Slim\Http\Response;
-use App\Services\Analytics;
 
 
 /*
 /*
  *  Admin Controller
  *  Admin Controller

+ 3 - 0
src/Controllers/User/DetectController.php

@@ -5,6 +5,9 @@ declare(strict_types=1);
 namespace App\Controllers\User;
 namespace App\Controllers\User;
 
 
 use App\Controllers\BaseController;
 use App\Controllers\BaseController;
+use App\Models\DetectLog;
+use App\Models\DetectRule;
+use App\Utils\Tools;
 use Slim\Http\Request;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Slim\Http\Response;
 
 

+ 1 - 1
src/Services/Analytics.php

@@ -67,7 +67,7 @@ final class Analytics
     public function getTotalTraffic()
     public function getTotalTraffic()
     {
     {
         $total = User::sum('transfer_enable');
         $total = User::sum('transfer_enable');
-        return Tools::flowAutoShow($total);
+        return Tools::flowAutoShow(intval($total));
     }
     }
 
 
     public function getRawTotalTraffic()
     public function getRawTotalTraffic()

+ 1 - 3
src/Services/Gateway/AbstractPayment.php

@@ -17,9 +17,9 @@ use App\Models\Paylist;
 use App\Models\Setting;
 use App\Models\Setting;
 use App\Models\User;
 use App\Models\User;
 use App\Utils\Telegram;
 use App\Utils\Telegram;
+use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Slim\Http\Response;
-use Psr\Http\Message\ResponseInterface;
 
 
 abstract class AbstractPayment
 abstract class AbstractPayment
 {
 {
@@ -144,6 +144,4 @@ abstract class AbstractPayment
         }
         }
         return false;
         return false;
     }
     }
-
-
 }
 }

+ 1 - 1
src/Services/Gateway/AopF2F.php

@@ -17,9 +17,9 @@ use App\Services\Auth;
 use App\Services\View;
 use App\Services\View;
 use Exception;
 use Exception;
 use Omnipay\Omnipay;
 use Omnipay\Omnipay;
+use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Slim\Http\Response;
-use Psr\Http\Message\ResponseInterface;
 
 
 final class AopF2F extends AbstractPayment
 final class AopF2F extends AbstractPayment
 {
 {

+ 1 - 2
src/Services/Gateway/CoinPay.php

@@ -11,10 +11,9 @@ use App\Services\Gateway\CoinPay\CoinPayApi;
 use App\Services\Gateway\CoinPay\CoinPayConfig;
 use App\Services\Gateway\CoinPay\CoinPayConfig;
 use App\Services\Gateway\CoinPay\CoinPayException;
 use App\Services\Gateway\CoinPay\CoinPayException;
 use App\Services\Gateway\CoinPay\CoinPayUnifiedOrder;
 use App\Services\Gateway\CoinPay\CoinPayUnifiedOrder;
+use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Slim\Http\Response;
-use Psr\Http\Message\ResponseInterface;
-
 
 
 final class CoinPay extends AbstractPayment
 final class CoinPay extends AbstractPayment
 {
 {

+ 0 - 1
src/Services/Gateway/PaymentWall.php

@@ -120,5 +120,4 @@ final class PaymentWall extends AbstractPayment
         );
         );
         return $widget->getHtmlCode(['height' => $configs['pmw_height'], 'width' => '100%']);
         return $widget->getHtmlCode(['height' => $configs['pmw_height'], 'width' => '100%']);
     }
     }
-
 }
 }

+ 2 - 2
src/Utils/ResponseHelper.php

@@ -18,7 +18,7 @@ final class ResponseHelper
         ]);
         ]);
     }
     }
 
 
-    public static function error(Response $response, string $msg): ResponseInterface
+    public static function error(Response $response, mixed $msg): ResponseInterface
     {
     {
         return $response->withJson([
         return $response->withJson([
             'ret' => 0,
             'ret' => 0,
@@ -26,7 +26,7 @@ final class ResponseHelper
         ]);
         ]);
     }
     }
 
 
-    public static function buildTableConfig(array $data, string $uri): array
+    public static function buildTableConfig(array $data, mixed $uri): array
     {
     {
         return [
         return [
             'total_column' => $data,
             'total_column' => $data,