Explorar o código

update Yii2 version for php7.2+

jiangzixin hai 1 ano
pai
achega
3745ad1e82

+ 1 - 1
server/api/modules/v1/controllers/ArticleController.php

@@ -179,7 +179,7 @@ class ArticleController extends Controller
      */
     public function actionFootprint()
     {
-        $ids = Footprint::find()->where(['entity' => \common\models\Article::className()])->my()->active()->select('entity_id')->orderBy(['id' => SORTDATE])->column();
+        $ids = Footprint::find()->where(['entity' => \common\models\Article::className()])->my()->active()->select('entity_id')->orderBy(['id' => SORT_DESC])->column();
         $query = Article::find()->where(['in', 'id', $ids])->published();
 
         $dataProvider = new ActiveDataProvider([

+ 2 - 2
server/backend/widgets/grid/TreeColumn.php

@@ -5,7 +5,7 @@ namespace backend\widgets\grid;
 use Closure;
 use Yii;
 use yii\base\Model;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\data\ActiveDataProvider;
 use yii\db\ActiveQueryInterface;
 use yii\helpers\ArrayHelper;
@@ -18,7 +18,7 @@ use yii\helpers\Inflector;
  *
  * @author Leandro Gehlen <leandrogehlen@gmail.com>
  */
-class TreeColumn extends Object
+class TreeColumn extends BaseObject
 {
     /**
      * @var TreeGrid the grid view object that owns this column.

+ 2 - 2
server/common/components/PackageInfo.php

@@ -10,7 +10,7 @@ namespace common\components;
 
 
 use common\models\Module;
-use yii\base\Object;
+use yii\base\BaseObject;
 use Yii;
 use yii\helpers\Json;
 
@@ -23,7 +23,7 @@ use yii\helpers\Json;
  * @property string $keywords
  * @property string $package
  */
-abstract class PackageInfo extends Object
+abstract class PackageInfo extends BaseObject
 {
     public $info = [
         'author' => '',

+ 2 - 2
server/common/components/notify/Handler.php

@@ -13,12 +13,12 @@ namespace common\components\notify;
 use common\models\Notify;
 use common\models\NotifyCategory;
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\data\ActiveDataProvider;
 use yii\helpers\Json;
 use yii\helpers\Url;
 
-class Handler extends Object
+class Handler extends BaseObject
 {
 
     public $notify;

+ 2 - 2
server/common/components/notify/Parser.php

@@ -9,10 +9,10 @@
 namespace common\components\notify;
 
 
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\StringHelper;
 
-class Parser extends Object
+class Parser extends BaseObject
 {
     /**
      * Regex to get values between curly bracket {$value}.

+ 2 - 2
server/common/helpers/Dsn.php

@@ -2,9 +2,9 @@
 
 namespace common\helpers;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
-class Dsn extends Object {
+class Dsn extends BaseObject {
 
     public $dsn;
 

+ 2 - 2
server/common/modules/migration/backend/controllers/DefaultController.php

@@ -7,7 +7,7 @@ namespace migration\backend\controllers;
 use migration\AppUtility;
 use migration\models\MigrationUtility;
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\FileHelper;
 use yii\web\Controller;
 
@@ -228,7 +228,7 @@ class DefaultController extends Controller
  *        
  * @package c006\utility\migration\controllers
  */
-class OutputString extends Object
+class OutputString extends BaseObject
 {
 
     /**

+ 2 - 2
server/common/modules/migration/console/MigrateController.php

@@ -10,7 +10,7 @@ namespace migration\console;
 
 use migration\models\MigrationUtility;
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\Console;
 use yii\helpers\FileHelper;
 use migration\AppUtility;
@@ -230,7 +230,7 @@ class MigrateController extends \yii\console\controllers\MigrateController
  *
  * @package c006\utility\migration\controllers
  */
-class OutputString extends Object
+class OutputString extends BaseObject
 {
 
     /**

+ 1 - 1
server/common/modules/rbac/components/Configs.php

@@ -34,7 +34,7 @@ use yii\helpers\ArrayHelper;
  *
  * @since 1.0
  */
-class Configs extends \yii\base\Object
+class Configs extends \yii\base\BaseObject
 {
     /**
      * @var Connection Database connection.

+ 2 - 1
server/common/widgets/tag/TagsInput.php

@@ -12,7 +12,8 @@ class TagsInput extends Select2
 
     public $pluginOptions =  [
         'tags' => true,
-        'maximumInputLength' => 10
+        'maximumInputLength' => 10,
+        'multiple' => true
     ];
 
     public $data;

+ 8 - 4
server/composer.json

@@ -15,8 +15,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
-        "fxp/composer-asset-plugin":"^1.2.0",
-        "yiisoft/yii2": ">=2.0.9",
+        "yiisoft/yii2": ">=2.0.13",
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*",
         "yiisoft/yii2-authclient": "~2.1.0",
@@ -77,10 +76,15 @@
             }
         },
         "allow-plugins": {
-            "yiisoft/yii2-composer": true,
-            "fxp/composer-asset-plugin": true
+            "yiisoft/yii2-composer": true
         }
     },
+	"repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ],
     "extra": {
         "yii\\composer\\Installer::postCreateProject": {
             "setPermission": [

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 497 - 465
server/composer.lock


+ 2 - 2
server/console/models/spider/SpiderAbstract.php

@@ -9,9 +9,9 @@ use common\models\Gather;
 use common\models\Spider;
 use yii\base\Exception;
 use Goutte\Client;
-use yii\base\Object;
+use yii\base\BaseObject;
 
-class SpiderAbstract extends Object
+class SpiderAbstract extends BaseObject
 {
     public $spiderName = '';
     private $_url;

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio