Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
b0b1c27c
Commit
b0b1c27c
authored
Nov 12, 2013
by
slavcodev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix phpDoc var tag format
parent
5f76ee01
Show whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
69 additions
and
72 deletions
+69
-72
index.php
extensions/gii/views/default/index.php
+4
-4
files.php
extensions/gii/views/default/view/files.php
+2
-2
generator.php
extensions/gii/views/layouts/generator.php
+4
-4
main.php
extensions/gii/views/layouts/main.php
+2
-2
Message.php
extensions/swiftmailer/Message.php
+1
-1
BaseYii.php
framework/yii/BaseYii.php
+1
-1
Application.php
framework/yii/base/Application.php
+0
-2
Model.php
framework/yii/base/Model.php
+1
-2
Module.php
framework/yii/base/Module.php
+1
-1
View.php
framework/yii/base/View.php
+1
-1
CacheController.php
framework/yii/console/controllers/CacheController.php
+1
-1
ActiveQuery.php
framework/yii/db/ActiveQuery.php
+3
-3
ActiveRecord.php
framework/yii/db/ActiveRecord.php
+5
-5
ActiveRelation.php
framework/yii/db/ActiveRelation.php
+4
-4
Command.php
framework/yii/db/Command.php
+1
-1
Schema.php
framework/yii/db/Schema.php
+2
-2
Target.php
framework/yii/log/Target.php
+1
-1
PhpManager.php
framework/yii/rbac/PhpManager.php
+10
-10
requirements.php
framework/yii/requirements/requirements.php
+1
-1
index.php
framework/yii/requirements/views/console/index.php
+3
-3
index.php
framework/yii/requirements/views/web/index.php
+3
-3
ExistValidator.php
framework/yii/validators/ExistValidator.php
+2
-2
UniqueValidator.php
framework/yii/validators/UniqueValidator.php
+1
-1
AccessControl.php
framework/yii/web/AccessControl.php
+1
-1
UrlManager.php
framework/yii/web/UrlManager.php
+3
-3
User.php
framework/yii/web/User.php
+2
-2
ActiveForm.php
framework/yii/widgets/ActiveForm.php
+1
-1
layout.php
tests/unit/data/views/layout.php
+2
-2
rawlayout.php
tests/unit/data/views/rawlayout.php
+1
-1
MessageTest.php
tests/unit/extensions/swiftmailer/MessageTest.php
+1
-1
ActiveRecordTest.php
tests/unit/framework/db/ActiveRecordTest.php
+3
-3
ValidatorTest.php
tests/unit/framework/validators/ValidatorTest.php
+1
-1
No files found.
extensions/gii/views/default/index.php
View file @
b0b1c27c
...
...
@@ -2,10 +2,10 @@
use
yii\helpers\Html
;
/**
* @var
$this \yii\web\View
* @var
$content string
* @var
yii\gii\Generator[] $generators
* @var
yii\gii\Generator $activeGenerator
* @var
\yii\web\View $this
* @var
\yii\gii\Generator[] $generators
* @var
\yii\gii\Generator $activeGenerator
* @var
string $content
*/
$generators
=
Yii
::
$app
->
controller
->
module
->
generators
;
$activeGenerator
=
Yii
::
$app
->
controller
->
generator
;
...
...
extensions/gii/views/default/view/files.php
View file @
b0b1c27c
...
...
@@ -4,8 +4,8 @@ use yii\helpers\Html;
use
yii\gii\CodeFile
;
/**
* @var
$this \yii\web\View
* @var
$generator \yii\gii\G
enerator
* @var
\yii\web\View $this
* @var
\yii\gii\Generator $g
enerator
* @var CodeFile[] $files
* @var array $answers
*/
...
...
extensions/gii/views/layouts/generator.php
View file @
b0b1c27c
...
...
@@ -2,10 +2,10 @@
use
yii\helpers\Html
;
/**
* @var
$this \yii\web\View
* @var
$content string
* @var
yii\gii\Generator[] $generators
* @var
yii\gii\Generator $activeGenerator
* @var
\yii\web\View $this
* @var
\yii\gii\Generator[] $generators
* @var
\yii\gii\Generator $activeGenerator
* @var
string $content
*/
$generators
=
Yii
::
$app
->
controller
->
module
->
generators
;
$activeGenerator
=
Yii
::
$app
->
controller
->
generator
;
...
...
extensions/gii/views/layouts/main.php
View file @
b0b1c27c
...
...
@@ -4,8 +4,8 @@ use yii\bootstrap\Nav;
use
yii\helpers\Html
;
/**
* @var
$this \yii\web\View
* @var
$content string
* @var
\yii\web\View $this
* @var
string $content
*/
$asset
=
yii\gii\GiiAsset
::
register
(
$this
);
?>
...
...
extensions/swiftmailer/Message.php
View file @
b0b1c27c
...
...
@@ -192,7 +192,7 @@ class Message extends BaseMessage
$partFound
=
false
;
foreach
(
$parts
as
$key
=>
$part
)
{
if
(
!
(
$part
instanceof
\Swift_Mime_Attachment
))
{
/* @var
$part \Swift_Mime_MimeP
art */
/* @var
\Swift_Mime_MimePart $p
art */
if
(
$part
->
getContentType
()
==
$contentType
)
{
unset
(
$parts
[
$key
]);
$partFound
=
true
;
...
...
framework/yii/BaseYii.php
View file @
b0b1c27c
...
...
@@ -367,7 +367,7 @@ class BaseYii
}
if
((
$n
=
func_num_args
())
>
1
)
{
/** @var
$reflection \ReflectionClass
*/
/** @var
\ReflectionClass $reflection
*/
if
(
isset
(
$reflections
[
$class
]))
{
$reflection
=
$reflections
[
$class
];
}
else
{
...
...
framework/yii/base/Application.php
View file @
b0b1c27c
...
...
@@ -616,10 +616,8 @@ abstract class Application extends Module
{
$category
=
get_class
(
$exception
);
if
(
$exception
instanceof
HttpException
)
{
/** @var $exception HttpException */
$category
.=
'\\'
.
$exception
->
statusCode
;
}
elseif
(
$exception
instanceof
\ErrorException
)
{
/** @var $exception \ErrorException */
$category
.=
'\\'
.
$exception
->
getSeverity
();
}
Yii
::
error
((
string
)
$exception
,
$category
);
...
...
framework/yii/base/Model.php
View file @
b0b1c27c
...
...
@@ -349,7 +349,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
* $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
()
{
...
...
@@ -369,7 +369,6 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
{
$validators
=
[];
$scenario
=
$this
->
getScenario
();
/** @var $validator Validator */
foreach
(
$this
->
getValidators
()
as
$validator
)
{
if
(
$validator
->
isActive
(
$scenario
)
&&
(
$attribute
===
null
||
in_array
(
$attribute
,
$validator
->
attributes
,
true
)))
{
$validators
[]
=
$validator
;
...
...
framework/yii/base/Module.php
View file @
b0b1c27c
...
...
@@ -578,7 +578,7 @@ abstract class Module extends Component
{
$parts
=
$this
->
createController
(
$route
);
if
(
is_array
(
$parts
))
{
/** @var
$controller C
ontroller */
/** @var
Controller $c
ontroller */
list
(
$controller
,
$actionID
)
=
$parts
;
$oldController
=
Yii
::
$app
->
controller
;
Yii
::
$app
->
controller
=
$controller
;
...
...
framework/yii/base/View.php
View file @
b0b1c27c
...
...
@@ -410,7 +410,7 @@ class View extends Component
{
$properties
[
'id'
]
=
$id
;
$properties
[
'view'
]
=
$this
;
/** @var
$cache FragmentC
ache */
/** @var
FragmentCache $c
ache */
$cache
=
FragmentCache
::
begin
(
$properties
);
if
(
$cache
->
getCachedContent
()
!==
false
)
{
$this
->
endCache
();
...
...
framework/yii/console/controllers/CacheController.php
View file @
b0b1c27c
...
...
@@ -52,7 +52,7 @@ class CacheController extends Controller
*/
public
function
actionFlush
(
$component
=
'cache'
)
{
/** @var
$cache C
ache */
/** @var
Cache $c
ache */
$cache
=
Yii
::
$app
->
getComponent
(
$component
);
if
(
!
$cache
||
!
$cache
instanceof
Cache
)
{
throw
new
Exception
(
'Application component "'
.
$component
.
'" is not defined or not a cache.'
);
...
...
framework/yii/db/ActiveQuery.php
View file @
b0b1c27c
...
...
@@ -122,7 +122,7 @@ class ActiveQuery extends Query
if
(
$this
->
asArray
)
{
$model
=
$row
;
}
else
{
/** @var
$class ActiveRecord
*/
/** @var
ActiveRecord $class
*/
$class
=
$this
->
modelClass
;
$model
=
$class
::
create
(
$row
);
}
...
...
@@ -145,7 +145,7 @@ class ActiveQuery extends Query
*/
public
function
createCommand
(
$db
=
null
)
{
/** @var
$modelClass ActiveRecord
*/
/** @var
ActiveRecord $modelClass
*/
$modelClass
=
$this
->
modelClass
;
if
(
$db
===
null
)
{
$db
=
$modelClass
::
getDb
();
...
...
@@ -253,7 +253,7 @@ class ActiveQuery extends Query
$models
[
$key
]
=
$row
;
}
}
else
{
/** @var
$class ActiveRecord
*/
/** @var
ActiveRecord $class
*/
$class
=
$this
->
modelClass
;
if
(
$this
->
indexBy
===
null
)
{
foreach
(
$rows
as
$row
)
{
...
...
framework/yii/db/ActiveRecord.php
View file @
b0b1c27c
...
...
@@ -1321,9 +1321,9 @@ class ActiveRecord extends Model
throw
new
InvalidCallException
(
'Unable to link models: both models must NOT be newly created.'
);
}
if
(
is_array
(
$relation
->
via
))
{
/** @var
$viaRelation Active
Relation */
/** @var
ActiveRelation $via
Relation */
list
(
$viaName
,
$viaRelation
)
=
$relation
->
via
;
/** @var
$viaClass ActiveRecord
*/
/** @var
ActiveRecord $viaClass
*/
$viaClass
=
$viaRelation
->
modelClass
;
$viaTable
=
$viaClass
::
tableName
();
// 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
(
is_array
(
$relation
->
via
))
{
/** @var
$viaRelation Active
Relation */
/** @var
ActiveRelation $via
Relation */
list
(
$viaName
,
$viaRelation
)
=
$relation
->
via
;
/** @var
$viaClass ActiveRecord
*/
/** @var
ActiveRecord $viaClass
*/
$viaClass
=
$viaRelation
->
modelClass
;
$viaTable
=
$viaClass
::
tableName
();
unset
(
$this
->
_related
[
$viaName
]);
...
...
@@ -1444,7 +1444,7 @@ class ActiveRecord extends Model
if
(
!
$relation
->
multiple
)
{
unset
(
$this
->
_related
[
$name
]);
}
elseif
(
isset
(
$this
->
_related
[
$name
]))
{
/** @var
$b ActiveRecord
*/
/** @var
ActiveRecord $b
*/
foreach
(
$this
->
_related
[
$name
]
as
$a
=>
$b
)
{
if
(
$model
->
getPrimaryKey
()
==
$b
->
getPrimaryKey
())
{
unset
(
$this
->
_related
[
$name
][
$a
]);
...
...
framework/yii/db/ActiveRelation.php
View file @
b0b1c27c
...
...
@@ -120,7 +120,7 @@ class ActiveRelation extends ActiveQuery
$this
->
filterByModels
(
$viaModels
);
}
elseif
(
is_array
(
$this
->
via
))
{
// via relation
/** @var
$viaQuery ActiveRelation
*/
/** @var
ActiveRelation $viaQuery
*/
list
(
$viaName
,
$viaQuery
)
=
$this
->
via
;
if
(
$viaQuery
->
multiple
)
{
$viaModels
=
$viaQuery
->
all
();
...
...
@@ -154,13 +154,13 @@ class ActiveRelation extends ActiveQuery
if
(
$this
->
via
instanceof
self
)
{
// via pivot table
/** @var
$viaQuery ActiveRelation
*/
/** @var
ActiveRelation $viaQuery
*/
$viaQuery
=
$this
->
via
;
$viaModels
=
$viaQuery
->
findPivotRows
(
$primaryModels
);
$this
->
filterByModels
(
$viaModels
);
}
elseif
(
is_array
(
$this
->
via
))
{
// via relation
/** @var
$viaQuery ActiveRelation
*/
/** @var
ActiveRelation $viaQuery
*/
list
(
$viaName
,
$viaQuery
)
=
$this
->
via
;
$viaQuery
->
primaryModel
=
null
;
$viaModels
=
$viaQuery
->
findWith
(
$viaName
,
$primaryModels
);
...
...
@@ -306,7 +306,7 @@ class ActiveRelation extends ActiveQuery
return
[];
}
$this
->
filterByModels
(
$primaryModels
);
/** @var
$primaryModel ActiveRecord
*/
/** @var
ActiveRecord $primaryModel
*/
$primaryModel
=
reset
(
$primaryModels
);
$db
=
$primaryModel
->
getDb
();
list
(
$sql
,
$params
)
=
$db
->
getQueryBuilder
()
->
build
(
$this
);
...
...
framework/yii/db/Command.php
View file @
b0b1c27c
...
...
@@ -366,7 +366,7 @@ class Command extends \yii\base\Component
Yii
::
info
(
$rawSql
,
__METHOD__
);
/** @var
$cache \yii\caching\C
ache */
/** @var
\yii\caching\Cache $c
ache */
if
(
$db
->
enableQueryCache
&&
$method
!==
''
)
{
$cache
=
is_string
(
$db
->
queryCache
)
?
Yii
::
$app
->
getComponent
(
$db
->
queryCache
)
:
$db
->
queryCache
;
}
...
...
framework/yii/db/Schema.php
View file @
b0b1c27c
...
...
@@ -92,7 +92,7 @@ abstract class Schema extends Object
$realName
=
$this
->
getRawTableName
(
$name
);
if
(
$db
->
enableSchemaCache
&&
!
in_array
(
$name
,
$db
->
schemaCacheExclude
,
true
))
{
/** @var
$cache C
ache */
/** @var
Cache $c
ache */
$cache
=
is_string
(
$db
->
schemaCache
)
?
Yii
::
$app
->
getComponent
(
$db
->
schemaCache
)
:
$db
->
schemaCache
;
if
(
$cache
instanceof
Cache
)
{
$key
=
$this
->
getCacheKey
(
$name
);
...
...
@@ -215,7 +215,7 @@ abstract class Schema extends Object
*/
public
function
refresh
()
{
/** @var
$cache C
ache */
/** @var
Cache $c
ache */
$cache
=
is_string
(
$this
->
db
->
schemaCache
)
?
Yii
::
$app
->
getComponent
(
$this
->
db
->
schemaCache
)
:
$this
->
db
->
schemaCache
;
if
(
$this
->
db
->
enableSchemaCache
&&
$cache
instanceof
Cache
)
{
GroupDependency
::
invalidate
(
$cache
,
$this
->
getCacheGroup
());
...
...
framework/yii/log/Target.php
View file @
b0b1c27c
...
...
@@ -112,7 +112,7 @@ abstract class Target extends Component
{
$context
=
[];
if
(
$this
->
logUser
&&
(
$user
=
Yii
::
$app
->
getComponent
(
'user'
,
false
))
!==
null
)
{
/** @var
$user \yii\web\U
ser */
/** @var
\yii\web\User $u
ser */
$context
[]
=
'User: '
.
$user
->
getId
();
}
...
...
framework/yii/rbac/PhpManager.php
View file @
b0b1c27c
...
...
@@ -74,7 +74,7 @@ class PhpManager extends Manager
if
(
!
isset
(
$this
->
_items
[
$itemName
]))
{
return
false
;
}
/** @var
$item I
tem */
/** @var
Item $i
tem */
$item
=
$this
->
_items
[
$itemName
];
Yii
::
trace
(
'Checking permission: '
.
$item
->
getName
(),
__METHOD__
);
if
(
!
isset
(
$params
[
'userId'
]))
{
...
...
@@ -85,7 +85,7 @@ class PhpManager extends Manager
return
true
;
}
if
(
isset
(
$this
->
_assignments
[
$userId
][
$itemName
]))
{
/** @var
$assignment A
ssignment */
/** @var
Assignment $a
ssignment */
$assignment
=
$this
->
_assignments
[
$userId
][
$itemName
];
if
(
$this
->
executeBizRule
(
$assignment
->
bizRule
,
$params
,
$assignment
->
data
))
{
return
true
;
...
...
@@ -113,9 +113,9 @@ class PhpManager extends Manager
if
(
!
isset
(
$this
->
_items
[
$childName
],
$this
->
_items
[
$itemName
]))
{
throw
new
Exception
(
"Either '
$itemName
' or '
$childName
' does not exist."
);
}
/** @var
$child Item
*/
/** @var
Item $child
*/
$child
=
$this
->
_items
[
$childName
];
/** @var
$item I
tem */
/** @var
Item $i
tem */
$item
=
$this
->
_items
[
$itemName
];
$this
->
checkItemChildType
(
$item
->
type
,
$child
->
type
);
if
(
$this
->
detectLoop
(
$itemName
,
$childName
))
{
...
...
@@ -270,14 +270,14 @@ class PhpManager extends Manager
$items
=
[];
if
(
$userId
===
null
)
{
foreach
(
$this
->
_items
as
$name
=>
$item
)
{
/** @var
$item I
tem */
/** @var
Item $i
tem */
if
(
$item
->
type
==
$type
)
{
$items
[
$name
]
=
$item
;
}
}
}
elseif
(
isset
(
$this
->
_assignments
[
$userId
]))
{
foreach
(
$this
->
_assignments
[
$userId
]
as
$assignment
)
{
/** @var
$assignment A
ssignment */
/** @var
Assignment $a
ssignment */
$name
=
$assignment
->
itemName
;
if
(
isset
(
$this
->
_items
[
$name
])
&&
(
$type
===
null
||
$this
->
_items
[
$name
]
->
type
==
$type
))
{
$items
[
$name
]
=
$this
->
_items
[
$name
];
...
...
@@ -400,7 +400,7 @@ class PhpManager extends Manager
{
$items
=
[];
foreach
(
$this
->
_items
as
$name
=>
$item
)
{
/** @var
$item I
tem */
/** @var
Item $i
tem */
$items
[
$name
]
=
[
'type'
=>
$item
->
type
,
'description'
=>
$item
->
description
,
...
...
@@ -409,7 +409,7 @@ class PhpManager extends Manager
];
if
(
isset
(
$this
->
_children
[
$name
]))
{
foreach
(
$this
->
_children
[
$name
]
as
$child
)
{
/** @var
$child Item
*/
/** @var
Item $child
*/
$items
[
$name
][
'children'
][]
=
$child
->
getName
();
}
}
...
...
@@ -417,7 +417,7 @@ class PhpManager extends Manager
foreach
(
$this
->
_assignments
as
$userId
=>
$assignments
)
{
foreach
(
$assignments
as
$name
=>
$assignment
)
{
/** @var
$assignment A
ssignment */
/** @var
Assignment $a
ssignment */
if
(
isset
(
$items
[
$name
]))
{
$items
[
$name
][
'assignments'
][
$userId
]
=
[
'bizRule'
=>
$assignment
->
bizRule
,
...
...
@@ -505,7 +505,7 @@ class PhpManager extends Manager
return
false
;
}
foreach
(
$this
->
_children
[
$childName
]
as
$child
)
{
/** @var
$child Item
*/
/** @var
Item $child
*/
if
(
$this
->
detectLoop
(
$itemName
,
$child
->
getName
()))
{
return
true
;
}
...
...
framework/yii/requirements/requirements.php
View file @
b0b1c27c
...
...
@@ -3,7 +3,7 @@
* These are the Yii core requirements for the [[YiiRequirementChecker]] instance.
* These requirements are mandatory for any Yii application.
*
* @var
$this YiiRequirementChecker
* @var
YiiRequirementChecker $this
*/
return
array
(
array
(
...
...
framework/yii/requirements/views/console/index.php
View file @
b0b1c27c
<?php
/* @var
$this YiiRequirementChecker
*/
/* @var
$summary arra
y */
/* @var
$requirements array[]
*/
/* @var
YiiRequirementChecker $this
*/
/* @var
array $summar
y */
/* @var
array[] $requirements
*/
echo
"
\n
Yii Application Requirement Checker
\n\n
"
;
...
...
framework/yii/requirements/views/web/index.php
View file @
b0b1c27c
<?php
/* @var
$this YiiRequirementChecker
*/
/* @var
$summary arra
y */
/* @var
$requirements array[]
*/
/* @var
YiiRequirementChecker $this
*/
/* @var
array $summar
y */
/* @var
array[] $requirements
*/
?>
<!DOCTYPE html>
<html
lang=
"en"
>
...
...
framework/yii/validators/ExistValidator.php
View file @
b0b1c27c
...
...
@@ -65,7 +65,7 @@ class ExistValidator extends Validator
return
;
}
/** @var
$className \yii\db\ActiveRecord
*/
/** @var
\yii\db\ActiveRecord $className
*/
$className
=
$this
->
className
===
null
?
get_class
(
$object
)
:
$this
->
className
;
$attributeName
=
$this
->
attributeName
===
null
?
$attribute
:
$this
->
attributeName
;
$query
=
$className
::
find
();
...
...
@@ -92,7 +92,7 @@ class ExistValidator extends Validator
if
(
$this
->
attributeName
===
null
)
{
throw
new
InvalidConfigException
(
'The "attributeName" property must be set.'
);
}
/** @var
$className \yii\db\ActiveRecord
*/
/** @var
\yii\db\ActiveRecord $className
*/
$className
=
$this
->
className
;
$query
=
$className
::
find
();
$query
->
where
([
$this
->
attributeName
=>
$value
]);
...
...
framework/yii/validators/UniqueValidator.php
View file @
b0b1c27c
...
...
@@ -60,7 +60,7 @@ class UniqueValidator extends Validator
return
;
}
/** @var
$className \yii\db\ActiveRecord
*/
/** @var
\yii\db\ActiveRecord $className
*/
$className
=
$this
->
className
===
null
?
get_class
(
$object
)
:
$this
->
className
;
$attributeName
=
$this
->
attributeName
===
null
?
$attribute
:
$this
->
attributeName
;
...
...
framework/yii/web/AccessControl.php
View file @
b0b1c27c
...
...
@@ -102,7 +102,7 @@ class AccessControl extends ActionFilter
{
$user
=
Yii
::
$app
->
getUser
();
$request
=
Yii
::
$app
->
getRequest
();
/** @var
$rule AccessR
ule */
/** @var
AccessRule $r
ule */
foreach
(
$this
->
rules
as
$rule
)
{
if
(
$allow
=
$rule
->
allows
(
$action
,
$user
,
$request
))
{
return
true
;
...
...
framework/yii/web/UrlManager.php
View file @
b0b1c27c
...
...
@@ -169,7 +169,7 @@ class UrlManager extends Component
{
if
(
$this
->
enablePrettyUrl
)
{
$pathInfo
=
$request
->
getPathInfo
();
/** @var
$rule UrlR
ule */
/** @var
UrlRule $r
ule */
foreach
(
$this
->
rules
as
$rule
)
{
if
((
$result
=
$rule
->
parseRequest
(
$this
,
$request
))
!==
false
)
{
Yii
::
trace
(
"Request parsed with URL rule:
{
$rule
->
name
}
"
,
__METHOD__
);
...
...
@@ -224,7 +224,7 @@ class UrlManager extends Component
$baseUrl
=
$this
->
getBaseUrl
();
if
(
$this
->
enablePrettyUrl
)
{
/** @var
$rule UrlR
ule */
/** @var
UrlRule $r
ule */
foreach
(
$this
->
rules
as
$rule
)
{
if
((
$url
=
$rule
->
createUrl
(
$this
,
$route
,
$params
))
!==
false
)
{
if
(
$rule
->
host
!==
null
)
{
...
...
@@ -282,7 +282,7 @@ class UrlManager extends Component
public
function
getBaseUrl
()
{
if
(
$this
->
_baseUrl
===
null
)
{
/** @var
$request \yii\web\R
equest */
/** @var
\yii\web\Request $r
equest */
$request
=
Yii
::
$app
->
getRequest
();
$this
->
_baseUrl
=
$this
->
showScriptName
||
!
$this
->
enablePrettyUrl
?
$request
->
getScriptUrl
()
:
$request
->
getBaseUrl
();
}
...
...
framework/yii/web/User.php
View file @
b0b1c27c
...
...
@@ -139,7 +139,7 @@ class User extends Component
if
(
$id
===
null
)
{
$this
->
_identity
=
null
;
}
else
{
/** @var
$class IdentityInterface
*/
/** @var
IdentityInterface $class
*/
$class
=
$this
->
identityClass
;
$this
->
_identity
=
$class
::
findIdentity
(
$id
);
}
...
...
@@ -202,7 +202,7 @@ class User extends Component
$data
=
json_decode
(
$value
,
true
);
if
(
count
(
$data
)
===
3
&&
isset
(
$data
[
0
],
$data
[
1
],
$data
[
2
]))
{
list
(
$id
,
$authKey
,
$duration
)
=
$data
;
/** @var
$class IdentityInterface
*/
/** @var
IdentityInterface $class
*/
$class
=
$this
->
identityClass
;
$identity
=
$class
::
findIdentity
(
$id
);
if
(
$identity
!==
null
&&
$identity
->
validateAuthKey
(
$authKey
))
{
...
...
framework/yii/widgets/ActiveForm.php
View file @
b0b1c27c
...
...
@@ -220,7 +220,7 @@ class ActiveForm extends Widget
$lines
=
[];
foreach
(
$models
as
$model
)
{
/** @var
$model M
odel */
/** @var
Model $m
odel */
foreach
(
$model
->
getFirstErrors
()
as
$error
)
{
$lines
[]
=
Html
::
encode
(
$error
);
}
...
...
tests/unit/data/views/layout.php
View file @
b0b1c27c
<?php
/**
* @var
$this \yii\web\View
* @var
$content string
* @var
\yii\web\View $this
* @var
string $content
*/
?>
<?php
$this
->
beginPage
();
?>
...
...
tests/unit/data/views/rawlayout.php
View file @
b0b1c27c
<?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
();
?>
tests/unit/extensions/swiftmailer/MessageTest.php
View file @
b0b1c27c
...
...
@@ -306,7 +306,7 @@ class MessageTest extends VendorTestCase
$htmlPresent
=
false
;
foreach
(
$messageParts
as
$part
)
{
if
(
!
(
$part
instanceof
\Swift_Mime_Attachment
))
{
/* @var
$part \Swift_Mime_MimeP
art */
/* @var
\Swift_Mime_MimePart $p
art */
if
(
$part
->
getContentType
()
==
'text/plain'
)
{
$textPresent
=
true
;
}
...
...
tests/unit/framework/db/ActiveRecordTest.php
View file @
b0b1c27c
...
...
@@ -117,7 +117,7 @@ class ActiveRecordTest extends DatabaseTestCase
public
function
testFindLazy
()
{
/** @var
$customer C
ustomer */
/** @var
Customer $c
ustomer */
$customer
=
Customer
::
find
(
2
);
$orders
=
$customer
->
orders
;
$this
->
assertEquals
(
2
,
count
(
$orders
));
...
...
@@ -137,7 +137,7 @@ class ActiveRecordTest extends DatabaseTestCase
public
function
testFindLazyVia
()
{
/** @var
$order O
rder */
/** @var
Order $o
rder */
$order
=
Order
::
find
(
1
);
$this
->
assertEquals
(
1
,
$order
->
id
);
$this
->
assertEquals
(
2
,
count
(
$order
->
items
));
...
...
@@ -162,7 +162,7 @@ class ActiveRecordTest extends DatabaseTestCase
public
function
testFindLazyViaTable
()
{
/** @var
$order O
rder */
/** @var
Order $o
rder */
$order
=
Order
::
find
(
1
);
$this
->
assertEquals
(
1
,
$order
->
id
);
$this
->
assertEquals
(
2
,
count
(
$order
->
books
));
...
...
tests/unit/framework/validators/ValidatorTest.php
View file @
b0b1c27c
...
...
@@ -30,7 +30,7 @@ class ValidatorTest extends TestCase
public
function
testCreateValidator
()
{
$model
=
FakedValidationModel
::
createWithAttributes
([
'attr_test1'
=>
'abc'
,
'attr_test2'
=>
'2013'
]);
/** @var
$numberVal NumberValidator
*/
/** @var
NumberValidator $numberVal
*/
$numberVal
=
TestValidator
::
createValidator
(
'number'
,
$model
,
[
'attr_test1'
]);
$this
->
assertInstanceOf
(
NumberValidator
::
className
(),
$numberVal
);
$numberVal
=
TestValidator
::
createValidator
(
'integer'
,
$model
,
[
'attr_test2'
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment