Merge branch 'master' into feature/docker-testing

tests/framework/console/controllers/DbMessageControllerTest.php

@@ -14,12 +14,12 @@ class DbMessageControllerTest extends BaseMessageControllerTest
 {
     protected static $driverName = 'mysql';
     protected static $database;
-    
+
     /**
      * @var Connection
      */
     protected static $db;
-    
+
     protected static function runConsoleAction($route, $params = [])
     {
         if (Yii::$app === null) {
@@ -44,7 +44,7 @@ class DbMessageControllerTest extends BaseMessageControllerTest
             ob_end_clean();
         }
     }
-    
+
     public static function setUpBeforeClass()
     {
         parent::setUpBeforeClass();
@@ -58,7 +58,7 @@ class DbMessageControllerTest extends BaseMessageControllerTest
 
         static::runConsoleAction('migrate/up', ['migrationPath' => '@yii/i18n/migrations/', 'interactive' => false]);
     }
-    
+
     public static function tearDownAfterClass()
     {
         static::runConsoleAction('migrate/down', ['migrationPath' => '@yii/i18n/migrations/', 'interactive' => false]);
@@ -68,13 +68,13 @@ class DbMessageControllerTest extends BaseMessageControllerTest
         Yii::$app = null;
         parent::tearDownAfterClass();
     }
-    
+
     public function tearDown()
     {
         parent::tearDown();
         Yii::$app = null;
     }
-    
+
     /**
      * @throws \yii\base\InvalidParamException
      * @throws \yii\db\Exception
@@ -100,7 +100,7 @@ class DbMessageControllerTest extends BaseMessageControllerTest
         }
         return static::$db;
     }
-    
+
     /**
      * @inheritdoc
      */
@@ -151,9 +151,9 @@ class DbMessageControllerTest extends BaseMessageControllerTest
                 't2.language' => $this->language,
             ])->all(static::$db), 'message', 'translation');
     }
-    
+
     // DbMessage tests variants:
-    
+
     /**
      * Source is marked instead of translation.
      * @depends testMerge
@@ -173,10 +173,10 @@ class DbMessageControllerTest extends BaseMessageControllerTest
         $out = $this->runMessageControllerAction('extract', [$this->configFileName]);
 
         $obsoleteMessage = '@@obsolete message@@';
-        
+
         $messages = $this->loadMessages($category);
 
         $this->assertArrayHasKey($obsoleteMessage, $messages, "Obsolete message should not be removed. Command output:\n\n" . $out);
         $this->assertEquals($obsoleteTranslation, $messages[$obsoleteMessage], "Obsolete message was not marked properly. Command output:\n\n" . $out);
     }
-}
+}