Helper independent (#14050)

cebe · web-flow · commit d786b78f2553 · 2017-04-26T09:49:44.000+02:00
* Made sure most helpers are independent of Yii::$app

* Made sure most validators are independent of Yii::$app
diff --git a/tests/framework/helpers/ArrayHelperTest.php b/tests/framework/helpers/ArrayHelperTest.php
@@ -44,7 +44,9 @@ class ArrayHelperTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Helper must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testToArray()
@@ -267,6 +269,7 @@ public function testMultisortUseSort()
         $sort = new Sort([
             'attributes' => ['name', 'age'],
             'defaultOrder' => ['name' => SORT_ASC],
+            'params' => [],
         ]);
         $orders = $sort->getOrders();
 
@@ -284,6 +287,7 @@ public function testMultisortUseSort()
         $sort = new Sort([
             'attributes' => ['name', 'age'],
             'defaultOrder' => ['name' => SORT_ASC, 'age' => SORT_DESC],
+            'params' => [],
         ]);
         $orders = $sort->getOrders();
 
diff --git a/tests/framework/helpers/ConsoleTest.php b/tests/framework/helpers/ConsoleTest.php
@@ -12,6 +12,14 @@
  */
 class ConsoleTest extends TestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+
+        // destroy application, Helper must work without Yii::$app
+        $this->destroyApplication();
+    }
+
     public function testStripAnsiFormat()
     {
         ob_start();
diff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php
@@ -33,8 +33,14 @@ public function setUp()
              */
             $this->markTestInComplete('Unit tests runtime directory should be local!');
         }
+
+        parent::setUp();
+
+        // destroy application, Helper must work without Yii::$app
+        $this->destroyApplication();
     }
 
+
     public function tearDown()
     {
         $this->removeDir($this->testFilePath);
diff --git a/tests/framework/helpers/InflectorTest.php b/tests/framework/helpers/InflectorTest.php
@@ -10,6 +10,14 @@
  */
 class InflectorTest extends TestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+
+        // destroy application, Helper must work without Yii::$app
+        $this->destroyApplication();
+    }
+
     public function testPluralize()
     {
         $testData = [
diff --git a/tests/framework/helpers/JsonTest.php b/tests/framework/helpers/JsonTest.php
@@ -14,6 +14,14 @@
  */
 class JsonTest extends TestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+
+        // destroy application, Helper must work without Yii::$app
+        $this->destroyApplication();
+    }
+
     public function testEncode()
     {
         // basic data encoding
diff --git a/tests/framework/helpers/MarkdownTest.php b/tests/framework/helpers/MarkdownTest.php
@@ -12,6 +12,14 @@
  */
 class MarkdownTest extends TestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+
+        // destroy application, Helper must work without Yii::$app
+        $this->destroyApplication();
+    }
+
     public function testOriginalFlavor()
     {
         $text = <<<TEXT
diff --git a/tests/framework/helpers/VarDumperTest.php b/tests/framework/helpers/VarDumperTest.php
@@ -10,6 +10,14 @@
  */
 class VarDumperTest extends TestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+
+        // destroy application, Helper must work without Yii::$app
+        $this->destroyApplication();
+    }
+
     public function testDumpIncompleteObject()
     {
         $serializedObj = 'O:16:"nonExistingClass":0:{}';
diff --git a/tests/framework/validators/BooleanValidatorTest.php b/tests/framework/validators/BooleanValidatorTest.php
@@ -14,7 +14,9 @@ class BooleanValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testValidateValue()
diff --git a/tests/framework/validators/CompareValidatorTest.php b/tests/framework/validators/CompareValidatorTest.php
@@ -14,7 +14,9 @@ class CompareValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testValidateValueException()
diff --git a/tests/framework/validators/DefaultValueValidatorTest.php b/tests/framework/validators/DefaultValueValidatorTest.php
@@ -13,7 +13,9 @@ class DefaultValueValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testValidateAttribute()
diff --git a/tests/framework/validators/EachValidatorTest.php b/tests/framework/validators/EachValidatorTest.php
@@ -14,7 +14,9 @@ class EachValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testArrayFormat()
diff --git a/tests/framework/validators/EmailValidatorTest.php b/tests/framework/validators/EmailValidatorTest.php
@@ -13,7 +13,9 @@ class EmailValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testValidateValue()
diff --git a/tests/framework/validators/ExistValidatorTest.php b/tests/framework/validators/ExistValidatorTest.php
@@ -14,10 +14,12 @@
 
 abstract class ExistValidatorTest extends DatabaseTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
         ActiveRecord::$db = $this->getConnection();
     }
 
diff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php
@@ -14,8 +14,9 @@
  */
 class FileValidatorTest extends TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
+        parent::setUp();
         $this->mockApplication();
     }
 
