diff --git a/extensions/composer/Installer.php b/extensions/composer/Installer.php
index d8d799f..164392e 100644
--- a/extensions/composer/Installer.php
+++ b/extensions/composer/Installer.php
@@ -26,7 +26,7 @@ class Installer extends LibraryInstaller
 	const EXTENSION_FILE = 'yiisoft/extensions.php';
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function supports($packageType)
 	{
@@ -34,7 +34,7 @@ class Installer extends LibraryInstaller
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function install(InstalledRepositoryInterface $repo, PackageInterface $package)
 	{
@@ -49,7 +49,7 @@ class Installer extends LibraryInstaller
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target)
 	{
@@ -63,7 +63,7 @@ class Installer extends LibraryInstaller
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function uninstall(InstalledRepositoryInterface $repo, PackageInterface $package)
 	{
diff --git a/extensions/composer/Plugin.php b/extensions/composer/Plugin.php
index 1111738..40bd8e5 100644
--- a/extensions/composer/Plugin.php
+++ b/extensions/composer/Plugin.php
@@ -20,7 +20,7 @@ use Composer\Plugin\PluginInterface;
 class Plugin implements PluginInterface
 {
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function activate(Composer $composer, IOInterface $io)
 	{
diff --git a/extensions/elasticsearch/ActiveQuery.php b/extensions/elasticsearch/ActiveQuery.php
index 3df9d8d..b444f05 100644
--- a/extensions/elasticsearch/ActiveQuery.php
+++ b/extensions/elasticsearch/ActiveQuery.php
@@ -139,7 +139,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	public function search($db = null, $options = [])
 	{
@@ -161,7 +161,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	public function scalar($field, $db = null)
 	{
@@ -177,7 +177,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	public function column($field, $db = null)
 	{
diff --git a/extensions/elasticsearch/ActiveRecord.php b/extensions/elasticsearch/ActiveRecord.php
index c7d3d98..e5f991f 100644
--- a/extensions/elasticsearch/ActiveRecord.php
+++ b/extensions/elasticsearch/ActiveRecord.php
@@ -61,7 +61,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritdoc}
 	 */
 	public static function find($q = null)
 	{
@@ -138,7 +138,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	// TODO add percolate functionality http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-percolate.html
 
 	/**
-	 * @inheritDoc
+	 * {@inheritdoc}
 	 */
 	public static function createQuery()
 	{
@@ -146,7 +146,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritdoc}
 	 */
 	public static function createActiveRelation($config = [])
 	{
@@ -175,7 +175,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritdoc}
 	 */
 	public function getPrimaryKey($asArray = false)
 	{
@@ -187,7 +187,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritdoc}
 	 */
 	public function getOldPrimaryKey($asArray = false)
 	{
@@ -430,7 +430,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public static function updateAllCounters($counters, $condition = null, $params = [])
 	{
@@ -438,7 +438,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public static function getTableSchema()
 	{
@@ -446,7 +446,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritdoc}
 	 */
 	public static function tableName()
 	{
@@ -454,7 +454,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public static function findBySql($sql, $params = [])
 	{
diff --git a/extensions/gii/Generator.php b/extensions/gii/Generator.php
index 05c45a7..53e54bb 100644
--- a/extensions/gii/Generator.php
+++ b/extensions/gii/Generator.php
@@ -63,7 +63,7 @@ abstract class Generator extends Model
 	abstract public function generate();
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function init()
 	{
@@ -164,7 +164,7 @@ abstract class Generator extends Model
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 *
 	 * Child classes should override this method like the following so that the parent
 	 * rules are included:
diff --git a/extensions/gii/GiiAsset.php b/extensions/gii/GiiAsset.php
index b100750..64dc62b 100644
--- a/extensions/gii/GiiAsset.php
+++ b/extensions/gii/GiiAsset.php
@@ -18,25 +18,25 @@ use yii\web\AssetBundle;
 class GiiAsset extends AssetBundle
 {
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public $sourcePath = '@yii/gii/assets';
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public $css = [
 		'main.css',
 		'typeahead.js-bootstrap.css',
 	];
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public $js = [
 		'gii.js',
 		'typeahead.js',
 	];
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public $depends = [
 		'yii\web\YiiAsset',
diff --git a/extensions/gii/Module.php b/extensions/gii/Module.php
index 7dc9590..5644e29 100644
--- a/extensions/gii/Module.php
+++ b/extensions/gii/Module.php
@@ -54,7 +54,7 @@ use yii\web\HttpException;
 class Module extends \yii\base\Module
 {
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public $controllerNamespace = 'yii\gii\controllers';
 	/**
@@ -92,7 +92,7 @@ class Module extends \yii\base\Module
 
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function init()
 	{
@@ -103,7 +103,7 @@ class Module extends \yii\base\Module
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function beforeAction($action)
 	{
diff --git a/extensions/gii/generators/controller/Generator.php b/extensions/gii/generators/controller/Generator.php
index 08b29d5..769db0a 100644
--- a/extensions/gii/generators/controller/Generator.php
+++ b/extensions/gii/generators/controller/Generator.php
@@ -38,7 +38,7 @@ class Generator extends \yii\gii\Generator
 	public $actions = 'index';
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function init()
 	{
@@ -47,7 +47,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getName()
 	{
@@ -55,7 +55,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getDescription()
 	{
@@ -64,7 +64,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function rules()
 	{
@@ -79,7 +79,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function attributeLabels()
 	{
@@ -92,7 +92,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function requiredTemplates()
 	{
@@ -103,7 +103,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function stickyAttributes()
 	{
@@ -111,7 +111,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function hints()
 	{
@@ -134,7 +134,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function successMessage()
 	{
@@ -149,7 +149,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function generate()
 	{
diff --git a/extensions/gii/generators/crud/Generator.php b/extensions/gii/generators/crud/Generator.php
index 1925de2..107c8f2 100644
--- a/extensions/gii/generators/crud/Generator.php
+++ b/extensions/gii/generators/crud/Generator.php
@@ -69,7 +69,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function hints()
 	{
@@ -95,7 +95,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function stickyAttributes()
 	{
@@ -123,7 +123,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function generate()
 	{
diff --git a/extensions/gii/generators/crud/templates/search.php b/extensions/gii/generators/crud/templates/search.php
index 1411896..17a0024 100644
--- a/extensions/gii/generators/crud/templates/search.php
+++ b/extensions/gii/generators/crud/templates/search.php
@@ -40,7 +40,7 @@ class <?= $searchModelClass ?> extends Model
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function attributeLabels()
 	{
diff --git a/extensions/gii/generators/form/Generator.php b/extensions/gii/generators/form/Generator.php
index 3bc0be6..cc4328e 100644
--- a/extensions/gii/generators/form/Generator.php
+++ b/extensions/gii/generators/form/Generator.php
@@ -26,7 +26,7 @@ class Generator extends \yii\gii\Generator
 
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getName()
 	{
@@ -34,7 +34,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getDescription()
 	{
@@ -42,7 +42,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function generate()
 	{
@@ -55,7 +55,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function rules()
 	{
@@ -72,7 +72,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function attributeLabels()
 	{
@@ -85,7 +85,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function requiredTemplates()
 	{
@@ -93,7 +93,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function stickyAttributes()
 	{
@@ -101,7 +101,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function hints()
 	{
@@ -114,7 +114,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function successMessage()
 	{
diff --git a/extensions/gii/generators/model/Generator.php b/extensions/gii/generators/model/Generator.php
index cd2fcbf..8c505f1 100644
--- a/extensions/gii/generators/model/Generator.php
+++ b/extensions/gii/generators/model/Generator.php
@@ -32,7 +32,7 @@ class Generator extends \yii\gii\Generator
 
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getName()
 	{
@@ -40,7 +40,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getDescription()
 	{
@@ -48,7 +48,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function rules()
 	{
@@ -68,7 +68,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function attributeLabels()
 	{
@@ -84,7 +84,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function hints()
 	{
@@ -111,7 +111,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function autoCompleteData()
 	{
@@ -128,7 +128,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function requiredTemplates()
 	{
@@ -136,7 +136,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function stickyAttributes()
 	{
@@ -144,7 +144,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function generate()
 	{
diff --git a/extensions/gii/generators/model/templates/model.php b/extensions/gii/generators/model/templates/model.php
index dcd1461..555bee1 100644
--- a/extensions/gii/generators/model/templates/model.php
+++ b/extensions/gii/generators/model/templates/model.php
@@ -33,7 +33,7 @@ namespace <?= $generator->ns ?>;
 class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') . "\n" ?>
 {
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public static function tableName()
 	{
@@ -41,7 +41,7 @@ class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') .
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function rules()
 	{
@@ -49,7 +49,7 @@ class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') .
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function attributeLabels()
 	{
diff --git a/extensions/gii/generators/module/Generator.php b/extensions/gii/generators/module/Generator.php
index 5946e07..a29555b 100644
--- a/extensions/gii/generators/module/Generator.php
+++ b/extensions/gii/generators/module/Generator.php
@@ -24,7 +24,7 @@ class Generator extends \yii\gii\Generator
 	public $moduleID;
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getName()
 	{
@@ -32,7 +32,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getDescription()
 	{
@@ -40,7 +40,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function rules()
 	{
@@ -54,7 +54,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function attributeLabels()
 	{
@@ -65,7 +65,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function hints()
 	{
@@ -76,7 +76,7 @@ class Generator extends \yii\gii\Generator
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function successMessage()
 	{
@@ -104,7 +104,7 @@ EOD;
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function requiredTemplates()
 	{
@@ -112,7 +112,7 @@ EOD;
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function generate()
 	{
diff --git a/extensions/redis/ActiveRecord.php b/extensions/redis/ActiveRecord.php
index d98a230..1137629 100644
--- a/extensions/redis/ActiveRecord.php
+++ b/extensions/redis/ActiveRecord.php
@@ -48,7 +48,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritdoc}
 	 */
 	public static function createQuery()
 	{
@@ -56,7 +56,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritdoc}
 	 */
 	public static function createActiveRelation($config = [])
 	{
@@ -87,7 +87,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	public function insert($runValidation = true, $attributes = null)
 	{
@@ -294,7 +294,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public static function getTableSchema()
 	{
@@ -302,7 +302,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public static function findBySql($sql, $params = [])
 	{
diff --git a/extensions/redis/Cache.php b/extensions/redis/Cache.php
index 733df26..627acdc 100644
--- a/extensions/redis/Cache.php
+++ b/extensions/redis/Cache.php
@@ -105,7 +105,7 @@ class Cache extends \yii\caching\Cache
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	protected function getValue($key)
 	{
@@ -113,7 +113,7 @@ class Cache extends \yii\caching\Cache
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	protected function getValues($keys)
 	{
@@ -127,7 +127,7 @@ class Cache extends \yii\caching\Cache
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	protected function setValue($key, $value, $expire)
 	{
@@ -140,7 +140,7 @@ class Cache extends \yii\caching\Cache
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	protected function setValues($data, $expire)
 	{
@@ -174,7 +174,7 @@ class Cache extends \yii\caching\Cache
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	protected function addValue($key, $value, $expire)
 	{
@@ -187,7 +187,7 @@ class Cache extends \yii\caching\Cache
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	protected function deleteValue($key)
 	{
@@ -195,7 +195,7 @@ class Cache extends \yii\caching\Cache
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	protected function flushValues()
 	{
diff --git a/extensions/sphinx/ActiveQuery.php b/extensions/sphinx/ActiveQuery.php
index 62a6ef0..7ba48d2 100644
--- a/extensions/sphinx/ActiveQuery.php
+++ b/extensions/sphinx/ActiveQuery.php
@@ -176,7 +176,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	protected function defaultConnection()
 	{
diff --git a/extensions/sphinx/Command.php b/extensions/sphinx/Command.php
index 400b3ed..a6c8c4f 100644
--- a/extensions/sphinx/Command.php
+++ b/extensions/sphinx/Command.php
@@ -197,7 +197,7 @@ class Command extends \yii\db\Command
 	// Not Supported :
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function createTable($table, $columns, $options = null)
 	{
@@ -205,7 +205,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function renameTable($table, $newName)
 	{
@@ -213,7 +213,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function dropTable($table)
 	{
@@ -221,7 +221,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function truncateTable($table)
 	{
@@ -229,7 +229,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function addColumn($table, $column, $type)
 	{
@@ -237,7 +237,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function dropColumn($table, $column)
 	{
@@ -245,7 +245,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function renameColumn($table, $oldName, $newName)
 	{
@@ -253,7 +253,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function alterColumn($table, $column, $type)
 	{
@@ -261,7 +261,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function addPrimaryKey($name, $table, $columns)
 	{
@@ -269,7 +269,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function dropPrimaryKey($name, $table)
 	{
@@ -277,7 +277,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
 	{
@@ -285,7 +285,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function dropForeignKey($name, $table)
 	{
@@ -293,7 +293,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function createIndex($name, $table, $columns, $unique = false)
 	{
@@ -301,7 +301,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function dropIndex($name, $table)
 	{
@@ -309,7 +309,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function resetSequence($table, $value = null)
 	{
@@ -317,7 +317,7 @@ class Command extends \yii\db\Command
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function checkIntegrity($check = true, $schema = '')
 	{
diff --git a/extensions/sphinx/Connection.php b/extensions/sphinx/Connection.php
index 6f3a18a..a3492bb 100644
--- a/extensions/sphinx/Connection.php
+++ b/extensions/sphinx/Connection.php
@@ -62,7 +62,7 @@ use yii\base\NotSupportedException;
 class Connection extends \yii\db\Connection
 {
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public $schemaMap = [
 		'mysqli' => 'yii\sphinx\Schema',   // MySQL
diff --git a/extensions/swiftmailer/Mailer.php b/extensions/swiftmailer/Mailer.php
index 891f2b5..aab8434 100644
--- a/extensions/swiftmailer/Mailer.php
+++ b/extensions/swiftmailer/Mailer.php
@@ -123,7 +123,7 @@ class Mailer extends BaseMailer
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	protected function sendMessage($message)
 	{
diff --git a/extensions/swiftmailer/Message.php b/extensions/swiftmailer/Message.php
index 9558d58..f7d8b34 100644
--- a/extensions/swiftmailer/Message.php
+++ b/extensions/swiftmailer/Message.php
@@ -41,7 +41,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getCharset()
 	{
@@ -49,7 +49,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setCharset($charset)
 	{
@@ -58,7 +58,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getFrom()
 	{
@@ -66,7 +66,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setFrom($from)
 	{
@@ -75,7 +75,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getReplyTo()
 	{
@@ -83,7 +83,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setReplyTo($replyTo)
 	{
@@ -92,7 +92,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getTo()
 	{
@@ -100,7 +100,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setTo($to)
 	{
@@ -109,7 +109,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getCc()
 	{
@@ -117,7 +117,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setCc($cc)
 	{
@@ -126,7 +126,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getBcc()
 	{
@@ -134,7 +134,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setBcc($bcc)
 	{
@@ -143,7 +143,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function getSubject()
 	{
@@ -151,7 +151,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setSubject($subject)
 	{
@@ -160,7 +160,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setTextBody($text)
 	{
@@ -169,7 +169,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setHtmlBody($html)
 	{
@@ -222,7 +222,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function attach($fileName, array $options = [])
 	{
@@ -238,7 +238,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function attachContent($content, array $options = [])
 	{
@@ -254,7 +254,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function embed($fileName, array $options = [])
 	{
@@ -269,7 +269,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function embedContent($content, array $options = [])
 	{
@@ -284,7 +284,7 @@ class Message extends BaseMessage
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function toString()
 	{
diff --git a/framework/yii/base/Application.php b/framework/yii/base/Application.php
index d6409e8..4f2bee2 100644
--- a/framework/yii/base/Application.php
+++ b/framework/yii/base/Application.php
@@ -199,7 +199,7 @@ abstract class Application extends Module
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function init()
 	{
diff --git a/framework/yii/data/ActiveDataProvider.php b/framework/yii/data/ActiveDataProvider.php
index e9d5403..0b3fc4a 100644
--- a/framework/yii/data/ActiveDataProvider.php
+++ b/framework/yii/data/ActiveDataProvider.php
@@ -93,7 +93,7 @@ class ActiveDataProvider extends BaseDataProvider
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	protected function prepareModels()
 	{
@@ -111,7 +111,7 @@ class ActiveDataProvider extends BaseDataProvider
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	protected function prepareKeys($models)
 	{
@@ -150,7 +150,7 @@ class ActiveDataProvider extends BaseDataProvider
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	protected function prepareTotalCount()
 	{
@@ -162,7 +162,7 @@ class ActiveDataProvider extends BaseDataProvider
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function setSort($value)
 	{
diff --git a/framework/yii/data/ArrayDataProvider.php b/framework/yii/data/ArrayDataProvider.php
index 2b694c7..987e364 100644
--- a/framework/yii/data/ArrayDataProvider.php
+++ b/framework/yii/data/ArrayDataProvider.php
@@ -66,7 +66,7 @@ class ArrayDataProvider extends BaseDataProvider
 
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	protected function prepareModels()
 	{
@@ -87,7 +87,7 @@ class ArrayDataProvider extends BaseDataProvider
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	protected function prepareKeys($models)
 	{
@@ -107,7 +107,7 @@ class ArrayDataProvider extends BaseDataProvider
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	protected function prepareTotalCount()
 	{
diff --git a/framework/yii/db/cubrid/QueryBuilder.php b/framework/yii/db/cubrid/QueryBuilder.php
index 5c03ab7..45bd4a2 100644
--- a/framework/yii/db/cubrid/QueryBuilder.php
+++ b/framework/yii/db/cubrid/QueryBuilder.php
@@ -69,7 +69,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	public function buildLimit($limit, $offset)
 	{
diff --git a/framework/yii/db/mysql/QueryBuilder.php b/framework/yii/db/mysql/QueryBuilder.php
index 93a06e3..9cb321f 100644
--- a/framework/yii/db/mysql/QueryBuilder.php
+++ b/framework/yii/db/mysql/QueryBuilder.php
@@ -142,7 +142,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	public function buildLimit($limit, $offset)
 	{
diff --git a/framework/yii/db/sqlite/QueryBuilder.php b/framework/yii/db/sqlite/QueryBuilder.php
index be4248a..ae049e7 100644
--- a/framework/yii/db/sqlite/QueryBuilder.php
+++ b/framework/yii/db/sqlite/QueryBuilder.php
@@ -228,7 +228,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
 	{
 		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
 	}
-	
+
 	/**
 	 * Builds a SQL statement for adding a primary key constraint to an existing table.
 	 * @param string $name the name of the primary key constraint.
@@ -255,7 +255,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
 	}
 
 	/**
-	 * @inheritDocs
+	 * {@inheritdoc}
 	 */
 	public function buildLimit($limit, $offset)
 	{
diff --git a/framework/yii/mail/BaseMessage.php b/framework/yii/mail/BaseMessage.php
index 01b671c..208840a 100644
--- a/framework/yii/mail/BaseMessage.php
+++ b/framework/yii/mail/BaseMessage.php
@@ -34,7 +34,7 @@ abstract class BaseMessage extends Object implements MessageInterface
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function send()
 	{
diff --git a/framework/yii/validators/SafeValidator.php b/framework/yii/validators/SafeValidator.php
index 25da899..7cdc0a1 100644
--- a/framework/yii/validators/SafeValidator.php
+++ b/framework/yii/validators/SafeValidator.php
@@ -16,7 +16,7 @@ namespace yii\validators;
 class SafeValidator extends Validator
 {
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function validateAttribute($object, $attribute)
 	{
diff --git a/framework/yii/validators/Validator.php b/framework/yii/validators/Validator.php
index 2cd611b..f0602b6 100644
--- a/framework/yii/validators/Validator.php
+++ b/framework/yii/validators/Validator.php
@@ -159,7 +159,7 @@ abstract class Validator extends Component
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function init()
 	{
diff --git a/framework/yii/web/Controller.php b/framework/yii/web/Controller.php
index 5c68cdb..1424d0c 100644
--- a/framework/yii/web/Controller.php
+++ b/framework/yii/web/Controller.php
@@ -79,14 +79,14 @@ class Controller extends \yii\base\Controller
 				'params' => implode(', ', $missing),
 			]));
 		}
-		
+
 		$this->actionParams = $actionParams;
 
 		return $args;
 	}
 
 	/**
-	 * @inheritdoc
+	 * {@inheritdoc}
 	 */
 	public function beforeAction($action)
 	{