修复错误等级包括E_STRICT时的错误信息 Deprecated: Non-static method xxx::toString() …

…should not be called statically
Yurunsoft · May 13, 2019 · 8ceef75 · 8ceef75
1 parent 2e01aa2
commit 8ceef75
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 18 deletions.
diff --git a/src/AlipayApp/App/Params/Pay/ExtendParams.php b/src/AlipayApp/App/Params/Pay/ExtendParams.php
@@ -8,7 +8,9 @@
  */
 class ExtendParams
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 系统商编号，该参数作为系统商返佣数据提取的依据，请填写系统商签约协议的PID
@@ -49,6 +51,6 @@ public function toString()
 		{
 			return null;
 		}
-		return JSONParams::toString();
+		return $this->traitToString();
 	}
 }
diff --git a/src/AlipayApp/FTF/Params/ExtendParams.php b/src/AlipayApp/FTF/Params/ExtendParams.php
@@ -8,7 +8,9 @@
  */
 class ExtendParams
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 系统商编号，该参数作为系统商返佣数据提取的依据，请填写系统商签约协议的PID
@@ -22,6 +24,6 @@ public function toString()
 		{
 			return null;
 		}
-		return JSONParams::toString();
+		return $this->traitToString();
 	}
 }
diff --git a/src/AlipayApp/Page/Params/GoodsDetail.php b/src/AlipayApp/Page/Params/GoodsDetail.php
@@ -8,7 +8,9 @@
  */
 class GoodsDetail
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 在支付时，可点击商品名称跳转到该地址
@@ -22,6 +24,6 @@ public function toString()
 		{
 			return null;
 		}
-		return JSONParams::toString();
+		return $this->traitToString();
 	}
 }
diff --git a/src/AlipayApp/Page/Params/Pay/ExtendParams.php b/src/AlipayApp/Page/Params/Pay/ExtendParams.php
@@ -8,7 +8,9 @@
  */
 class ExtendParams
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 系统商编号，该参数作为系统商返佣数据提取的依据，请填写系统商签约协议的PID
@@ -34,6 +36,6 @@ public function toString()
 		{
 			return null;
 		}
-		return JSONParams::toString();
+		return $this->traitToString();
 	}
 }
diff --git a/src/AlipayApp/Wap/Params/Pay/ExtendParams.php b/src/AlipayApp/Wap/Params/Pay/ExtendParams.php
@@ -8,7 +8,9 @@
  */
 class ExtendParams
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 系统商编号，该参数作为系统商返佣数据提取的依据，请填写系统商签约协议的PID
@@ -49,6 +51,6 @@ public function toString()
 		{
 			return null;
 		}
-		return JSONParams::toString();
+		return $this->traitToString();
 	}
 }
diff --git a/src/Weixin/JSAPI/Params/SceneInfo.php b/src/Weixin/JSAPI/Params/SceneInfo.php
@@ -9,7 +9,9 @@
  */
 class SceneInfo
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 门店唯一标识
@@ -43,7 +45,7 @@ public function toString()
 		}
 		else
 		{
-			return JSONParams::toString();
+			return $this->traitToString();
 		}
 	}
 }
diff --git a/src/Weixin/Micropay/Params/SceneInfo.php b/src/Weixin/Micropay/Params/SceneInfo.php
@@ -9,7 +9,9 @@
  */
 class SceneInfo
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 门店唯一标识
@@ -43,7 +45,7 @@ public function toString()
 		}
 		else
 		{
-			return JSONParams::toString();
+			return $this->traitToString();
 		}
 	}
 }
diff --git a/src/Weixin/Native/Params/SceneInfo.php b/src/Weixin/Native/Params/SceneInfo.php
@@ -9,7 +9,9 @@
  */
 class SceneInfo
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 门店唯一标识
@@ -43,7 +45,7 @@ public function toString()
 		}
 		else
 		{
-			return JSONParams::toString();
+			return $this->traitToString();
 		}
 	}
 }
diff --git a/src/Weixin/Params/Detail.php b/src/Weixin/Params/Detail.php
@@ -8,7 +8,9 @@
  */
 class Detail
 {
-	use JSONParams;
+	use JSONParams{
+		toString as private traitToString;
+	}
 
 	/**
 	 * 订单原价
@@ -39,7 +41,7 @@ public function toString()
 		}
 		else
 		{
-			return JSONParams::toString();
+			return $this->traitToString();
 		}
 	}
 }