php5和php7的升级兼容问题

fecshop · Jul 26, 2017 · f7839d1 · f7839d1
1 parent 455363b
commit f7839d1
Show file tree

Hide file tree

Showing 36 changed files with 301 additions and 272 deletions.
diff --git a/app/appfront/modules/Catalog/block/product/Index.php b/app/appfront/modules/Catalog/block/product/Index.php
@@ -50,14 +50,15 @@ public function __construct()
 
     public function getLastData()
     {
+        $reviewHelper = $this->_reviewHelper;
         $productImgSize = Yii::$app->controller->module->params['productImgSize'];
         $productImgMagnifier = Yii::$app->controller->module->params['productImgMagnifier'];
         if(!$this->initProduct()){
             Yii::$service->url->redirect404();
             return;
         }
-        $this->_reviewHelper::initReviewConfig();
-        $ReviewAndStarCount = $this->_reviewHelper::getReviewAndStarCount($this->_product);
+        $reviewHelper::initReviewConfig();
+        $ReviewAndStarCount = $reviewHelper::getReviewAndStarCount($this->_product);
         list($review_count, $reviw_rate_star_average) = $ReviewAndStarCount;
         $this->filterProductImg($this->_product['image']);
         $groupAttr = Yii::$service->product->getGroupAttr($this->_product['attr_group']);

diff --git a/app/appfront/modules/Catalog/block/product/Review.php b/app/appfront/modules/Catalog/block/product/Review.php
@@ -35,9 +35,9 @@ public function __construct()
          * 通过Yii::mapGet() 得到重写后的class类名以及对象。Yii::mapGet是在文件@fecshop\yii\Yii.php中
          */
         list($this->_reviewHelperName,$this->_reviewHelper) = Yii::mapGet($this->_reviewHelperName);  
-
+        $reviewHelper = $this->_reviewHelper;
         // 初始化当前appfront的设置，覆盖service的初始设置。
-        $this->_reviewHelper::initReviewConfig();
+        $reviewHelper::initReviewConfig();
     }
     /**
      * 得到当前spu下面的所有评论信息。

diff --git a/app/appfront/modules/Catalog/block/reviewproduct/Add.php b/app/appfront/modules/Catalog/block/reviewproduct/Add.php
@@ -31,8 +31,8 @@ public function __construct()
          * 通过Yii::mapGet() 得到重写后的class类名以及对象。Yii::mapGet是在文件@fecshop\yii\Yii.php中
          */
         list($this->_reviewHelperName,$this->_reviewHelper) = Yii::mapGet($this->_reviewHelperName);  
-
-        $this->_reviewHelper::initReviewConfig();
+        $reviewHelper = $this->_reviewHelper;
+        $reviewHelper::initReviewConfig();
     }
     /**
      * @return boolean , review页面是否开启验证码验证。

diff --git a/app/appfront/modules/Catalog/block/reviewproduct/Lists.php b/app/appfront/modules/Catalog/block/reviewproduct/Lists.php
@@ -37,8 +37,8 @@ public function __construct()
          * 通过Yii::mapGet() 得到重写后的class类名以及对象。Yii::mapGet是在文件@fecshop\yii\Yii.php中
          */
         list($this->_reviewHelperName,$this->_reviewHelper) = Yii::mapGet($this->_reviewHelperName);  
