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

Fix phpDoc var tag format

tags/2.0.0-beta
slavcodev 11 years ago
parent
5f76ee0149
commit
b0b1c27c85
32 changed files with 72 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      extensions/gii/views/default/index.php
  2. 4
      extensions/gii/views/default/view/files.php
  3. 8
      extensions/gii/views/layouts/generator.php
  4. 4
      extensions/gii/views/layouts/main.php
  5. 2
      extensions/swiftmailer/Message.php
  6. 2
      framework/yii/BaseYii.php
  7. 2
      framework/yii/base/Application.php
  8. 3
      framework/yii/base/Model.php
  9. 2
      framework/yii/base/Module.php
  10. 2
      framework/yii/base/View.php
  11. 2
      framework/yii/console/controllers/CacheController.php
  12. 6
      framework/yii/db/ActiveQuery.php
  13. 10
      framework/yii/db/ActiveRecord.php
  14. 8
      framework/yii/db/ActiveRelation.php
  15. 2
      framework/yii/db/Command.php
  16. 4
      framework/yii/db/Schema.php
  17. 2
      framework/yii/log/Target.php
  18. 20
      framework/yii/rbac/PhpManager.php
  19. 2
      framework/yii/requirements/requirements.php
  20. 6
      framework/yii/requirements/views/console/index.php
  21. 6
      framework/yii/requirements/views/web/index.php
  22. 4
      framework/yii/validators/ExistValidator.php
  23. 2
      framework/yii/validators/UniqueValidator.php
  24. 2
      framework/yii/web/AccessControl.php
  25. 6
      framework/yii/web/UrlManager.php
  26. 4
      framework/yii/web/User.php
  27. 2
      framework/yii/widgets/ActiveForm.php
  28. 4
      tests/unit/data/views/layout.php
  29. 2
      tests/unit/data/views/rawlayout.php
  30. 2
      tests/unit/extensions/swiftmailer/MessageTest.php
  31. 6
      tests/unit/framework/db/ActiveRecordTest.php
  32. 2
      tests/unit/framework/validators/ValidatorTest.php

8
extensions/gii/views/default/index.php
Unescape View File

@ -2,10 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
/** /**
* @var $this \yii\web\View * @var \yii\web\View $this
* @var $content string * @var \yii\gii\Generator[] $generators
* @var yii\gii\Generator[] $generators * @var \yii\gii\Generator $activeGenerator
* @var yii\gii\Generator $activeGenerator * @var string $content
*/ */
$generators = Yii::$app->controller->module->generators; $generators = Yii::$app->controller->module->generators;
$activeGenerator = Yii::$app->controller->generator; $activeGenerator = Yii::$app->controller->generator;

4
extensions/gii/views/default/view/files.php
Unescape View File

@ -4,8 +4,8 @@ use yii\helpers\Html;
use yii\gii\CodeFile; use yii\gii\CodeFile;
/** /**
* @var $this \yii\web\View * @var \yii\web\View $this
* @var $generator \yii\gii\Generator * @var \yii\gii\Generator $generator
* @var CodeFile[] $files * @var CodeFile[] $files
* @var array $answers * @var array $answers
*/ */

8
extensions/gii/views/layouts/generator.php
Unescape View File

@ -2,10 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
/** /**
* @var $this \yii\web\View * @var \yii\web\View $this
* @var $content string * @var \yii\gii\Generator[] $generators
* @var yii\gii\Generator[] $generators * @var \yii\gii\Generator $activeGenerator
* @var yii\gii\Generator $activeGenerator * @var string $content
*/ */
$generators = Yii::$app->controller->module->generators; $generators = Yii::$app->controller->module->generators;
$activeGenerator = Yii::$app->controller->generator; $activeGenerator = Yii::$app->controller->generator;

4
extensions/gii/views/layouts/main.php
Unescape View File

@ -4,8 +4,8 @@ use yii\bootstrap\Nav;
use yii\helpers\Html; use yii\helpers\Html;
/** /**
* @var $this \yii\web\View * @var \yii\web\View $this
* @var $content string * @var string $content
*/ */
$asset = yii\gii\GiiAsset::register($this); $asset = yii\gii\GiiAsset::register($this);
?> ?>

