Fixing tests

docs/guide-ja/db-active-record.md

@@ -997,21 +997,21 @@ class Customer extends ActiveRecord
     public function getPurchasedItems()
     {
         // 顧客の購入品目、すなわち、`Item` の 'id' カラムが OrderItem の 'item_id' に合致するもの
-        return $this->hasMany(Item::className(), ['id' => 'item_id'])
+        return $this->hasMany(Item::class, ['id' => 'item_id'])
                     ->via('orderItems');
     }
 
     public function getOrderItems()
     {
         // 顧客の OrderItems、すなわち、`Order` の `id` カラムが `OrderItem` の 'order_id' に合致するもの
-        return $this->hasMany(OrderItem::className(), ['order_id' => 'id'])
+        return $this->hasMany(OrderItem::class, ['order_id' => 'id'])
                     ->via('orders');
     }
 
     public function getOrders()
     {
         // 顧客の注文
-        return $this->hasMany(Order::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Order::class, ['customer_id' => 'id']);
     }
 }
 ```
@@ -1306,7 +1306,7 @@ class Customer extends ActiveRecord
 {
     public function getOrders()
     {
-        return $this->hasMany(Order::className(), ['customer_id' => 'id'])->inverseOf('customer');
+        return $this->hasMany(Order::class, ['customer_id' => 'id'])->inverseOf('customer');
     }
 }
 ```

docs/guide-zh-CN/concept-events.md

@@ -305,10 +305,10 @@ Event::on('app\interfaces\DanceEventInterface', DanceEventInterface::EVENT_DANCE
 
 ```php
 // trigger event for Dog class
-Event::trigger(Dog::className(), DanceEventInterface::EVENT_DANCE);
+Event::trigger(Dog::class, DanceEventInterface::EVENT_DANCE);
 
 // trigger event for Developer class
-Event::trigger(Developer::className(), DanceEventInterface::EVENT_DANCE);
+Event::trigger(Developer::class, DanceEventInterface::EVENT_DANCE);
 ```
 
 但是请注意, 你不能让所有实现这个接口的类都触发事件：

docs/guide-zh-CN/db-active-record.md

@@ -831,7 +831,7 @@ class Order extends ActiveRecord
   一个客户可以有很多订单，而每个订单只有一个客户。
 - 相关联 Active Record 类名：用来指定为 [[yii\db\ActiveRecord::hasMany()|hasMany()]] 或者 
   [[yii\db\ActiveRecord::hasOne()|hasOne()]] 方法的第一个参数。
-  推荐的做法是调用 `Xyz::className()` 来获取类名称的字符串，以便您
+  推荐的做法是调用 `Xyz::class` 来获取类名称的字符串，以便您
   可以使用 IDE 的自动补全，以及让编译阶段的错误检测生效。
 - 两组数据的关联列：用以指定两组数据相关的列（hasOne()/hasMany() 的第二个参数）。
   数组的值填的是主数据的列（当前要声明关联的 Active Record 类为主数据），
@@ -996,21 +996,21 @@ class Customer extends ActiveRecord
     public function getPurchasedItems()
     {
         // 客户的商品，将 Item 中的 'id' 列与 OrderItem 中的 'item_id' 相匹配
-        return $this->hasMany(Item::className(), ['id' => 'item_id'])
+        return $this->hasMany(Item::class, ['id' => 'item_id'])
                     ->via('orderItems');
     }
 
     public function getOrderItems()
     {
         // 客户订单中的商品，将 `Order` 的 'id' 列和 OrderItem 的 'order_id' 列相匹配
-        return $this->hasMany(OrderItem::className(), ['order_id' => 'id'])
+        return $this->hasMany(OrderItem::class, ['order_id' => 'id'])
                     ->via('orders');
     }
 
     public function getOrders()
     {
         // 见上述列子
-        return $this->hasMany(Order::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Order::class, ['customer_id' => 'id']);
     }
 }
 ```
@@ -1523,7 +1523,7 @@ class Customer extends \yii\db\ActiveRecord
 {
     public function getComments()
     {
-        return $this->hasMany(Comment::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Comment::class, ['customer_id' => 'id']);
     }
 }
 
@@ -1684,7 +1684,7 @@ class Customer extends \yii\db\ActiveRecord
 
     public function getOrders()
     {
-        return $this->hasMany(Order::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Order::class, ['customer_id' => 'id']);
     }
 }
 ```
@@ -1715,7 +1715,7 @@ class Customer extends \yii\db\ActiveRecord
      */
     public function getOrders()
     {
-        return $this->hasMany(Order::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Order::class, ['customer_id' => 'id']);
     }
 
     /**

docs/guide-zh-CN/input-validation.md

@@ -448,7 +448,7 @@ class EntryForm extends Model
     {
         return [
             [['name', 'email'], 'required'],
-            ['country', CountryValidator::className()],
+            ['country', CountryValidator::class],
             ['email', 'email'],
         ];
     }

docs/guide-zh-CN/output-client-scripts.md

@@ -30,7 +30,7 @@ $this->registerJs("var options = ".json_encode($options).";", View::POS_END, 'my
 外部脚本的引入使用像下面这样：
 
 ```php
-$this->registerJsFile('http://example.com/js/main.js', ['depends' => [\yii\web\JqueryAsset::className()]]);
+$this->registerJsFile('http://example.com/js/main.js', ['depends' => [\yii\web\JqueryAsset::class]]);
 ```
 
 [[yii\web\View::registerJsFile()|registerJsFile()]] 中参数的使用与 
@@ -77,7 +77,7 @@ body { background: #f00; }
 
 ```php
 $this->registerCssFile("http://example.com/css/themes/black-and-white.css", [
-    'depends' => [BootstrapAsset::className()],
+    'depends' => [BootstrapAsset::class],
     'media' => 'print',
 ], 'css-print-theme');
 ```

docs/guide-zh-CN/rest-controllers.md

@@ -98,7 +98,7 @@ public function behaviors()
     
     // add CORS filter
     $behaviors['corsFilter'] = [
-        'class' => \yii\filters\Cors::className(),
+        'class' => \yii\filters\Cors::class,
     ];
     
     // re-add authentication filter

docs/guide-zh-CN/security-authorization.md

@@ -25,7 +25,7 @@ class SiteController extends Controller
     {
         return [
             'access' => [
-                'class' => AccessControl::className(),
+                'class' => AccessControl::class,
                 'only' => ['login', 'logout', 'signup'],
                 'rules' => [
                     [
@@ -70,7 +70,7 @@ ACF 自顶向下逐一检查存取规则，直到找到一个与当前
 
 ```php
 [
-    'class' => AccessControl::className(),
+    'class' => AccessControl::class,
     ...
     'denyCallback' => function ($rule, $action) {
         throw new \Exception('You are not allowed to access this page');
@@ -129,7 +129,7 @@ class SiteController extends Controller
     {
         return [
             'access' => [
-                'class' => AccessControl::className(),
+                'class' => AccessControl::class,
                 'only' => ['special-callback'],
                 'rules' => [
                     [
@@ -538,7 +538,7 @@ public function behaviors()
 {
     return [
         'access' => [
-            'class' => AccessControl::className(),
+            'class' => AccessControl::class,
             'rules' => [
                 [
                     'allow' => true,

docs/guide-zh-CN/test-fixtures.md

@@ -129,7 +129,7 @@ class UserProfileTest extends DbTestCase
     public function fixtures()
     {
         return [
-            'profiles' => UserProfileFixture::className(),
+            'profiles' => UserProfileFixture::class,
         ];
     }
 

docs/guide-zh-CN/yii2-redis.md

@@ -193,7 +193,7 @@ class Customer extends \yii\redis\ActiveRecord
      */
     public function getOrders()
     {
-         return $this->hasMany(Order::className(), ['customer_id' => 'id']);
+         return $this->hasMany(Order::class, ['customer_id' => 'id']);
     }
 
 }

