Browse Source

Wrap @inheritdoc tag in curly brackets [skip ci]

tags/2.0.14
SilverFire - Dmitry Naumenko 7 years ago
parent
commit
089685975a
No known key found for this signature in database
GPG Key ID: 39DD917A92B270A
  1. 20
      docs/guide-es/db-migrations.md
  2. 20
      docs/guide-fr/db-migrations.md
  3. 8
      docs/guide-fr/output-data-providers.md
  4. 6
      docs/guide-fr/output-data-widgets.md
  5. 20
      docs/guide-ja/db-migrations.md
  6. 8
      docs/guide-ja/output-data-providers.md
  7. 6
      docs/guide-ja/output-data-widgets.md
  8. 8
      docs/guide-pt-BR/output-data-providers.md
  9. 2
      docs/guide-zh-CN/db-active-record.md
  10. 8
      framework/db/cubrid/QueryBuilder.php
  11. 18
      framework/db/cubrid/Schema.php
  12. 4
      framework/db/cubrid/conditions/LikeConditionBuilder.php
  13. 6
      framework/db/mssql/QueryBuilder.php
  14. 22
      framework/db/mssql/Schema.php
  15. 2
      framework/db/mssql/conditions/LikeConditionBuilder.php
  16. 8
      framework/db/mysql/QueryBuilder.php
  17. 22
      framework/db/mysql/Schema.php
  18. 2
      framework/db/oci/QueryBuilder.php
  19. 22
      framework/db/oci/Schema.php
  20. 4
      framework/db/oci/conditions/LikeConditionBuilder.php
  21. 2
      framework/db/pgsql/ColumnSchema.php
  22. 2
      framework/db/pgsql/QueryBuilder.php
  23. 22
      framework/db/pgsql/Schema.php
  24. 14
      framework/db/sqlite/QueryBuilder.php
  25. 20
      framework/db/sqlite/Schema.php
  26. 12
      framework/db/sqlite/SqlTokenizer.php
  27. 2
      framework/db/sqlite/conditions/LikeConditionBuilder.php
  28. 2
      tests/data/ar/Department.php
  29. 2
      tests/data/ar/Dossier.php
  30. 2
      tests/data/ar/Employee.php
  31. 10
      tests/framework/behaviors/CacheableWidgetBehaviorTest.php

20
docs/guide-es/db-migrations.md