2
extensions/swiftmailer/Message.php
Unescape View File

@ -192,7 +192,7 @@ class Message extends BaseMessage
$partFound = false; $partFound = false;
foreach ($parts as $key => $part) { foreach ($parts as $key => $part) {
if (!($part instanceof \Swift_Mime_Attachment)) { if (!($part instanceof \Swift_Mime_Attachment)) {
/* @var $part \Swift_Mime_MimePart */ /* @var \Swift_Mime_MimePart $part */
if ($part->getContentType() == $contentType) { if ($part->getContentType() == $contentType) {
unset($parts[$key]); unset($parts[$key]);
$partFound = true; $partFound = true;

2
framework/yii/BaseYii.php
Unescape View File

@ -367,7 +367,7 @@ class BaseYii
} }
if (($n = func_num_args()) > 1) { if (($n = func_num_args()) > 1) {
/** @var $reflection \ReflectionClass */ /** @var \ReflectionClass $reflection */
if (isset($reflections[$class])) { if (isset($reflections[$class])) {
$reflection = $reflections[$class]; $reflection = $reflections[$class];
} else { } else {

2
framework/yii/base/Application.php
Unescape View File

@ -616,10 +616,8 @@ abstract class Application extends Module
{ {
$category = get_class($exception); $category = get_class($exception);
if ($exception instanceof HttpException) { if ($exception instanceof HttpException) {
/** @var $exception HttpException */
$category .= '\\' . $exception->statusCode; $category .= '\\' . $exception->statusCode;
} elseif ($exception instanceof \ErrorException) { } elseif ($exception instanceof \ErrorException) {
/** @var $exception \ErrorException */
$category .= '\\' . $exception->getSeverity(); $category .= '\\' . $exception->getSeverity();
} }
Yii::error((string)$exception, $category); Yii::error((string)$exception, $category);

3
framework/yii/base/Model.php
Unescape View File

@ -349,7 +349,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
* $model->validators[] = $newValidator; * $model->validators[] = $newValidator;
* ~~~ * ~~~
* *
* @return ArrayObject all the validators declared in the model. * @return ArrayObject|\yii\validators\Validator[] all the validators declared in the model.
*/ */
public function getValidators() public function getValidators()
{ {
@ -369,7 +369,6 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
{ {
$validators = []; $validators = [];
$scenario = $this->getScenario(); $scenario = $this->getScenario();
/** @var $validator Validator */
foreach ($this->getValidators() as $validator) { foreach ($this->getValidators() as $validator) {
if ($validator->isActive($scenario) && ($attribute === null || in_array($attribute, $validator->attributes, true))) { if ($validator->isActive($scenario) && ($attribute === null || in_array($attribute, $validator->attributes, true))) {
$validators[] = $validator; $validators[] = $validator;

2
framework/yii/base/Module.php
Unescape View File

@ -578,7 +578,7 @@ abstract class Module extends Component
{ {
$parts = $this->createController($route); $parts = $this->createController($route);
if (is_array($parts)) { if (is_array($parts)) {
/** @var $controller Controller */ /** @var Controller $controller */
list($controller, $actionID) = $parts; list($controller, $actionID) = $parts;
$oldController = Yii::$app->controller; $oldController = Yii::$app->controller;
Yii::$app->controller = $controller; Yii::$app->controller = $controller;

2
framework/yii/base/View.php
Unescape View File

@ -410,7 +410,7 @@ class View extends Component
{ {
$properties['id'] = $id; $properties['id'] = $id;
$properties['view'] = $this; $properties['view'] = $this;
/** @var $cache FragmentCache */ /** @var FragmentCache $cache */
$cache = FragmentCache::begin($properties); $cache = FragmentCache::begin($properties);
if ($cache->getCachedContent() !== false) { if ($cache->getCachedContent() !== false) {
$this->endCache(); $this->endCache();

2
framework/yii/console/controllers/CacheController.php
Unescape View File

@ -52,7 +52,7 @@ class CacheController extends Controller
*/ */
public function actionFlush($component = 'cache') public function actionFlush($component = 'cache')
{ {
/** @var $cache Cache */ /** @var Cache $cache */
$cache = Yii::$app->getComponent($component); $cache = Yii::$app->getComponent($component);
if (!$cache || !$cache instanceof Cache) { if (!$cache || !$cache instanceof Cache) {
throw new Exception('Application component "'.$component.'" is not defined or not a cache.'); throw new Exception('Application component "'.$component.'" is not defined or not a cache.');

6
framework/yii/db/ActiveQuery.php
Unescape View File

@ -122,7 +122,7 @@ class ActiveQuery extends Query
if ($this->asArray) { if ($this->asArray) {
$model = $row; $model = $row;
} else { } else {
/** @var $class ActiveRecord */ /** @var ActiveRecord $class */
$class = $this->modelClass; $class = $this->modelClass;
$model = $class::create($row); $model = $class::create($row);
} }
@ -145,7 +145,7 @@ class ActiveQuery extends Query
*/ */
public function createCommand($db = null) public function createCommand($db = null)
{ {
/** @var $modelClass ActiveRecord */ /** @var ActiveRecord $modelClass */
$modelClass = $this->modelClass; $modelClass = $this->modelClass;
if ($db === null) { if ($db === null) {
$db = $modelClass::getDb(); $db = $modelClass::getDb();
@ -253,7 +253,7 @@ class ActiveQuery extends Query
$models[$key] = $row; $models[$key] = $row;
} }
} else { } else {
/** @var $class ActiveRecord */ /** @var ActiveRecord $class */
$class = $this->modelClass; $class = $this->modelClass;
if ($this->indexBy === null) { if ($this->indexBy === null) {
foreach ($rows as $row) { foreach ($rows as $row) {

10
framework/yii/db/ActiveRecord.php
Unescape View File

@ -1321,9 +1321,9 @@ class ActiveRecord extends Model
throw new InvalidCallException('Unable to link models: both models must NOT be newly created.'); throw new InvalidCallException('Unable to link models: both models must NOT be newly created.');
} }
if (is_array($relation->via)) { if (is_array($relation->via)) {
/** @var $viaRelation ActiveRelation */ /** @var ActiveRelation $viaRelation */
list($viaName, $viaRelation) = $relation->via; list($viaName, $viaRelation) = $relation->via;
/** @var $viaClass ActiveRecord */ /** @var ActiveRecord $viaClass */
$viaClass = $viaRelation->modelClass; $viaClass = $viaRelation->modelClass;
$viaTable = $viaClass::tableName(); $viaTable = $viaClass::tableName();
// unset $viaName so that it can be reloaded to reflect the change // unset $viaName so that it can be reloaded to reflect the change
@ -1396,9 +1396,9 @@ class ActiveRecord extends Model
if ($relation->via !== null) { if ($relation->via !== null) {
if (is_array($relation->via)) { if (is_array($relation->via)) {
/** @var $viaRelation ActiveRelation */ /** @var ActiveRelation $viaRelation */
list($viaName, $viaRelation) = $relation->via; list($viaName, $viaRelation) = $relation->via;
/** @var $viaClass ActiveRecord */ /** @var ActiveRecord $viaClass */
$viaClass = $viaRelation->modelClass; $viaClass = $viaRelation->modelClass;
$viaTable = $viaClass::tableName(); $viaTable = $viaClass::tableName();
unset($this->_related[$viaName]); unset($this->_related[$viaName]);
@ -1444,7 +1444,7 @@ class ActiveRecord extends Model
if (!$relation->multiple) { if (!$relation->multiple) {
unset($this->_related[$name]); unset($this->_related[$name]);
} elseif (isset($this->_related[$name])) { } elseif (isset($this->_related[$name])) {
/** @var $b ActiveRecord */ /** @var ActiveRecord $b */
foreach ($this->_related[$name] as $a => $b) { foreach ($this->_related[$name] as $a => $b) {
if ($model->getPrimaryKey() == $b->getPrimaryKey()) { if ($model->getPrimaryKey() == $b->getPrimaryKey()) {
unset($this->_related[$name][$a]); unset($this->_related[$name][$a]);

8
framework/yii/db/ActiveRelation.php
Unescape View File

@ -120,7 +120,7 @@ class ActiveRelation extends ActiveQuery
$this->filterByModels($viaModels); $this->filterByModels($viaModels);
} elseif (is_array($this->via)) { } elseif (is_array($this->via)) {
// via relation // via relation
/** @var $viaQuery ActiveRelation */ /** @var ActiveRelation $viaQuery */
list($viaName, $viaQuery) = $this->via; list($viaName, $viaQuery) = $this->via;
if ($viaQuery->multiple) { if ($viaQuery->multiple) {
$viaModels = $viaQuery->all(); $viaModels = $viaQuery->all();
@ -154,13 +154,13 @@ class ActiveRelation extends ActiveQuery
if ($this->via instanceof self) { if ($this->via instanceof self) {
// via pivot table // via pivot table
/** @var $viaQuery ActiveRelation */ /** @var ActiveRelation $viaQuery */
$viaQuery = $this->via; $viaQuery = $this->via;
$viaModels = $viaQuery->findPivotRows($primaryModels); $viaModels = $viaQuery->findPivotRows($primaryModels);
$this->filterByModels($viaModels); $this->filterByModels($viaModels);
} elseif (is_array($this->via)) { } elseif (is_array($this->via)) {
// via relation // via relation
/** @var $viaQuery ActiveRelation */ /** @var ActiveRelation $viaQuery */
list($viaName, $viaQuery) = $this->via; list($viaName, $viaQuery) = $this->via;
$viaQuery->primaryModel = null; $viaQuery->primaryModel = null;
$viaModels = $viaQuery->findWith($viaName, $primaryModels); $viaModels = $viaQuery->findWith($viaName, $primaryModels);
@ -306,7 +306,7 @@ class ActiveRelation extends ActiveQuery
return []; return [];
} }
$this->filterByModels($primaryModels); $this->filterByModels($primaryModels);
/** @var $primaryModel ActiveRecord */ /** @var ActiveRecord $primaryModel */
$primaryModel = reset($primaryModels); $primaryModel = reset($primaryModels);
$db = $primaryModel->getDb(); $db = $primaryModel->getDb();
list ($sql, $params) = $db->getQueryBuilder()->build($this); list ($sql, $params) = $db->getQueryBuilder()->build($this);

2
framework/yii/db/Command.php
Unescape View File

@ -366,7 +366,7 @@ class Command extends \yii\base\Component
Yii::info($rawSql, __METHOD__); Yii::info($rawSql, __METHOD__);
/** @var $cache \yii\caching\Cache */ /** @var \yii\caching\Cache $cache */
if ($db->enableQueryCache && $method !== '') { if ($db->enableQueryCache && $method !== '') {
$cache = is_string($db->queryCache) ? Yii::$app->getComponent($db->queryCache) : $db->queryCache; $cache = is_string($db->queryCache) ? Yii::$app->getComponent($db->queryCache) : $db->queryCache;
} }

4
framework/yii/db/Schema.php
Unescape View File

@ -92,7 +92,7 @@ abstract class Schema extends Object
$realName = $this->getRawTableName($name); $realName = $this->getRawTableName($name);
if ($db->enableSchemaCache && !in_array($name, $db->schemaCacheExclude, true)) { if ($db->enableSchemaCache && !in_array($name, $db->schemaCacheExclude, true)) {
/** @var $cache Cache */ /** @var Cache $cache */
$cache = is_string($db->schemaCache) ? Yii::$app->getComponent($db->schemaCache) : $db->schemaCache; $cache = is_string($db->schemaCache) ? Yii::$app->getComponent($db->schemaCache) : $db->schemaCache;
if ($cache instanceof Cache) { if ($cache instanceof Cache) {
$key = $this->getCacheKey($name); $key = $this->getCacheKey($name);
@ -215,7 +215,7 @@ abstract class Schema extends Object
*/ */
public function refresh() public function refresh()
{ {
/** @var $cache Cache */ /** @var Cache $cache */
$cache = is_string($this->db->schemaCache) ? Yii::$app->getComponent($this->db->schemaCache) : $this->db->schemaCache; $cache = is_string($this->db->schemaCache) ? Yii::$app->getComponent($this->db->schemaCache) : $this->db->schemaCache;
if ($this->db->enableSchemaCache && $cache instanceof Cache) { if ($this->db->enableSchemaCache && $cache instanceof Cache) {
GroupDependency::invalidate($cache, $this->getCacheGroup()); GroupDependency::invalidate($cache, $this->getCacheGroup());

2
framework/yii/log/Target.php
Unescape View File

@ -112,7 +112,7 @@ abstract class Target extends Component
{ {
$context = []; $context = [];
if ($this->logUser && ($user = Yii::$app->getComponent('user', false)) !== null) { if ($this->logUser && ($user = Yii::$app->getComponent('user', false)) !== null) {
/** @var $user \yii\web\User */ /** @var \yii\web\User $user */
$context[] = 'User: ' . $user->getId(); $context[] = 'User: ' . $user->getId();
} }

20
framework/yii/rbac/PhpManager.php
Unescape View File

@ -74,7 +74,7 @@ class PhpManager extends Manager
if (!isset($this->_items[$itemName])) { if (!isset($this->_items[$itemName])) {
return false; return false;
} }
/** @var $item Item */ /** @var Item $item */
$item = $this->_items[$itemName]; $item = $this->_items[$itemName];
Yii::trace('Checking permission: ' . $item->getName(), __METHOD__); Yii::trace('Checking permission: ' . $item->getName(), __METHOD__);
if (!isset($params['userId'])) { if (!isset($params['userId'])) {
@ -85,7 +85,7 @@ class PhpManager extends Manager
return true; return true;
} }
if (isset($this->_assignments[$userId][$itemName])) { if (isset($this->_assignments[$userId][$itemName])) {
/** @var $assignment Assignment */ /** @var Assignment $assignment */
$assignment = $this->_assignments[$userId][$itemName]; $assignment = $this->_assignments[$userId][$itemName];
if ($this->executeBizRule($assignment->bizRule, $params, $assignment->data)) { if ($this->executeBizRule($assignment->bizRule, $params, $assignment->data)) {
return true; return true;
@ -113,9 +113,9 @@ class PhpManager extends Manager
if (!isset($this->_items[$childName], $this->_items[$itemName])) { if (!isset($this->_items[$childName], $this->_items[$itemName])) {
throw new Exception("Either '$itemName' or '$childName' does not exist."); throw new Exception("Either '$itemName' or '$childName' does not exist.");
} }
/** @var $child Item */ /** @var Item $child */
$child = $this->_items[$childName]; $child = $this->_items[$childName];
/** @var $item Item */ /** @var Item $item */
$item = $this->_items[$itemName]; $item = $this->_items[$itemName];
$this->checkItemChildType($item->type, $child->type); $this->checkItemChildType($item->type, $child->type);
if ($this->detectLoop($itemName, $childName)) { if ($this->detectLoop($itemName, $childName)) {
@ -270,14 +270,14 @@ class PhpManager extends Manager
$items = []; $items = [];
if ($userId === null) { if ($userId === null) {
foreach ($this->_items as $name => $item) { foreach ($this->_items as $name => $item) {
/** @var $item Item */ /** @var Item $item */
if ($item->type == $type) { if ($item->type == $type) {
$items[$name] = $item; $items[$name] = $item;
} }
} }
} elseif (isset($this->_assignments[$userId])) { } elseif (isset($this->_assignments[$userId])) {
foreach ($this->_assignments[$userId] as $assignment) { foreach ($this->_assignments[$userId] as $assignment) {
/** @var $assignment Assignment */ /** @var Assignment $assignment */
$name = $assignment->itemName; $name = $assignment->itemName;
if (isset($this->_items[$name]) && ($type === null || $this->_items[$name]->type == $type)) { if (isset($this->_items[$name]) && ($type === null || $this->_items[$name]->type == $type)) {
$items[$name] = $this->_items[$name]; $items[$name] = $this->_items[$name];
@ -400,7 +400,7 @@ class PhpManager extends Manager
{ {
$items = []; $items = [];
foreach ($this->_items as $name => $item) { foreach ($this->_items as $name => $item) {
/** @var $item Item */ /** @var Item $item */
$items[$name] = [ $items[$name] = [
'type' => $item->type, 'type' => $item->type,
'description' => $item->description, 'description' => $item->description,
@ -409,7 +409,7 @@ class PhpManager extends Manager
]; ];
if (isset($this->_children[$name])) { if (isset($this->_children[$name])) {
foreach ($this->_children[$name] as $child) { foreach ($this->_children[$name] as $child) {
/** @var $child Item */ /** @var Item $child */
$items[$name]['children'][] = $child->getName(); $items[$name]['children'][] = $child->getName();
} }
} }
@ -417,7 +417,7 @@ class PhpManager extends Manager
foreach ($this->_assignments as $userId => $assignments) { foreach ($this->_assignments as $userId => $assignments) {
foreach ($assignments as $name => $assignment) { foreach ($assignments as $name => $assignment) {
/** @var $assignment Assignment */ /** @var Assignment $assignment */
if (isset($items[$name])) { if (isset($items[$name])) {
$items[$name]['assignments'][$userId] = [ $items[$name]['assignments'][$userId] = [
'bizRule' => $assignment->bizRule, 'bizRule' => $assignment->bizRule,
@ -505,7 +505,7 @@ class PhpManager extends Manager
return false; return false;
} }
foreach ($this->_children[$childName] as $child) { foreach ($this->_children[$childName] as $child) {
/** @var $child Item */ /** @var Item $child */
if ($this->detectLoop($itemName, $child->getName())) { if ($this->detectLoop($itemName, $child->getName())) {
return true; return true;
} }

2
framework/yii/requirements/requirements.php
Unescape View File

@ -3,7 +3,7 @@
* These are the Yii core requirements for the [[YiiRequirementChecker]] instance. * These are the Yii core requirements for the [[YiiRequirementChecker]] instance.
* These requirements are mandatory for any Yii application. * These requirements are mandatory for any Yii application.
* *
* @var $this YiiRequirementChecker * @var YiiRequirementChecker $this
*/ */
return array( return array(
array( array(

6
framework/yii/requirements/views/console/index.php
Unescape View File

@ -1,7 +1,7 @@
<?php <?php
/* @var $this YiiRequirementChecker */ /* @var YiiRequirementChecker $this */
/* @var $summary array */ /* @var array $summary */
/* @var $requirements array[] */ /* @var array[] $requirements */
echo "\nYii Application Requirement Checker\n\n"; echo "\nYii Application Requirement Checker\n\n";

6
framework/yii/requirements/views/web/index.php
Unescape View File

@ -1,7 +1,7 @@
<?php <?php
/* @var $this YiiRequirementChecker */ /* @var YiiRequirementChecker $this */
/* @var $summary array */ /* @var array $summary */
/* @var $requirements array[] */ /* @var array[] $requirements */
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">

4
framework/yii/validators/ExistValidator.php
Unescape View File

@ -65,7 +65,7 @@ class ExistValidator extends Validator
return; return;
} }
/** @var $className \yii\db\ActiveRecord */ /** @var \yii\db\ActiveRecord $className */
$className = $this->className === null ? get_class($object) : $this->className; $className = $this->className === null ? get_class($object) : $this->className;
$attributeName = $this->attributeName === null ? $attribute : $this->attributeName; $attributeName = $this->attributeName === null ? $attribute : $this->attributeName;
$query = $className::find(); $query = $className::find();
@ -92,7 +92,7 @@ class ExistValidator extends Validator
if ($this->attributeName === null) { if ($this->attributeName === null) {
throw new InvalidConfigException('The "attributeName" property must be set.'); throw new InvalidConfigException('The "attributeName" property must be set.');
} }
/** @var $className \yii\db\ActiveRecord */ /** @var \yii\db\ActiveRecord $className */
$className = $this->className; $className = $this->className;
$query = $className::find(); $query = $className::find();
$query->where([$this->attributeName => $value]); $query->where([$this->attributeName => $value]);

2
framework/yii/validators/UniqueValidator.php
Unescape View File

@ -60,7 +60,7 @@ class UniqueValidator extends Validator
return; return;
} }
/** @var $className \yii\db\ActiveRecord */ /** @var \yii\db\ActiveRecord $className */
$className = $this->className === null ? get_class($object) : $this->className; $className = $this->className === null ? get_class($object) : $this->className;
$attributeName = $this->attributeName === null ? $attribute : $this->attributeName; $attributeName = $this->attributeName === null ? $attribute : $this->attributeName;

2
framework/yii/web/AccessControl.php
Unescape View File

@ -102,7 +102,7 @@ class AccessControl extends ActionFilter
{ {
$user = Yii::$app->getUser(); $user = Yii::$app->getUser();
$request = Yii::$app->getRequest(); $request = Yii::$app->getRequest();
/** @var $rule AccessRule */ /** @var AccessRule $rule */
foreach ($this->rules as $rule) { foreach ($this->rules as $rule) {
if ($allow = $rule->allows($action, $user, $request)) { if ($allow = $rule->allows($action, $user, $request)) {
return true; return true;

6
framework/yii/web/UrlManager.php
Unescape View File

@ -169,7 +169,7 @@ class UrlManager extends Component
{ {
if ($this->enablePrettyUrl) { if ($this->enablePrettyUrl) {
$pathInfo = $request->getPathInfo(); $pathInfo = $request->getPathInfo();
/** @var $rule UrlRule */ /** @var UrlRule $rule */
foreach ($this->rules as $rule) { foreach ($this->rules as $rule) {
if (($result = $rule->parseRequest($this, $request)) !== false) { if (($result = $rule->parseRequest($this, $request)) !== false) {
Yii::trace("Request parsed with URL rule: {$rule->name}", __METHOD__); Yii::trace("Request parsed with URL rule: {$rule->name}", __METHOD__);
@ -224,7 +224,7 @@ class UrlManager extends Component
$baseUrl = $this->getBaseUrl(); $baseUrl = $this->getBaseUrl();
if ($this->enablePrettyUrl) { if ($this->enablePrettyUrl) {
/** @var $rule UrlRule */ /** @var UrlRule $rule */
foreach ($this->rules as $rule) { foreach ($this->rules as $rule) {
if (($url = $rule->createUrl($this, $route, $params)) !== false) { if (($url = $rule->createUrl($this, $route, $params)) !== false) {
if ($rule->host !== null) { if ($rule->host !== null) {
@ -282,7 +282,7 @@ class UrlManager extends Component
public function getBaseUrl() public function getBaseUrl()
{ {
if ($this->_baseUrl === null) { if ($this->_baseUrl === null) {
/** @var $request \yii\web\Request */ /** @var \yii\web\Request $request */
$request = Yii::$app->getRequest(); $request = Yii::$app->getRequest();
$this->_baseUrl = $this->showScriptName || !$this->enablePrettyUrl ? $request->getScriptUrl() : $request->getBaseUrl(); $this->_baseUrl = $this->showScriptName || !$this->enablePrettyUrl ? $request->getScriptUrl() : $request->getBaseUrl();
} }

4
framework/yii/web/User.php
Unescape View File

@ -139,7 +139,7 @@ class User extends Component
if ($id === null) { if ($id === null) {
$this->_identity = null; $this->_identity = null;
} else { } else {
/** @var $class IdentityInterface */ /** @var IdentityInterface $class */
$class = $this->identityClass; $class = $this->identityClass;
$this->_identity = $class::findIdentity($id); $this->_identity = $class::findIdentity($id);
} }
@ -202,7 +202,7 @@ class User extends Component
$data = json_decode($value, true); $data = json_decode($value, true);
if (count($data) === 3 && isset($data[0], $data[1], $data[2])) { if (count($data) === 3 && isset($data[0], $data[1], $data[2])) {
list ($id, $authKey, $duration) = $data; list ($id, $authKey, $duration) = $data;
/** @var $class IdentityInterface */ /** @var IdentityInterface $class */
$class = $this->identityClass; $class = $this->identityClass;
$identity = $class::findIdentity($id); $identity = $class::findIdentity($id);
if ($identity !== null && $identity->validateAuthKey($authKey)) { if ($identity !== null && $identity->validateAuthKey($authKey)) {

2
framework/yii/widgets/ActiveForm.php
Unescape View File

@ -220,7 +220,7 @@ class ActiveForm extends Widget
$lines = []; $lines = [];
foreach ($models as $model) { foreach ($models as $model) {
/** @var $model Model */ /** @var Model $model */
foreach ($model->getFirstErrors() as $error) { foreach ($model->getFirstErrors() as $error) {
$lines[] = Html::encode($error); $lines[] = Html::encode($error);
} }

4
tests/unit/data/views/layout.php
Unescape View File

@ -1,7 +1,7 @@
<?php <?php
/** /**
* @var $this \yii\web\View * @var \yii\web\View $this
* @var $content string * @var string $content
*/ */
?> ?>
<?php $this->beginPage(); ?> <?php $this->beginPage(); ?>

2
tests/unit/data/views/rawlayout.php
Unescape View File

@ -1,5 +1,5 @@
<?php <?php
/** /**
* @var $this \yii\web\View * @var \yii\web\View $this
*/ */
?><?php $this->beginPage(); ?>1<?php $this->head(); ?>2<?php $this->beginBody(); ?>3<?php $this->endBody(); ?>4<?php $this->endPage(); ?> ?><?php $this->beginPage(); ?>1<?php $this->head(); ?>2<?php $this->beginBody(); ?>3<?php $this->endBody(); ?>4<?php $this->endPage(); ?>

2
tests/unit/extensions/swiftmailer/MessageTest.php
Unescape View File

@ -306,7 +306,7 @@ class MessageTest extends VendorTestCase
$htmlPresent = false; $htmlPresent = false;
foreach ($messageParts as $part) { foreach ($messageParts as $part) {
if (!($part instanceof \Swift_Mime_Attachment)) { if (!($part instanceof \Swift_Mime_Attachment)) {
/* @var $part \Swift_Mime_MimePart */ /* @var \Swift_Mime_MimePart $part */
if ($part->getContentType() == 'text/plain') { if ($part->getContentType() == 'text/plain') {
$textPresent = true; $textPresent = true;
} }

6
tests/unit/framework/db/ActiveRecordTest.php
Unescape View File

@ -117,7 +117,7 @@ class ActiveRecordTest extends DatabaseTestCase
public function testFindLazy() public function testFindLazy()
{ {
/** @var $customer Customer */ /** @var Customer $customer */
$customer = Customer::find(2); $customer = Customer::find(2);
$orders = $customer->orders; $orders = $customer->orders;
$this->assertEquals(2, count($orders)); $this->assertEquals(2, count($orders));
@ -137,7 +137,7 @@ class ActiveRecordTest extends DatabaseTestCase
public function testFindLazyVia() public function testFindLazyVia()
{ {
/** @var $order Order */ /** @var Order $order */
$order = Order::find(1); $order = Order::find(1);
$this->assertEquals(1, $order->id); $this->assertEquals(1, $order->id);
$this->assertEquals(2, count($order->items)); $this->assertEquals(2, count($order->items));
@ -162,7 +162,7 @@ class ActiveRecordTest extends DatabaseTestCase
public function testFindLazyViaTable() public function testFindLazyViaTable()
{ {
/** @var $order Order */ /** @var Order $order */
$order = Order::find(1); $order = Order::find(1);
$this->assertEquals(1, $order->id); $this->assertEquals(1, $order->id);
$this->assertEquals(2, count($order->books)); $this->assertEquals(2, count($order->books));

2
tests/unit/framework/validators/ValidatorTest.php
Unescape View File

@ -30,7 +30,7 @@ class ValidatorTest extends TestCase
public function testCreateValidator() public function testCreateValidator()
{ {
$model = FakedValidationModel::createWithAttributes(['attr_test1' => 'abc', 'attr_test2' => '2013']); $model = FakedValidationModel::createWithAttributes(['attr_test1' => 'abc', 'attr_test2' => '2013']);
/** @var $numberVal NumberValidator */ /** @var NumberValidator $numberVal */
$numberVal = TestValidator::createValidator('number', $model, ['attr_test1']); $numberVal = TestValidator::createValidator('number', $model, ['attr_test1']);
$this->assertInstanceOf(NumberValidator::className(), $numberVal); $this->assertInstanceOf(NumberValidator::className(), $numberVal);
$numberVal = TestValidator::createValidator('integer', $model, ['attr_test2']); $numberVal = TestValidator::createValidator('integer', $model, ['attr_test2']);

Write Preview
Loading…
Cancel
Save