framework/caching/DbCache.php

@@ -192,7 +192,7 @@ class DbCache extends SimpleCache
 
             $this->gc();
 
-            return $this->addValue($key, $value, $ttl);
+            return true;
         } catch (\Exception $e) {
             Yii::warning("Unable to update or insert cache data: {$e->getMessage()}", __METHOD__);
 

tests/framework/db/ConnectionTest.php

@@ -10,6 +10,7 @@ namespace yiiunit\framework\db;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\caching\ArrayCache;
+use yii\caching\Cache;
 use yii\db\Connection;
 use yii\db\Transaction;
 
@@ -455,7 +456,7 @@ abstract class ConnectionTest extends DatabaseTestCase
 
     public function testServerStatusCacheWorks()
     {
-        $cache = new ArrayCache();
+        $cache = new Cache(['handler' => new ArrayCache()]);
         Yii::$app->set('cache', $cache);
 
         $connection = $this->getConnection(true, false);
@@ -468,9 +469,9 @@ abstract class ConnectionTest extends DatabaseTestCase
 
         $cacheKey = ['yii\db\Connection::openFromPoolSequentially', $connection->dsn];
 
-        $this->assertFalse($cache->exists($cacheKey));
+        $this->assertFalse($cache->has($cacheKey));
         $connection->open();
-        $this->assertFalse($cache->exists($cacheKey), 'Connection was successful – cache must not contain information about this DSN');
+        $this->assertFalse($cache->has($cacheKey), 'Connection was successful – cache must not contain information about this DSN');
         $connection->close();
 
         $cacheKey = ['yii\db\Connection::openFromPoolSequentially', 'host:invalid'];
@@ -479,13 +480,13 @@ abstract class ConnectionTest extends DatabaseTestCase
             $connection->open();
         } catch (InvalidConfigException $e) {
         }
-        $this->assertTrue($cache->exists($cacheKey), 'Connection was not successful – cache must contain information about this DSN');
+        $this->assertTrue($cache->has($cacheKey), 'Connection was not successful – cache must contain information about this DSN');
         $connection->close();
     }
 
     public function testServerStatusCacheCanBeDisabled()
     {
-        $cache = new ArrayCache();
+        $cache = new Cache(['handler' => new ArrayCache()]);
         Yii::$app->set('cache', $cache);
 
         $connection = $this->getConnection(true, false);
@@ -499,9 +500,9 @@ abstract class ConnectionTest extends DatabaseTestCase
 
         $cacheKey = ['yii\db\Connection::openFromPoolSequentially', $connection->dsn];
 
-        $this->assertFalse($cache->exists($cacheKey));
+        $this->assertFalse($cache->has($cacheKey));
         $connection->open();
-        $this->assertFalse($cache->exists($cacheKey), 'Caching is disabled');
+        $this->assertFalse($cache->has($cacheKey), 'Caching is disabled');
         $connection->close();
 
         $cacheKey = ['yii\db\Connection::openFromPoolSequentially', 'host:invalid'];
@@ -510,7 +511,7 @@ abstract class ConnectionTest extends DatabaseTestCase
             $connection->open();
         } catch (InvalidConfigException $e) {
         }
-        $this->assertFalse($cache->exists($cacheKey), 'Caching is disabled');
+        $this->assertFalse($cache->has($cacheKey), 'Caching is disabled');
         $connection->close();
     }
 }

tests/framework/test/ActiveFixtureTest.php

@@ -92,7 +92,7 @@ class TruncateTestCase extends BaseDbTestCase
     {
         return [
             'animals' => [
-                'class' => AnimalFixture::className(),
+                '__class' => AnimalFixture::class,
             ]
         ];
     }