-
-        $this->_reviewHelper::initReviewConfig();
+        $reviewHelper = $this->_reviewHelper;
+        $reviewHelper::initReviewConfig();
     }
     /**
      * @property $countTotal | Int
@@ -97,7 +97,8 @@ public function getLastData()
 
             $pageToolBar = $this->getProductPage($count);
             $coll = $data['coll'];
-            $ReviewAndStarCount = $this->_reviewHelper::getReviewAndStarCount($product);
+            $reviewHelper = $this->_reviewHelper;
+            $ReviewAndStarCount = $reviewHelper::getReviewAndStarCount($product);
             list($review_count, $reviw_rate_star_average) = $ReviewAndStarCount;
 
             return [

diff --git a/app/apphtml5/modules/Catalog/block/product/Index.php b/app/apphtml5/modules/Catalog/block/product/Index.php
@@ -54,8 +54,9 @@ public function getLastData()
             Yii::$service->url->redirect404();
             return;
         }
-        $this->_reviewHelper::initReviewConfig();
-        $ReviewAndStarCount = $this->_reviewHelper::getReviewAndStarCount($this->_product);
+        $reviewHelper = $this->_reviewHelper;
+        $reviewHelper::initReviewConfig();
+        $ReviewAndStarCount = $reviewHelper::getReviewAndStarCount($this->_product);
         list($review_count, $reviw_rate_star_average) = $ReviewAndStarCount;
         $this->filterProductImg($this->_product['image']);
         $groupAttr = Yii::$service->product->getGroupAttr($this->_product['attr_group']);

diff --git a/app/apphtml5/modules/Catalog/block/product/Review.php b/app/apphtml5/modules/Catalog/block/product/Review.php
@@ -35,7 +35,8 @@ public function __construct()
          */
         list($this->_reviewHelperName,$this->_reviewHelper) = Yii::mapGet($this->_reviewHelperName);  
         // 初始化当前apphtml5的设置，覆盖service的初始设置。
-        $this->_reviewHelper::initReviewConfig();
+        $reviewHelper = $this->_reviewHelper;
+        $reviewHelper::initReviewConfig();
     }
 
     /**

diff --git a/app/apphtml5/modules/Catalog/block/reviewproduct/Add.php b/app/apphtml5/modules/Catalog/block/reviewproduct/Add.php
@@ -31,7 +31,8 @@ public function __construct()
          * 通过Yii::mapGet() 得到重写后的class类名以及对象。Yii::mapGet是在文件@fecshop\yii\Yii.php中
          */
         list($this->_reviewHelperName,$this->_reviewHelper) = Yii::mapGet($this->_reviewHelperName);  
-        $this->_reviewHelper::initReviewConfig();
+        $reviewHelper = $this->_reviewHelper;
+        $reviewHelper::initReviewConfig();
     }
 
     /**

diff --git a/app/apphtml5/modules/Catalog/block/reviewproduct/Lists.php b/app/apphtml5/modules/Catalog/block/reviewproduct/Lists.php
@@ -38,7 +38,8 @@ public function __construct()
          */
         list($this->_reviewHelperName,$this->_reviewHelper) = Yii::mapGet($this->_reviewHelperName);  
         // 初始化服务
