fix: Adapt to php8.1

easy-swoole · Apr 29, 2024 · 65ee68c · 65ee68c
1 parent ac56c30
commit 65ee68c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 22 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/tests export-ignore
+/docker-composer.yml export-ignore
+/EXAMPLE.md export-ignore
diff --git a/composer.json b/composer.json
@@ -14,7 +14,8 @@
         }
     },
     "require": {
-        "easyswoole/spl": "^1.1",
+        "php": ">=8.1.0",
+        "easyswoole/spl": "^2.0",
         "easyswoole/http-client": "^1.2",
         "ext-bcmath": "*",
         "ext-openssl":"*",

diff --git a/src/AliPay/GateWay.php b/src/AliPay/GateWay.php
@@ -8,11 +8,8 @@
 
 namespace EasySwoole\Pay\AliPay;
 
-
-use EasySwoole\Spl\SplEnum;
-
-class GateWay extends SplEnum
+class GateWay
 {
     const NORMAL = 'https://openapi.alipay.com/gateway.do';
     const SANDBOX = 'https://openapi.alipaydev.com/gateway.do';
-}
+}
diff --git a/src/AliPay/RequestBean/Base.php b/src/AliPay/RequestBean/Base.php
@@ -85,9 +85,9 @@ public function setTimeoutExpress( $timeout_express ) : void
         $this->timeout_express = $timeout_express;
     }
 
-    public function toArray(array $columns = null, $filter = null): array
+    public function toArray(int|callable $filter = null): array
     {
-        return parent::toArray(null, self::FILTER_NOT_NULL);
+        return parent::toArray($filter);
     }
 
     /**
@@ -137,4 +137,4 @@ public function setReturnUrl($returnUrl): void
     {
         $this->return_url = $returnUrl;
     }
-}
+}
diff --git a/src/AliPay/ResponseBean/Base.php b/src/AliPay/ResponseBean/Base.php
@@ -34,8 +34,8 @@ class Base extends SplBean
     protected $app_cert_sn;
     protected $alipay_root_cert_sn;
 
-    public function toArray(array $columns = null, $filter = null): array
+    public function toArray(int|callable $filter = null): array
     {
-        return parent::toArray(null, self::FILTER_NOT_NULL);
+        return parent::toArray($filter);
     }
-}
+}
diff --git a/src/WeChat/RequestBean/Base.php b/src/WeChat/RequestBean/Base.php
@@ -49,9 +49,9 @@ public function initialize(): void
      * @param null $filter
      * @return array
      */
-    public function toArray(array $columns = null, $filter = null): array
+    public function toArray(int|callable $filter = null): array
     {
-        return parent::toArray(null, self::FILTER_NOT_NULL);
+        return parent::toArray($filter);
     }
 
     /**
@@ -214,4 +214,4 @@ public function setSubOpenid($sub_openid): void
     {
         $this->sub_openid = $sub_openid;
     }
-}
+}
diff --git a/src/WeChat/ResponseBean/Base.php b/src/WeChat/ResponseBean/Base.php
@@ -25,8 +25,8 @@ class Base extends SplBean
 	//    protected $refund_id;
 	//    protected $refund_channel;
 
-	public function toArray(array $columns = null, $filter = null): array
-	{
-		return parent::toArray($columns, self::FILTER_NOT_NULL);
-	}
-}
+    public function toArray(int|callable $filter = null): array
+    {
+        return parent::toArray($filter);
+    }
+}
diff --git a/tests/AliPayTest.php b/tests/AliPayTest.php
@@ -396,7 +396,7 @@ protected function buildPayHtml($endpoint, $payload)
     {
         $sHtml = "<form id='alipaysubmit' name='alipaysubmit' action='" . $endpoint . "' method='POST'>";
         foreach ($payload as $key => $val) {
-            $val = str_replace("'", '&apos;', $val);
+            $val = str_replace("'", '&apos;', (string)$val);
             $sHtml .= "<input type='hidden' name='" . $key . "' value='" . $val . "'/>";
         }
         $sHtml .= "<input type='submit' value='ok' style='display:none;'></form>";
@@ -426,4 +426,4 @@ protected function buildCertConfig()
         $aliConfig->setMerchantCertPath(__DIR__ . '/cert/appCertPublicKey_2016091800538780.crt');
         return $aliConfig;
     }
-}
+}