@ -204,7 +204,7 @@ esto genera
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -214,7 +214,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -238,7 +238,7 @@ genera
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -250,7 +250,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -275,7 +275,7 @@ genera
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -287,7 +287,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -320,7 +320,7 @@ genera
class m160328_040430_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -368,7 +368,7 @@ class m160328_040430_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -522,7 +522,7 @@ genera
class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -569,7 +569,7 @@ class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migra
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{

20
docs/guide-fr/db-migrations.md

@ -169,7 +169,7 @@ génère
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -179,7 +179,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -203,7 +203,7 @@ génère
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -215,7 +215,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -240,7 +240,7 @@ génère
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -252,7 +252,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -284,7 +284,7 @@ génère
class m160328_040430_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -332,7 +332,7 @@ class m160328_040430_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -477,7 +477,7 @@ génère
class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -524,7 +524,7 @@ class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migra
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{

8
docs/guide-fr/output-data-providers.md

@ -220,7 +220,7 @@ class CsvDataProvider extends BaseDataProvider
/**
* @inheritdoc
* {@inheritdoc}
*/
public function init()
{
@ -231,7 +231,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareModels()
{
@ -260,7 +260,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareKeys($models)
{
@ -282,7 +282,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareTotalCount()
{

6
docs/guide-fr/output-data-widgets.md

@ -561,7 +561,7 @@ class UserView extends ActiveRecord
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public static function tableName()
{
@ -574,7 +574,7 @@ class UserView extends ActiveRecord
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function rules()
{
@ -584,7 +584,7 @@ class UserView extends ActiveRecord
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function attributeLabels()
{

20
docs/guide-ja/db-migrations.md

@ -196,7 +196,7 @@ yii migrate/create create_post_table
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -206,7 +206,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -230,7 +230,7 @@ yii migrate/create create_post_table --fields="title:string,body:text"
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -242,7 +242,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -267,7 +267,7 @@ yii migrate/create create_post_table --fields="title:string(12):notNull:unique,b
class m150811_220037_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -279,7 +279,7 @@ class m150811_220037_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -313,7 +313,7 @@ yii migrate/create create_post_table --fields="author_id:integer:notNull:foreign
class m160328_040430_create_post_table extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -361,7 +361,7 @@ class m160328_040430_create_post_table extends Migration
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{
@ -521,7 +521,7 @@ yii migrate/create create_junction_table_for_post_and_tag_tables --fields="creat
class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migration
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function up()
{
@ -568,7 +568,7 @@ class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migra
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function down()
{

8
docs/guide-ja/output-data-providers.md

@ -250,7 +250,7 @@ class CsvDataProvider extends BaseDataProvider
/**
* @inheritdoc
* {@inheritdoc}
*/
public function init()
{
@ -261,7 +261,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareModels()
{
@ -290,7 +290,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareKeys($models)
{
@ -312,7 +312,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareTotalCount()
{

6
docs/guide-ja/output-data-widgets.md

@ -637,7 +637,7 @@ class UserView extends ActiveRecord
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public static function tableName()
{
@ -650,7 +650,7 @@ class UserView extends ActiveRecord
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function rules()
{
@ -660,7 +660,7 @@ class UserView extends ActiveRecord
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function attributeLabels()
{

8
docs/guide-pt-BR/output-data-providers.md

@ -228,7 +228,7 @@ class CsvDataProvider extends BaseDataProvider
protected $fileObject; // SplFileObject é muito conveniente para procurar uma linha específica em um arquivo
/**
* @inheritdoc
* {@inheritdoc}
*/
public function init()
{
@ -239,7 +239,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareModels()
{
@ -265,7 +265,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareKeys($models)
{
@ -285,7 +285,7 @@ class CsvDataProvider extends BaseDataProvider
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function prepareTotalCount()
{

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

@ -796,7 +796,7 @@ use yii\db\ActiveRecord;
class Comment extends ActiveRecord
{
/**
* @inheritdoc
* {@inheritdoc}
* @return CommentQuery
*/
public static function find()

8
framework/db/cubrid/QueryBuilder.php

@ -59,7 +59,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritdoc
* {@inheritdoc}
* @see https://www.cubrid.org/manual/en/9.3.0/sql/query/merge.html
*/
public function upsert($table, $insertColumns, $updateColumns, &$params)
@ -175,7 +175,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @see http://www.cubrid.org/manual/93/en/sql/schema/table.html#drop-index-clause
*/
public function dropIndex($name, $table)
@ -192,7 +192,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by CUBRID.
*/
public function addCheck($name, $table, $expression)
@ -201,7 +201,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by CUBRID.
*/
public function dropCheck($name, $table)

18
framework/db/cubrid/Schema.php

@ -81,12 +81,12 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
];
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $tableQuoteCharacter = '"';
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function findTableNames($schema = '')
{
@ -104,7 +104,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableSchema($name)
{
@ -153,7 +153,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTablePrimaryKey($tableName)
{
@ -170,7 +170,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableForeignKeys($tableName)
{
@ -200,7 +200,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableIndexes($tableName)
{
@ -208,7 +208,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableUniques($tableName)
{
@ -216,7 +216,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException if this method is called.
*/
protected function loadTableChecks($tableName)
@ -225,7 +225,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException if this method is called.
*/
protected function loadTableDefaultValues($tableName)

4
framework/db/cubrid/conditions/LikeConditionBuilder.php

@ -8,13 +8,13 @@ namespace yii\db\cubrid\conditions;
class LikeConditionBuilder extends \yii\db\conditions\LikeConditionBuilder
{
/**
* @inheritdoc
* {@inheritdoc}
*/
protected $escapeCharacter = '!';
/**
* `\` is initialized in [[buildLikeCondition()]] method since
* we need to choose replacement value based on [[\yii\db\Schema::quoteValue()]].
* @inheritdoc
* {@inheritdoc}
*/
protected $escapingReplacements = [
'%' => '!%',

6
framework/db/mssql/QueryBuilder.php

@ -177,7 +177,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
*/
public function addDefaultValue($name, $table, $column, $value)
{
@ -187,7 +187,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
*/
public function dropDefaultValue($name, $table)
{
@ -353,7 +353,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritdoc
* {@inheritdoc}
* @see https://docs.microsoft.com/en-us/sql/t-sql/statements/merge-transact-sql
* @see http://weblogs.sqlteam.com/dang/archive/2009/01/31/UPSERT-Race-Condition-With-MERGE.aspx
*/

22
framework/db/mssql/Schema.php

@ -81,11 +81,11 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
];
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $tableQuoteCharacter = ['[', ']'];
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $columnQuoteCharacter = ['[', ']'];
@ -127,7 +127,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
* @see https://docs.microsoft.com/en-us/sql/relational-databases/system-catalog-views/sys-database-principals-transact-sql
*/
protected function findSchemaNames()
@ -144,7 +144,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function findTableNames($schema = '')
{
@ -163,7 +163,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableSchema($name)
{
@ -179,7 +179,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTablePrimaryKey($tableName)
{
@ -187,7 +187,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableForeignKeys($tableName)
{
@ -195,7 +195,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableIndexes($tableName)
{
@ -234,7 +234,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableUniques($tableName)
{
@ -242,7 +242,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableChecks($tableName)
{
@ -250,7 +250,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableDefaultValues($tableName)
{

2
framework/db/mssql/conditions/LikeConditionBuilder.php

@ -8,7 +8,7 @@ namespace yii\db\mssql\conditions;
class LikeConditionBuilder extends \yii\db\conditions\LikeConditionBuilder
{
/**
* @inheritdoc
* {@inheritdoc}
*/
protected $escapingReplacements = [
'%' => '[%]',

8
framework/db/mysql/QueryBuilder.php

@ -133,7 +133,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
*/
public function dropUnique($name, $table)
{
@ -141,7 +141,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by MySQL.
*/
public function addCheck($name, $table, $expression)
@ -150,7 +150,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by MySQL.
*/
public function dropCheck($name, $table)
@ -260,7 +260,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritdoc
* {@inheritdoc}
* @see https://downloads.mysql.com/docs/refman-5.1-en.pdf
*/
public function upsert($table, $insertColumns, $updateColumns, &$params)

22
framework/db/mysql/Schema.php

@ -72,16 +72,16 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
];
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $tableQuoteCharacter = '`';
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $columnQuoteCharacter = '`';
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function resolveTableName($name)
{
@ -99,7 +99,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function findTableNames($schema = '')
{
@ -112,7 +112,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableSchema($name)
{
@ -128,7 +128,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTablePrimaryKey($tableName)
{
@ -136,7 +136,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableForeignKeys($tableName)
{
@ -144,7 +144,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableIndexes($tableName)
{
@ -180,7 +180,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableUniques($tableName)
{
@ -188,7 +188,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException if this method is called.
*/
protected function loadTableChecks($tableName)
@ -197,7 +197,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException if this method is called.
*/
protected function loadTableDefaultValues($tableName)

2
framework/db/oci/QueryBuilder.php

@ -200,7 +200,7 @@ EOD;
}
/**
* @inheritdoc
* {@inheritdoc}
* @see https://docs.oracle.com/cd/B28359_01/server.111/b28286/statements_9016.htm#SQLRF01606
*/
public function upsert($table, $insertColumns, $updateColumns, &$params)

22
framework/db/oci/Schema.php

@ -43,7 +43,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
];
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $tableQuoteCharacter = '"';
@ -64,7 +64,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function resolveTableName($name)
{
@ -82,7 +82,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
* @see https://docs.oracle.com/cd/B28359_01/server.111/b28337/tdpsg_user_accounts.htm
*/
protected function findSchemaNames()
@ -98,7 +98,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function findTableNames($schema = '')
{
@ -144,7 +144,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableSchema($name)
{
@ -159,7 +159,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTablePrimaryKey($tableName)
{
@ -167,7 +167,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableForeignKeys($tableName)
{
@ -175,7 +175,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableIndexes($tableName)
{
@ -216,7 +216,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableUniques($tableName)
{
@ -224,7 +224,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableChecks($tableName)
{
@ -232,7 +232,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException if this method is called.
*/
protected function loadTableDefaultValues($tableName)

4
framework/db/oci/conditions/LikeConditionBuilder.php

@ -10,13 +10,13 @@ use yii\db\ExpressionInterface;
class LikeConditionBuilder extends \yii\db\conditions\LikeConditionBuilder
{
/**
* @inheritdoc
* {@inheritdoc}
*/
protected $escapeCharacter = '!';
/**
* `\` is initialized in [[buildLikeCondition()]] method since
* we need to choose replacement value based on [[\yii\db\Schema::quoteValue()]].
* @inheritdoc
* {@inheritdoc}
*/
protected $escapingReplacements = [
'%' => '!%',

2
framework/db/pgsql/ColumnSchema.php

@ -38,7 +38,7 @@ class ColumnSchema extends \yii\db\ColumnSchema
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function phpTypecast($value)
{

2
framework/db/pgsql/QueryBuilder.php

@ -254,7 +254,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritdoc
* {@inheritdoc}
* @see https://www.postgresql.org/docs/9.5/static/sql-insert.html#SQL-ON-CONFLICT
* @see https://stackoverflow.com/questions/1109061/insert-on-duplicate-update-in-postgresql/8702291#8702291
*/

22
framework/db/pgsql/Schema.php

@ -126,13 +126,13 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
];
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $tableQuoteCharacter = '"';
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function resolveTableName($name)
{
@ -150,7 +150,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function findSchemaNames()
{
@ -165,7 +165,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function findTableNames($schema = '')
{
@ -183,7 +183,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableSchema($name)
{
@ -198,7 +198,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTablePrimaryKey($tableName)
{
@ -206,7 +206,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableForeignKeys($tableName)
{
@ -214,7 +214,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableIndexes($tableName)
{
@ -258,7 +258,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableUniques($tableName)
{
@ -266,7 +266,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableChecks($tableName)
{
@ -274,7 +274,7 @@ SQL;
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException if this method is called.
*/
protected function loadTableDefaultValues($tableName)

14
framework/db/sqlite/QueryBuilder.php

@ -63,7 +63,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritdoc
* {@inheritdoc}
* @see https://stackoverflow.com/questions/15277373/sqlite-upsert-update-or-insert/15277374#15277374
*/
public function upsert($table, $insertColumns, $updateColumns, &$params)
@ -361,7 +361,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by SQLite.
*/
public function addUnique($name, $table, $columns)
@ -370,7 +370,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by SQLite.
*/
public function dropUnique($name, $table)
@ -379,7 +379,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by SQLite.
*/
public function addCheck($name, $table, $expression)
@ -388,7 +388,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by SQLite.
*/
public function dropCheck($name, $table)
@ -397,7 +397,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by SQLite.
*/
public function addDefaultValue($name, $table, $column, $value)
@ -406,7 +406,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException this is not supported by SQLite.
*/
public function dropDefaultValue($name, $table)

20
framework/db/sqlite/Schema.php

@ -69,17 +69,17 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
];
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $tableQuoteCharacter = '`';
/**
* @inheritDoc
* {@inheritdoc}
*/
protected $columnQuoteCharacter = '`';
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function findTableNames($schema = '')
{
@ -88,7 +88,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableSchema($name)
{
@ -105,7 +105,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTablePrimaryKey($tableName)
{
@ -113,7 +113,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableForeignKeys($tableName)
{
@ -136,7 +136,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableIndexes($tableName)
{
@ -144,7 +144,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableUniques($tableName)
{
@ -152,7 +152,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function loadTableChecks($tableName)
{
@ -191,7 +191,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
}
/**
* @inheritDoc
* {@inheritdoc}
* @throws NotSupportedException if this method is called.
*/
protected function loadTableDefaultValues($tableName)

12
framework/db/sqlite/SqlTokenizer.php

@ -19,7 +19,7 @@ namespace yii\db\sqlite;
class SqlTokenizer extends \yii\db\SqlTokenizer
{
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function isWhitespace(&$length)
{
@ -36,7 +36,7 @@ class SqlTokenizer extends \yii\db\SqlTokenizer
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function isComment(&$length)
{
@ -60,7 +60,7 @@ class SqlTokenizer extends \yii\db\SqlTokenizer
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function isOperator(&$length, &$content)
{
@ -95,7 +95,7 @@ class SqlTokenizer extends \yii\db\SqlTokenizer
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function isIdentifier(&$length, &$content)
{
@ -127,7 +127,7 @@ class SqlTokenizer extends \yii\db\SqlTokenizer
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function isStringLiteral(&$length, &$content)
{
@ -148,7 +148,7 @@ class SqlTokenizer extends \yii\db\SqlTokenizer
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function isKeyword($string, &$content)
{

2
framework/db/sqlite/conditions/LikeConditionBuilder.php

@ -8,7 +8,7 @@ namespace yii\db\sqlite\conditions;
class LikeConditionBuilder extends \yii\db\conditions\LikeConditionBuilder
{
/**
* @inheritdoc
* {@inheritdoc}
*/
protected $escapeCharacter = '\\';
}

2
tests/data/ar/Department.php

@ -24,7 +24,7 @@ use yii\db\ActiveQuery;
class Department extends ActiveRecord
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public static function tableName()
{

2
tests/data/ar/Dossier.php

@ -26,7 +26,7 @@ use yii\db\ActiveQuery;
class Dossier extends ActiveRecord
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public static function tableName()
{

2
tests/data/ar/Employee.php

@ -28,7 +28,7 @@ use yii\db\ActiveQuery;
class Employee extends ActiveRecord
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public static function tableName()
{

10
tests/framework/behaviors/CacheableWidgetBehaviorTest.php

@ -30,7 +30,7 @@ class CacheableWidgetBehaviorTest extends TestCase
private $dynamicWidget;
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function setUp()
{
@ -121,7 +121,7 @@ class CacheableWidgetBehaviorTest extends TestCase
class BaseCacheableWidget extends Widget
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function test()
{
@ -144,7 +144,7 @@ class BaseCacheableWidget extends Widget
}
/**
* @inheritdoc
* {@inheritdoc}
*/
public function behaviors()
{
@ -157,7 +157,7 @@ class BaseCacheableWidget extends Widget
class SimpleCacheableWidget extends BaseCacheableWidget
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function run()
{
@ -170,7 +170,7 @@ class SimpleCacheableWidget extends BaseCacheableWidget
class DynamicCacheableWidget extends BaseCacheableWidget
{
/**
* @inheritdoc
* {@inheritdoc}
*/
public function run()
{

Loading…
Cancel
Save