diff --git a/tests/framework/validators/FilterValidatorTest.php b/tests/framework/validators/FilterValidatorTest.php
@@ -14,7 +14,8 @@ class FilterValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testAssureExceptionOnInit()
diff --git a/tests/framework/validators/IpValidatorTest.php b/tests/framework/validators/IpValidatorTest.php
@@ -14,7 +14,8 @@ class IpValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testInitException()
diff --git a/tests/framework/validators/NumberValidatorTest.php b/tests/framework/validators/NumberValidatorTest.php
@@ -46,8 +46,11 @@ private function restoreLocale()
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
         $this->oldLocale = setlocale(LC_NUMERIC, 0);
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testEnsureMessageOnInit()
diff --git a/tests/framework/validators/RangeValidatorTest.php b/tests/framework/validators/RangeValidatorTest.php
@@ -14,7 +14,9 @@ class RangeValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testInitException()
diff --git a/tests/framework/validators/RegularExpressionValidatorTest.php b/tests/framework/validators/RegularExpressionValidatorTest.php
@@ -14,7 +14,9 @@ class RegularExpressionValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testValidateValue()
diff --git a/tests/framework/validators/RequiredValidatorTest.php b/tests/framework/validators/RequiredValidatorTest.php
@@ -13,7 +13,9 @@ class RequiredValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testValidateValueWithDefaults()
diff --git a/tests/framework/validators/UniqueValidatorTest.php b/tests/framework/validators/UniqueValidatorTest.php
@@ -16,11 +16,13 @@
 
 abstract class UniqueValidatorTest extends DatabaseTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
         ActiveRecord::$db = $this->getConnection();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testAssureMessageSetOnInit()
diff --git a/tests/framework/validators/UrlValidatorTest.php b/tests/framework/validators/UrlValidatorTest.php
@@ -14,7 +14,9 @@ class UrlValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testValidateValue()
diff --git a/tests/framework/validators/ValidatorTest.php b/tests/framework/validators/ValidatorTest.php
@@ -17,7 +17,9 @@ class ValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     protected function getTestModel($additionalAttributes = [])

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,14 @@ public function setUp()`
`33`	`33`	`*/`
`34`	`34`	`$this->markTestInComplete('Unit tests runtime directory should be local!');`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ parent::setUp();`
	`38`	`+`
	`39`	`+ // destroy application, Helper must work without Yii::$app`
	`40`	`+ $this->destroyApplication();`
`36`	`41`	`}`
`37`	`42`
	`43`	`+`
`38`	`44`	`public function tearDown()`
`39`	`45`	`{`
`40`	`46`	`$this->removeDir($this->testFilePath);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@ class BooleanValidatorTest extends TestCase`
`14`	`14`	`protected function setUp()`
`15`	`15`	`{`
`16`	`16`	`parent::setUp();`
`17`		`- $this->mockApplication();`
	`17`	`+`
	`18`	`+ // destroy application, Validator must work without Yii::$app`
	`19`	`+ $this->destroyApplication();`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`public function testValidateValue()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@ class CompareValidatorTest extends TestCase`
`14`	`14`	`protected function setUp()`
`15`	`15`	`{`
`16`	`16`	`parent::setUp();`
`17`		`- $this->mockApplication();`
	`17`	`+`
	`18`	`+ // destroy application, Validator must work without Yii::$app`
	`19`	`+ $this->destroyApplication();`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`public function testValidateValueException()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ class DefaultValueValidatorTest extends TestCase`
`13`	`13`	`protected function setUp()`
`14`	`14`	`{`
`15`	`15`	`parent::setUp();`
`16`		`- $this->mockApplication();`
	`16`	`+`
	`17`	`+ // destroy application, Validator must work without Yii::$app`
	`18`	`+ $this->destroyApplication();`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`public function testValidateAttribute()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@ class EachValidatorTest extends TestCase`
`14`	`14`	`protected function setUp()`
`15`	`15`	`{`
`16`	`16`	`parent::setUp();`
`17`		`- $this->mockApplication();`
	`17`	`+`
	`18`	`+ // destroy application, Validator must work without Yii::$app`
	`19`	`+ $this->destroyApplication();`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`public function testArrayFormat()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ class EmailValidatorTest extends TestCase`
`13`	`13`	`protected function setUp()`
`14`	`14`	`{`
`15`	`15`	`parent::setUp();`
`16`		`- $this->mockApplication();`
	`16`	`+`
	`17`	`+ // destroy application, Validator must work without Yii::$app`
	`18`	`+ $this->destroyApplication();`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`public function testValidateValue()`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,12 @@`
`14`	`14`
`15`	`15`	`abstract class ExistValidatorTest extends DatabaseTestCase`
`16`	`16`	`{`
`17`		`- public function setUp()`
	`17`	`+ protected function setUp()`
`18`	`18`	`{`
`19`	`19`	`parent::setUp();`
`20`		`- $this->mockApplication();`
	`20`	`+`
	`21`	`+ // destroy application, Validator must work without Yii::$app`
	`22`	`+ $this->destroyApplication();`
`21`	`23`	`ActiveRecord::$db = $this->getConnection();`
`22`	`24`	`}`
`23`	`25`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@`
`14`	`14`	`*/`
`15`	`15`	`class FileValidatorTest extends TestCase`
`16`	`16`	`{`
`17`		`- public function setUp()`
	`17`	`+ protected function setUp()`
`18`	`18`	`{`
	`19`	`+ parent::setUp();`
`19`	`20`	`$this->mockApplication();`
`20`	`21`	`}`
`21`	`22`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ class FilterValidatorTest extends TestCase`
`14`	`14`	`protected function setUp()`
`15`	`15`	`{`
`16`	`16`	`parent::setUp();`
`17`		`- $this->mockApplication();`
	`17`	`+ // destroy application, Validator must work without Yii::$app`
	`18`	`+ $this->destroyApplication();`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`public function testAssureExceptionOnInit()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ class IpValidatorTest extends TestCase`
`14`	`14`	`protected function setUp()`
`15`	`15`	`{`
`16`	`16`	`parent::setUp();`
`17`		`- $this->mockApplication();`
	`17`	`+ // destroy application, Validator must work without Yii::$app`
	`18`	`+ $this->destroyApplication();`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`public function testInitException()`