-        $this->_reviewHelper::initReviewConfig();
+        $reviewHelper = $this->_reviewHelper;
+        $reviewHelper::initReviewConfig();
     }
     /**
      * @property $countTotal | Int
@@ -97,7 +98,8 @@ public function getLastData()
 
             $pageToolBar = $this->getProductPage($count);
             $coll = $data['coll'];
-            $ReviewAndStarCount = $this->_reviewHelper::getReviewAndStarCount($product);
+            $reviewHelper = $this->_reviewHelper;
+            $ReviewAndStarCount = $reviewHelper::getReviewAndStarCount($product);
             list($review_count, $reviw_rate_star_average) = $ReviewAndStarCount;
 
             return [

diff --git a/services/Customer.php b/services/Customer.php
@@ -132,7 +132,7 @@ protected function actionRegister($param)
      */
     protected function actionIsRegistered($email)
     {
-        $customer = $this->_customerModel::findOne(['email' => $email]);
+        $customer = $this->_customerModel->findOne(['email' => $email]);
         if ($customer['email']) {
             return true;
         } else {
@@ -190,10 +190,10 @@ protected function actionChangePassword($password, $identity)
     {
         if (is_int($identity)) {
             $customer_id = $identity;
-            $customerModel = $this->_customerModel::findIdentity($customer_id);
+            $customerModel = $this->_customerModel->findIdentity($customer_id);
         } elseif (is_string($identity)) {
             $email = $identity;
-            $customerModel = $this->_customerModel::findByEmail($email);
+            $customerModel = $this->_customerModel->findByEmail($email);
         } elseif (is_object($identity)) {
             $customerModel = $identity;
         }
@@ -222,7 +222,7 @@ protected function actionGetModelName()
     protected function actionGetByPrimaryKey($val)
     {
         if ($val) {
-            $one = $this->_customerModel::findOne($val);
+            $one = $this->_customerModel->findOne($val);
             $primaryKey = $this->getPrimaryKey();
             if ($one[$primaryKey]) {
                 return $one;
@@ -242,10 +242,10 @@ protected function actionChangePasswordAndClearToken($password, $identity)
     {
         if (is_int($identity)) {
             $customer_id = $identity;
-            $customerModel = $this->_customerModel::findIdentity($customer_id);
+            $customerModel = $this->_customerModel->findIdentity($customer_id);
         } elseif (is_string($identity)) {
             $email = $identity;
-            $customerModel = $this->_customerModel::findByEmail($email);
+            $customerModel = $this->_customerModel->findByEmail($email);
         } elseif (is_object($identity)) {
             $customerModel = $identity;
         } else {
@@ -286,7 +286,7 @@ protected function actionGetCurrentAccount()
      */
     protected function actionGetUserIdentityByEmail($email)
     {
-        $one = $this->_customerModel::findByEmail($email);
+        $one = $this->_customerModel->findByEmail($email);
         if ($one['email']) {
             return $one;
         } else {
@@ -324,7 +324,7 @@ protected function actionGeneratePasswordResetToken($identify)
      */
     protected function actionFindByPasswordResetToken($token)
     {
-        return $this->_customerModel::findByPasswordResetToken($token);
+        return $this->_customerModel->findByPasswordResetToken($token);
     }
 
     /**
@@ -379,15 +379,17 @@ protected function actionLoginSuccessRedirect($urlKey = '')
      */
     protected function actionGetStatusDeleted()
     {
-        return $this->_customerModel::STATUS_DELETED;
+        $model = $this->_customerModel;
+        return $model::STATUS_DELETED;
     }
 
     /**
      * 得到status为激活状态的值
      */
     protected function actionGetStatusActive()
     {
-        return $this->_customerModel::STATUS_ACTIVE;
+        $model = $this->_customerModel;
+        return $model::STATUS_ACTIVE;
     }
     /**
      * 得到customer 表的主键（mysql表）
@@ -415,7 +417,7 @@ protected function actionGetPrimaryKey()
      */
     protected function actionColl($filter = '')
     {
-        $query = $this->_customerModel::find();
+        $query = $this->_customerModel->find();
         $query = Yii::$service->helper->ar->getCollByFilter($query, $filter);
         //var_dump($query->all());exit;
         return [
@@ -433,7 +435,7 @@ protected function actionGetEmailByIds($user_ids)
     {
         $arr = [];
         if (is_array($user_ids) && !empty($user_ids)) {
-            $data = $this->_customerModel::find()->where([
+            $data = $this->_customerModel->find()->where([
                 'in', 'id', $user_ids,
             ])->all();
             if (is_array($data) && !empty($data)) {

diff --git a/services/Order.php b/services/Order.php
@@ -138,7 +138,7 @@ protected function actionGetPrimaryKey()
      */
     protected function actionGetByPrimaryKey($primaryKey)
     {
-        $one = $this->_orderModel::findOne($primaryKey);
+        $one = $this->_orderModel->findOne($primaryKey);
         $primaryKey = $this->getPrimaryKey();
         if ($one[$primaryKey]) {
             return $one;
@@ -154,7 +154,7 @@ protected function actionGetByPrimaryKey($primaryKey)
      */
     protected function actionGetByIncrementId($increment_id)
     {
-        $one = $this->_orderModel::findOne(['increment_id' => $increment_id]);
+        $one = $this->_orderModel->findOne(['increment_id' => $increment_id]);
         $primaryKey = $this->getPrimaryKey();
         if ($one[$primaryKey]) {
             return $one;
@@ -219,7 +219,7 @@ protected function actionGetOrderInfoById($order_id)
         if (!$order_id) {
             return;
         }
-        $one = $this->_orderModel::findOne($order_id);
+        $one = $this->_orderModel->findOne($order_id);
         $primaryKey = $this->getPrimaryKey();
         if (!isset($one[$primaryKey]) || empty($one[$primaryKey])) {
             return;
@@ -256,7 +256,7 @@ protected function actionGetOrderInfoById($order_id)
      */
     protected function actionColl($filter = '')
     {
-        $query  = $this->_orderModel::find();
+        $query  = $this->_orderModel->find();
         $query  = Yii::$service->helper->ar->getCollByFilter($query, $filter);
         $coll   = $query->all();
 
@@ -276,7 +276,7 @@ protected function actionSave($one)
         $primaryKey = $this->getPrimaryKey();
         $primaryVal = isset($one[$primaryKey]) ? $one[$primaryKey] : '';
         if ($primaryVal) {
-            $model = $this->_orderModel::findOne($primaryVal);
+            $model = $this->_orderModel->findOne($primaryVal);
             if (!$model) {
                 Yii::$service->helper->errors->add('order '.$this->getPrimaryKey().' is not exist');
 
@@ -308,7 +308,7 @@ protected function actionRemove($ids)
         }
         if (is_array($ids) && !empty($ids)) {
             foreach ($ids as $id) {
-                $model = $this->_orderModel::findOne($id);
+                $model = $this->_orderModel->findOne($id);
                 if (isset($model[$this->getPrimaryKey()]) && !empty($model[$this->getPrimaryKey()])) {
                     $model->delete();
                 } else {
@@ -319,7 +319,7 @@ protected function actionRemove($ids)
             }
         } else {
             $id = $ids;
-            $model = $this->_orderModel::findOne($id);
+            $model = $this->_orderModel->findOne($id);
             if (isset($model[$this->getPrimaryKey()]) && !empty($model[$this->getPrimaryKey()])) {
                 $model->delete();
             } else {
@@ -380,7 +380,7 @@ protected function actionGeneratePPExpressOrder($token){
      *   通过token 得到订单 Object
      */
     protected function actionGetByPaymentToken($token){
-        $one = $this->_orderModel::find()->where(['payment_token' => $token])
+        $one = $this->_orderModel->find()->where(['payment_token' => $token])
             ->one();
         if(isset($one['order_id']) && $one['order_id']){
             return $one;
@@ -547,12 +547,12 @@ protected function actionGenerateOrderByCart($address, $shipping_method, $paymen
      */
     protected  function  checkOrderVersion($increment_id){
         # 更新订单版本号，防止被多次执行。
-        $sql    = 'update '.$this->_orderModel::tableName().' set version = version + 1  where increment_id = :increment_id';
+        $sql    = 'update '.$this->_orderModel->tableName().' set version = version + 1  where increment_id = :increment_id';
         $data   = [
             'increment_id'  => $increment_id,
         ];
-        $result     = $this->_orderModel::getDb()->createCommand($sql,$data)->execute();
-        $myOrder    = $this->_orderModel::find()->where([
+        $result     = $this->_orderModel->getDb()->createCommand($sql,$data)->execute();
+        $myOrder    = $this->_orderModel->find()->where([
             'increment_id'  => $increment_id,
         ])->one();
         # 如果版本号不等于1，则回滚

diff --git a/services/Request.php b/services/Request.php
@@ -131,7 +131,7 @@ public function setRequestParam($originUrlPath)
      */
     protected function getOriginUrl($urlKey)
     {
-        $UrlData = $this->_urlRewriteModel::find()->where([
+        $UrlData = $this->_urlRewriteModel->find()->where([
             'custom_url_key' => $urlKey,
         ])->asArray()->one();
         if ($UrlData['custom_url_key']) {