From 65f6b59b35cc63aee7f16a64aeafcec11a8dba39 Mon Sep 17 00:00:00 2001 From: Klimov Paul Date: Tue, 23 Jan 2018 13:11:24 +0200 Subject: [PATCH] `@inheritdoc` notation changed --- docs/guide-ru/db-migrations.md | 8 +-- docs/guide-ru/output-data-providers.md | 8 +-- docs/guide-ru/output-data-widgets.md | 6 +- docs/guide/db-migrations.md | 20 +++--- docs/guide/output-data-providers.md | 8 +-- docs/guide/output-data-widgets.md | 6 +- framework/base/ActionFilter.php | 4 +- framework/base/Application.php | 2 +- framework/base/DynamicModel.php | 10 +-- framework/behaviors/AttributeBehavior.php | 2 +- .../behaviors/AttributeTypecastBehavior.php | 4 +- framework/behaviors/AttributesBehavior.php | 2 +- framework/behaviors/BlameableBehavior.php | 6 +- framework/behaviors/SluggableBehavior.php | 4 +- framework/behaviors/TimestampBehavior.php | 6 +- framework/caching/ArrayCache.php | 12 ++-- framework/caching/ChainedDependency.php | 2 +- framework/caching/TagDependency.php | 2 +- .../migrations/m150909_153426_cache_init.php | 4 +- framework/captcha/CaptchaValidator.php | 8 +-- framework/console/Application.php | 4 +- .../controllers/BaseMigrateController.php | 2 +- .../console/controllers/FixtureController.php | 4 +- .../console/controllers/MessageController.php | 4 +- .../console/controllers/MigrateController.php | 18 +++--- .../console/controllers/ServeController.php | 4 +- framework/data/ActiveDataFilter.php | 2 +- framework/data/ActiveDataProvider.php | 8 +-- framework/data/ArrayDataProvider.php | 6 +- framework/data/BaseDataProvider.php | 2 +- framework/data/DataFilter.php | 20 +++--- framework/data/SqlDataProvider.php | 6 +- framework/db/ActiveQuery.php | 8 +-- framework/db/ActiveRecord.php | 6 +- framework/db/BaseActiveRecord.php | 12 ++-- framework/db/Migration.php | 2 +- framework/db/Query.php | 2 +- framework/db/cubrid/ColumnSchemaBuilder.php | 10 +-- framework/db/cubrid/QueryBuilder.php | 16 ++--- framework/db/cubrid/Schema.php | 6 +- framework/db/mssql/QueryBuilder.php | 20 +++--- framework/db/mssql/Schema.php | 8 +-- framework/db/mysql/ColumnSchemaBuilder.php | 10 +-- framework/db/mysql/QueryBuilder.php | 18 +++--- framework/db/mysql/Schema.php | 2 +- framework/db/oci/ColumnSchemaBuilder.php | 4 +- framework/db/oci/QueryBuilder.php | 20 +++--- framework/db/oci/Schema.php | 12 ++-- framework/db/pgsql/QueryBuilder.php | 6 +- framework/db/pgsql/Schema.php | 4 +- framework/db/sqlite/ColumnSchemaBuilder.php | 4 +- framework/db/sqlite/Command.php | 4 +- framework/db/sqlite/QueryBuilder.php | 18 +++--- framework/db/sqlite/Schema.php | 2 +- framework/di/NotInstantiableException.php | 2 +- framework/filters/AjaxFilter.php | 4 +- framework/filters/ContentNegotiator.php | 4 +- framework/filters/Cors.php | 2 +- framework/filters/HostControl.php | 2 +- framework/filters/PageCache.php | 2 +- framework/filters/RateLimiter.php | 4 +- framework/filters/auth/AuthMethod.php | 6 +- framework/filters/auth/CompositeAuth.php | 6 +- framework/filters/auth/HttpBasicAuth.php | 4 +- framework/filters/auth/HttpBearerAuth.php | 9 ++- framework/filters/auth/HttpHeaderAuth.php | 4 +- framework/filters/auth/QueryParamAuth.php | 2 +- framework/grid/ActionColumn.php | 6 +- framework/grid/CheckboxColumn.php | 4 +- framework/grid/DataColumn.php | 8 +-- framework/grid/GridView.php | 2 +- framework/grid/RadioButtonColumn.php | 4 +- framework/grid/SerialColumn.php | 4 +- framework/i18n/Formatter.php | 2 +- framework/log/Dispatcher.php | 4 +- framework/log/EmailTarget.php | 2 +- framework/log/SyslogTarget.php | 4 +- framework/rbac/BaseManager.php | 18 +++--- framework/rbac/DbManager.php | 62 +++++++++--------- framework/rbac/Permission.php | 2 +- framework/rbac/PhpManager.php | 64 +++++++++---------- framework/rbac/Role.php | 2 +- .../migrations/m140506_102106_rbac_init.php | 4 +- ...c_add_index_on_auth_assignment_user_id.php | 4 +- framework/rest/Action.php | 2 +- framework/rest/ActiveController.php | 6 +- framework/rest/Controller.php | 6 +- framework/rest/Serializer.php | 2 +- framework/rest/UrlRule.php | 8 +-- framework/test/ActiveFixture.php | 4 +- framework/test/ArrayFixture.php | 2 +- framework/test/BaseActiveFixture.php | 2 +- framework/test/DbFixture.php | 2 +- framework/test/InitDbFixture.php | 10 +-- framework/validators/BooleanValidator.php | 8 +-- framework/validators/CompareValidator.php | 10 +-- framework/validators/DateValidator.php | 6 +- .../validators/DefaultValueValidator.php | 2 +- framework/validators/EachValidator.php | 6 +- framework/validators/EmailValidator.php | 8 +-- framework/validators/ExistValidator.php | 6 +- framework/validators/FileValidator.php | 12 ++-- framework/validators/FilterValidator.php | 8 +-- framework/validators/ImageValidator.php | 8 +-- framework/validators/InlineValidator.php | 4 +- framework/validators/IpValidator.php | 10 +-- framework/validators/NumberValidator.php | 10 +-- framework/validators/RangeValidator.php | 10 +-- .../validators/RegularExpressionValidator.php | 8 +-- framework/validators/RequiredValidator.php | 8 +-- framework/validators/SafeValidator.php | 4 +- framework/validators/StringValidator.php | 10 +-- framework/validators/UniqueValidator.php | 4 +- framework/validators/UrlValidator.php | 10 +-- framework/validators/Validator.php | 2 +- framework/views/addColumnMigration.php | 4 +- framework/views/createJunctionMigration.php | 4 +- framework/views/createTableMigration.php | 4 +- framework/views/dropColumnMigration.php | 4 +- framework/views/dropTableMigration.php | 4 +- framework/views/migration.php | 4 +- framework/web/Application.php | 4 +- framework/web/CompositeUrlRule.php | 6 +- framework/web/Controller.php | 2 +- framework/web/GroupUrlRule.php | 8 +-- framework/web/HeadersAlreadySentException.php | 2 +- framework/web/MultipartFormDataParser.php | 2 +- .../m160313_153426_session_init.php | 4 +- framework/widgets/MaskedInput.php | 2 +- framework/widgets/Pjax.php | 8 +-- tests/IsOneOfAssert.php | 2 +- tests/data/ar/Customer.php | 2 +- tests/data/ar/Type.php | 2 +- tests/data/base/TraversableObject.php | 10 +-- .../console/migrate_create/add_columns_fk.php | 4 +- .../migrate_create/add_columns_prefix.php | 4 +- .../migrate_create/add_columns_test.php | 4 +- .../console/migrate_create/create_fields.php | 4 +- .../migrate_create/create_foreign_key.php | 4 +- .../console/migrate_create/create_id_pk.php | 4 +- .../console/migrate_create/create_prefix.php | 4 +- .../create_products_from_store_table.php | 4 +- .../console/migrate_create/create_test.php | 4 +- .../migrate_create/create_title_pk.php | 4 +- ...create_title_with_comma_default_values.php | 4 +- .../migrate_create/create_unsigned_big_pk.php | 4 +- .../migrate_create/create_unsigned_pk.php | 4 +- tests/data/console/migrate_create/default.php | 4 +- .../migrate_create/drop_columns_test.php | 4 +- .../console/migrate_create/drop_fields.php | 4 +- .../drop_products_from_store_table.php | 4 +- .../data/console/migrate_create/drop_test.php | 4 +- .../console/migrate_create/junction_test.php | 4 +- tests/framework/base/ActionFilterTest.php | 12 ++-- tests/framework/base/ExposedSecurity.php | 4 +- .../behaviors/AttributeBehaviorTest.php | 4 +- .../behaviors/AttributesBehaviorTest.php | 4 +- tests/framework/caching/DbDependencyTest.php | 4 +- .../caching/DbQueryDependencyTest.php | 4 +- .../controllers/DbMessageControllerTest.php | 6 +- .../controllers/EchoMigrateController.php | 2 +- .../controllers/HelpControllerTest.php | 2 +- .../controllers/PHPMessageControllerTest.php | 6 +- .../controllers/POMessageControllerTest.php | 6 +- .../controllers/SilencedCacheController.php | 2 +- tests/framework/data/BaseDataProviderTest.php | 6 +- tests/framework/db/ActiveRecordTest.php | 12 ++-- tests/framework/db/UnqueryableQueryMock.php | 4 +- .../framework/db/sqlite/QueryBuilderTest.php | 2 +- .../filters/stubs/MockAuthManager.php | 2 +- tests/framework/helpers/ConsoleStub.php | 6 +- tests/framework/helpers/FallbackInflector.php | 2 +- tests/framework/log/TargetTest.php | 2 +- tests/framework/rbac/AuthorRule.php | 2 +- tests/framework/rbac/PhpManagerTest.php | 2 +- 175 files changed, 546 insertions(+), 547 deletions(-) diff --git a/docs/guide-ru/db-migrations.md b/docs/guide-ru/db-migrations.md index a55e00c5ca..4171b77bfd 100644 --- a/docs/guide-ru/db-migrations.md +++ b/docs/guide-ru/db-migrations.md @@ -266,7 +266,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() { @@ -314,7 +314,7 @@ class m160328_040430_create_post_table extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function down() { @@ -465,7 +465,7 @@ yii migrate/create create_junction_table_for_post_and_tag_tables class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function up() { @@ -512,7 +512,7 @@ class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migra } /** - * @inheritdoc + *{@inheritdoc} */ public function down() { diff --git a/docs/guide-ru/output-data-providers.md b/docs/guide-ru/output-data-providers.md index 28239a981a..9f47392c13 100644 --- a/docs/guide-ru/output-data-providers.md +++ b/docs/guide-ru/output-data-providers.md @@ -258,7 +258,7 @@ class CsvDataProvider extends BaseDataProvider /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -269,7 +269,7 @@ class CsvDataProvider extends BaseDataProvider } /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareModels() { @@ -298,7 +298,7 @@ class CsvDataProvider extends BaseDataProvider } /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareKeys($models) { @@ -320,7 +320,7 @@ class CsvDataProvider extends BaseDataProvider } /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareTotalCount() { diff --git a/docs/guide-ru/output-data-widgets.md b/docs/guide-ru/output-data-widgets.md index 9f4c917144..c9aa88862e 100644 --- a/docs/guide-ru/output-data-widgets.md +++ b/docs/guide-ru/output-data-widgets.md @@ -633,7 +633,7 @@ class UserView extends ActiveRecord { /** - * @inheritdoc + *{@inheritdoc} */ public static function tableName() { @@ -646,7 +646,7 @@ class UserView extends ActiveRecord } /** - * @inheritdoc + *{@inheritdoc} */ public function rules() { @@ -656,7 +656,7 @@ class UserView extends ActiveRecord } /** - * @inheritdoc + *{@inheritdoc} */ public function attributeLabels() { diff --git a/docs/guide/db-migrations.md b/docs/guide/db-migrations.md index faefb8146c..98de09df4f 100644 --- a/docs/guide/db-migrations.md +++ b/docs/guide/db-migrations.md @@ -211,7 +211,7 @@ generates class m150811_220037_create_post_table extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function up() { @@ -221,7 +221,7 @@ class m150811_220037_create_post_table extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function down() { @@ -245,7 +245,7 @@ generates class m150811_220037_create_post_table extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function up() { @@ -257,7 +257,7 @@ class m150811_220037_create_post_table extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function down() { @@ -282,7 +282,7 @@ generates class m150811_220037_create_post_table extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function up() { @@ -294,7 +294,7 @@ class m150811_220037_create_post_table extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function down() { @@ -327,7 +327,7 @@ generates class m160328_040430_create_post_table extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function up() { @@ -375,7 +375,7 @@ class m160328_040430_create_post_table extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function down() { @@ -540,7 +540,7 @@ generates class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function up() { @@ -587,7 +587,7 @@ class m160328_041642_create_junction_table_for_post_and_tag_tables extends Migra } /** - * @inheritdoc + *{@inheritdoc} */ public function down() { diff --git a/docs/guide/output-data-providers.md b/docs/guide/output-data-providers.md index 919ef26da4..bd93c649c1 100644 --- a/docs/guide/output-data-providers.md +++ b/docs/guide/output-data-providers.md @@ -262,7 +262,7 @@ class CsvDataProvider extends BaseDataProvider /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -273,7 +273,7 @@ class CsvDataProvider extends BaseDataProvider } /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareModels() { @@ -302,7 +302,7 @@ class CsvDataProvider extends BaseDataProvider } /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareKeys($models) { @@ -324,7 +324,7 @@ class CsvDataProvider extends BaseDataProvider } /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareTotalCount() { diff --git a/docs/guide/output-data-widgets.md b/docs/guide/output-data-widgets.md index 52a4713cfc..bb12cada28 100644 --- a/docs/guide/output-data-widgets.md +++ b/docs/guide/output-data-widgets.md @@ -656,7 +656,7 @@ class UserView extends ActiveRecord { /** - * @inheritdoc + *{@inheritdoc} */ public static function tableName() { @@ -669,7 +669,7 @@ class UserView extends ActiveRecord } /** - * @inheritdoc + *{@inheritdoc} */ public function rules() { @@ -679,7 +679,7 @@ class UserView extends ActiveRecord } /** - * @inheritdoc + *{@inheritdoc} */ public function attributeLabels() { diff --git a/framework/base/ActionFilter.php b/framework/base/ActionFilter.php index eb7fb095a8..26e5a92569 100644 --- a/framework/base/ActionFilter.php +++ b/framework/base/ActionFilter.php @@ -44,7 +44,7 @@ class ActionFilter extends Behavior /** - * @inheritdoc + * {@inheritdoc} */ public function attach($owner) { @@ -53,7 +53,7 @@ class ActionFilter extends Behavior } /** - * @inheritdoc + * {@inheritdoc} */ public function detach() { diff --git a/framework/base/Application.php b/framework/base/Application.php index 7bf81104ef..75be12cdd6 100644 --- a/framework/base/Application.php +++ b/framework/base/Application.php @@ -265,7 +265,7 @@ abstract class Application extends Module } /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/base/DynamicModel.php b/framework/base/DynamicModel.php index a0c5bf8ad7..7d983364ce 100644 --- a/framework/base/DynamicModel.php +++ b/framework/base/DynamicModel.php @@ -76,7 +76,7 @@ class DynamicModel extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function __get($name) { @@ -88,7 +88,7 @@ class DynamicModel extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function __set($name, $value) { @@ -100,7 +100,7 @@ class DynamicModel extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function __isset($name) { @@ -112,7 +112,7 @@ class DynamicModel extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function __unset($name) { @@ -193,7 +193,7 @@ class DynamicModel extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function attributes() { diff --git a/framework/behaviors/AttributeBehavior.php b/framework/behaviors/AttributeBehavior.php index cc82b1babe..c50f180f6c 100644 --- a/framework/behaviors/AttributeBehavior.php +++ b/framework/behaviors/AttributeBehavior.php @@ -93,7 +93,7 @@ class AttributeBehavior extends Behavior /** - * @inheritdoc + * {@inheritdoc} */ public function events() { diff --git a/framework/behaviors/AttributeTypecastBehavior.php b/framework/behaviors/AttributeTypecastBehavior.php index cfc600d9ea..7835535ac2 100644 --- a/framework/behaviors/AttributeTypecastBehavior.php +++ b/framework/behaviors/AttributeTypecastBehavior.php @@ -188,7 +188,7 @@ class AttributeTypecastBehavior extends Behavior } /** - * @inheritdoc + * {@inheritdoc} */ public function attach($owner) { @@ -294,7 +294,7 @@ class AttributeTypecastBehavior extends Behavior } /** - * @inheritdoc + * {@inheritdoc} */ public function events() { diff --git a/framework/behaviors/AttributesBehavior.php b/framework/behaviors/AttributesBehavior.php index 78aa7d2660..1ac025f16e 100644 --- a/framework/behaviors/AttributesBehavior.php +++ b/framework/behaviors/AttributesBehavior.php @@ -122,7 +122,7 @@ class AttributesBehavior extends Behavior /** - * @inheritdoc + * {@inheritdoc} */ public function events() { diff --git a/framework/behaviors/BlameableBehavior.php b/framework/behaviors/BlameableBehavior.php index 9ce18991e3..cc0ee4e868 100644 --- a/framework/behaviors/BlameableBehavior.php +++ b/framework/behaviors/BlameableBehavior.php @@ -67,7 +67,7 @@ class BlameableBehavior extends AttributeBehavior */ public $updatedByAttribute = 'updated_by'; /** - * @inheritdoc + * {@inheritdoc} * * In case, when the property is `null`, the value of `Yii::$app->user->id` will be used as the value. */ @@ -80,7 +80,7 @@ class BlameableBehavior extends AttributeBehavior public $defaultValue; /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -95,7 +95,7 @@ class BlameableBehavior extends AttributeBehavior } /** - * @inheritdoc + * {@inheritdoc} * * In case, when the [[value]] property is `null`, the value of [[defaultValue]] will be used as the value. */ diff --git a/framework/behaviors/SluggableBehavior.php b/framework/behaviors/SluggableBehavior.php index f7eb9bb33a..3d82a73618 100644 --- a/framework/behaviors/SluggableBehavior.php +++ b/framework/behaviors/SluggableBehavior.php @@ -124,7 +124,7 @@ class SluggableBehavior extends AttributeBehavior /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -140,7 +140,7 @@ class SluggableBehavior extends AttributeBehavior } /** - * @inheritdoc + * {@inheritdoc} */ protected function getValue($event) { diff --git a/framework/behaviors/TimestampBehavior.php b/framework/behaviors/TimestampBehavior.php index d5bfe4d992..4c6a507b73 100644 --- a/framework/behaviors/TimestampBehavior.php +++ b/framework/behaviors/TimestampBehavior.php @@ -82,7 +82,7 @@ class TimestampBehavior extends AttributeBehavior */ public $updatedAtAttribute = 'updated_at'; /** - * @inheritdoc + * {@inheritdoc} * * In case, when the value is `null`, the result of the PHP function [time()](http://php.net/manual/en/function.time.php) * will be used as value. @@ -91,7 +91,7 @@ class TimestampBehavior extends AttributeBehavior /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -106,7 +106,7 @@ class TimestampBehavior extends AttributeBehavior } /** - * @inheritdoc + * {@inheritdoc} * * In case, when the [[value]] is `null`, the result of the PHP function [time()](http://php.net/manual/en/function.time.php) * will be used as value. diff --git a/framework/caching/ArrayCache.php b/framework/caching/ArrayCache.php index c3e4cbbc34..545dfece24 100644 --- a/framework/caching/ArrayCache.php +++ b/framework/caching/ArrayCache.php @@ -28,7 +28,7 @@ class ArrayCache extends Cache /** - * @inheritdoc + * {@inheritdoc} */ public function exists($key) { @@ -37,7 +37,7 @@ class ArrayCache extends Cache } /** - * @inheritdoc + * {@inheritdoc} */ protected function getValue($key) { @@ -49,7 +49,7 @@ class ArrayCache extends Cache } /** - * @inheritdoc + * {@inheritdoc} */ protected function setValue($key, $value, $duration) { @@ -58,7 +58,7 @@ class ArrayCache extends Cache } /** - * @inheritdoc + * {@inheritdoc} */ protected function addValue($key, $value, $duration) { @@ -70,7 +70,7 @@ class ArrayCache extends Cache } /** - * @inheritdoc + * {@inheritdoc} */ protected function deleteValue($key) { @@ -79,7 +79,7 @@ class ArrayCache extends Cache } /** - * @inheritdoc + * {@inheritdoc} */ protected function flushValues() { diff --git a/framework/caching/ChainedDependency.php b/framework/caching/ChainedDependency.php index c9a751b857..ecacb90be0 100644 --- a/framework/caching/ChainedDependency.php +++ b/framework/caching/ChainedDependency.php @@ -58,7 +58,7 @@ class ChainedDependency extends Dependency } /** - * @inheritdoc + * {@inheritdoc} */ public function isChanged($cache) { diff --git a/framework/caching/TagDependency.php b/framework/caching/TagDependency.php index 26b286c08f..9e484e9dd5 100644 --- a/framework/caching/TagDependency.php +++ b/framework/caching/TagDependency.php @@ -58,7 +58,7 @@ class TagDependency extends Dependency } /** - * @inheritdoc + * {@inheritdoc} */ public function isChanged($cache) { diff --git a/framework/caching/migrations/m150909_153426_cache_init.php b/framework/caching/migrations/m150909_153426_cache_init.php index 4b55cd9bd8..0e3e0b8383 100644 --- a/framework/caching/migrations/m150909_153426_cache_init.php +++ b/framework/caching/migrations/m150909_153426_cache_init.php @@ -32,7 +32,7 @@ class m150909_153426_cache_init extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function up() { @@ -54,7 +54,7 @@ class m150909_153426_cache_init extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function down() { diff --git a/framework/captcha/CaptchaValidator.php b/framework/captcha/CaptchaValidator.php index 357a81bc70..9bcedca449 100644 --- a/framework/captcha/CaptchaValidator.php +++ b/framework/captcha/CaptchaValidator.php @@ -41,7 +41,7 @@ class CaptchaValidator extends Validator /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -52,7 +52,7 @@ class CaptchaValidator extends Validator } /** - * @inheritdoc + * {@inheritdoc} */ protected function validateValue($value) { @@ -82,7 +82,7 @@ class CaptchaValidator extends Validator } /** - * @inheritdoc + * {@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -93,7 +93,7 @@ class CaptchaValidator extends Validator } /** - * @inheritdoc + * {@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/console/Application.php b/framework/console/Application.php index d2fd4a3071..1067c563f6 100644 --- a/framework/console/Application.php +++ b/framework/console/Application.php @@ -81,7 +81,7 @@ class Application extends \yii\base\Application /** - * @inheritdoc + * {@inheritdoc} */ public function __construct($config = []) { @@ -229,7 +229,7 @@ class Application extends \yii\base\Application } /** - * @inheritdoc + * {@inheritdoc} */ public function coreComponents() { diff --git a/framework/console/controllers/BaseMigrateController.php b/framework/console/controllers/BaseMigrateController.php index cab25372ce..2a85a82e5c 100644 --- a/framework/console/controllers/BaseMigrateController.php +++ b/framework/console/controllers/BaseMigrateController.php @@ -93,7 +93,7 @@ abstract class BaseMigrateController extends Controller /** - * @inheritdoc + * {@inheritdoc} */ public function options($actionID) { diff --git a/framework/console/controllers/FixtureController.php b/framework/console/controllers/FixtureController.php index 8b159f1f60..0ad64e81ef 100644 --- a/framework/console/controllers/FixtureController.php +++ b/framework/console/controllers/FixtureController.php @@ -64,7 +64,7 @@ class FixtureController extends Controller /** - * @inheritdoc + * {@inheritdoc} */ public function options($actionID) { @@ -74,7 +74,7 @@ class FixtureController extends Controller } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function optionAliases() diff --git a/framework/console/controllers/MessageController.php b/framework/console/controllers/MessageController.php index bc404f7445..70d38a95c5 100644 --- a/framework/console/controllers/MessageController.php +++ b/framework/console/controllers/MessageController.php @@ -154,7 +154,7 @@ class MessageController extends \yii\console\Controller /** - * @inheritdoc + * {@inheritdoc} */ public function options($actionID) { @@ -181,7 +181,7 @@ class MessageController extends \yii\console\Controller } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function optionAliases() diff --git a/framework/console/controllers/MigrateController.php b/framework/console/controllers/MigrateController.php index de511ed911..f5fdb0595d 100644 --- a/framework/console/controllers/MigrateController.php +++ b/framework/console/controllers/MigrateController.php @@ -84,7 +84,7 @@ class MigrateController extends BaseMigrateController */ public $migrationTable = '{{%migration}}'; /** - * @inheritdoc + * {@inheritdoc} */ public $templateFile = '@yii/views/migration.php'; /** @@ -140,7 +140,7 @@ class MigrateController extends BaseMigrateController /** - * @inheritdoc + * {@inheritdoc} */ public function options($actionID) { @@ -154,7 +154,7 @@ class MigrateController extends BaseMigrateController } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function optionAliases() @@ -203,7 +203,7 @@ class MigrateController extends BaseMigrateController } /** - * @inheritdoc + * {@inheritdoc} */ protected function getMigrationHistory($limit) { @@ -278,7 +278,7 @@ class MigrateController extends BaseMigrateController } /** - * @inheritdoc + * {@inheritdoc} */ protected function addMigrationHistory($version) { @@ -290,7 +290,7 @@ class MigrateController extends BaseMigrateController } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.13 */ protected function truncateDatabase() @@ -316,7 +316,7 @@ class MigrateController extends BaseMigrateController } /** - * @inheritdoc + * {@inheritdoc} */ protected function removeMigrationHistory($version) { @@ -329,7 +329,7 @@ class MigrateController extends BaseMigrateController private $_migrationNameLimit; /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.13 */ protected function getMigrationNameLimit() @@ -346,7 +346,7 @@ class MigrateController extends BaseMigrateController } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ protected function generateMigrationSourceCode($params) diff --git a/framework/console/controllers/ServeController.php b/framework/console/controllers/ServeController.php index 65e69bd03f..5eb9816597 100644 --- a/framework/console/controllers/ServeController.php +++ b/framework/console/controllers/ServeController.php @@ -83,7 +83,7 @@ class ServeController extends Controller } /** - * @inheritdoc + * {@inheritdoc} */ public function options($actionID) { @@ -95,7 +95,7 @@ class ServeController extends Controller } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function optionAliases() diff --git a/framework/data/ActiveDataFilter.php b/framework/data/ActiveDataFilter.php index 264c613eaa..5ca65539ec 100644 --- a/framework/data/ActiveDataFilter.php +++ b/framework/data/ActiveDataFilter.php @@ -66,7 +66,7 @@ class ActiveDataFilter extends DataFilter /** - * @inheritdoc + * {@inheritdoc} */ protected function buildInternal() { diff --git a/framework/data/ActiveDataProvider.php b/framework/data/ActiveDataProvider.php index 62ef012abc..32b63e7378 100644 --- a/framework/data/ActiveDataProvider.php +++ b/framework/data/ActiveDataProvider.php @@ -94,7 +94,7 @@ class ActiveDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareModels() { @@ -117,7 +117,7 @@ class ActiveDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareKeys($models) { @@ -158,7 +158,7 @@ class ActiveDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareTotalCount() { @@ -170,7 +170,7 @@ class ActiveDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ public function setSort($value) { diff --git a/framework/data/ArrayDataProvider.php b/framework/data/ArrayDataProvider.php index 516fb2dc0a..73d634e167 100644 --- a/framework/data/ArrayDataProvider.php +++ b/framework/data/ArrayDataProvider.php @@ -74,7 +74,7 @@ class ArrayDataProvider extends BaseDataProvider /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareModels() { @@ -98,7 +98,7 @@ class ArrayDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareKeys($models) { @@ -119,7 +119,7 @@ class ArrayDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareTotalCount() { diff --git a/framework/data/BaseDataProvider.php b/framework/data/BaseDataProvider.php index 19b47126e2..a939827e8a 100644 --- a/framework/data/BaseDataProvider.php +++ b/framework/data/BaseDataProvider.php @@ -53,7 +53,7 @@ abstract class BaseDataProvider extends Component implements DataProviderInterfa /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/data/DataFilter.php b/framework/data/DataFilter.php index 4b6f20cfad..147a156d7d 100644 --- a/framework/data/DataFilter.php +++ b/framework/data/DataFilter.php @@ -427,7 +427,7 @@ class DataFilter extends Model // Model specific: /** - * @inheritdoc + * {@inheritdoc} */ public function attributes() { @@ -437,7 +437,7 @@ class DataFilter extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function formName() { @@ -445,7 +445,7 @@ class DataFilter extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function rules() { @@ -455,7 +455,7 @@ class DataFilter extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function attributeLabels() { @@ -730,7 +730,7 @@ class DataFilter extends Model // Property access: /** - * @inheritdoc + * {@inheritdoc} */ public function canGetProperty($name, $checkVars = true, $checkBehaviors = true) { @@ -741,7 +741,7 @@ class DataFilter extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function canSetProperty($name, $checkVars = true, $checkBehaviors = true) { @@ -752,7 +752,7 @@ class DataFilter extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function __get($name) { @@ -764,7 +764,7 @@ class DataFilter extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function __set($name, $value) { @@ -776,7 +776,7 @@ class DataFilter extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function __isset($name) { @@ -788,7 +788,7 @@ class DataFilter extends Model } /** - * @inheritdoc + * {@inheritdoc} */ public function __unset($name) { diff --git a/framework/data/SqlDataProvider.php b/framework/data/SqlDataProvider.php index a54bf5b47d..00ebd121db 100644 --- a/framework/data/SqlDataProvider.php +++ b/framework/data/SqlDataProvider.php @@ -103,7 +103,7 @@ class SqlDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareModels() { @@ -138,7 +138,7 @@ class SqlDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareKeys($models) { @@ -159,7 +159,7 @@ class SqlDataProvider extends BaseDataProvider } /** - * @inheritdoc + * {@inheritdoc} */ protected function prepareTotalCount() { diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php index e7df63af0d..7253d86192 100644 --- a/framework/db/ActiveQuery.php +++ b/framework/db/ActiveQuery.php @@ -134,7 +134,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function prepare($builder) { @@ -196,7 +196,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function populate($rows) { @@ -323,7 +323,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface } /** - * @inheritdoc + * {@inheritdoc} */ protected function queryScalar($selectExpression, $db) { @@ -803,7 +803,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.12 */ public function getTablesUsedInFrom() diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php index 819eacd950..122e5c9d04 100644 --- a/framework/db/ActiveRecord.php +++ b/framework/db/ActiveRecord.php @@ -190,7 +190,7 @@ class ActiveRecord extends BaseActiveRecord } /** - * @inheritdoc + * {@inheritdoc} */ public function refresh() { @@ -313,7 +313,7 @@ class ActiveRecord extends BaseActiveRecord } /** - * @inheritdoc + * {@inheritdoc} * @return ActiveQuery the newly created [[ActiveQuery]] instance. */ public static function find() @@ -413,7 +413,7 @@ class ActiveRecord extends BaseActiveRecord } /** - * @inheritdoc + * {@inheritdoc} */ public static function populateRecord($record, $row) { diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php index 3d3b0d7658..13830025d0 100644 --- a/framework/db/BaseActiveRecord.php +++ b/framework/db/BaseActiveRecord.php @@ -99,7 +99,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface /** - * @inheritdoc + * {@inheritdoc} * @return static|null ActiveRecord instance matching the condition, or `null` if nothing matches. */ public static function findOne($condition) @@ -108,7 +108,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface } /** - * @inheritdoc + * {@inheritdoc} * @return static[] an array of ActiveRecord instances, or an empty array if nothing matches. */ public static function findAll($condition) @@ -232,7 +232,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function canGetProperty($name, $checkVars = true, $checkBehaviors = true) { @@ -249,7 +249,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function canSetProperty($name, $checkVars = true, $checkBehaviors = true) { @@ -1645,7 +1645,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface } /** - * @inheritdoc + * {@inheritdoc} * * The default implementation returns the names of the columns whose values have been populated into this record. */ @@ -1657,7 +1657,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface } /** - * @inheritdoc + * {@inheritdoc} * * The default implementation returns the names of the relations that have been populated into this record. */ diff --git a/framework/db/Migration.php b/framework/db/Migration.php index a83b36a937..41e9a3d049 100644 --- a/framework/db/Migration.php +++ b/framework/db/Migration.php @@ -93,7 +93,7 @@ class Migration extends Component implements MigrationInterface } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.6 */ protected function getDb() diff --git a/framework/db/Query.php b/framework/db/Query.php index bbb648dc11..4a39db4ba0 100644 --- a/framework/db/Query.php +++ b/framework/db/Query.php @@ -692,7 +692,7 @@ PATTERN; * * The `$condition` parameter should be either a string (e.g. `'id=1'`) or an array. * - * @inheritdoc + * {@inheritdoc} * * @param string|array|Expression $condition the conditions that should be put in the WHERE part. * @param array $params the parameters (name => value) to be bound to the query. diff --git a/framework/db/cubrid/ColumnSchemaBuilder.php b/framework/db/cubrid/ColumnSchemaBuilder.php index 93feb7045a..1b077ec061 100644 --- a/framework/db/cubrid/ColumnSchemaBuilder.php +++ b/framework/db/cubrid/ColumnSchemaBuilder.php @@ -18,7 +18,7 @@ use yii\db\ColumnSchemaBuilder as AbstractColumnSchemaBuilder; class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder { /** - * @inheritdoc + * {@inheritdoc} */ protected function buildUnsignedString() { @@ -26,7 +26,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ protected function buildAfterString() { @@ -36,7 +36,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ protected function buildFirstString() { @@ -44,7 +44,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ protected function buildCommentString() { @@ -52,7 +52,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function __toString() { diff --git a/framework/db/cubrid/QueryBuilder.php b/framework/db/cubrid/QueryBuilder.php index 0e199369b3..73a0951e59 100644 --- a/framework/db/cubrid/QueryBuilder.php +++ b/framework/db/cubrid/QueryBuilder.php @@ -46,11 +46,11 @@ class QueryBuilder extends \yii\db\QueryBuilder ]; /** - * @inheritdoc + * {@inheritdoc} */ protected $likeEscapeCharacter = '!'; /** - * @inheritdoc + * {@inheritdoc} */ protected $likeEscapingReplacements = [ '%' => '!%', @@ -90,7 +90,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function buildLimit($limit, $offset) { @@ -111,7 +111,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function selectExists($rawSql) @@ -155,7 +155,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function addCommentOnColumn($table, $column, $comment) @@ -171,7 +171,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function addCommentOnTable($table, $comment) @@ -180,7 +180,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function dropCommentFromColumn($table, $column) @@ -189,7 +189,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function dropCommentFromTable($table) diff --git a/framework/db/cubrid/Schema.php b/framework/db/cubrid/Schema.php index dae0ded838..362ca27909 100644 --- a/framework/db/cubrid/Schema.php +++ b/framework/db/cubrid/Schema.php @@ -229,7 +229,7 @@ class Schema extends \yii\db\Schema } /** - * @inheritdoc + * {@inheritdoc} */ public function releaseSavepoint($name) { @@ -360,7 +360,7 @@ class Schema extends \yii\db\Schema } /** - * @inheritdoc + * {@inheritdoc} * @see http://www.cubrid.org/manual/91/en/sql/transaction.html#database-concurrency */ public function setTransactionIsolationLevel($level) @@ -384,7 +384,7 @@ class Schema extends \yii\db\Schema } /** - * @inheritdoc + * {@inheritdoc} */ public function createColumnSchemaBuilder($type, $length = null) { diff --git a/framework/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php index 04afdd3522..04e3e326e9 100644 --- a/framework/db/mssql/QueryBuilder.php +++ b/framework/db/mssql/QueryBuilder.php @@ -46,7 +46,7 @@ class QueryBuilder extends \yii\db\QueryBuilder ]; /** - * @inheritdoc + * {@inheritdoc} */ protected $likeEscapingReplacements = [ '%' => '[%]', @@ -58,7 +58,7 @@ class QueryBuilder extends \yii\db\QueryBuilder /** - * @inheritdoc + * {@inheritdoc} */ public function buildOrderByAndLimit($sql, $orderBy, $limit, $offset) { @@ -250,7 +250,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function addCommentOnColumn($table, $column, $comment) @@ -259,7 +259,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function addCommentOnTable($table, $comment) @@ -268,7 +268,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function dropCommentFromColumn($table, $column) @@ -277,7 +277,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function dropCommentFromTable($table) @@ -323,7 +323,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @throws NotSupportedException if `$columns` is an array */ protected function buildSubqueryInCondition($operator, $columns, $values, &$params) @@ -369,7 +369,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function selectExists($rawSql) @@ -400,7 +400,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function insert($table, $columns, &$params) { @@ -408,7 +408,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function update($table, $columns, $condition, &$params) { diff --git a/framework/db/mssql/Schema.php b/framework/db/mssql/Schema.php index 7a185e3d5f..ade63ac448 100644 --- a/framework/db/mssql/Schema.php +++ b/framework/db/mssql/Schema.php @@ -248,7 +248,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function createSavepoint($name) { @@ -256,7 +256,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function releaseSavepoint($name) { @@ -264,7 +264,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function rollBackSavepoint($name) { @@ -555,7 +555,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ protected function findViewNames($schema = '') { diff --git a/framework/db/mysql/ColumnSchemaBuilder.php b/framework/db/mysql/ColumnSchemaBuilder.php index ad79ee6ca3..038cc099fe 100644 --- a/framework/db/mysql/ColumnSchemaBuilder.php +++ b/framework/db/mysql/ColumnSchemaBuilder.php @@ -18,7 +18,7 @@ use yii\db\ColumnSchemaBuilder as AbstractColumnSchemaBuilder; class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder { /** - * @inheritdoc + * {@inheritdoc} */ protected function buildUnsignedString() { @@ -26,7 +26,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ protected function buildAfterString() { @@ -36,7 +36,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ protected function buildFirstString() { @@ -44,7 +44,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ protected function buildCommentString() { @@ -52,7 +52,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function __toString() { diff --git a/framework/db/mysql/QueryBuilder.php b/framework/db/mysql/QueryBuilder.php index a5e803c901..2d6dc7ca98 100644 --- a/framework/db/mysql/QueryBuilder.php +++ b/framework/db/mysql/QueryBuilder.php @@ -85,7 +85,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @see https://bugs.mysql.com/bug.php?id=48875 */ public function createIndex($name, $table, $columns, $unique = false) @@ -189,7 +189,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function buildLimit($limit, $offset) { @@ -210,7 +210,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ protected function hasLimit($limit) { @@ -219,7 +219,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ protected function hasOffset($offset) { @@ -229,7 +229,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function insert($table, $columns, &$params) { @@ -276,7 +276,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function addCommentOnColumn($table, $column, $comment) @@ -292,7 +292,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function addCommentOnTable($table, $comment) @@ -301,7 +301,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function dropCommentFromColumn($table, $column) @@ -310,7 +310,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function dropCommentFromTable($table) diff --git a/framework/db/mysql/Schema.php b/framework/db/mysql/Schema.php index 5953229c93..e7ba028e2a 100644 --- a/framework/db/mysql/Schema.php +++ b/framework/db/mysql/Schema.php @@ -460,7 +460,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function createColumnSchemaBuilder($type, $length = null) { diff --git a/framework/db/oci/ColumnSchemaBuilder.php b/framework/db/oci/ColumnSchemaBuilder.php index ec68a99fb8..545d34606c 100644 --- a/framework/db/oci/ColumnSchemaBuilder.php +++ b/framework/db/oci/ColumnSchemaBuilder.php @@ -19,7 +19,7 @@ use yii\db\ColumnSchemaBuilder as AbstractColumnSchemaBuilder; class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder { /** - * @inheritdoc + * {@inheritdoc} */ protected function buildUnsignedString() { @@ -27,7 +27,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function __toString() { diff --git a/framework/db/oci/QueryBuilder.php b/framework/db/oci/QueryBuilder.php index 19ec645594..3d6a8c0ed9 100644 --- a/framework/db/oci/QueryBuilder.php +++ b/framework/db/oci/QueryBuilder.php @@ -48,13 +48,13 @@ class QueryBuilder extends \yii\db\QueryBuilder ]; /** - * @inheritdoc + * {@inheritdoc} */ protected $likeEscapeCharacter = '!'; /** * `\` is initialized in [[buildLikeCondition()]] method since * we need to choose replacement value based on [[\yii\db\Schema::quoteValue()]]. - * @inheritdoc + * {@inheritdoc} */ protected $likeEscapingReplacements = [ '%' => '!%', @@ -64,7 +64,7 @@ class QueryBuilder extends \yii\db\QueryBuilder /** - * @inheritdoc + * {@inheritdoc} */ public function buildOrderByAndLimit($sql, $orderBy, $limit, $offset) { @@ -136,7 +136,7 @@ EOD; } /** - * @inheritdoc + * {@inheritdoc} */ public function resetSequence($table, $value = null) { @@ -162,7 +162,7 @@ EOD; } /** - * @inheritdoc + * {@inheritdoc} */ public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null) { @@ -182,7 +182,7 @@ EOD; } /** - * @inheritdoc + * {@inheritdoc} */ public function insert($table, $columns, &$params) { @@ -297,7 +297,7 @@ EOD; } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function selectExists($rawSql) @@ -306,7 +306,7 @@ EOD; } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function dropCommentFromColumn($table, $column) @@ -315,7 +315,7 @@ EOD; } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function dropCommentFromTable($table) @@ -340,7 +340,7 @@ EOD; } /** - * @inheritdoc + * {@inheritdoc} */ public function buildInCondition($operator, $operands, &$params) { diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php index 4cc21171db..2589c27069 100644 --- a/framework/db/oci/Schema.php +++ b/framework/db/oci/Schema.php @@ -43,7 +43,7 @@ class Schema extends \yii\db\Schema /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -231,7 +231,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function releaseSavepoint($name) { @@ -239,7 +239,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function quoteSimpleTableName($name) { @@ -247,7 +247,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function createQueryBuilder() { @@ -255,7 +255,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function createColumnSchemaBuilder($type, $length = null) { @@ -584,7 +584,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function insert($table, $columns) { diff --git a/framework/db/pgsql/QueryBuilder.php b/framework/db/pgsql/QueryBuilder.php index 80be1a7d6d..419d7e1670 100644 --- a/framework/db/pgsql/QueryBuilder.php +++ b/framework/db/pgsql/QueryBuilder.php @@ -240,7 +240,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function insert($table, $columns, &$params) { @@ -248,7 +248,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function update($table, $columns, $condition, &$params) { @@ -283,7 +283,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function batchInsert($table, $columns, $rows) { diff --git a/framework/db/pgsql/Schema.php b/framework/db/pgsql/Schema.php index bead45e367..f2da250b42 100644 --- a/framework/db/pgsql/Schema.php +++ b/framework/db/pgsql/Schema.php @@ -311,7 +311,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc] */ protected function findViewNames($schema = '') { @@ -589,7 +589,7 @@ SQL; } /** - * @inheritdoc + * {@inheritdoc} */ public function insert($table, $columns) { diff --git a/framework/db/sqlite/ColumnSchemaBuilder.php b/framework/db/sqlite/ColumnSchemaBuilder.php index 8ba74568c4..763552cf0a 100644 --- a/framework/db/sqlite/ColumnSchemaBuilder.php +++ b/framework/db/sqlite/ColumnSchemaBuilder.php @@ -18,7 +18,7 @@ use yii\db\ColumnSchemaBuilder as AbstractColumnSchemaBuilder; class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder { /** - * @inheritdoc + * {@inheritdoc} */ protected function buildUnsignedString() { @@ -26,7 +26,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function __toString() { diff --git a/framework/db/sqlite/Command.php b/framework/db/sqlite/Command.php index 81de0baddf..58066fd365 100644 --- a/framework/db/sqlite/Command.php +++ b/framework/db/sqlite/Command.php @@ -21,7 +21,7 @@ use yii\helpers\StringHelper; class Command extends \yii\db\Command { /** - * @inheritdoc + * {@inheritdoc} */ public function execute() { @@ -43,7 +43,7 @@ class Command extends \yii\db\Command } /** - * @inheritdoc + * {@inheritdoc} */ protected function queryInternal($method, $fetchMode = null) { diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php index 8000f563ad..acc002e38e 100644 --- a/framework/db/sqlite/QueryBuilder.php +++ b/framework/db/sqlite/QueryBuilder.php @@ -49,7 +49,7 @@ class QueryBuilder extends \yii\db\QueryBuilder ]; /** - * @inheritdoc + * {@inheritdoc} */ protected $likeEscapeCharacter = '\\'; @@ -359,7 +359,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @throws NotSupportedException * @since 2.0.8 */ @@ -369,7 +369,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @throws NotSupportedException * @since 2.0.8 */ @@ -379,7 +379,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @throws NotSupportedException * @since 2.0.8 */ @@ -389,7 +389,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @throws NotSupportedException * @since 2.0.8 */ @@ -399,7 +399,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function buildLimit($limit, $offset) { @@ -419,7 +419,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} * @throws NotSupportedException if `$columns` is an array */ protected function buildSubqueryInCondition($operator, $columns, $values, &$params) @@ -465,7 +465,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function build($query, $params = []) { @@ -509,7 +509,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } /** - * @inheritdoc + * {@inheritdoc} */ public function buildUnion($unions, &$params) { diff --git a/framework/db/sqlite/Schema.php b/framework/db/sqlite/Schema.php index b744cb9004..5a7392c3ca 100644 --- a/framework/db/sqlite/Schema.php +++ b/framework/db/sqlite/Schema.php @@ -222,7 +222,7 @@ class Schema extends \yii\db\Schema } /** - * @inheritdoc + * {@inheritdoc} * @return ColumnSchemaBuilder column schema builder instance */ public function createColumnSchemaBuilder($type, $length = null) diff --git a/framework/di/NotInstantiableException.php b/framework/di/NotInstantiableException.php index e6f3e8187a..c80332ae08 100644 --- a/framework/di/NotInstantiableException.php +++ b/framework/di/NotInstantiableException.php @@ -19,7 +19,7 @@ use yii\base\InvalidConfigException; class NotInstantiableException extends InvalidConfigException { /** - * @inheritdoc + * {@inheritdoc} */ public function __construct($class, $message = null, $code = 0, \Exception $previous = null) { diff --git a/framework/filters/AjaxFilter.php b/framework/filters/AjaxFilter.php index 70d7239fe0..265f01a570 100644 --- a/framework/filters/AjaxFilter.php +++ b/framework/filters/AjaxFilter.php @@ -43,7 +43,7 @@ class AjaxFilter extends ActionFilter /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -53,7 +53,7 @@ class AjaxFilter extends ActionFilter } /** - * @inheritdoc + * {@inheritdoc} */ public function beforeAction($action) { diff --git a/framework/filters/ContentNegotiator.php b/framework/filters/ContentNegotiator.php index eba85dcd17..9aea7c58fa 100644 --- a/framework/filters/ContentNegotiator.php +++ b/framework/filters/ContentNegotiator.php @@ -130,7 +130,7 @@ class ContentNegotiator extends ActionFilter implements BootstrapInterface /** - * @inheritdoc + * {@inheritdoc} */ public function bootstrap($app) { @@ -138,7 +138,7 @@ class ContentNegotiator extends ActionFilter implements BootstrapInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function beforeAction($action) { diff --git a/framework/filters/Cors.php b/framework/filters/Cors.php index e677a4364c..584f504f04 100644 --- a/framework/filters/Cors.php +++ b/framework/filters/Cors.php @@ -93,7 +93,7 @@ class Cors extends ActionFilter /** - * @inheritdoc + * {@inheritdoc} */ public function beforeAction($action) { diff --git a/framework/filters/HostControl.php b/framework/filters/HostControl.php index a76b819d24..0c9b7fbc2c 100644 --- a/framework/filters/HostControl.php +++ b/framework/filters/HostControl.php @@ -117,7 +117,7 @@ class HostControl extends ActionFilter /** - * @inheritdoc + * {@inheritdoc} */ public function beforeAction($action) { diff --git a/framework/filters/PageCache.php b/framework/filters/PageCache.php index c5e92f7cf5..2633d0be0b 100644 --- a/framework/filters/PageCache.php +++ b/framework/filters/PageCache.php @@ -134,7 +134,7 @@ class PageCache extends ActionFilter /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/filters/RateLimiter.php b/framework/filters/RateLimiter.php index 2fafa298ae..b473a96bba 100644 --- a/framework/filters/RateLimiter.php +++ b/framework/filters/RateLimiter.php @@ -63,7 +63,7 @@ class RateLimiter extends ActionFilter /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -76,7 +76,7 @@ class RateLimiter extends ActionFilter } /** - * @inheritdoc + * {@inheritdoc} */ public function beforeAction($action) { diff --git a/framework/filters/auth/AuthMethod.php b/framework/filters/auth/AuthMethod.php index 2c2a2906db..9dcba078c3 100644 --- a/framework/filters/auth/AuthMethod.php +++ b/framework/filters/auth/AuthMethod.php @@ -48,7 +48,7 @@ abstract class AuthMethod extends ActionFilter implements AuthInterface /** - * @inheritdoc + * {@inheritdoc} */ public function beforeAction($action) { @@ -79,14 +79,14 @@ abstract class AuthMethod extends ActionFilter implements AuthInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function challenge($response) { } /** - * @inheritdoc + * {@inheritdoc} */ public function handleFailure($response) { diff --git a/framework/filters/auth/CompositeAuth.php b/framework/filters/auth/CompositeAuth.php index 3a532a4efb..3b63c5af4a 100644 --- a/framework/filters/auth/CompositeAuth.php +++ b/framework/filters/auth/CompositeAuth.php @@ -50,7 +50,7 @@ class CompositeAuth extends AuthMethod /** - * @inheritdoc + * {@inheritdoc} */ public function beforeAction($action) { @@ -58,7 +58,7 @@ class CompositeAuth extends AuthMethod } /** - * @inheritdoc + * {@inheritdoc} */ public function authenticate($user, $request, $response) { @@ -80,7 +80,7 @@ class CompositeAuth extends AuthMethod } /** - * @inheritdoc + * {@inheritdoc} */ public function challenge($response) { diff --git a/framework/filters/auth/HttpBasicAuth.php b/framework/filters/auth/HttpBasicAuth.php index d30f5e3d54..ceb9af6c26 100644 --- a/framework/filters/auth/HttpBasicAuth.php +++ b/framework/filters/auth/HttpBasicAuth.php @@ -87,7 +87,7 @@ class HttpBasicAuth extends AuthMethod /** - * @inheritdoc + * {@inheritdoc} */ public function authenticate($user, $request, $response) { @@ -117,7 +117,7 @@ class HttpBasicAuth extends AuthMethod } /** - * @inheritdoc + * {@inheritdoc} */ public function challenge($response) { diff --git a/framework/filters/auth/HttpBearerAuth.php b/framework/filters/auth/HttpBearerAuth.php index fb49ef9c86..4756731033 100644 --- a/framework/filters/auth/HttpBearerAuth.php +++ b/framework/filters/auth/HttpBearerAuth.php @@ -29,22 +29,21 @@ namespace yii\filters\auth; class HttpBearerAuth extends HttpHeaderAuth { /** - * @inheritdoc + * {@inheritdoc} */ public $header = 'Authorization'; - /** - * @inheritdoc + * {@inheritdoc} */ public $pattern = '/^Bearer\s+(.*?)$/'; - /** * @var string the HTTP authentication realm */ public $realm = 'api'; + /** - * @inheritdoc + * {@inheritdoc} */ public function challenge($response) { diff --git a/framework/filters/auth/HttpHeaderAuth.php b/framework/filters/auth/HttpHeaderAuth.php index 801f205714..4a484708bc 100644 --- a/framework/filters/auth/HttpHeaderAuth.php +++ b/framework/filters/auth/HttpHeaderAuth.php @@ -37,14 +37,14 @@ class HttpHeaderAuth extends AuthMethod * @var string the HTTP header name */ public $header = 'X-Api-Key'; - /** * @var string a pattern to use to extract the HTTP authentication value */ public $pattern; + /** - * @inheritdoc + * {@inheritdoc} */ public function authenticate($user, $request, $response) { diff --git a/framework/filters/auth/QueryParamAuth.php b/framework/filters/auth/QueryParamAuth.php index cd7888bd37..7bf5afdc26 100644 --- a/framework/filters/auth/QueryParamAuth.php +++ b/framework/filters/auth/QueryParamAuth.php @@ -22,7 +22,7 @@ class QueryParamAuth extends AuthMethod /** - * @inheritdoc + * {@inheritdoc} */ public function authenticate($user, $request, $response) { diff --git a/framework/grid/ActionColumn.php b/framework/grid/ActionColumn.php index 9ef1ed2d6e..8540095878 100644 --- a/framework/grid/ActionColumn.php +++ b/framework/grid/ActionColumn.php @@ -34,7 +34,7 @@ use yii\helpers\Url; class ActionColumn extends Column { /** - * @inheritdoc + * {@inheritdoc} */ public $headerOptions = ['class' => 'action-column']; /** @@ -129,7 +129,7 @@ class ActionColumn extends Column /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -207,7 +207,7 @@ class ActionColumn extends Column } /** - * @inheritdoc + * {@inheritdoc} */ protected function renderDataCellContent($model, $key, $index) { diff --git a/framework/grid/CheckboxColumn.php b/framework/grid/CheckboxColumn.php index 632033fe22..aec6df977e 100644 --- a/framework/grid/CheckboxColumn.php +++ b/framework/grid/CheckboxColumn.php @@ -77,7 +77,7 @@ class CheckboxColumn extends Column /** - * @inheritdoc + * {@inheritdoc} * @throws \yii\base\InvalidConfigException if [[name]] is not set. */ public function init() @@ -109,7 +109,7 @@ class CheckboxColumn extends Column } /** - * @inheritdoc + * {@inheritdoc} */ protected function renderDataCellContent($model, $key, $index) { diff --git a/framework/grid/DataColumn.php b/framework/grid/DataColumn.php index 03ac75dfc0..b77617ac31 100644 --- a/framework/grid/DataColumn.php +++ b/framework/grid/DataColumn.php @@ -120,7 +120,7 @@ class DataColumn extends Column /** - * @inheritdoc + * {@inheritdoc} */ protected function renderHeaderCellContent() { @@ -142,7 +142,7 @@ class DataColumn extends Column } /** - * @inheritdoc + * {@inheritdoc] * @since 2.0.8 */ protected function getHeaderCellLabel() @@ -179,7 +179,7 @@ class DataColumn extends Column } /** - * @inheritdoc + * {@inheritdoc} */ protected function renderFilterCellContent() { @@ -236,7 +236,7 @@ class DataColumn extends Column } /** - * @inheritdoc + * {@inheritdoc} */ protected function renderDataCellContent($model, $key, $index) { diff --git a/framework/grid/GridView.php b/framework/grid/GridView.php index 57b3b3add4..039156b5fe 100644 --- a/framework/grid/GridView.php +++ b/framework/grid/GridView.php @@ -310,7 +310,7 @@ class GridView extends BaseListView } /** - * @inheritdoc + * {@inheritdoc} */ public function renderSection($name) { diff --git a/framework/grid/RadioButtonColumn.php b/framework/grid/RadioButtonColumn.php index 0ab6cacfab..a021ae7347 100644 --- a/framework/grid/RadioButtonColumn.php +++ b/framework/grid/RadioButtonColumn.php @@ -64,7 +64,7 @@ class RadioButtonColumn extends Column /** - * @inheritdoc + * {@inheritdoc} * @throws \yii\base\InvalidConfigException if [[name]] is not set. */ public function init() @@ -76,7 +76,7 @@ class RadioButtonColumn extends Column } /** - * @inheritdoc + * {@inheritdoc} */ protected function renderDataCellContent($model, $key, $index) { diff --git a/framework/grid/SerialColumn.php b/framework/grid/SerialColumn.php index 9505b26c45..69e27faacc 100644 --- a/framework/grid/SerialColumn.php +++ b/framework/grid/SerialColumn.php @@ -30,13 +30,13 @@ namespace yii\grid; class SerialColumn extends Column { /** - * @inheritdoc + * {@inheritdoc} */ public $header = '#'; /** - * @inheritdoc + * {@inheritdoc} */ protected function renderDataCellContent($model, $key, $index) { diff --git a/framework/i18n/Formatter.php b/framework/i18n/Formatter.php index f60c3807c3..fa2c47da5d 100644 --- a/framework/i18n/Formatter.php +++ b/framework/i18n/Formatter.php @@ -371,7 +371,7 @@ class Formatter extends Component /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/log/Dispatcher.php b/framework/log/Dispatcher.php index 7e5c72aa1b..018108c317 100644 --- a/framework/log/Dispatcher.php +++ b/framework/log/Dispatcher.php @@ -75,7 +75,7 @@ class Dispatcher extends Component /** - * @inheritdoc + * {@inheritdoc} */ public function __construct($config = []) { @@ -91,7 +91,7 @@ class Dispatcher extends Component } /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/log/EmailTarget.php b/framework/log/EmailTarget.php index 659c645f75..1b073a5460 100644 --- a/framework/log/EmailTarget.php +++ b/framework/log/EmailTarget.php @@ -59,7 +59,7 @@ class EmailTarget extends Target /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/log/SyslogTarget.php b/framework/log/SyslogTarget.php index 76007e4650..ce03e8fc42 100644 --- a/framework/log/SyslogTarget.php +++ b/framework/log/SyslogTarget.php @@ -49,7 +49,7 @@ class SyslogTarget extends Target /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -72,7 +72,7 @@ class SyslogTarget extends Target } /** - * @inheritdoc + * {@inheritdoc} */ public function formatMessage($message) { diff --git a/framework/rbac/BaseManager.php b/framework/rbac/BaseManager.php index 26e153f2e2..04a18592b8 100644 --- a/framework/rbac/BaseManager.php +++ b/framework/rbac/BaseManager.php @@ -96,7 +96,7 @@ abstract class BaseManager extends Component implements ManagerInterface abstract protected function updateRule($name, $rule); /** - * @inheritdoc + * {@inheritdoc} */ public function createRole($name) { @@ -106,7 +106,7 @@ abstract class BaseManager extends Component implements ManagerInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function createPermission($name) { @@ -116,7 +116,7 @@ abstract class BaseManager extends Component implements ManagerInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function add($object) { @@ -136,7 +136,7 @@ abstract class BaseManager extends Component implements ManagerInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function remove($object) { @@ -150,7 +150,7 @@ abstract class BaseManager extends Component implements ManagerInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function update($name, $object) { @@ -170,7 +170,7 @@ abstract class BaseManager extends Component implements ManagerInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function getRole($name) { @@ -179,7 +179,7 @@ abstract class BaseManager extends Component implements ManagerInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function getPermission($name) { @@ -188,7 +188,7 @@ abstract class BaseManager extends Component implements ManagerInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function getRoles() { @@ -241,7 +241,7 @@ abstract class BaseManager extends Component implements ManagerInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function getPermissions() { diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php index c5ddcfe0a1..08ab08a4c7 100644 --- a/framework/rbac/DbManager.php +++ b/framework/rbac/DbManager.php @@ -118,7 +118,7 @@ class DbManager extends BaseManager private $_checkAccessAssignments = []; /** - * @inheritdoc + * {@inheritdoc} */ public function checkAccess($userId, $permissionName, $params = []) { @@ -226,7 +226,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function getItem($name) { @@ -260,7 +260,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function addItem($item) { @@ -288,7 +288,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function removeItem($item) { @@ -311,7 +311,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function updateItem($name, $item) { @@ -346,7 +346,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function addRule($rule) { @@ -371,7 +371,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function updateRule($name, $rule) { @@ -398,7 +398,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function removeRule($rule) { @@ -418,7 +418,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function getItems($type) { @@ -459,7 +459,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} * The roles returned by this method include the roles assigned via [[$defaultRoles]]. */ public function getRolesByUser($userId) @@ -483,7 +483,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getChildRoles($roleName) { @@ -506,7 +506,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getPermissionsByRole($roleName) { @@ -529,7 +529,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getPermissionsByUser($userId) { @@ -632,7 +632,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getRule($name) { @@ -656,7 +656,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getRules() { @@ -679,7 +679,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getAssignment($roleName, $userId) { @@ -703,7 +703,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getAssignments($userId) { @@ -728,7 +728,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function canAddChild($parent, $child) @@ -737,7 +737,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function addChild($parent, $child) { @@ -763,7 +763,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeChild($parent, $child) { @@ -777,7 +777,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeChildren($parent) { @@ -791,7 +791,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function hasChild($parent, $child) { @@ -802,7 +802,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getChildren($name) { @@ -840,7 +840,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function assign($role, $userId) { @@ -862,7 +862,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function revoke($role, $userId) { @@ -877,7 +877,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function revokeAll($userId) { @@ -892,7 +892,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAll() { @@ -904,7 +904,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAllPermissions() { @@ -912,7 +912,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAllRoles() { @@ -950,7 +950,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAllRules() { @@ -966,7 +966,7 @@ class DbManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAllAssignments() { diff --git a/framework/rbac/Permission.php b/framework/rbac/Permission.php index 84166a02d3..9471079ce1 100644 --- a/framework/rbac/Permission.php +++ b/framework/rbac/Permission.php @@ -16,7 +16,7 @@ namespace yii\rbac; class Permission extends Item { /** - * @inheritdoc + * {@inheritdoc} */ public $type = self::TYPE_PERMISSION; } diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php index 55f82ef73e..5eb9f37744 100644 --- a/framework/rbac/PhpManager.php +++ b/framework/rbac/PhpManager.php @@ -94,7 +94,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function checkAccess($userId, $permissionName, $params = []) { @@ -108,7 +108,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getAssignments($userId) { @@ -156,7 +156,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.8 */ public function canAddChild($parent, $child) @@ -165,7 +165,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function addChild($parent, $child) { @@ -218,7 +218,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeChild($parent, $child) { @@ -232,7 +232,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeChildren($parent) { @@ -246,7 +246,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function hasChild($parent, $child) { @@ -254,7 +254,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function assign($role, $userId) { @@ -275,7 +275,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function revoke($role, $userId) { @@ -289,7 +289,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function revokeAll($userId) { @@ -305,7 +305,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getAssignment($roleName, $userId) { @@ -313,7 +313,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getItems($type) { @@ -331,7 +331,7 @@ class PhpManager extends BaseManager /** - * @inheritdoc + * {@inheritdoc} */ public function removeItem($item) { @@ -352,7 +352,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getItem($name) { @@ -360,7 +360,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function updateRule($name, $rule) { @@ -373,7 +373,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getRule($name) { @@ -381,7 +381,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getRules() { @@ -389,7 +389,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} * The roles returned by this method include the roles assigned via [[$defaultRoles]]. */ public function getRolesByUser($userId) @@ -406,7 +406,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getChildRoles($roleName) { @@ -429,7 +429,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getPermissionsByRole($roleName) { @@ -465,7 +465,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getPermissionsByUser($userId) { @@ -523,7 +523,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function getChildren($name) { @@ -531,7 +531,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAll() { @@ -543,7 +543,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAllPermissions() { @@ -551,7 +551,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAllRoles() { @@ -599,7 +599,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAllRules() { @@ -611,7 +611,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ public function removeAllAssignments() { @@ -620,7 +620,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function removeRule($rule) { @@ -639,7 +639,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function addRule($rule) { @@ -649,7 +649,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function updateItem($name, $item) { @@ -688,7 +688,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} */ protected function addItem($item) { @@ -869,7 +869,7 @@ class PhpManager extends BaseManager } /** - * @inheritdoc + * {@inheritdoc} * @since 2.0.7 */ public function getUserIdsByRole($roleName) diff --git a/framework/rbac/Role.php b/framework/rbac/Role.php index ed084e98fa..a7b3216554 100644 --- a/framework/rbac/Role.php +++ b/framework/rbac/Role.php @@ -16,7 +16,7 @@ namespace yii\rbac; class Role extends Item { /** - * @inheritdoc + * {@inheritdoc} */ public $type = self::TYPE_ROLE; } diff --git a/framework/rbac/migrations/m140506_102106_rbac_init.php b/framework/rbac/migrations/m140506_102106_rbac_init.php index d5c01a757c..72083c3607 100644 --- a/framework/rbac/migrations/m140506_102106_rbac_init.php +++ b/framework/rbac/migrations/m140506_102106_rbac_init.php @@ -44,7 +44,7 @@ class m140506_102106_rbac_init extends \yii\db\Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function up() { @@ -137,7 +137,7 @@ class m140506_102106_rbac_init extends \yii\db\Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function down() { diff --git a/framework/rbac/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php b/framework/rbac/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php index 08848d174c..26ec41f80e 100644 --- a/framework/rbac/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php +++ b/framework/rbac/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php @@ -37,7 +37,7 @@ class m170907_052038_rbac_add_index_on_auth_assignment_user_id extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function up() { @@ -46,7 +46,7 @@ class m170907_052038_rbac_add_index_on_auth_assignment_user_id extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function down() { diff --git a/framework/rest/Action.php b/framework/rest/Action.php index 08f89d4049..466acfc2f3 100644 --- a/framework/rest/Action.php +++ b/framework/rest/Action.php @@ -60,7 +60,7 @@ class Action extends \yii\base\Action /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/rest/ActiveController.php b/framework/rest/ActiveController.php index ed68fec2e8..5e7df58fbe 100644 --- a/framework/rest/ActiveController.php +++ b/framework/rest/ActiveController.php @@ -56,7 +56,7 @@ class ActiveController extends Controller /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -67,7 +67,7 @@ class ActiveController extends Controller } /** - * @inheritdoc + * {@inheritdoc} */ public function actions() { @@ -106,7 +106,7 @@ class ActiveController extends Controller } /** - * @inheritdoc + * {@inheritdoc} */ protected function verbs() { diff --git a/framework/rest/Controller.php b/framework/rest/Controller.php index 734b34429b..e473bdb4a7 100644 --- a/framework/rest/Controller.php +++ b/framework/rest/Controller.php @@ -37,13 +37,13 @@ class Controller extends \yii\web\Controller */ public $serializer = 'yii\rest\Serializer'; /** - * @inheritdoc + * {@inheritdoc} */ public $enableCsrfValidation = false; /** - * @inheritdoc + * {@inheritdoc} */ public function behaviors() { @@ -69,7 +69,7 @@ class Controller extends \yii\web\Controller } /** - * @inheritdoc + * {@inheritdoc} */ public function afterAction($action, $result) { diff --git a/framework/rest/Serializer.php b/framework/rest/Serializer.php index 52f5828b45..8105eb3697 100644 --- a/framework/rest/Serializer.php +++ b/framework/rest/Serializer.php @@ -121,7 +121,7 @@ class Serializer extends Component /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/rest/UrlRule.php b/framework/rest/UrlRule.php index c6675124f7..3003c8f89f 100644 --- a/framework/rest/UrlRule.php +++ b/framework/rest/UrlRule.php @@ -141,7 +141,7 @@ class UrlRule extends CompositeUrlRule /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -164,7 +164,7 @@ class UrlRule extends CompositeUrlRule } /** - * @inheritdoc + * {@inheritdoc} */ protected function createRules() { @@ -214,7 +214,7 @@ class UrlRule extends CompositeUrlRule } /** - * @inheritdoc + * {@inheritdoc} */ public function parseRequest($manager, $request) { @@ -242,7 +242,7 @@ class UrlRule extends CompositeUrlRule } /** - * @inheritdoc + * {@inheritdoc} */ public function createUrl($manager, $route, $params) { diff --git a/framework/test/ActiveFixture.php b/framework/test/ActiveFixture.php index 12a1300688..87eff0fd18 100644 --- a/framework/test/ActiveFixture.php +++ b/framework/test/ActiveFixture.php @@ -54,7 +54,7 @@ class ActiveFixture extends BaseActiveFixture /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -105,7 +105,7 @@ class ActiveFixture extends BaseActiveFixture } /** - * @inheritdoc + * {@inheritdoc} */ public function unload() { diff --git a/framework/test/ArrayFixture.php b/framework/test/ArrayFixture.php index 793538c17a..3ce967d850 100644 --- a/framework/test/ArrayFixture.php +++ b/framework/test/ArrayFixture.php @@ -68,7 +68,7 @@ class ArrayFixture extends Fixture implements \IteratorAggregate, \ArrayAccess, } /** - * @inheritdoc + * {@inheritdoc} */ public function unload() { diff --git a/framework/test/BaseActiveFixture.php b/framework/test/BaseActiveFixture.php index 1e952cca9c..1e7a778d7f 100644 --- a/framework/test/BaseActiveFixture.php +++ b/framework/test/BaseActiveFixture.php @@ -107,7 +107,7 @@ abstract class BaseActiveFixture extends DbFixture implements \IteratorAggregate } /** - * @inheritdoc + * {@inheritdoc} */ public function unload() { diff --git a/framework/test/DbFixture.php b/framework/test/DbFixture.php index 4be21e4ea1..bc10e69c7b 100644 --- a/framework/test/DbFixture.php +++ b/framework/test/DbFixture.php @@ -34,7 +34,7 @@ abstract class DbFixture extends Fixture /** - * @inheritdoc + * {@inheritdoc} */ public function init() { diff --git a/framework/test/InitDbFixture.php b/framework/test/InitDbFixture.php index ea72f42904..1cf3d1b712 100644 --- a/framework/test/InitDbFixture.php +++ b/framework/test/InitDbFixture.php @@ -44,7 +44,7 @@ class InitDbFixture extends DbFixture /** - * @inheritdoc + * {@inheritdoc} */ public function beforeLoad() { @@ -52,7 +52,7 @@ class InitDbFixture extends DbFixture } /** - * @inheritdoc + * {@inheritdoc} */ public function afterLoad() { @@ -60,7 +60,7 @@ class InitDbFixture extends DbFixture } /** - * @inheritdoc + * {@inheritdoc} */ public function load() { @@ -71,7 +71,7 @@ class InitDbFixture extends DbFixture } /** - * @inheritdoc + * {@inheritdoc} */ public function beforeUnload() { @@ -79,7 +79,7 @@ class InitDbFixture extends DbFixture } /** - * @inheritdoc + * {@inheritdoc} */ public function afterUnload() { diff --git a/framework/validators/BooleanValidator.php b/framework/validators/BooleanValidator.php index 2a6830ad40..49531628ea 100644 --- a/framework/validators/BooleanValidator.php +++ b/framework/validators/BooleanValidator.php @@ -37,7 +37,7 @@ class BooleanValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -48,7 +48,7 @@ class BooleanValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -69,7 +69,7 @@ class BooleanValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -80,7 +80,7 @@ class BooleanValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/CompareValidator.php b/framework/validators/CompareValidator.php index 8755b51d0d..86ead45a83 100644 --- a/framework/validators/CompareValidator.php +++ b/framework/validators/CompareValidator.php @@ -97,7 +97,7 @@ class CompareValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -135,7 +135,7 @@ class CompareValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -163,7 +163,7 @@ class CompareValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -221,7 +221,7 @@ class CompareValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -232,7 +232,7 @@ class CompareValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/DateValidator.php b/framework/validators/DateValidator.php index 33e466bbc9..d2f1367f2a 100644 --- a/framework/validators/DateValidator.php +++ b/framework/validators/DateValidator.php @@ -207,7 +207,7 @@ class DateValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -261,7 +261,7 @@ class DateValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -301,7 +301,7 @@ class DateValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { diff --git a/framework/validators/DefaultValueValidator.php b/framework/validators/DefaultValueValidator.php index 1b54e5a286..55d782de9d 100644 --- a/framework/validators/DefaultValueValidator.php +++ b/framework/validators/DefaultValueValidator.php @@ -39,7 +39,7 @@ class DefaultValueValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { diff --git a/framework/validators/EachValidator.php b/framework/validators/EachValidator.php index 4c830b006e..8f00922de3 100644 --- a/framework/validators/EachValidator.php +++ b/framework/validators/EachValidator.php @@ -77,7 +77,7 @@ class EachValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -124,7 +124,7 @@ class EachValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -168,7 +168,7 @@ class EachValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { diff --git a/framework/validators/EmailValidator.php b/framework/validators/EmailValidator.php index 2c57f28aae..61186b0925 100644 --- a/framework/validators/EmailValidator.php +++ b/framework/validators/EmailValidator.php @@ -52,7 +52,7 @@ class EmailValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -66,7 +66,7 @@ class EmailValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -116,7 +116,7 @@ class EmailValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -130,7 +130,7 @@ class EmailValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/ExistValidator.php b/framework/validators/ExistValidator.php index b7e5c574ab..6305795083 100644 --- a/framework/validators/ExistValidator.php +++ b/framework/validators/ExistValidator.php @@ -75,7 +75,7 @@ class ExistValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -86,7 +86,7 @@ class ExistValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -167,7 +167,7 @@ class ExistValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { diff --git a/framework/validators/FileValidator.php b/framework/validators/FileValidator.php index 26e6086771..fdbb6b6924 100644 --- a/framework/validators/FileValidator.php +++ b/framework/validators/FileValidator.php @@ -163,7 +163,7 @@ class FileValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -205,7 +205,7 @@ class FileValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -268,7 +268,7 @@ class FileValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -361,7 +361,7 @@ class FileValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} * @param bool $trim */ public function isEmpty($value, $trim = false) @@ -423,7 +423,7 @@ class FileValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -433,7 +433,7 @@ class FileValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/FilterValidator.php b/framework/validators/FilterValidator.php index cedf241fd1..116a95e425 100644 --- a/framework/validators/FilterValidator.php +++ b/framework/validators/FilterValidator.php @@ -58,7 +58,7 @@ class FilterValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -69,7 +69,7 @@ class FilterValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -80,7 +80,7 @@ class FilterValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -95,7 +95,7 @@ class FilterValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/ImageValidator.php b/framework/validators/ImageValidator.php index f9067fa63d..456f11d75e 100644 --- a/framework/validators/ImageValidator.php +++ b/framework/validators/ImageValidator.php @@ -89,7 +89,7 @@ class ImageValidator extends FileValidator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -113,7 +113,7 @@ class ImageValidator extends FileValidator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -160,7 +160,7 @@ class ImageValidator extends FileValidator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -170,7 +170,7 @@ class ImageValidator extends FileValidator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/InlineValidator.php b/framework/validators/InlineValidator.php index 3192598912..0f25a0560e 100644 --- a/framework/validators/InlineValidator.php +++ b/framework/validators/InlineValidator.php @@ -61,7 +61,7 @@ class InlineValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -73,7 +73,7 @@ class InlineValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { diff --git a/framework/validators/IpValidator.php b/framework/validators/IpValidator.php index c72a94d4a8..e445b4b183 100644 --- a/framework/validators/IpValidator.php +++ b/framework/validators/IpValidator.php @@ -205,7 +205,7 @@ class IpValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -283,7 +283,7 @@ class IpValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -297,7 +297,7 @@ class IpValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -533,7 +533,7 @@ class IpValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -544,7 +544,7 @@ class IpValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/NumberValidator.php b/framework/validators/NumberValidator.php index e438c048a4..6e33cab9df 100644 --- a/framework/validators/NumberValidator.php +++ b/framework/validators/NumberValidator.php @@ -58,7 +58,7 @@ class NumberValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -76,7 +76,7 @@ class NumberValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -99,7 +99,7 @@ class NumberValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -119,7 +119,7 @@ class NumberValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -130,7 +130,7 @@ class NumberValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/RangeValidator.php b/framework/validators/RangeValidator.php index bbc344ada5..f916d7af48 100644 --- a/framework/validators/RangeValidator.php +++ b/framework/validators/RangeValidator.php @@ -51,7 +51,7 @@ class RangeValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -68,7 +68,7 @@ class RangeValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -89,7 +89,7 @@ class RangeValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -100,7 +100,7 @@ class RangeValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -115,7 +115,7 @@ class RangeValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/RegularExpressionValidator.php b/framework/validators/RegularExpressionValidator.php index fab5c51b45..1ae0190a05 100644 --- a/framework/validators/RegularExpressionValidator.php +++ b/framework/validators/RegularExpressionValidator.php @@ -35,7 +35,7 @@ class RegularExpressionValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -49,7 +49,7 @@ class RegularExpressionValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -61,7 +61,7 @@ class RegularExpressionValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -72,7 +72,7 @@ class RegularExpressionValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/RequiredValidator.php b/framework/validators/RequiredValidator.php index a8c620a6f8..670a6ff9c0 100644 --- a/framework/validators/RequiredValidator.php +++ b/framework/validators/RequiredValidator.php @@ -51,7 +51,7 @@ class RequiredValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -63,7 +63,7 @@ class RequiredValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -84,7 +84,7 @@ class RequiredValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -95,7 +95,7 @@ class RequiredValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/SafeValidator.php b/framework/validators/SafeValidator.php index 5e13fb06c5..b4992a7ab3 100644 --- a/framework/validators/SafeValidator.php +++ b/framework/validators/SafeValidator.php @@ -26,14 +26,14 @@ namespace yii\validators; class SafeValidator extends Validator { /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttributes($model, $attributes = null) { } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { diff --git a/framework/validators/StringValidator.php b/framework/validators/StringValidator.php index e01bfe6404..8f27d4660e 100644 --- a/framework/validators/StringValidator.php +++ b/framework/validators/StringValidator.php @@ -67,7 +67,7 @@ class StringValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -99,7 +99,7 @@ class StringValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -125,7 +125,7 @@ class StringValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -149,7 +149,7 @@ class StringValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -160,7 +160,7 @@ class StringValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php index d99095cc12..7b1c308182 100644 --- a/framework/validators/UniqueValidator.php +++ b/framework/validators/UniqueValidator.php @@ -92,7 +92,7 @@ class UniqueValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -113,7 +113,7 @@ class UniqueValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { diff --git a/framework/validators/UrlValidator.php b/framework/validators/UrlValidator.php index 2eeb99f84c..bf31279888 100644 --- a/framework/validators/UrlValidator.php +++ b/framework/validators/UrlValidator.php @@ -50,7 +50,7 @@ class UrlValidator extends Validator /** - * @inheritdoc + *{@inheritdoc} */ public function init() { @@ -64,7 +64,7 @@ class UrlValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function validateAttribute($model, $attribute) { @@ -78,7 +78,7 @@ class UrlValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ protected function validateValue($value) { @@ -119,7 +119,7 @@ class UrlValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function clientValidateAttribute($model, $attribute, $view) { @@ -133,7 +133,7 @@ class UrlValidator extends Validator } /** - * @inheritdoc + *{@inheritdoc} */ public function getClientOptions($model, $attribute) { diff --git a/framework/validators/Validator.php b/framework/validators/Validator.php index 7e61940470..d73a2d5721 100644 --- a/framework/validators/Validator.php +++ b/framework/validators/Validator.php @@ -227,7 +227,7 @@ class Validator extends Component } /** - * @inheritdoc + *{@inheritdoc} */ public function init() { diff --git a/framework/views/addColumnMigration.php b/framework/views/addColumnMigration.php index 2df166bc86..c992c7c6ae 100644 --- a/framework/views/addColumnMigration.php +++ b/framework/views/addColumnMigration.php @@ -29,7 +29,7 @@ use yii\db\Migration; class extends Migration { /** - * @inheritdoc + * {@inheritdoc} */ public function safeUp() { @@ -42,7 +42,7 @@ class extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function safeDown() { diff --git a/framework/views/createJunctionMigration.php b/framework/views/createJunctionMigration.php index c10658718b..fa62b25163 100644 --- a/framework/views/createJunctionMigration.php +++ b/framework/views/createJunctionMigration.php @@ -27,7 +27,7 @@ use yii\db\Migration; class extends Migration { /** - * @inheritdoc + * {@inheritdoc} */ public function safeUp() { @@ -69,7 +69,7 @@ class extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function safeDown() { diff --git a/framework/views/createTableMigration.php b/framework/views/createTableMigration.php index 82f89f7664..dceb6b2649 100644 --- a/framework/views/createTableMigration.php +++ b/framework/views/createTableMigration.php @@ -28,7 +28,7 @@ use yii\db\Migration; class extends Migration { /** - * @inheritdoc + * {@inheritdoc} */ public function safeUp() { @@ -48,7 +48,7 @@ class extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function safeDown() { diff --git a/framework/views/dropColumnMigration.php b/framework/views/dropColumnMigration.php index fd001b57ac..be1a4d2d96 100644 --- a/framework/views/dropColumnMigration.php +++ b/framework/views/dropColumnMigration.php @@ -28,7 +28,7 @@ use yii\db\Migration; class extends Migration { /** - * @inheritdoc + * {@inheritdoc} */ public function safeUp() { @@ -41,7 +41,7 @@ class extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function safeDown() { diff --git a/framework/views/dropTableMigration.php b/framework/views/dropTableMigration.php index 40e06b6165..a2151106d3 100644 --- a/framework/views/dropTableMigration.php +++ b/framework/views/dropTableMigration.php @@ -26,7 +26,7 @@ use yii\db\Migration; class extends Migration { /** - * @inheritdoc + * {@inheritdoc} */ public function safeUp() { @@ -38,7 +38,7 @@ class extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function safeDown() { diff --git a/framework/views/migration.php b/framework/views/migration.php index cb4c4acea2..1a1e3bb402 100644 --- a/framework/views/migration.php +++ b/framework/views/migration.php @@ -21,7 +21,7 @@ use yii\db\Migration; class extends Migration { /** - * @inheritdoc + * {@inheritdoc} */ public function safeUp() { @@ -29,7 +29,7 @@ class extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function safeDown() { diff --git a/framework/web/Application.php b/framework/web/Application.php index 8951ee30d7..36a2a92f5b 100644 --- a/framework/web/Application.php +++ b/framework/web/Application.php @@ -58,7 +58,7 @@ class Application extends \yii\base\Application /** - * @inheritdoc + * {@inheritdoc} */ protected function bootstrap() { @@ -188,7 +188,7 @@ class Application extends \yii\base\Application } /** - * @inheritdoc + * {@inheritdoc} */ public function coreComponents() { diff --git a/framework/web/CompositeUrlRule.php b/framework/web/CompositeUrlRule.php index bb03ae0f65..8cab76750d 100644 --- a/framework/web/CompositeUrlRule.php +++ b/framework/web/CompositeUrlRule.php @@ -40,7 +40,7 @@ abstract class CompositeUrlRule extends BaseObject implements UrlRuleInterface abstract protected function createRules(); /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -49,7 +49,7 @@ abstract class CompositeUrlRule extends BaseObject implements UrlRuleInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function parseRequest($manager, $request) { @@ -72,7 +72,7 @@ abstract class CompositeUrlRule extends BaseObject implements UrlRuleInterface } /** - * @inheritdoc + * {@inheritdoc} */ public function createUrl($manager, $route, $params) { diff --git a/framework/web/Controller.php b/framework/web/Controller.php index 347f8f7e2e..aca323eaa4 100644 --- a/framework/web/Controller.php +++ b/framework/web/Controller.php @@ -157,7 +157,7 @@ class Controller extends \yii\base\Controller } /** - * @inheritdoc + * {@inheritdoc} */ public function beforeAction($action) { diff --git a/framework/web/GroupUrlRule.php b/framework/web/GroupUrlRule.php index 42120825ba..4ce3b19a14 100644 --- a/framework/web/GroupUrlRule.php +++ b/framework/web/GroupUrlRule.php @@ -73,7 +73,7 @@ class GroupUrlRule extends CompositeUrlRule /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -83,7 +83,7 @@ class GroupUrlRule extends CompositeUrlRule } /** - * @inheritdoc + * {@inheritdoc} */ protected function createRules() { @@ -117,7 +117,7 @@ class GroupUrlRule extends CompositeUrlRule } /** - * @inheritdoc + * {@inheritdoc} */ public function parseRequest($manager, $request) { @@ -130,7 +130,7 @@ class GroupUrlRule extends CompositeUrlRule } /** - * @inheritdoc + * {@inheritdoc} */ public function createUrl($manager, $route, $params) { diff --git a/framework/web/HeadersAlreadySentException.php b/framework/web/HeadersAlreadySentException.php index bdb9f41489..c57b5b8801 100644 --- a/framework/web/HeadersAlreadySentException.php +++ b/framework/web/HeadersAlreadySentException.php @@ -19,7 +19,7 @@ use yii\base\Exception; class HeadersAlreadySentException extends Exception { /** - * @inheritdoc + * {@inheritdoc} */ public function __construct($file, $line) { diff --git a/framework/web/MultipartFormDataParser.php b/framework/web/MultipartFormDataParser.php index 10b6c15e4d..89ebf0aa00 100644 --- a/framework/web/MultipartFormDataParser.php +++ b/framework/web/MultipartFormDataParser.php @@ -125,7 +125,7 @@ class MultipartFormDataParser extends BaseObject implements RequestParserInterfa } /** - * @inheritdoc + * {@inheritdoc} */ public function parse($rawBody, $contentType) { diff --git a/framework/web/migrations/m160313_153426_session_init.php b/framework/web/migrations/m160313_153426_session_init.php index ec107d0f71..9d5dfa6cb0 100644 --- a/framework/web/migrations/m160313_153426_session_init.php +++ b/framework/web/migrations/m160313_153426_session_init.php @@ -16,7 +16,7 @@ use yii\db\Migration; class m160313_153426_session_init extends Migration { /** - * @inheritdoc + * {@inheritdoc} */ public function up() { @@ -44,7 +44,7 @@ class m160313_153426_session_init extends Migration } /** - * @inheritdoc + * {@inheritdoc} */ public function down() { diff --git a/framework/widgets/MaskedInput.php b/framework/widgets/MaskedInput.php index 7f6915c19f..8208e13984 100644 --- a/framework/widgets/MaskedInput.php +++ b/framework/widgets/MaskedInput.php @@ -119,7 +119,7 @@ class MaskedInput extends InputWidget } /** - * @inheritdoc + * {@inheritdoc} */ public function run() { diff --git a/framework/widgets/Pjax.php b/framework/widgets/Pjax.php index e15892af84..2b055698ab 100644 --- a/framework/widgets/Pjax.php +++ b/framework/widgets/Pjax.php @@ -98,18 +98,18 @@ class Pjax extends Widget */ public $clientOptions; /** - * @inheritdoc + * {@inheritdoc} * @internal */ public static $counter = 0; /** - * @inheritdoc + * {@inheritdoc} */ public static $autoIdPrefix = 'p'; /** - * @inheritdoc + * {@inheritdoc} */ public function init() { @@ -142,7 +142,7 @@ class Pjax extends Widget } /** - * @inheritdoc + * {@inheritdoc} */ public function run() { diff --git a/tests/IsOneOfAssert.php b/tests/IsOneOfAssert.php index 3bd7ce0356..6bf242ac3d 100644 --- a/tests/IsOneOfAssert.php +++ b/tests/IsOneOfAssert.php @@ -37,7 +37,7 @@ class IsOneOfAssert extends \PHPUnit\Framework\Constraint\Constraint } /** - * @inheritdoc + *{@inheritdoc} */ protected function matches($other) { diff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php index 89cdedf5e5..c703d531de 100644 --- a/tests/data/ar/Customer.php +++ b/tests/data/ar/Customer.php @@ -95,7 +95,7 @@ class Customer extends ActiveRecord } /** - * @inheritdoc + *{@inheritdoc} * @return CustomerQuery */ public static function find() diff --git a/tests/data/ar/Type.php b/tests/data/ar/Type.php index bd02d4eea3..ee0dc0ca41 100644 --- a/tests/data/ar/Type.php +++ b/tests/data/ar/Type.php @@ -27,7 +27,7 @@ namespace yiiunit\data\ar; class Type extends ActiveRecord { /** - * @inheritdoc + *{@inheritdoc} */ public static function tableName() { diff --git a/tests/data/base/TraversableObject.php b/tests/data/base/TraversableObject.php index bf4b58a6b9..e355ac2d28 100644 --- a/tests/data/base/TraversableObject.php +++ b/tests/data/base/TraversableObject.php @@ -34,7 +34,7 @@ class TraversableObject implements \Iterator, \Countable } /** - * @inheritdoc + *{@inheritdoc} */ public function current() { @@ -42,7 +42,7 @@ class TraversableObject implements \Iterator, \Countable } /** - * @inheritdoc + *{@inheritdoc} */ public function next() { @@ -50,7 +50,7 @@ class TraversableObject implements \Iterator, \Countable } /** - * @inheritdoc + *{@inheritdoc} */ public function key() { @@ -58,7 +58,7 @@ class TraversableObject implements \Iterator, \Countable } /** - * @inheritdoc + *{@inheritdoc} */ public function valid() { @@ -66,7 +66,7 @@ class TraversableObject implements \Iterator, \Countable } /** - * @inheritdoc + *{@inheritdoc} */ public function rewind() { diff --git a/tests/data/console/migrate_create/add_columns_fk.php b/tests/data/console/migrate_create/add_columns_fk.php index a47ae55a73..3a36428291 100644 --- a/tests/data/console/migrate_create/add_columns_fk.php +++ b/tests/data/console/migrate_create/add_columns_fk.php @@ -21,7 +21,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -83,7 +83,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/add_columns_prefix.php b/tests/data/console/migrate_create/add_columns_prefix.php index 87b3fdc50a..40bb9ae1db 100644 --- a/tests/data/console/migrate_create/add_columns_prefix.php +++ b/tests/data/console/migrate_create/add_columns_prefix.php @@ -21,7 +21,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -83,7 +83,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/add_columns_test.php b/tests/data/console/migrate_create/add_columns_test.php index fb6052a0ec..bd65492ef7 100644 --- a/tests/data/console/migrate_create/add_columns_test.php +++ b/tests/data/console/migrate_create/add_columns_test.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -27,7 +27,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_fields.php b/tests/data/console/migrate_create/create_fields.php index c6bf067686..096e298880 100644 --- a/tests/data/console/migrate_create/create_fields.php +++ b/tests/data/console/migrate_create/create_fields.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -30,7 +30,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_foreign_key.php b/tests/data/console/migrate_create/create_foreign_key.php index 036691c2ce..e499d3932c 100644 --- a/tests/data/console/migrate_create/create_foreign_key.php +++ b/tests/data/console/migrate_create/create_foreign_key.php @@ -21,7 +21,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -86,7 +86,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_id_pk.php b/tests/data/console/migrate_create/create_id_pk.php index 845d2a7dc6..e71ab6b833 100644 --- a/tests/data/console/migrate_create/create_id_pk.php +++ b/tests/data/console/migrate_create/create_id_pk.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -29,7 +29,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_prefix.php b/tests/data/console/migrate_create/create_prefix.php index dd8f423b80..5ee86d9663 100644 --- a/tests/data/console/migrate_create/create_prefix.php +++ b/tests/data/console/migrate_create/create_prefix.php @@ -21,7 +21,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -86,7 +86,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_products_from_store_table.php b/tests/data/console/migrate_create/create_products_from_store_table.php index e029586c25..76aac69ff9 100644 --- a/tests/data/console/migrate_create/create_products_from_store_table.php +++ b/tests/data/console/migrate_create/create_products_from_store_table.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -26,7 +26,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_test.php b/tests/data/console/migrate_create/create_test.php index e029586c25..76aac69ff9 100644 --- a/tests/data/console/migrate_create/create_test.php +++ b/tests/data/console/migrate_create/create_test.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -26,7 +26,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_title_pk.php b/tests/data/console/migrate_create/create_title_pk.php index d1794209f5..d02b9ca278 100644 --- a/tests/data/console/migrate_create/create_title_pk.php +++ b/tests/data/console/migrate_create/create_title_pk.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -28,7 +28,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_title_with_comma_default_values.php b/tests/data/console/migrate_create/create_title_with_comma_default_values.php index 573c794958..32cb76e70c 100644 --- a/tests/data/console/migrate_create/create_title_with_comma_default_values.php +++ b/tests/data/console/migrate_create/create_title_with_comma_default_values.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -29,7 +29,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_unsigned_big_pk.php b/tests/data/console/migrate_create/create_unsigned_big_pk.php index 60eddb41d7..4fef75a220 100644 --- a/tests/data/console/migrate_create/create_unsigned_big_pk.php +++ b/tests/data/console/migrate_create/create_unsigned_big_pk.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -26,7 +26,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/create_unsigned_pk.php b/tests/data/console/migrate_create/create_unsigned_pk.php index 8aa8cc9013..6763e5f2b4 100644 --- a/tests/data/console/migrate_create/create_unsigned_pk.php +++ b/tests/data/console/migrate_create/create_unsigned_pk.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -26,7 +26,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/default.php b/tests/data/console/migrate_create/default.php index 959f064103..cee3ce56ee 100644 --- a/tests/data/console/migrate_create/default.php +++ b/tests/data/console/migrate_create/default.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -24,7 +24,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/drop_columns_test.php b/tests/data/console/migrate_create/drop_columns_test.php index 401ca478bc..eddf3657bd 100644 --- a/tests/data/console/migrate_create/drop_columns_test.php +++ b/tests/data/console/migrate_create/drop_columns_test.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -27,7 +27,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/drop_fields.php b/tests/data/console/migrate_create/drop_fields.php index c9d75b3fec..b932600d27 100644 --- a/tests/data/console/migrate_create/drop_fields.php +++ b/tests/data/console/migrate_create/drop_fields.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -24,7 +24,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/drop_products_from_store_table.php b/tests/data/console/migrate_create/drop_products_from_store_table.php index 39070a69f7..2201c5cd67 100644 --- a/tests/data/console/migrate_create/drop_products_from_store_table.php +++ b/tests/data/console/migrate_create/drop_products_from_store_table.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -24,7 +24,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/drop_test.php b/tests/data/console/migrate_create/drop_test.php index 39070a69f7..2201c5cd67 100644 --- a/tests/data/console/migrate_create/drop_test.php +++ b/tests/data/console/migrate_create/drop_test.php @@ -16,7 +16,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -24,7 +24,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/data/console/migrate_create/junction_test.php b/tests/data/console/migrate_create/junction_test.php index df0998dc15..58ad01d028 100644 --- a/tests/data/console/migrate_create/junction_test.php +++ b/tests/data/console/migrate_create/junction_test.php @@ -20,7 +20,7 @@ use yii\db\Migration; class {$class} extends Migration { /** - * @inheritdoc + *{@inheritdoc} */ public function safeUp() { @@ -66,7 +66,7 @@ class {$class} extends Migration } /** - * @inheritdoc + *{@inheritdoc} */ public function safeDown() { diff --git a/tests/framework/base/ActionFilterTest.php b/tests/framework/base/ActionFilterTest.php index a10c65fba8..7ccb5dd99c 100644 --- a/tests/framework/base/ActionFilterTest.php +++ b/tests/framework/base/ActionFilterTest.php @@ -180,7 +180,7 @@ class FakeController extends Controller class Filter1 extends ActionFilter { /** - * @inheritdoc + *{@inheritdoc} */ public function beforeAction($action) { @@ -189,7 +189,7 @@ class Filter1 extends ActionFilter } /** - * @inheritdoc + *{@inheritdoc} */ public function afterAction($action, $result) { @@ -200,7 +200,7 @@ class Filter1 extends ActionFilter class Filter2 extends ActionFilter { /** - * @inheritdoc + *{@inheritdoc} */ public function beforeAction($action) { @@ -209,7 +209,7 @@ class Filter2 extends ActionFilter } /** - * @inheritdoc + *{@inheritdoc} */ public function afterAction($action, $result) { @@ -220,7 +220,7 @@ class Filter2 extends ActionFilter class Filter3 extends ActionFilter { /** - * @inheritdoc + *{@inheritdoc} */ public function beforeAction($action) { @@ -229,7 +229,7 @@ class Filter3 extends ActionFilter } /** - * @inheritdoc + *{@inheritdoc} */ public function afterAction($action, $result) { diff --git a/tests/framework/base/ExposedSecurity.php b/tests/framework/base/ExposedSecurity.php index 2e7e45a7d1..7d97d33d1e 100644 --- a/tests/framework/base/ExposedSecurity.php +++ b/tests/framework/base/ExposedSecurity.php @@ -15,7 +15,7 @@ use yii\base\Security; class ExposedSecurity extends Security { /** - * @inheritdoc + *{@inheritdoc} */ public function hkdf($algo, $inputKey, $salt = null, $info = null, $length = 0) { @@ -23,7 +23,7 @@ class ExposedSecurity extends Security } /** - * @inheritdoc + *{@inheritdoc} */ public function pbkdf2($algo, $password, $salt, $iterations, $length = 0) { diff --git a/tests/framework/behaviors/AttributeBehaviorTest.php b/tests/framework/behaviors/AttributeBehaviorTest.php index 86cf47e0fa..19d17ee634 100644 --- a/tests/framework/behaviors/AttributeBehaviorTest.php +++ b/tests/framework/behaviors/AttributeBehaviorTest.php @@ -128,7 +128,7 @@ class AttributeBehaviorTest extends TestCase class ActiveRecordWithAttributeBehavior extends ActiveRecord { /** - * @inheritdoc + *{@inheritdoc} */ public function behaviors() { @@ -146,7 +146,7 @@ class ActiveRecordWithAttributeBehavior extends ActiveRecord } /** - * @inheritdoc + *{@inheritdoc} */ public static function tableName() { diff --git a/tests/framework/behaviors/AttributesBehaviorTest.php b/tests/framework/behaviors/AttributesBehaviorTest.php index 948b2f2a43..eee5f6f0f8 100644 --- a/tests/framework/behaviors/AttributesBehaviorTest.php +++ b/tests/framework/behaviors/AttributesBehaviorTest.php @@ -173,7 +173,7 @@ class AttributesBehaviorTest extends TestCase class ActiveRecordWithAttributesBehavior extends ActiveRecord { /** - * @inheritdoc + *{@inheritdoc} */ public function behaviors() { @@ -197,7 +197,7 @@ class ActiveRecordWithAttributesBehavior extends ActiveRecord } /** - * @inheritdoc + *{@inheritdoc} */ public static function tableName() { diff --git a/tests/framework/caching/DbDependencyTest.php b/tests/framework/caching/DbDependencyTest.php index 95c1cf9d01..76e34ebced 100644 --- a/tests/framework/caching/DbDependencyTest.php +++ b/tests/framework/caching/DbDependencyTest.php @@ -17,13 +17,13 @@ use yiiunit\framework\db\DatabaseTestCase; class DbDependencyTest extends DatabaseTestCase { /** - * @inheritdoc + *{@inheritdoc} */ protected $driverName = 'sqlite'; /** - * @inheritdoc + *{@inheritdoc} */ protected function setUp() { diff --git a/tests/framework/caching/DbQueryDependencyTest.php b/tests/framework/caching/DbQueryDependencyTest.php index c66aa3168a..80ac123e86 100644 --- a/tests/framework/caching/DbQueryDependencyTest.php +++ b/tests/framework/caching/DbQueryDependencyTest.php @@ -15,13 +15,13 @@ use yiiunit\framework\db\DatabaseTestCase; class DbQueryDependencyTest extends DatabaseTestCase { /** - * @inheritdoc + *{@inheritdoc} */ protected $driverName = 'sqlite'; /** - * @inheritdoc + *{@inheritdoc} */ protected function setUp() { diff --git a/tests/framework/console/controllers/DbMessageControllerTest.php b/tests/framework/console/controllers/DbMessageControllerTest.php index 0dca7de3b6..54d668d0f1 100644 --- a/tests/framework/console/controllers/DbMessageControllerTest.php +++ b/tests/framework/console/controllers/DbMessageControllerTest.php @@ -109,7 +109,7 @@ class DbMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function getDefaultConfig() { @@ -123,7 +123,7 @@ class DbMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function saveMessages($messages, $category) { @@ -145,7 +145,7 @@ class DbMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function loadMessages($category) { diff --git a/tests/framework/console/controllers/EchoMigrateController.php b/tests/framework/console/controllers/EchoMigrateController.php index eec267f278..4811b4c8b8 100644 --- a/tests/framework/console/controllers/EchoMigrateController.php +++ b/tests/framework/console/controllers/EchoMigrateController.php @@ -15,7 +15,7 @@ use yii\console\controllers\MigrateController; class EchoMigrateController extends MigrateController { /** - * @inheritdoc + *{@inheritdoc} */ public function stdout($string) { diff --git a/tests/framework/console/controllers/HelpControllerTest.php b/tests/framework/console/controllers/HelpControllerTest.php index 891757dc3d..a6c3802b93 100644 --- a/tests/framework/console/controllers/HelpControllerTest.php +++ b/tests/framework/console/controllers/HelpControllerTest.php @@ -19,7 +19,7 @@ use yiiunit\TestCase; class HelpControllerTest extends TestCase { /** - * @inheritdoc + *{@inheritdoc} */ public function setUp() { diff --git a/tests/framework/console/controllers/PHPMessageControllerTest.php b/tests/framework/console/controllers/PHPMessageControllerTest.php index b7a43af93a..c49fba85eb 100644 --- a/tests/framework/console/controllers/PHPMessageControllerTest.php +++ b/tests/framework/console/controllers/PHPMessageControllerTest.php @@ -32,7 +32,7 @@ class PHPMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function getDefaultConfig() { @@ -57,7 +57,7 @@ class PHPMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function saveMessages($messages, $category) { @@ -75,7 +75,7 @@ class PHPMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function loadMessages($category) { diff --git a/tests/framework/console/controllers/POMessageControllerTest.php b/tests/framework/console/controllers/POMessageControllerTest.php index 34b21d60a3..8521f254b2 100644 --- a/tests/framework/console/controllers/POMessageControllerTest.php +++ b/tests/framework/console/controllers/POMessageControllerTest.php @@ -34,7 +34,7 @@ class POMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function getDefaultConfig() { @@ -56,7 +56,7 @@ class POMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function saveMessages($messages, $category) { @@ -73,7 +73,7 @@ class POMessageControllerTest extends BaseMessageControllerTest } /** - * @inheritdoc + *{@inheritdoc} */ protected function loadMessages($category) { diff --git a/tests/framework/console/controllers/SilencedCacheController.php b/tests/framework/console/controllers/SilencedCacheController.php index 234b724022..155a5fb1fd 100644 --- a/tests/framework/console/controllers/SilencedCacheController.php +++ b/tests/framework/console/controllers/SilencedCacheController.php @@ -15,7 +15,7 @@ use yii\console\controllers\CacheController; class SilencedCacheController extends CacheController { /** - * @inheritdoc + *{@inheritdoc} */ public function stdout($string) { diff --git a/tests/framework/data/BaseDataProviderTest.php b/tests/framework/data/BaseDataProviderTest.php index 0fc1003537..bebd531a1f 100644 --- a/tests/framework/data/BaseDataProviderTest.php +++ b/tests/framework/data/BaseDataProviderTest.php @@ -33,7 +33,7 @@ class BaseDataProviderTest extends TestCase class ConcreteDataProvider extends BaseDataProvider { /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareModels() { @@ -41,7 +41,7 @@ class ConcreteDataProvider extends BaseDataProvider } /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareKeys($models) { @@ -49,7 +49,7 @@ class ConcreteDataProvider extends BaseDataProvider } /** - * @inheritdoc + *{@inheritdoc} */ protected function prepareTotalCount() { diff --git a/tests/framework/db/ActiveRecordTest.php b/tests/framework/db/ActiveRecordTest.php index 0519b5ab0f..3000d376a9 100644 --- a/tests/framework/db/ActiveRecordTest.php +++ b/tests/framework/db/ActiveRecordTest.php @@ -45,7 +45,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase } /** - * @inheritdoc + *{@inheritdoc} */ public function getCustomerClass() { @@ -53,7 +53,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase } /** - * @inheritdoc + *{@inheritdoc} */ public function getItemClass() { @@ -61,7 +61,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase } /** - * @inheritdoc + *{@inheritdoc} */ public function getOrderClass() { @@ -69,7 +69,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase } /** - * @inheritdoc + *{@inheritdoc} */ public function getOrderItemClass() { @@ -85,7 +85,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase } /** - * @inheritdoc + *{@inheritdoc} */ public function getOrderWithNullFKClass() { @@ -93,7 +93,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase } /** - * @inheritdoc + *{@inheritdoc} */ public function getOrderItemWithNullFKmClass() { diff --git a/tests/framework/db/UnqueryableQueryMock.php b/tests/framework/db/UnqueryableQueryMock.php index e95d275d69..0e7c97a911 100644 --- a/tests/framework/db/UnqueryableQueryMock.php +++ b/tests/framework/db/UnqueryableQueryMock.php @@ -13,7 +13,7 @@ use yii\db\Query; class UnqueryableQueryMock extends Query { /** - * @inheritdoc + *{@inheritdoc} */ public function one($db = null) { @@ -21,7 +21,7 @@ class UnqueryableQueryMock extends Query } /** - * @inheritdoc + *{@inheritdoc} */ public function all($db = null) { diff --git a/tests/framework/db/sqlite/QueryBuilderTest.php b/tests/framework/db/sqlite/QueryBuilderTest.php index 06a44c1ac0..2a9eb0fbd7 100644 --- a/tests/framework/db/sqlite/QueryBuilderTest.php +++ b/tests/framework/db/sqlite/QueryBuilderTest.php @@ -117,7 +117,7 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest } /** - * @inheritdoc + *{@inheritdoc} */ public function testBuildUnion() { diff --git a/tests/framework/filters/stubs/MockAuthManager.php b/tests/framework/filters/stubs/MockAuthManager.php index 8b0bb26557..353d933097 100644 --- a/tests/framework/filters/stubs/MockAuthManager.php +++ b/tests/framework/filters/stubs/MockAuthManager.php @@ -13,7 +13,7 @@ class MockAuthManager extends PhpManager { /** * This mock does not persist. - * @inheritdoc + *{@inheritdoc} */ protected function saveToFile($data, $file) { diff --git a/tests/framework/helpers/ConsoleStub.php b/tests/framework/helpers/ConsoleStub.php index bce768fdb1..494e7cf8e4 100644 --- a/tests/framework/helpers/ConsoleStub.php +++ b/tests/framework/helpers/ConsoleStub.php @@ -33,7 +33,7 @@ class ConsoleStub extends Console /** - * @inheritdoc + *{@inheritdoc} */ public static function stdin($raw = false) { @@ -41,7 +41,7 @@ class ConsoleStub extends Console } /** - * @inheritdoc + *{@inheritdoc} */ public static function stdout($string) { @@ -49,7 +49,7 @@ class ConsoleStub extends Console } /** - * @inheritdoc + *{@inheritdoc} */ public static function stderr($string) { diff --git a/tests/framework/helpers/FallbackInflector.php b/tests/framework/helpers/FallbackInflector.php index 868c51d939..aa7a18b58c 100644 --- a/tests/framework/helpers/FallbackInflector.php +++ b/tests/framework/helpers/FallbackInflector.php @@ -15,7 +15,7 @@ use yii\helpers\BaseInflector; class FallbackInflector extends BaseInflector { /** - * @inheritdoc + *{@inheritdoc} */ protected static function hasIntl() { diff --git a/tests/framework/log/TargetTest.php b/tests/framework/log/TargetTest.php index 6544b6a4df..48cb83534c 100644 --- a/tests/framework/log/TargetTest.php +++ b/tests/framework/log/TargetTest.php @@ -226,7 +226,7 @@ class TestTarget extends Target } /** - * @inheritdoc + *{@inheritdoc} */ public function getContextMessage() { diff --git a/tests/framework/rbac/AuthorRule.php b/tests/framework/rbac/AuthorRule.php index 4a0dd4df56..d73c75e4ac 100644 --- a/tests/framework/rbac/AuthorRule.php +++ b/tests/framework/rbac/AuthorRule.php @@ -18,7 +18,7 @@ class AuthorRule extends Rule public $reallyReally = false; /** - * @inheritdoc + *{@inheritdoc} */ public function execute($user, $item, $params) { diff --git a/tests/framework/rbac/PhpManagerTest.php b/tests/framework/rbac/PhpManagerTest.php index 7d73896e1f..50410662b9 100644 --- a/tests/framework/rbac/PhpManagerTest.php +++ b/tests/framework/rbac/PhpManagerTest.php @@ -62,7 +62,7 @@ class PhpManagerTest extends ManagerTestCase } /** - * @inheritdoc + *{@inheritdoc} */ protected function createManager() {