Skip to content

Y
yii2
Commit 16739ec3 by Qiang Xue
Options

Merge pull request #1321 from pmoust/inheritdoc-fix

fixed PhpDoc by swapping to {@inheritdoc}
parents 80de4e6e 2ff8ac3d
Showing with 138 additions and 138 deletions
extensions/composer/Installer.php
...@@ -26,7 +26,7 @@ class Installer extends LibraryInstaller ...@@ -26,7 +26,7 @@ class Installer extends LibraryInstaller
const EXTENSION_FILE = 'yiisoft/extensions.php'; const EXTENSION_FILE = 'yiisoft/extensions.php';
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function supports($packageType) public function supports($packageType)
{ {
...@@ -34,7 +34,7 @@ class Installer extends LibraryInstaller ...@@ -34,7 +34,7 @@ class Installer extends LibraryInstaller
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function install(InstalledRepositoryInterface $repo, PackageInterface $package) public function install(InstalledRepositoryInterface $repo, PackageInterface $package)
{ {
...@@ -49,7 +49,7 @@ class Installer extends LibraryInstaller ...@@ -49,7 +49,7 @@ class Installer extends LibraryInstaller
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target) public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target)
{ {
...@@ -63,7 +63,7 @@ class Installer extends LibraryInstaller ...@@ -63,7 +63,7 @@ class Installer extends LibraryInstaller
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function uninstall(InstalledRepositoryInterface $repo, PackageInterface $package) public function uninstall(InstalledRepositoryInterface $repo, PackageInterface $package)
{ {
......
extensions/composer/Plugin.php
...@@ -20,7 +20,7 @@ use Composer\Plugin\PluginInterface; ...@@ -20,7 +20,7 @@ use Composer\Plugin\PluginInterface;
class Plugin implements PluginInterface class Plugin implements PluginInterface
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function activate(Composer $composer, IOInterface $io) public function activate(Composer $composer, IOInterface $io)
{ {
......
extensions/elasticsearch/ActiveQuery.php
...@@ -139,7 +139,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -139,7 +139,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function search($db = null, $options = []) public function search($db = null, $options = [])
{ {
...@@ -161,7 +161,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -161,7 +161,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function scalar($field, $db = null) public function scalar($field, $db = null)
{ {
...@@ -177,7 +177,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -177,7 +177,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function column($field, $db = null) public function column($field, $db = null)
{ {
......
extensions/elasticsearch/ActiveRecord.php
...@@ -61,7 +61,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -61,7 +61,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public static function find($q = null) public static function find($q = null)
{ {
...@@ -138,7 +138,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -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 // TODO add percolate functionality http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-percolate.html
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public static function createQuery() public static function createQuery()
{ {
...@@ -146,7 +146,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -146,7 +146,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public static function createActiveRelation($config = []) public static function createActiveRelation($config = [])
{ {
...@@ -175,7 +175,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -175,7 +175,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public function getPrimaryKey($asArray = false) public function getPrimaryKey($asArray = false)
{ {
...@@ -187,7 +187,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -187,7 +187,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public function getOldPrimaryKey($asArray = false) public function getOldPrimaryKey($asArray = false)
{ {
...@@ -430,7 +430,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -430,7 +430,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function updateAllCounters($counters, $condition = null, $params = []) public static function updateAllCounters($counters, $condition = null, $params = [])
{ {
...@@ -438,7 +438,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -438,7 +438,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function getTableSchema() public static function getTableSchema()
{ {
...@@ -446,7 +446,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -446,7 +446,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public static function tableName() public static function tableName()
{ {
...@@ -454,7 +454,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -454,7 +454,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function findBySql($sql, $params = []) public static function findBySql($sql, $params = [])
{ {
......
extensions/gii/Generator.php
...@@ -63,7 +63,7 @@ abstract class Generator extends Model ...@@ -63,7 +63,7 @@ abstract class Generator extends Model
abstract public function generate(); abstract public function generate();
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {
...@@ -164,7 +164,7 @@ abstract class Generator extends Model ...@@ -164,7 +164,7 @@ abstract class Generator extends Model
} }
/** /**
* @inheritdoc * {@inheritdoc}
* *
* Child classes should override this method like the following so that the parent * Child classes should override this method like the following so that the parent
* rules are included: * rules are included:
......
extensions/gii/GiiAsset.php
...@@ -18,25 +18,25 @@ use yii\web\AssetBundle; ...@@ -18,25 +18,25 @@ use yii\web\AssetBundle;
class GiiAsset extends AssetBundle class GiiAsset extends AssetBundle
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $sourcePath = '@yii/gii/assets'; public $sourcePath = '@yii/gii/assets';
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $css = [ public $css = [
'main.css', 'main.css',
'typeahead.js-bootstrap.css', 'typeahead.js-bootstrap.css',
]; ];
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $js = [ public $js = [
'gii.js', 'gii.js',
'typeahead.js', 'typeahead.js',
]; ];
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $depends = [ public $depends = [
'yii\web\YiiAsset', 'yii\web\YiiAsset',
......
extensions/gii/Module.php
...@@ -54,7 +54,7 @@ use yii\web\HttpException; ...@@ -54,7 +54,7 @@ use yii\web\HttpException;
class Module extends \yii\base\Module class Module extends \yii\base\Module
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $controllerNamespace = 'yii\gii\controllers'; public $controllerNamespace = 'yii\gii\controllers';
/** /**
...@@ -92,7 +92,7 @@ class Module extends \yii\base\Module ...@@ -92,7 +92,7 @@ class Module extends \yii\base\Module
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {
...@@ -103,7 +103,7 @@ class Module extends \yii\base\Module ...@@ -103,7 +103,7 @@ class Module extends \yii\base\Module
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function beforeAction($action) public function beforeAction($action)
{ {
......
extensions/gii/generators/controller/Generator.php
...@@ -38,7 +38,7 @@ class Generator extends \yii\gii\Generator ...@@ -38,7 +38,7 @@ class Generator extends \yii\gii\Generator
public $actions = 'index'; public $actions = 'index';
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {
...@@ -47,7 +47,7 @@ class Generator extends \yii\gii\Generator ...@@ -47,7 +47,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getName() public function getName()
{ {
...@@ -55,7 +55,7 @@ class Generator extends \yii\gii\Generator ...@@ -55,7 +55,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getDescription() public function getDescription()
{ {
...@@ -64,7 +64,7 @@ class Generator extends \yii\gii\Generator ...@@ -64,7 +64,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
...@@ -79,7 +79,7 @@ class Generator extends \yii\gii\Generator ...@@ -79,7 +79,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
...@@ -92,7 +92,7 @@ class Generator extends \yii\gii\Generator ...@@ -92,7 +92,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function requiredTemplates() public function requiredTemplates()
{ {
...@@ -103,7 +103,7 @@ class Generator extends \yii\gii\Generator ...@@ -103,7 +103,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function stickyAttributes() public function stickyAttributes()
{ {
...@@ -111,7 +111,7 @@ class Generator extends \yii\gii\Generator ...@@ -111,7 +111,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
...@@ -134,7 +134,7 @@ class Generator extends \yii\gii\Generator ...@@ -134,7 +134,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function successMessage() public function successMessage()
{ {
...@@ -149,7 +149,7 @@ class Generator extends \yii\gii\Generator ...@@ -149,7 +149,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {
......
extensions/gii/generators/crud/Generator.php
...@@ -69,7 +69,7 @@ class Generator extends \yii\gii\Generator ...@@ -69,7 +69,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
...@@ -95,7 +95,7 @@ class Generator extends \yii\gii\Generator ...@@ -95,7 +95,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function stickyAttributes() public function stickyAttributes()
{ {
...@@ -123,7 +123,7 @@ class Generator extends \yii\gii\Generator ...@@ -123,7 +123,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {
......
extensions/gii/generators/crud/templates/search.php
...@@ -40,7 +40,7 @@ class <?= $searchModelClass ?> extends Model ...@@ -40,7 +40,7 @@ class <?= $searchModelClass ?> extends Model
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
......
extensions/gii/generators/form/Generator.php
...@@ -26,7 +26,7 @@ class Generator extends \yii\gii\Generator ...@@ -26,7 +26,7 @@ class Generator extends \yii\gii\Generator
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getName() public function getName()
{ {
...@@ -34,7 +34,7 @@ class Generator extends \yii\gii\Generator ...@@ -34,7 +34,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getDescription() public function getDescription()
{ {
...@@ -42,7 +42,7 @@ class Generator extends \yii\gii\Generator ...@@ -42,7 +42,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {
...@@ -55,7 +55,7 @@ class Generator extends \yii\gii\Generator ...@@ -55,7 +55,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
...@@ -72,7 +72,7 @@ class Generator extends \yii\gii\Generator ...@@ -72,7 +72,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
...@@ -85,7 +85,7 @@ class Generator extends \yii\gii\Generator ...@@ -85,7 +85,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function requiredTemplates() public function requiredTemplates()
{ {
...@@ -93,7 +93,7 @@ class Generator extends \yii\gii\Generator ...@@ -93,7 +93,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function stickyAttributes() public function stickyAttributes()
{ {
...@@ -101,7 +101,7 @@ class Generator extends \yii\gii\Generator ...@@ -101,7 +101,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
...@@ -114,7 +114,7 @@ class Generator extends \yii\gii\Generator ...@@ -114,7 +114,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function successMessage() public function successMessage()
{ {
......
extensions/gii/generators/model/Generator.php
...@@ -32,7 +32,7 @@ class Generator extends \yii\gii\Generator ...@@ -32,7 +32,7 @@ class Generator extends \yii\gii\Generator
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getName() public function getName()
{ {
...@@ -40,7 +40,7 @@ class Generator extends \yii\gii\Generator ...@@ -40,7 +40,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getDescription() public function getDescription()
{ {
...@@ -48,7 +48,7 @@ class Generator extends \yii\gii\Generator ...@@ -48,7 +48,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
...@@ -68,7 +68,7 @@ class Generator extends \yii\gii\Generator ...@@ -68,7 +68,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
...@@ -84,7 +84,7 @@ class Generator extends \yii\gii\Generator ...@@ -84,7 +84,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
...@@ -111,7 +111,7 @@ class Generator extends \yii\gii\Generator ...@@ -111,7 +111,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function autoCompleteData() public function autoCompleteData()
{ {
...@@ -128,7 +128,7 @@ class Generator extends \yii\gii\Generator ...@@ -128,7 +128,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function requiredTemplates() public function requiredTemplates()
{ {
...@@ -136,7 +136,7 @@ class Generator extends \yii\gii\Generator ...@@ -136,7 +136,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function stickyAttributes() public function stickyAttributes()
{ {
...@@ -144,7 +144,7 @@ class Generator extends \yii\gii\Generator ...@@ -144,7 +144,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {
......
extensions/gii/generators/model/templates/model.php
...@@ -33,7 +33,7 @@ namespace <?= $generator->ns ?>; ...@@ -33,7 +33,7 @@ namespace <?= $generator->ns ?>;
class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') . "\n" ?> class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') . "\n" ?>
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function tableName() public static function tableName()
{ {
...@@ -41,7 +41,7 @@ class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') . ...@@ -41,7 +41,7 @@ class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') .
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
...@@ -49,7 +49,7 @@ class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') . ...@@ -49,7 +49,7 @@ class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') .
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
......
extensions/gii/generators/module/Generator.php
...@@ -24,7 +24,7 @@ class Generator extends \yii\gii\Generator ...@@ -24,7 +24,7 @@ class Generator extends \yii\gii\Generator
public $moduleID; public $moduleID;
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getName() public function getName()
{ {
...@@ -32,7 +32,7 @@ class Generator extends \yii\gii\Generator ...@@ -32,7 +32,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getDescription() public function getDescription()
{ {
...@@ -40,7 +40,7 @@ class Generator extends \yii\gii\Generator ...@@ -40,7 +40,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
...@@ -54,7 +54,7 @@ class Generator extends \yii\gii\Generator ...@@ -54,7 +54,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
...@@ -65,7 +65,7 @@ class Generator extends \yii\gii\Generator ...@@ -65,7 +65,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
...@@ -76,7 +76,7 @@ class Generator extends \yii\gii\Generator ...@@ -76,7 +76,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function successMessage() public function successMessage()
{ {
...@@ -104,7 +104,7 @@ EOD; ...@@ -104,7 +104,7 @@ EOD;
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function requiredTemplates() public function requiredTemplates()
{ {
...@@ -112,7 +112,7 @@ EOD; ...@@ -112,7 +112,7 @@ EOD;
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {
......
extensions/redis/ActiveRecord.php
...@@ -48,7 +48,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -48,7 +48,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public static function createQuery() public static function createQuery()
{ {
...@@ -56,7 +56,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -56,7 +56,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public static function createActiveRelation($config = []) public static function createActiveRelation($config = [])
{ {
...@@ -87,7 +87,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -87,7 +87,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function insert($runValidation = true, $attributes = null) public function insert($runValidation = true, $attributes = null)
{ {
...@@ -294,7 +294,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -294,7 +294,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function getTableSchema() public static function getTableSchema()
{ {
...@@ -302,7 +302,7 @@ class ActiveRecord extends \yii\db\ActiveRecord ...@@ -302,7 +302,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function findBySql($sql, $params = []) public static function findBySql($sql, $params = [])
{ {
......
extensions/redis/Cache.php
...@@ -105,7 +105,7 @@ class Cache extends \yii\caching\Cache ...@@ -105,7 +105,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function getValue($key) protected function getValue($key)
{ {
...@@ -113,7 +113,7 @@ class Cache extends \yii\caching\Cache ...@@ -113,7 +113,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function getValues($keys) protected function getValues($keys)
{ {
...@@ -127,7 +127,7 @@ class Cache extends \yii\caching\Cache ...@@ -127,7 +127,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function setValue($key, $value, $expire) protected function setValue($key, $value, $expire)
{ {
...@@ -140,7 +140,7 @@ class Cache extends \yii\caching\Cache ...@@ -140,7 +140,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function setValues($data, $expire) protected function setValues($data, $expire)
{ {
...@@ -174,7 +174,7 @@ class Cache extends \yii\caching\Cache ...@@ -174,7 +174,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function addValue($key, $value, $expire) protected function addValue($key, $value, $expire)
{ {
...@@ -187,7 +187,7 @@ class Cache extends \yii\caching\Cache ...@@ -187,7 +187,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function deleteValue($key) protected function deleteValue($key)
{ {
...@@ -195,7 +195,7 @@ class Cache extends \yii\caching\Cache ...@@ -195,7 +195,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function flushValues() protected function flushValues()
{ {
......
extensions/sphinx/ActiveQuery.php
...@@ -176,7 +176,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -176,7 +176,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function defaultConnection() protected function defaultConnection()
{ {
......
extensions/sphinx/Command.php
...@@ -197,7 +197,7 @@ class Command extends \yii\db\Command ...@@ -197,7 +197,7 @@ class Command extends \yii\db\Command
// Not Supported : // Not Supported :
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function createTable($table, $columns, $options = null) public function createTable($table, $columns, $options = null)
{ {
...@@ -205,7 +205,7 @@ class Command extends \yii\db\Command ...@@ -205,7 +205,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function renameTable($table, $newName) public function renameTable($table, $newName)
{ {
...@@ -213,7 +213,7 @@ class Command extends \yii\db\Command ...@@ -213,7 +213,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropTable($table) public function dropTable($table)
{ {
...@@ -221,7 +221,7 @@ class Command extends \yii\db\Command ...@@ -221,7 +221,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function truncateTable($table) public function truncateTable($table)
{ {
...@@ -229,7 +229,7 @@ class Command extends \yii\db\Command ...@@ -229,7 +229,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function addColumn($table, $column, $type) public function addColumn($table, $column, $type)
{ {
...@@ -237,7 +237,7 @@ class Command extends \yii\db\Command ...@@ -237,7 +237,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropColumn($table, $column) public function dropColumn($table, $column)
{ {
...@@ -245,7 +245,7 @@ class Command extends \yii\db\Command ...@@ -245,7 +245,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function renameColumn($table, $oldName, $newName) public function renameColumn($table, $oldName, $newName)
{ {
...@@ -253,7 +253,7 @@ class Command extends \yii\db\Command ...@@ -253,7 +253,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function alterColumn($table, $column, $type) public function alterColumn($table, $column, $type)
{ {
...@@ -261,7 +261,7 @@ class Command extends \yii\db\Command ...@@ -261,7 +261,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function addPrimaryKey($name, $table, $columns) public function addPrimaryKey($name, $table, $columns)
{ {
...@@ -269,7 +269,7 @@ class Command extends \yii\db\Command ...@@ -269,7 +269,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropPrimaryKey($name, $table) public function dropPrimaryKey($name, $table)
{ {
...@@ -277,7 +277,7 @@ class Command extends \yii\db\Command ...@@ -277,7 +277,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null) public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
{ {
...@@ -285,7 +285,7 @@ class Command extends \yii\db\Command ...@@ -285,7 +285,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropForeignKey($name, $table) public function dropForeignKey($name, $table)
{ {
...@@ -293,7 +293,7 @@ class Command extends \yii\db\Command ...@@ -293,7 +293,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function createIndex($name, $table, $columns, $unique = false) public function createIndex($name, $table, $columns, $unique = false)
{ {
...@@ -301,7 +301,7 @@ class Command extends \yii\db\Command ...@@ -301,7 +301,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropIndex($name, $table) public function dropIndex($name, $table)
{ {
...@@ -309,7 +309,7 @@ class Command extends \yii\db\Command ...@@ -309,7 +309,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function resetSequence($table, $value = null) public function resetSequence($table, $value = null)
{ {
...@@ -317,7 +317,7 @@ class Command extends \yii\db\Command ...@@ -317,7 +317,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function checkIntegrity($check = true, $schema = '') public function checkIntegrity($check = true, $schema = '')
{ {
......
extensions/sphinx/Connection.php
...@@ -62,7 +62,7 @@ use yii\base\NotSupportedException; ...@@ -62,7 +62,7 @@ use yii\base\NotSupportedException;
class Connection extends \yii\db\Connection class Connection extends \yii\db\Connection
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $schemaMap = [ public $schemaMap = [
'mysqli' => 'yii\sphinx\Schema', // MySQL 'mysqli' => 'yii\sphinx\Schema', // MySQL
......
extensions/swiftmailer/Mailer.php
...@@ -123,7 +123,7 @@ class Mailer extends BaseMailer ...@@ -123,7 +123,7 @@ class Mailer extends BaseMailer
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function sendMessage($message) protected function sendMessage($message)
{ {
......
extensions/swiftmailer/Message.php
...@@ -41,7 +41,7 @@ class Message extends BaseMessage ...@@ -41,7 +41,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getCharset() public function getCharset()
{ {
...@@ -49,7 +49,7 @@ class Message extends BaseMessage ...@@ -49,7 +49,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setCharset($charset) public function setCharset($charset)
{ {
...@@ -58,7 +58,7 @@ class Message extends BaseMessage ...@@ -58,7 +58,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getFrom() public function getFrom()
{ {
...@@ -66,7 +66,7 @@ class Message extends BaseMessage ...@@ -66,7 +66,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setFrom($from) public function setFrom($from)
{ {
...@@ -75,7 +75,7 @@ class Message extends BaseMessage ...@@ -75,7 +75,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getReplyTo() public function getReplyTo()
{ {
...@@ -83,7 +83,7 @@ class Message extends BaseMessage ...@@ -83,7 +83,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setReplyTo($replyTo) public function setReplyTo($replyTo)
{ {
...@@ -92,7 +92,7 @@ class Message extends BaseMessage ...@@ -92,7 +92,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getTo() public function getTo()
{ {
...@@ -100,7 +100,7 @@ class Message extends BaseMessage ...@@ -100,7 +100,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setTo($to) public function setTo($to)
{ {
...@@ -109,7 +109,7 @@ class Message extends BaseMessage ...@@ -109,7 +109,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getCc() public function getCc()
{ {
...@@ -117,7 +117,7 @@ class Message extends BaseMessage ...@@ -117,7 +117,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setCc($cc) public function setCc($cc)
{ {
...@@ -126,7 +126,7 @@ class Message extends BaseMessage ...@@ -126,7 +126,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getBcc() public function getBcc()
{ {
...@@ -134,7 +134,7 @@ class Message extends BaseMessage ...@@ -134,7 +134,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setBcc($bcc) public function setBcc($bcc)
{ {
...@@ -143,7 +143,7 @@ class Message extends BaseMessage ...@@ -143,7 +143,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getSubject() public function getSubject()
{ {
...@@ -151,7 +151,7 @@ class Message extends BaseMessage ...@@ -151,7 +151,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setSubject($subject) public function setSubject($subject)
{ {
...@@ -160,7 +160,7 @@ class Message extends BaseMessage ...@@ -160,7 +160,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setTextBody($text) public function setTextBody($text)
{ {
...@@ -169,7 +169,7 @@ class Message extends BaseMessage ...@@ -169,7 +169,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setHtmlBody($html) public function setHtmlBody($html)
{ {
...@@ -222,7 +222,7 @@ class Message extends BaseMessage ...@@ -222,7 +222,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attach($fileName, array $options = []) public function attach($fileName, array $options = [])
{ {
...@@ -238,7 +238,7 @@ class Message extends BaseMessage ...@@ -238,7 +238,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attachContent($content, array $options = []) public function attachContent($content, array $options = [])
{ {
...@@ -254,7 +254,7 @@ class Message extends BaseMessage ...@@ -254,7 +254,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function embed($fileName, array $options = []) public function embed($fileName, array $options = [])
{ {
...@@ -269,7 +269,7 @@ class Message extends BaseMessage ...@@ -269,7 +269,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function embedContent($content, array $options = []) public function embedContent($content, array $options = [])
{ {
...@@ -284,7 +284,7 @@ class Message extends BaseMessage ...@@ -284,7 +284,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function toString() public function toString()
{ {
......
framework/yii/base/Application.php
...@@ -199,7 +199,7 @@ abstract class Application extends Module ...@@ -199,7 +199,7 @@ abstract class Application extends Module
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {
......
framework/yii/data/ActiveDataProvider.php
...@@ -93,7 +93,7 @@ class ActiveDataProvider extends BaseDataProvider ...@@ -93,7 +93,7 @@ class ActiveDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareModels() protected function prepareModels()
{ {
...@@ -111,7 +111,7 @@ class ActiveDataProvider extends BaseDataProvider ...@@ -111,7 +111,7 @@ class ActiveDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareKeys($models) protected function prepareKeys($models)
{ {
...@@ -150,7 +150,7 @@ class ActiveDataProvider extends BaseDataProvider ...@@ -150,7 +150,7 @@ class ActiveDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareTotalCount() protected function prepareTotalCount()
{ {
...@@ -162,7 +162,7 @@ class ActiveDataProvider extends BaseDataProvider ...@@ -162,7 +162,7 @@ class ActiveDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setSort($value) public function setSort($value)
{ {
......
framework/yii/data/ArrayDataProvider.php
...@@ -66,7 +66,7 @@ class ArrayDataProvider extends BaseDataProvider ...@@ -66,7 +66,7 @@ class ArrayDataProvider extends BaseDataProvider
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareModels() protected function prepareModels()
{ {
...@@ -87,7 +87,7 @@ class ArrayDataProvider extends BaseDataProvider ...@@ -87,7 +87,7 @@ class ArrayDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareKeys($models) protected function prepareKeys($models)
{ {
...@@ -107,7 +107,7 @@ class ArrayDataProvider extends BaseDataProvider ...@@ -107,7 +107,7 @@ class ArrayDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareTotalCount() protected function prepareTotalCount()
{ {
......
framework/yii/db/cubrid/QueryBuilder.php
...@@ -69,7 +69,7 @@ class QueryBuilder extends \yii\db\QueryBuilder ...@@ -69,7 +69,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function buildLimit($limit, $offset) public function buildLimit($limit, $offset)
{ {
......
framework/yii/db/mysql/QueryBuilder.php
...@@ -142,7 +142,7 @@ class QueryBuilder extends \yii\db\QueryBuilder ...@@ -142,7 +142,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function buildLimit($limit, $offset) public function buildLimit($limit, $offset)
{ {
......
framework/yii/db/sqlite/QueryBuilder.php
...@@ -228,7 +228,7 @@ class QueryBuilder extends \yii\db\QueryBuilder ...@@ -228,7 +228,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
{ {
throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.'); throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
} }
/** /**
* Builds a SQL statement for adding a primary key constraint to an existing table. * Builds a SQL statement for adding a primary key constraint to an existing table.
* @param string $name the name of the primary key constraint. * @param string $name the name of the primary key constraint.
...@@ -255,7 +255,7 @@ class QueryBuilder extends \yii\db\QueryBuilder ...@@ -255,7 +255,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function buildLimit($limit, $offset) public function buildLimit($limit, $offset)
{ {
......
framework/yii/mail/BaseMessage.php
...@@ -34,7 +34,7 @@ abstract class BaseMessage extends Object implements MessageInterface ...@@ -34,7 +34,7 @@ abstract class BaseMessage extends Object implements MessageInterface
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function send() public function send()
{ {
......
framework/yii/validators/SafeValidator.php
...@@ -16,7 +16,7 @@ namespace yii\validators; ...@@ -16,7 +16,7 @@ namespace yii\validators;
class SafeValidator extends Validator class SafeValidator extends Validator
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function validateAttribute($object, $attribute) public function validateAttribute($object, $attribute)
{ {
......
framework/yii/validators/Validator.php
...@@ -159,7 +159,7 @@ abstract class Validator extends Component ...@@ -159,7 +159,7 @@ abstract class Validator extends Component
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {
......
framework/yii/web/Controller.php
...@@ -79,14 +79,14 @@ class Controller extends \yii\base\Controller ...@@ -79,14 +79,14 @@ class Controller extends \yii\base\Controller
'params' => implode(', ', $missing), 'params' => implode(', ', $missing),
])); ]));
} }
$this->actionParams = $actionParams; $this->actionParams = $actionParams;
return $args; return $args;
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function beforeAction($action) public function beforeAction($action)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment