Error202
/
yii2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Enable `heredoc_to_nowdoc` rule in php-cs-fixer (#14419)

tags/2.0.13
Robert Korulczyk 7 years ago committed by Alexander Makarov
parent
fe8a0a6a2e
commit
12eb936083
26 changed files with 121 additions and 121 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cs/src/YiiConfig.php
  2. 2
      cs/src/YiisoftConfig.php
  3. 2
      docs/guide-zh-CN/structure-entry-scripts.md
  4. 12
      framework/db/mssql/Schema.php
  5. 6
      framework/db/mysql/Schema.php
  6. 18
      framework/db/oci/Schema.php
  7. 12
      framework/db/pgsql/Schema.php
  8. 4
      tests/framework/base/ViewTest.php
  9. 6
      tests/framework/console/controllers/HelpControllerTest.php
  10. 14
      tests/framework/console/widgets/TableTest.php
  11. 2
      tests/framework/db/CommandTest.php
  12. 2
      tests/framework/db/sqlite/SqlTokenizerTest.php
  13. 4
      tests/framework/grid/DataColumnTest.php
  14. 2
      tests/framework/grid/RadiobuttonColumnTest.php
  15. 70
      tests/framework/helpers/HtmlTest.php
  16. 2
      tests/framework/helpers/MarkdownTest.php
  17. 6
      tests/framework/helpers/VarDumperTest.php
  18. 2
      tests/framework/i18n/FallbackMessageFormatterTest.php
  19. 2
      tests/framework/i18n/MessageFormatterTest.php
  20. 4
      tests/framework/mail/BaseMailerTest.php
  21. 14
      tests/framework/web/AssetBundleTest.php
  22. 2
      tests/framework/web/AssetConverterTest.php
  23. 20
      tests/framework/widgets/ActiveFieldTest.php
  24. 10
      tests/framework/widgets/ActiveFormTest.php
  25. 6
      tests/framework/widgets/ListViewTest.php
  26. 16
      tests/framework/widgets/MenuTest.php

2
cs/src/YiiConfig.php
Unescape View File

@ -45,7 +45,7 @@ class YiiConfig extends Config
'ereg_to_preg' => true, 'ereg_to_preg' => true,
'function_typehint_space' => true, 'function_typehint_space' => true,
'hash_to_slash_comment' => true, 'hash_to_slash_comment' => true,
// 'heredoc_to_nowdoc' => true, // needs more discussion 'heredoc_to_nowdoc' => true,
// 'include' => true, // needs more discussion // 'include' => true, // needs more discussion
'is_null' => [ 'is_null' => [
'use_yoda_style' => false, 'use_yoda_style' => false,

2
cs/src/YiisoftConfig.php
Unescape View File

@ -22,7 +22,7 @@ final class YiisoftConfig extends YiiConfig
{ {
parent::__construct('yiisoft-cs-config'); parent::__construct('yiisoft-cs-config');
$header = <<<HEADER $header = <<<'HEADER'
@link http://www.yiiframework.com/ @link http://www.yiiframework.com/
@copyright Copyright (c) 2008 Yii Software LLC @copyright Copyright (c) 2008 Yii Software LLC
@license http://www.yiiframework.com/license/ @license http://www.yiiframework.com/license/

2
docs/guide-zh-CN/structure-entry-scripts.md
Unescape View File

@ -97,4 +97,4 @@ if (!defined('YII_DEBUG')) {
显然第一段代码更加简洁易懂。 显然第一段代码更加简洁易懂。
常量定义应该在入口脚本的开头，这样包含其他 PHP 文件时，常量就能生效。 常量定义应该在入口脚本的开头，这样包含其他 PHP 文件时，常量就能生效。

12
framework/db/mssql/Schema.php
Unescape View File

@ -120,7 +120,7 @@ class Schema extends \yii\db\Schema
*/ */
protected function findSchemaNames() protected function findSchemaNames()
{ {
$sql = <<<SQL $sql = <<<'SQL'
SELECT ns.nspname AS schema_name SELECT ns.nspname AS schema_name
FROM pg_namespace ns FROM pg_namespace ns
WHERE ns.nspname != 'information_schema' AND ns.nspname NOT LIKE 'pg_%' WHERE ns.nspname != 'information_schema' AND ns.nspname NOT LIKE 'pg_%'
@ -138,7 +138,7 @@ SQL;
$schema = $this->defaultSchema; $schema = $this->defaultSchema;
} }
$sql = <<<SQL $sql = <<<'SQL'
SELECT [t].[table_name] SELECT [t].[table_name]
FROM [INFORMATION_SCHEMA].[TABLES] AS [t] FROM [INFORMATION_SCHEMA].[TABLES] AS [t]
WHERE [t].[table_schema] = :schema AND [t].[table_type] IN ('BASE TABLE', 'VIEW') WHERE [t].[table_schema] = :schema AND [t].[table_type] IN ('BASE TABLE', 'VIEW')
@ -185,7 +185,7 @@ SQL;
*/ */
protected function loadTableIndexes($tableName) protected function loadTableIndexes($tableName)
{ {
static $sql = <<<SQL static $sql = <<<'SQL'
SELECT SELECT
[i].[name] AS [name], [i].[name] AS [name],
[iccol].[name] AS [column_name], [iccol].[name] AS [column_name],
@ -519,7 +519,7 @@ SQL;
// please refer to the following page for more details: // please refer to the following page for more details:
// http://msdn2.microsoft.com/en-us/library/aa175805(SQL.80).aspx // http://msdn2.microsoft.com/en-us/library/aa175805(SQL.80).aspx
$sql = <<<SQL $sql = <<<'SQL'
SELECT SELECT
[fk].[name] AS [fk_name], [fk].[name] AS [fk_name],
[cp].[name] AS [fk_column_name], [cp].[name] AS [fk_column_name],
@ -558,7 +558,7 @@ SQL;
$schema = $this->defaultSchema; $schema = $this->defaultSchema;
} }
$sql = <<<SQL $sql = <<<'SQL'
SELECT [t].[table_name] SELECT [t].[table_name]
FROM [INFORMATION_SCHEMA].[TABLES] AS [t] FROM [INFORMATION_SCHEMA].[TABLES] AS [t]
WHERE [t].[table_schema] = :schema AND [t].[table_type] = 'VIEW' WHERE [t].[table_schema] = :schema AND [t].[table_type] = 'VIEW'
@ -605,7 +605,7 @@ SQL;
*/ */
private function loadTableConstraints($tableName, $returnType) private function loadTableConstraints($tableName, $returnType)
{ {
static $sql = <<<SQL static $sql = <<<'SQL'
SELECT SELECT
[o].[name] AS [name], [o].[name] AS [name],
COALESCE([ccol].[name], [dcol].[name], [fccol].[name], [kiccol].[name]) AS [column_name], COALESCE([ccol].[name], [dcol].[name], [fccol].[name], [kiccol].[name]) AS [column_name],

6
framework/db/mysql/Schema.php
Unescape View File

@ -137,7 +137,7 @@ class Schema extends \yii\db\Schema
*/ */
protected function loadTableIndexes($tableName) protected function loadTableIndexes($tableName)
{ {
static $sql = <<<SQL static $sql = <<<'SQL'
SELECT SELECT
`s`.`INDEX_NAME` AS `name`, `s`.`INDEX_NAME` AS `name`,
`s`.`COLUMN_NAME` AS `column_name`, `s`.`COLUMN_NAME` AS `column_name`,
@ -368,7 +368,7 @@ SQL;
*/ */
protected function findConstraints($table) protected function findConstraints($table)
{ {
$sql = <<<SQL $sql = <<<'SQL'
SELECT SELECT
kcu.constraint_name, kcu.constraint_name,
kcu.column_name, kcu.column_name,
@ -491,7 +491,7 @@ SQL;
*/ */
private function loadTableConstraints($tableName, $returnType) private function loadTableConstraints($tableName, $returnType)
{ {
static $sql = <<<SQL static $sql = <<<'SQL'
SELECT DISTINCT SELECT DISTINCT
`kcu`.`CONSTRAINT_NAME` AS `name`, `kcu`.`CONSTRAINT_NAME` AS `name`,
`kcu`.`COLUMN_NAME` AS `column_name`, `kcu`.`COLUMN_NAME` AS `column_name`,

18
framework/db/oci/Schema.php
Unescape View File

@ -76,7 +76,7 @@ class Schema extends \yii\db\Schema
*/ */
protected function findSchemaNames() protected function findSchemaNames()
{ {
$sql = <<<SQL $sql = <<<'SQL'
SELECT SELECT
USERNAME USERNAME
FROM DBA_USERS U FROM DBA_USERS U
@ -93,7 +93,7 @@ SQL;
protected function findTableNames($schema = '') protected function findTableNames($schema = '')
{ {
if ($schema === '') { if ($schema === '') {
$sql = <<<SQL $sql = <<<'SQL'
SELECT SELECT
TABLE_NAME TABLE_NAME
FROM USER_TABLES FROM USER_TABLES
@ -109,7 +109,7 @@ ORDER BY TABLE_NAME
SQL; SQL;
$command = $this->db->createCommand($sql); $command = $this->db->createCommand($sql);
} else { } else {
$sql = <<<SQL $sql = <<<'SQL'
SELECT SELECT
OBJECT_NAME AS TABLE_NAME OBJECT_NAME AS TABLE_NAME
FROM ALL_OBJECTS FROM ALL_OBJECTS
@ -168,7 +168,7 @@ SQL;
*/ */
protected function loadTableIndexes($tableName) protected function loadTableIndexes($tableName)
{ {
static $sql = <<<SQL static $sql = <<<'SQL'
SELECT SELECT
/*+ PUSH_PRED("ui") PUSH_PRED("uicol") PUSH_PRED("uc") */ /*+ PUSH_PRED("ui") PUSH_PRED("uicol") PUSH_PRED("uc") */
"ui"."INDEX_NAME" AS "name", "ui"."INDEX_NAME" AS "name",
@ -287,7 +287,7 @@ SQL;
*/ */
protected function findColumns($table) protected function findColumns($table)
{ {
$sql = <<<SQL $sql = <<<'SQL'
SELECT SELECT
A.COLUMN_NAME, A.COLUMN_NAME,
A.DATA_TYPE, A.DATA_TYPE,
@ -339,7 +339,7 @@ SQL;
*/ */
protected function getTableSequenceName($tableName) protected function getTableSequenceName($tableName)
{ {
$sequenceNameSql = <<<SQL $sequenceNameSql = <<<'SQL'
SELECT SELECT
UD.REFERENCED_NAME AS SEQUENCE_NAME UD.REFERENCED_NAME AS SEQUENCE_NAME
FROM USER_DEPENDENCIES UD FROM USER_DEPENDENCIES UD
@ -424,7 +424,7 @@ SQL;
*/ */
protected function findConstraints($table) protected function findConstraints($table)
{ {
$sql = <<<SQL $sql = <<<'SQL'
SELECT SELECT
/*+ PUSH_PRED(C) PUSH_PRED(D) PUSH_PRED(E) */ /*+ PUSH_PRED(C) PUSH_PRED(D) PUSH_PRED(E) */
D.CONSTRAINT_NAME, D.CONSTRAINT_NAME,
@ -503,7 +503,7 @@ SQL;
*/ */
public function findUniqueIndexes($table) public function findUniqueIndexes($table)
{ {
$query = <<<SQL $query = <<<'SQL'
SELECT SELECT
DIC.INDEX_NAME, DIC.INDEX_NAME,
DIC.COLUMN_NAME DIC.COLUMN_NAME
@ -641,7 +641,7 @@ SQL;
*/ */
private function loadTableConstraints($tableName, $returnType) private function loadTableConstraints($tableName, $returnType)
{ {
static $sql = <<<SQL static $sql = <<<'SQL'
SELECT SELECT
/*+ PUSH_PRED("uc") PUSH_PRED("uccol") PUSH_PRED("fuc") */ /*+ PUSH_PRED("uc") PUSH_PRED("uccol") PUSH_PRED("fuc") */
"uc"."CONSTRAINT_NAME" AS "name", "uc"."CONSTRAINT_NAME" AS "name",

12
framework/db/pgsql/Schema.php
Unescape View File

@ -142,7 +142,7 @@ class Schema extends \yii\db\Schema
*/ */
protected function findSchemaNames() protected function findSchemaNames()
{ {
$sql = <<<SQL $sql = <<<'SQL'
SELECT ns.nspname AS schema_name SELECT ns.nspname AS schema_name
FROM pg_namespace ns FROM pg_namespace ns
WHERE ns.nspname != 'information_schema' AND ns.nspname NOT LIKE 'pg_%' WHERE ns.nspname != 'information_schema' AND ns.nspname NOT LIKE 'pg_%'
@ -159,7 +159,7 @@ SQL;
if ($schema === '') { if ($schema === '') {
$schema = $this->defaultSchema; $schema = $this->defaultSchema;
} }
$sql = <<<SQL $sql = <<<'SQL'
SELECT c.relname AS table_name SELECT c.relname AS table_name
FROM pg_class c FROM pg_class c
INNER JOIN pg_namespace ns ON ns.oid = c.relnamespace INNER JOIN pg_namespace ns ON ns.oid = c.relnamespace
@ -205,7 +205,7 @@ SQL;
*/ */
protected function loadTableIndexes($tableName) protected function loadTableIndexes($tableName)
{ {
static $sql = <<<SQL static $sql = <<<'SQL'
SELECT SELECT
"ic"."relname" AS "name", "ic"."relname" AS "name",
"ia"."attname" AS "column_name", "ia"."attname" AS "column_name",
@ -316,7 +316,7 @@ SQL;
if ($schema === '') { if ($schema === '') {
$schema = $this->defaultSchema; $schema = $this->defaultSchema;
} }
$sql = <<<SQL $sql = <<<'SQL'
SELECT c.relname AS table_name SELECT c.relname AS table_name
FROM pg_class c FROM pg_class c
INNER JOIN pg_namespace ns ON ns.oid = c.relnamespace INNER JOIN pg_namespace ns ON ns.oid = c.relnamespace
@ -394,7 +394,7 @@ SQL;
*/ */
protected function getUniqueIndexInformation($table) protected function getUniqueIndexInformation($table)
{ {
$sql = <<<SQL $sql = <<<'SQL'
SELECT SELECT
i.relname as indexname, i.relname as indexname,
pg_get_indexdef(idx.indexrelid, k + 1, TRUE) AS columnname pg_get_indexdef(idx.indexrelid, k + 1, TRUE) AS columnname
@ -620,7 +620,7 @@ SQL;
*/ */
private function loadTableConstraints($tableName, $returnType) private function loadTableConstraints($tableName, $returnType)
{ {
static $sql = <<<SQL static $sql = <<<'SQL'
SELECT SELECT
"c"."conname" AS "name", "c"."conname" AS "name",
"a"."attname" AS "column_name", "a"."attname" AS "column_name",

4
tests/framework/base/ViewTest.php
Unescape View File

@ -45,13 +45,13 @@ class ViewTest extends TestCase
$view = new View(); $view = new View();
$exceptionViewFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'exception.php'; $exceptionViewFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'exception.php';
file_put_contents($exceptionViewFile, <<<PHP file_put_contents($exceptionViewFile, <<<'PHP'
<h1>Exception</h1> <h1>Exception</h1>
<?php throw new Exception('Test Exception'); ?> <?php throw new Exception('Test Exception'); ?>
PHP PHP
); );
$normalViewFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'no-exception.php'; $normalViewFile = $this->testViewPath . DIRECTORY_SEPARATOR . 'no-exception.php';
file_put_contents($normalViewFile, <<<PHP file_put_contents($normalViewFile, <<<'PHP'
<h1>No Exception</h1> <h1>No Exception</h1>
PHP PHP
); );

6
tests/framework/console/controllers/HelpControllerTest.php
Unescape View File

@ -63,7 +63,7 @@ class HelpControllerTest extends TestCase
], ],
]); ]);
$result = Console::stripAnsiFormat($this->runControllerAction('list')); $result = Console::stripAnsiFormat($this->runControllerAction('list'));
$this->assertEquals(<<<STRING $this->assertEquals(<<<'STRING'
cache cache
cache/flush cache/flush
cache/flush-all cache/flush-all
@ -98,7 +98,7 @@ STRING
], ],
]); ]);
$result = Console::stripAnsiFormat($this->runControllerAction('list-action-options', ['action' => 'help/list-action-options'])); $result = Console::stripAnsiFormat($this->runControllerAction('list-action-options', ['action' => 'help/list-action-options']));
$this->assertEquals(<<<STRING $this->assertEquals(<<<'STRING'
action:route to action action:route to action
--interactive: whether to run the command interactively. --interactive: whether to run the command interactively.
@ -119,7 +119,7 @@ STRING
], ],
]); ]);
$result = Console::stripAnsiFormat($this->runControllerAction('usage', ['action' => 'help/list-action-options'])); $result = Console::stripAnsiFormat($this->runControllerAction('usage', ['action' => 'help/list-action-options']));
$this->assertEquals(<<<STRING $this->assertEquals(<<<'STRING'
bootstrap.php help/list-action-options <action> bootstrap.php help/list-action-options <action>
STRING STRING

14
tests/framework/console/widgets/TableTest.php
Unescape View File

@ -25,7 +25,7 @@ class TableTest extends TestCase
{ {
$table = new Table(); $table = new Table();
$expected = <<<EXPECTED $expected = <<<'EXPECTED'
╔═══════════════╤═══════════════╤═══════════════╗ ╔═══════════════╤═══════════════╤═══════════════╗
║ test1 │ test2 │ test3 ║ ║ test1 │ test2 │ test3 ║
╟───────────────┼───────────────┼───────────────╢ ╟───────────────┼───────────────┼───────────────╢
@ -50,7 +50,7 @@ EXPECTED;
// test fullwidth chars // test fullwidth chars
// @see https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms // @see https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms
$expected = <<<EXPECTED $expected = <<<'EXPECTED'
╔═════════════════╤═════════════════╤═════════════════╗ ╔═════════════════╤═════════════════╤═════════════════╗
║ test1 │ test2 │ ｔｅｓｔ３ ║ ║ test1 │ test2 │ ｔｅｓｔ３ ║
╟─────────────────┼─────────────────┼─────────────────╢ ╟─────────────────┼─────────────────┼─────────────────╢
@ -73,7 +73,7 @@ EXPECTED;
{ {
$table = new Table(); $table = new Table();
$expected = <<<EXPECTED $expected = <<<'EXPECTED'
╔═══════════════╤═══════════════╤══════════════╗ ╔═══════════════╤═══════════════╤══════════════╗
║ test1 │ test2 │ test3 ║ ║ test1 │ test2 │ test3 ║
╟───────────────┼───────────────┼──────────────╢ ╟───────────────┼───────────────┼──────────────╢
@ -97,7 +97,7 @@ EXPECTED;
{ {
$table = new Table(); $table = new Table();
$expected = <<<EXPECTED $expected = <<<'EXPECTED'
╔═══════════════╤═══════════════╤══════════════╗ ╔═══════════════╤═══════════════╤══════════════╗
║ test1 │ test2 │ test3 ║ ║ test1 │ test2 │ test3 ║
╟───────────────┼───────────────┼──────────────╢ ╟───────────────┼───────────────┼──────────────╢
@ -121,7 +121,7 @@ EXPECTED;
{ {
$table = new Table(); $table = new Table();
$expected = <<<EXPECTED $expected = <<<'EXPECTED'
*++++++++++++++++*+++++++++++++++++*++++++++++++++++++* *++++++++++++++++*+++++++++++++++++*++++++++++++++++++*
/ test1 / test2 / test3 / / test1 / test2 / test3 /
*++++++++++++++++*+++++++++++++++++*++++++++++++++++++* *++++++++++++++++*+++++++++++++++++*++++++++++++++++++*
@ -145,10 +145,10 @@ EXPECTED;
])->setScreenWidth(200)->run() ])->setScreenWidth(200)->run()
); );
} }
public function testTableWidgetSyntax() public function testTableWidgetSyntax()
{ {
$expected = <<<EXPECTED $expected = <<<'EXPECTED'
╔═══════════════╤═══════════════╤═══════════════╗ ╔═══════════════╤═══════════════╤═══════════════╗
║ test1 │ test2 │ test3 ║ ║ test1 │ test2 │ test3 ║
╟───────────────┼───────────────┼───────────────╢ ╟───────────────┼───────────────┼───────────────╢

2
tests/framework/db/CommandTest.php
Unescape View File

@ -165,7 +165,7 @@ abstract class CommandTest extends DatabaseTestCase
$command->bindParam(':email', $email); $command->bindParam(':email', $email);
$this->assertEquals($name, $command->queryScalar()); $this->assertEquals($name, $command->queryScalar());
$sql = <<<SQL $sql = <<<'SQL'
INSERT INTO {{type}} ([[int_col]], [[char_col]], [[float_col]], [[blob_col]], [[numeric_col]], [[bool_col]]) INSERT INTO {{type}} ([[int_col]], [[char_col]], [[float_col]], [[blob_col]], [[numeric_col]], [[bool_col]])
VALUES (:int_col, :char_col, :float_col, :blob_col, :numeric_col, :bool_col) VALUES (:int_col, :char_col, :float_col, :blob_col, :numeric_col, :bool_col)
SQL; SQL;

2
tests/framework/db/sqlite/SqlTokenizerTest.php
Unescape View File

@ -21,7 +21,7 @@ class SqlTokenizerTest extends TestCase
{ {
return [ return [
'complex' => [ 'complex' => [
<<<SQL <<<'SQL'
CREATE TABLE `constraints_test_1` ( CREATE TABLE `constraints_test_1` (
`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL, `id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
`col_1` integer, `col_1` integer,

4
tests/framework/grid/DataColumnTest.php
Unescape View File

@ -137,7 +137,7 @@ class DataColumnTest extends \yiiunit\TestCase
$method->setAccessible(true); $method->setAccessible(true);
$result = $method->invoke($dataColumn); $result = $method->invoke($dataColumn);
$this->assertEqualsWithoutLE(<<<HTML $this->assertEqualsWithoutLE(<<<'HTML'
<select class="form-control" name="Order[customer_id]"> <select class="form-control" name="Order[customer_id]">
<option value=""></option> <option value=""></option>
<option value="0">1</option> <option value="0">1</option>
@ -187,7 +187,7 @@ HTML
$method->setAccessible(true); $method->setAccessible(true);
$result = $method->invoke($dataColumn); $result = $method->invoke($dataColumn);
$this->assertEqualsWithoutLE(<<<HTML $this->assertEqualsWithoutLE(<<<'HTML'
<select class="form-control" name="Order[customer_id]"> <select class="form-control" name="Order[customer_id]">
<option value=""></option> <option value=""></option>
<option value="0">No</option> <option value="0">No</option>

2
tests/framework/grid/RadiobuttonColumnTest.php
Unescape View File

@ -89,7 +89,7 @@ class RadiobuttonColumnTest extends TestCase
ob_start(); ob_start();
$grid->run(); $grid->run();
$actual = ob_get_clean(); $actual = ob_get_clean();
$this->assertEqualsWithoutLE(<<<HTML $this->assertEqualsWithoutLE(<<<'HTML'
<div id="radio-gridview"><div class="summary">Showing <b>1-2</b> of <b>2</b> items.</div> <div id="radio-gridview"><div class="summary">Showing <b>1-2</b> of <b>2</b> items.</div>
<table class="table table-striped table-bordered"><thead> <table class="table table-striped table-bordered"><thead>
<tr><th>&nbsp;</th></tr> <tr><th>&nbsp;</th></tr>

70
tests/framework/helpers/HtmlTest.php
Unescape View File

@ -469,20 +469,20 @@ class HtmlTest extends TestCase
public function testDropDownList() public function testDropDownList()
{ {
$expected = <<<EOD $expected = <<<'EOD'
<select name="test"> <select name="test">
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::dropDownList('test')); $this->assertEqualsWithoutLE($expected, Html::dropDownList('test'));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test"> <select name="test">
<option value="value1">text1</option> <option value="value1">text1</option>
<option value="value2">text2</option> <option value="value2">text2</option>
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::dropDownList('test', null, $this->getDataItems())); $this->assertEqualsWithoutLE($expected, Html::dropDownList('test', null, $this->getDataItems()));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test"> <select name="test">
<option value="value1">text1</option> <option value="value1">text1</option>
<option value="value2" selected>text2</option> <option value="value2" selected>text2</option>
@ -490,7 +490,7 @@ EOD;
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::dropDownList('test', 'value2', $this->getDataItems())); $this->assertEqualsWithoutLE($expected, Html::dropDownList('test', 'value2', $this->getDataItems()));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test"> <select name="test">
<option value="value1">text1</option> <option value="value1">text1</option>
<option value="value2" selected>text2</option> <option value="value2" selected>text2</option>
@ -502,7 +502,7 @@ EOD;
], ],
])); ]));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test[]" multiple="true" size="4"> <select name="test[]" multiple="true" size="4">
</select> </select>
@ -512,55 +512,55 @@ EOD;
public function testListBox() public function testListBox()
{ {
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="4"> <select name="test" size="4">
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test')); $this->assertEqualsWithoutLE($expected, Html::listBox('test'));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="5"> <select name="test" size="5">
<option value="value1">text1</option> <option value="value1">text1</option>
<option value="value2">text2</option> <option value="value2">text2</option>
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems(), ['size' => 5])); $this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems(), ['size' => 5]));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="4"> <select name="test" size="4">
<option value="value1&lt;&gt;">text1&lt;&gt;</option> <option value="value1&lt;&gt;">text1&lt;&gt;</option>
<option value="value 2">text 2</option> <option value="value 2">text 2</option>
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems2())); $this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems2()));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="4"> <select name="test" size="4">
<option value="value1&lt;&gt;">text1&lt;&gt;</option> <option value="value1&lt;&gt;">text1&lt;&gt;</option>
<option value="value 2">text&nbsp;&nbsp;2</option> <option value="value 2">text&nbsp;&nbsp;2</option>
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems2(), ['encodeSpaces' => true])); $this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems2(), ['encodeSpaces' => true]));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="4"> <select name="test" size="4">
<option value="value1&lt;&gt;">text1<></option> <option value="value1&lt;&gt;">text1<></option>
<option value="value 2">text 2</option> <option value="value 2">text 2</option>
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems2(), ['encode' => false])); $this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems2(), ['encode' => false]));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="4"> <select name="test" size="4">
<option value="value1&lt;&gt;">text1<></option> <option value="value1&lt;&gt;">text1<></option>
<option value="value 2">text&nbsp;&nbsp;2</option> <option value="value 2">text&nbsp;&nbsp;2</option>
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems2(), ['encodeSpaces' => true, 'encode' => false])); $this->assertEqualsWithoutLE($expected, Html::listBox('test', null, $this->getDataItems2(), ['encodeSpaces' => true, 'encode' => false]));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="4"> <select name="test" size="4">
<option value="value1">text1</option> <option value="value1">text1</option>
<option value="value2" selected>text2</option> <option value="value2" selected>text2</option>
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', 'value2', $this->getDataItems())); $this->assertEqualsWithoutLE($expected, Html::listBox('test', 'value2', $this->getDataItems()));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="4"> <select name="test" size="4">
<option value="value1" selected>text1</option> <option value="value1" selected>text1</option>
<option value="value2" selected>text2</option> <option value="value2" selected>text2</option>
@ -568,7 +568,7 @@ EOD;
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', ['value1', 'value2'], $this->getDataItems())); $this->assertEqualsWithoutLE($expected, Html::listBox('test', ['value1', 'value2'], $this->getDataItems()));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test[]" multiple size="4"> <select name="test[]" multiple size="4">
</select> </select>
@ -576,14 +576,14 @@ EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', null, [], ['multiple' => true])); $this->assertEqualsWithoutLE($expected, Html::listBox('test', null, [], ['multiple' => true]));
$this->assertEqualsWithoutLE($expected, Html::listBox('test[]', null, [], ['multiple' => true])); $this->assertEqualsWithoutLE($expected, Html::listBox('test[]', null, [], ['multiple' => true]));
$expected = <<<EOD $expected = <<<'EOD'
<input type="hidden" name="test" value="0"><select name="test" size="4"> <input type="hidden" name="test" value="0"><select name="test" size="4">
</select> </select>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::listBox('test', '', [], ['unselect' => '0'])); $this->assertEqualsWithoutLE($expected, Html::listBox('test', '', [], ['unselect' => '0']));
$expected = <<<EOD $expected = <<<'EOD'
<select name="test" size="4"> <select name="test" size="4">
<option value="value1" selected>text1</option> <option value="value1" selected>text1</option>
<option value="value2" selected>text2</option> <option value="value2" selected>text2</option>
@ -596,20 +596,20 @@ EOD;
{ {
$this->assertEquals('<div></div>', Html::checkboxList('test')); $this->assertEquals('<div></div>', Html::checkboxList('test'));
$expected = <<<EOD $expected = <<<'EOD'
<div><label><input type="checkbox" name="test[]" value="value1"> text1</label> <div><label><input type="checkbox" name="test[]" value="value1"> text1</label>
<label><input type="checkbox" name="test[]" value="value2" checked> text2</label></div> <label><input type="checkbox" name="test[]" value="value2" checked> text2</label></div>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::checkboxList('test', ['value2'], $this->getDataItems())); $this->assertEqualsWithoutLE($expected, Html::checkboxList('test', ['value2'], $this->getDataItems()));
$this->assertEqualsWithoutLE($expected, Html::checkboxList('test[]', ['value2'], $this->getDataItems())); $this->assertEqualsWithoutLE($expected, Html::checkboxList('test[]', ['value2'], $this->getDataItems()));
$expected = <<<EOD $expected = <<<'EOD'
<div><label><input type="checkbox" name="test[]" value="value1&lt;&gt;"> text1&lt;&gt;</label> <div><label><input type="checkbox" name="test[]" value="value1&lt;&gt;"> text1&lt;&gt;</label>
<label><input type="checkbox" name="test[]" value="value 2"> text 2</label></div> <label><input type="checkbox" name="test[]" value="value 2"> text 2</label></div>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::checkboxList('test', ['value2'], $this->getDataItems2())); $this->assertEqualsWithoutLE($expected, Html::checkboxList('test', ['value2'], $this->getDataItems2()));
$expected = <<<EOD $expected = <<<'EOD'
<input type="hidden" name="test" value="0"><div><label><input type="checkbox" name="test[]" value="value1"> text1</label><br> <input type="hidden" name="test" value="0"><div><label><input type="checkbox" name="test[]" value="value1"> text1</label><br>
<label><input type="checkbox" name="test[]" value="value2" checked> text2</label></div> <label><input type="checkbox" name="test[]" value="value2" checked> text2</label></div>
EOD; EOD;
@ -618,7 +618,7 @@ EOD;
'unselect' => '0', 'unselect' => '0',
])); ]));
$expected = <<<EOD $expected = <<<'EOD'
<div>0<label>text1 <input type="checkbox" name="test[]" value="value1"></label> <div>0<label>text1 <input type="checkbox" name="test[]" value="value1"></label>
1<label>text2 <input type="checkbox" name="test[]" value="value2" checked></label></div> 1<label>text2 <input type="checkbox" name="test[]" value="value2" checked></label></div>
EOD; EOD;
@ -628,7 +628,7 @@ EOD;
}, },
])); ]));
$expected = <<<EOD $expected = <<<'EOD'
0<label>text1 <input type="checkbox" name="test[]" value="value1"></label> 0<label>text1 <input type="checkbox" name="test[]" value="value1"></label>
1<label>text2 <input type="checkbox" name="test[]" value="value2" checked></label> 1<label>text2 <input type="checkbox" name="test[]" value="value2" checked></label>
EOD; EOD;
@ -652,19 +652,19 @@ EOD;
{ {
$this->assertEquals('<div></div>', Html::radioList('test')); $this->assertEquals('<div></div>', Html::radioList('test'));
$expected = <<<EOD $expected = <<<'EOD'
<div><label><input type="radio" name="test" value="value1"> text1</label> <div><label><input type="radio" name="test" value="value1"> text1</label>
<label><input type="radio" name="test" value="value2" checked> text2</label></div> <label><input type="radio" name="test" value="value2" checked> text2</label></div>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::radioList('test', ['value2'], $this->getDataItems())); $this->assertEqualsWithoutLE($expected, Html::radioList('test', ['value2'], $this->getDataItems()));
$expected = <<<EOD $expected = <<<'EOD'
<div><label><input type="radio" name="test" value="value1&lt;&gt;"> text1&lt;&gt;</label> <div><label><input type="radio" name="test" value="value1&lt;&gt;"> text1&lt;&gt;</label>
<label><input type="radio" name="test" value="value 2"> text 2</label></div> <label><input type="radio" name="test" value="value 2"> text 2</label></div>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::radioList('test', ['value2'], $this->getDataItems2())); $this->assertEqualsWithoutLE($expected, Html::radioList('test', ['value2'], $this->getDataItems2()));
$expected = <<<EOD $expected = <<<'EOD'
<input type="hidden" name="test" value="0"><div><label><input type="radio" name="test" value="value1"> text1</label><br> <input type="hidden" name="test" value="0"><div><label><input type="radio" name="test" value="value1"> text1</label><br>
<label><input type="radio" name="test" value="value2" checked> text2</label></div> <label><input type="radio" name="test" value="value2" checked> text2</label></div>
EOD; EOD;
@ -673,7 +673,7 @@ EOD;
'unselect' => '0', 'unselect' => '0',
])); ]));
$expected = <<<EOD $expected = <<<'EOD'
<div>0<label>text1 <input type="radio" name="test" value="value1"></label> <div>0<label>text1 <input type="radio" name="test" value="value1"></label>
1<label>text2 <input type="radio" name="test" value="value2" checked></label></div> 1<label>text2 <input type="radio" name="test" value="value2" checked></label></div>
EOD; EOD;
@ -683,7 +683,7 @@ EOD;
}, },
])); ]));
$expected = <<<EOD $expected = <<<'EOD'
0<label>text1 <input type="radio" name="test" value="value1"></label> 0<label>text1 <input type="radio" name="test" value="value1"></label>
1<label>text2 <input type="radio" name="test" value="value2" checked></label> 1<label>text2 <input type="radio" name="test" value="value2" checked></label>
EOD; EOD;
@ -707,7 +707,7 @@ EOD;
$data = [ $data = [
1, 'abc', '<>', 1, 'abc', '<>',
]; ];
$expected = <<<EOD $expected = <<<'EOD'
<ul> <ul>
<li>1</li> <li>1</li>
<li>abc</li> <li>abc</li>
@ -715,7 +715,7 @@ EOD;
</ul> </ul>
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::ul($data)); $this->assertEqualsWithoutLE($expected, Html::ul($data));
$expected = <<<EOD $expected = <<<'EOD'
<ul class="test"> <ul class="test">
<li class="item-0">1</li> <li class="item-0">1</li>
<li class="item-1">abc</li> <li class="item-1">abc</li>
@ -739,7 +739,7 @@ EOD;
$data = [ $data = [
1, 'abc', '<>', 1, 'abc', '<>',
]; ];
$expected = <<<EOD $expected = <<<'EOD'
<ol> <ol>
<li class="ti">1</li> <li class="ti">1</li>
<li class="ti">abc</li> <li class="ti">abc</li>
@ -749,7 +749,7 @@ EOD;
$this->assertEqualsWithoutLE($expected, Html::ol($data, [ $this->assertEqualsWithoutLE($expected, Html::ol($data, [
'itemOptions' => ['class' => 'ti'], 'itemOptions' => ['class' => 'ti'],
])); ]));
$expected = <<<EOD $expected = <<<'EOD'
<ol class="test"> <ol class="test">
<li class="item-0">1</li> <li class="item-0">1</li>
<li class="item-1">abc</li> <li class="item-1">abc</li>
@ -780,7 +780,7 @@ EOD;
'value2' => 'label2', 'value2' => 'label2',
'group2' => [], 'group2' => [],
]; ];
$expected = <<<EOD $expected = <<<'EOD'
<option value="">please&nbsp;select&lt;&gt;</option> <option value="">please&nbsp;select&lt;&gt;</option>
<option value="value1" selected>label1</option> <option value="value1" selected>label1</option>
<optgroup label="group1"> <optgroup label="group1">
@ -826,7 +826,7 @@ EOD;
'value1' => 'label1', 'value1' => 'label1',
'value2' => 'label2', 'value2' => 'label2',
]; ];
$expected = <<<EOD $expected = <<<'EOD'
<option class="prompt" value="-1" label="None">Please select</option> <option class="prompt" value="-1" label="None">Please select</option>
<option value="value1" selected>label1</option> <option value="value1" selected>label1</option>
<option value="value2">label2</option> <option value="value2">label2</option>
@ -1512,7 +1512,7 @@ EOD;
public function testActiveDropDownList() public function testActiveDropDownList()
{ {
$expected = <<<HTML $expected = <<<'HTML'
<input type="hidden" name="HtmlTestModel[types]" value=""><select id="htmltestmodel-types" name="HtmlTestModel[types][]" multiple="true" size="4"> <input type="hidden" name="HtmlTestModel[types]" value=""><select id="htmltestmodel-types" name="HtmlTestModel[types][]" multiple="true" size="4">
</select> </select>
@ -1526,7 +1526,7 @@ HTML;
{ {
$model = new HtmlTestModel(); $model = new HtmlTestModel();
$expected = <<<HTML $expected = <<<'HTML'
<input type="hidden" name="HtmlTestModel[types]" value=""><div id="htmltestmodel-types"><label><input type="radio" name="HtmlTestModel[types]" value="0"> foo</label></div> <input type="hidden" name="HtmlTestModel[types]" value=""><div id="htmltestmodel-types"><label><input type="radio" name="HtmlTestModel[types]" value="0"> foo</label></div>
HTML; HTML;
$actual = Html::activeRadioList($model, 'types', ['foo']); $actual = Html::activeRadioList($model, 'types', ['foo']);
@ -1537,7 +1537,7 @@ HTML;
{ {
$model = new HtmlTestModel(); $model = new HtmlTestModel();
$expected = <<<HTML $expected = <<<'HTML'
<input type="hidden" name="HtmlTestModel[types]" value=""><div id="htmltestmodel-types"><label><input type="checkbox" name="HtmlTestModel[types][]" value="0"> foo</label></div> <input type="hidden" name="HtmlTestModel[types]" value=""><div id="htmltestmodel-types"><label><input type="checkbox" name="HtmlTestModel[types][]" value="0"> foo</label></div>
HTML; HTML;
$actual = Html::activeCheckboxList($model, 'types', ['foo']); $actual = Html::activeCheckboxList($model, 'types', ['foo']);

2
tests/framework/helpers/MarkdownTest.php
Unescape View File

@ -28,7 +28,7 @@ class MarkdownTest extends TestCase
public function testOriginalFlavor() public function testOriginalFlavor()
{ {
$text = <<<TEXT $text = <<<'TEXT'
html html
new line 1 new line 1

6
tests/framework/helpers/VarDumperTest.php
Unescape View File

@ -100,7 +100,7 @@ class VarDumperTest extends TestCase
'key1' => 'value1', 'key1' => 'value1',
'key2' => 'value2', 'key2' => 'value2',
]; ];
$expectedResult = <<<RESULT $expectedResult = <<<'RESULT'
[ [
'key1' => 'value1', 'key1' => 'value1',
'key2' => 'value2', 'key2' => 'value2',
@ -112,7 +112,7 @@ RESULT;
'value1', 'value1',
'value2', 'value2',
]; ];
$expectedResult = <<<RESULT $expectedResult = <<<'RESULT'
[ [
'value1', 'value1',
'value2', 'value2',
@ -128,7 +128,7 @@ RESULT;
'subkey2' => 'value3', 'subkey2' => 'value3',
], ],
]; ];
$expectedResult = <<<RESULT $expectedResult = <<<'RESULT'
[ [
'key1' => [ 'key1' => [
'subkey1' => 'value2', 'subkey1' => 'value2',

2
tests/framework/i18n/FallbackMessageFormatterTest.php
Unescape View File

@ -92,7 +92,7 @@ class FallbackMessageFormatterTest extends TestCase
], ],
// This one was provided by Aura.Intl. Thanks! // This one was provided by Aura.Intl. Thanks!
[<<<_MSG_ [<<<'_MSG_'
{gender_of_host, select, {gender_of_host, select,
female {{num_guests, plural, offset:1 female {{num_guests, plural, offset:1
=0 {{host} does not give a party.} =0 {{host} does not give a party.}

2
tests/framework/i18n/MessageFormatterTest.php
Unescape View File

@ -84,7 +84,7 @@ class MessageFormatterTest extends TestCase
], ],
// This one was provided by Aura.Intl. Thanks! // This one was provided by Aura.Intl. Thanks!
[<<<_MSG_ [<<<'_MSG_'
{gender_of_host, select, {gender_of_host, select,
female {{num_guests, plural, offset:1 female {{num_guests, plural, offset:1
=0 {{host} does not give a party.} =0 {{host} does not give a party.}

4
tests/framework/mail/BaseMailerTest.php
Unescape View File

@ -224,7 +224,7 @@ class BaseMailerTest extends TestCase
'HTML view file content http://yiifresh.com/index.php?r=site%2Freset-password&token=abcdef', 'HTML view file content http://yiifresh.com/index.php?r=site%2Freset-password&token=abcdef',
], ],
[ [
2, <<<HTML 2, <<<'HTML'
<html><head><style type="text/css">.content{color: #112345;}</style><title>TEST</title></head> <html><head><style type="text/css">.content{color: #112345;}</style><title>TEST</title></head>
<body> <body>
<style type="text/css">.content{color: #112345;}</style> <style type="text/css">.content{color: #112345;}</style>
@ -239,7 +239,7 @@ class BaseMailerTest extends TestCase
</body> </body>
</html> </html>
HTML HTML
, <<<TEXT , <<<'TEXT'
First paragraph First paragraph
second line second line

14
tests/framework/web/AssetBundleTest.php
Unescape View File

@ -208,7 +208,7 @@ class AssetBundleTest extends \yiiunit\TestCase
$this->assertArrayHasKey('yiiunit\\framework\\web\\TestSimpleAsset', $view->assetBundles); $this->assertArrayHasKey('yiiunit\\framework\\web\\TestSimpleAsset', $view->assetBundles);
$this->assertInstanceOf(AssetBundle::className(), $view->assetBundles['yiiunit\\framework\\web\\TestSimpleAsset']); $this->assertInstanceOf(AssetBundle::className(), $view->assetBundles['yiiunit\\framework\\web\\TestSimpleAsset']);
$expected = <<<EOF $expected = <<<'EOF'
123<script src="/js/jquery.js"></script>4 123<script src="/js/jquery.js"></script>4
EOF; EOF;
$this->assertEquals($expected, $view->renderFile('@yiiunit/data/views/rawlayout.php')); $this->assertEquals($expected, $view->renderFile('@yiiunit/data/views/rawlayout.php'));
@ -228,7 +228,7 @@ EOF;
$this->assertInstanceOf(AssetBundle::className(), $view->assetBundles['yiiunit\\framework\\web\\TestJqueryAsset']); $this->assertInstanceOf(AssetBundle::className(), $view->assetBundles['yiiunit\\framework\\web\\TestJqueryAsset']);
$this->assertInstanceOf(AssetBundle::className(), $view->assetBundles['yiiunit\\framework\\web\\TestAssetLevel3']); $this->assertInstanceOf(AssetBundle::className(), $view->assetBundles['yiiunit\\framework\\web\\TestAssetLevel3']);
$expected = <<<EOF $expected = <<<'EOF'
1<link href="/files/cssFile.css" rel="stylesheet">23<script src="/js/jquery.js"></script> 1<link href="/files/cssFile.css" rel="stylesheet">23<script src="/js/jquery.js"></script>
<script src="/files/jsFile.js"></script>4 <script src="/files/jsFile.js"></script>4
EOF; EOF;
@ -283,21 +283,21 @@ EOF;
switch ($pos) { switch ($pos) {
case View::POS_HEAD: case View::POS_HEAD:
$expected = <<<EOF $expected = <<<'EOF'
1<link href="/files/cssFile.css" rel="stylesheet"> 1<link href="/files/cssFile.css" rel="stylesheet">
<script src="/js/jquery.js"></script> <script src="/js/jquery.js"></script>
<script src="/files/jsFile.js"></script>234 <script src="/files/jsFile.js"></script>234
EOF; EOF;
break; break;
case View::POS_BEGIN: case View::POS_BEGIN:
$expected = <<<EOF $expected = <<<'EOF'
1<link href="/files/cssFile.css" rel="stylesheet">2<script src="/js/jquery.js"></script> 1<link href="/files/cssFile.css" rel="stylesheet">2<script src="/js/jquery.js"></script>
<script src="/files/jsFile.js"></script>34 <script src="/files/jsFile.js"></script>34
EOF; EOF;
break; break;
default: default:
case View::POS_END: case View::POS_END:
$expected = <<<EOF $expected = <<<'EOF'
1<link href="/files/cssFile.css" rel="stylesheet">23<script src="/js/jquery.js"></script> 1<link href="/files/cssFile.css" rel="stylesheet">23<script src="/js/jquery.js"></script>
<script src="/files/jsFile.js"></script>4 <script src="/files/jsFile.js"></script>4
EOF; EOF;
@ -360,7 +360,7 @@ EOF;
// register TestJqueryAsset which also has the jquery.js // register TestJqueryAsset which also has the jquery.js
TestJqueryAsset::register($view); TestJqueryAsset::register($view);
$expected = <<<EOF $expected = <<<'EOF'
123<script src="/js/jquery.js"></script>4 123<script src="/js/jquery.js"></script>4
EOF; EOF;
$this->assertEquals($expected, $view->renderFile('@yiiunit/data/views/rawlayout.php')); $this->assertEquals($expected, $view->renderFile('@yiiunit/data/views/rawlayout.php'));
@ -373,7 +373,7 @@ EOF;
$this->assertEmpty($view->assetBundles); $this->assertEmpty($view->assetBundles);
TestAssetPerFileOptions::register($view); TestAssetPerFileOptions::register($view);
$expected = <<<EOF $expected = <<<'EOF'
1<link href="/default_options.css" rel="stylesheet" media="screen" hreflang="en"> 1<link href="/default_options.css" rel="stylesheet" media="screen" hreflang="en">
<link href="/tv.css" rel="stylesheet" media="tv" hreflang="en"> <link href="/tv.css" rel="stylesheet" media="tv" hreflang="en">
<link href="/screen_and_print.css" rel="stylesheet" media="screen, print" hreflang="en">23<script src="/normal.js" charset="utf-8"></script> <link href="/screen_and_print.css" rel="stylesheet" media="screen, print" hreflang="en">23<script src="/normal.js" charset="utf-8"></script>

2
tests/framework/web/AssetConverterTest.php
Unescape View File

@ -65,7 +65,7 @@ EOF
public function testForceConvert() public function testForceConvert()
{ {
$tmpPath = $this->tmpPath; $tmpPath = $this->tmpPath;
file_put_contents($tmpPath . '/test.php', <<<EOF file_put_contents($tmpPath . '/test.php', <<<'EOF'
<?php <?php
echo microtime(); echo microtime();

20
tests/framework/widgets/ActiveFieldTest.php
Unescape View File

@ -268,7 +268,7 @@ EOT;
public function testInput() public function testInput()
{ {
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<input type="password" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]"> <input type="password" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
EOD; EOD;
$this->activeField->input('password'); $this->activeField->input('password');
@ -276,7 +276,7 @@ EOD;
$this->assertEquals($expectedValue, $this->activeField->parts['{input}']); $this->assertEquals($expectedValue, $this->activeField->parts['{input}']);
// with options // with options
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<input type="password" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" weird="value"> <input type="password" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" weird="value">
EOD; EOD;
$this->activeField->input('password', ['weird' => 'value']); $this->activeField->input('password', ['weird' => 'value']);
@ -286,7 +286,7 @@ EOD;
public function testTextInput() public function testTextInput()
{ {
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]"> <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
EOD; EOD;
$this->activeField->textInput(); $this->activeField->textInput();
@ -295,7 +295,7 @@ EOD;
public function testHiddenInput() public function testHiddenInput()
{ {
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]"> <input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
EOD; EOD;
$this->activeField->hiddenInput(); $this->activeField->hiddenInput();
@ -304,7 +304,7 @@ EOD;
public function testListBox() public function testListBox()
{ {
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4"> <input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
<option value="1">Item One</option> <option value="1">Item One</option>
<option value="2">Item 2</option> <option value="2">Item 2</option>
@ -314,7 +314,7 @@ EOD;
$this->assertEqualsWithoutLE($expectedValue, $this->activeField->parts['{input}']); $this->assertEqualsWithoutLE($expectedValue, $this->activeField->parts['{input}']);
// https://github.com/yiisoft/yii2/issues/8848 // https://github.com/yiisoft/yii2/issues/8848
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4"> <input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
<option value="value1" disabled>Item One</option> <option value="value1" disabled>Item One</option>
<option value="value2" label="value 2">Item 2</option> <option value="value2" label="value 2">Item 2</option>
@ -326,7 +326,7 @@ EOD;
]]); ]]);
$this->assertEqualsWithoutLE($expectedValue, $this->activeField->parts['{input}']); $this->assertEqualsWithoutLE($expectedValue, $this->activeField->parts['{input}']);
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4"> <input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
<option value="value1" disabled>Item One</option> <option value="value1" disabled>Item One</option>
<option value="value2" selected label="value 2">Item 2</option> <option value="value2" selected label="value 2">Item 2</option>
@ -453,7 +453,7 @@ EOD;
{ {
$this->activeField->addAriaAttributes = true; $this->activeField->addAriaAttributes = true;
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<div class="form-group field-activefieldtestmodel-attributename"> <div class="form-group field-activefieldtestmodel-attributename">
<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label> <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]"> <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
@ -471,7 +471,7 @@ EOD;
$this->activeField->addAriaAttributes = true; $this->activeField->addAriaAttributes = true;
$this->helperModel->addRule([$this->attributeName], 'required'); $this->helperModel->addRule([$this->attributeName], 'required');
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<div class="form-group field-activefieldtestmodel-attributename required"> <div class="form-group field-activefieldtestmodel-attributename required">
<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label> <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" aria-required="true"> <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" aria-required="true">
@ -489,7 +489,7 @@ EOD;
$this->activeField->addAriaAttributes = true; $this->activeField->addAriaAttributes = true;
$this->helperModel->addError($this->attributeName, 'Some error'); $this->helperModel->addError($this->attributeName, 'Some error');
$expectedValue = <<<EOD $expectedValue = <<<'EOD'
<div class="form-group field-activefieldtestmodel-attributename has-error"> <div class="form-group field-activefieldtestmodel-attributename has-error">
<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label> <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" aria-invalid="true"> <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" aria-invalid="true">

10
tests/framework/widgets/ActiveFormTest.php
Unescape View File

@ -33,14 +33,14 @@ class ActiveFormTest extends \yiiunit\TestCase
ActiveForm::end(); ActiveForm::end();
ob_end_clean(); ob_end_clean();
$this->assertEqualsWithoutLE(<<<EOF $this->assertEqualsWithoutLE(<<<'EOF'
<div class="form-group field-dynamicmodel-name"> <div class="form-group field-dynamicmodel-name">
<input type="email" id="dynamicmodel-name" class="form-control" name="DynamicModel[name]" required> <input type="email" id="dynamicmodel-name" class="form-control" name="DynamicModel[name]" required>
</div> </div>
EOF EOF
, (string) $form->field($model, 'name', $o)->input('email', ['required' => true])); , (string) $form->field($model, 'name', $o)->input('email', ['required' => true]));
$this->assertEqualsWithoutLE(<<<EOF $this->assertEqualsWithoutLE(<<<'EOF'
<div class="form-group field-dynamicmodel-name"> <div class="form-group field-dynamicmodel-name">
<input type="email" id="dynamicmodel-name" class="form-control" name="DynamicModel[name]"> <input type="email" id="dynamicmodel-name" class="form-control" name="DynamicModel[name]">
</div> </div>
@ -48,7 +48,7 @@ EOF
, (string) $form->field($model, 'name', $o)->input('email', ['required' => false])); , (string) $form->field($model, 'name', $o)->input('email', ['required' => false]));
$this->assertEqualsWithoutLE(<<<EOF $this->assertEqualsWithoutLE(<<<'EOF'
<div class="form-group field-dynamicmodel-name"> <div class="form-group field-dynamicmodel-name">
<input type="email" id="dynamicmodel-name" class="form-control" name="DynamicModel[name]" required="test"> <input type="email" id="dynamicmodel-name" class="form-control" name="DynamicModel[name]" required="test">
</div> </div>
@ -68,7 +68,7 @@ EOF
ob_end_clean(); ob_end_clean();
// https://github.com/yiisoft/yii2/issues/5356 // https://github.com/yiisoft/yii2/issues/5356
$this->assertEqualsWithoutLE(<<<EOF $this->assertEqualsWithoutLE(<<<'EOF'
<div class="form-group field-dynamicmodel-categories"> <div class="form-group field-dynamicmodel-categories">
<input type="hidden" name="DynamicModel[categories]" value=""><select id="dynamicmodel-categories" class="form-control" name="DynamicModel[categories][]" multiple size="4"> <input type="hidden" name="DynamicModel[categories]" value=""><select id="dynamicmodel-categories" class="form-control" name="DynamicModel[categories][]" multiple size="4">
<option value="0">apple</option> <option value="0">apple</option>
@ -95,7 +95,7 @@ EOF
$this->assertEquals($obLevel, ob_get_level(), 'Output buffers not closed correctly.'); $this->assertEquals($obLevel, ob_get_level(), 'Output buffers not closed correctly.');
$this->assertEqualsWithoutLE(<<<HTML $this->assertEqualsWithoutLE(<<<'HTML'
<form id="someform" action="/someform" method="post"> <form id="someform" action="/someform" method="post">
<div class="form-group field-dynamicmodel-name"> <div class="form-group field-dynamicmodel-name">
<label class="control-label" for="dynamicmodel-name">Name</label> <label class="control-label" for="dynamicmodel-name">Name</label>

6
tests/framework/widgets/ListViewTest.php
Unescape View File

@ -50,7 +50,7 @@ class ListViewTest extends TestCase
'showOnEmpty' => true, 'showOnEmpty' => true,
])->run(); ])->run();
$this->expectOutputString(<<<HTML $this->expectOutputString(<<<'HTML'
<div id="w0" class="list-view"> <div id="w0" class="list-view">
</div> </div>
@ -81,7 +81,7 @@ HTML
{ {
$this->getListView()->run(); $this->getListView()->run();
$this->expectOutputString(<<<HTML $this->expectOutputString(<<<'HTML'
<div id="w0" class="list-view"><div class="summary">Showing <b>1-3</b> of <b>3</b> items.</div> <div id="w0" class="list-view"><div class="summary">Showing <b>1-3</b> of <b>3</b> items.</div>
<div data-key="0">0</div> <div data-key="0">0</div>
<div data-key="1">1</div> <div data-key="1">1</div>
@ -95,7 +95,7 @@ HTML
{ {
$this->getListView(['options' => ['class' => 'test-passed'], 'separator' => ''])->run(); $this->getListView(['options' => ['class' => 'test-passed'], 'separator' => ''])->run();
$this->expectOutputString(<<<HTML $this->expectOutputString(<<<'HTML'
<div id="w0" class="test-passed"><div class="summary">Showing <b>1-3</b> of <b>3</b> items.</div> <div id="w0" class="test-passed"><div class="summary">Showing <b>1-3</b> of <b>3</b> items.</div>
<div data-key="0">0</div><div data-key="1">1</div><div data-key="2">2</div> <div data-key="0">0</div><div data-key="1">1</div><div data-key="2">2</div>
</div> </div>

16
tests/framework/widgets/MenuTest.php
Unescape View File

@ -41,7 +41,7 @@ class MenuTest extends \yiiunit\TestCase
], ],
]); ]);
$expected = <<<HTML $expected = <<<'HTML'
<ul><li><a href="#"><span class="glyphicon glyphicon-user"></span> Users</a></li> <ul><li><a href="#"><span class="glyphicon glyphicon-user"></span> Users</a></li>
<li><a href="#">Authors &amp; Publications</a></li></ul> <li><a href="#">Authors &amp; Publications</a></li></ul>
HTML; HTML;
@ -65,7 +65,7 @@ HTML;
], ],
]); ]);
$expected = <<<HTML $expected = <<<'HTML'
<ul><li><a href="#"><span class="glyphicon glyphicon-user"></span> Users</a></li> <ul><li><a href="#"><span class="glyphicon glyphicon-user"></span> Users</a></li>
<li><a href="#">Authors &amp; Publications</a></li></ul> <li><a href="#">Authors &amp; Publications</a></li></ul>
HTML; HTML;
@ -98,7 +98,7 @@ HTML;
], ],
]); ]);
$expected = <<<HTML $expected = <<<'HTML'
<div><a href="#">item1</a></div> <div><a href="#">item1</a></div>
<a href="#">item2</a> <a href="#">item2</a>
HTML; HTML;
@ -124,7 +124,7 @@ HTML;
'itemOptions' => ['tag' => false], 'itemOptions' => ['tag' => false],
]); ]);
$expected = <<<HTML $expected = <<<'HTML'
<a href="#">item1</a> <a href="#">item1</a>
<a href="#">item2</a> <a href="#">item2</a>
HTML; HTML;
@ -155,7 +155,7 @@ HTML;
], ],
]); ]);
$expected = <<<HTML $expected = <<<'HTML'
<ul><li>label: item1; url: #</li> <ul><li>label: item1; url: #</li>
<li>label: item2</li> <li>label: item2</li>
<li></li></ul> <li></li></ul>
@ -192,7 +192,7 @@ HTML;
], ],
]); ]);
$expected = <<<HTML $expected = <<<'HTML'
<ul><li class="active">label: item1; url: #</li> <ul><li class="active">label: item1; url: #</li>
<li>label: item2</li> <li>label: item2</li>
<li class="active"></li></ul> <li class="active"></li></ul>
@ -247,7 +247,7 @@ HTML;
], ],
]); ]);
$expected = <<<HTML $expected = <<<'HTML'
<ul><li class="someclass item-active"><a href="#">item1</a></li> <ul><li class="someclass item-active"><a href="#">item1</a></li>
<li class="another-class other--class two classes"><a href="#">item2</a></li> <li class="another-class other--class two classes"><a href="#">item2</a></li>
<li><a href="#">item3</a></li> <li><a href="#">item3</a></li>
@ -293,7 +293,7 @@ HTML;
], ],
]); ]);
$expected = <<<HTML $expected = <<<'HTML'
<ul><li class="someclass"><a href="#">item1</a></li> <ul><li class="someclass"><a href="#">item1</a></li>
<li><a href="#">item2</a></li> <li><a href="#">item2</a></li>
<li class="some classes"><a href="#">item3</a></li> <li class="some classes"><a href="#">item3</a></li>

Write Preview
Loading…
Cancel
Save