@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
254 | - * @return int|string current user ID |
|
254 | + * @return integer current user ID |
|
255 | 255 | */ |
256 | 256 | public function getId() |
257 | 257 | { |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | } |
386 | 386 | |
387 | 387 | /** |
388 | - * @return mixed|string Display name for the user visual identification |
|
388 | + * @return string Display name for the user visual identification |
|
389 | 389 | */ |
390 | 390 | public function getDisplayName() |
391 | 391 | { |
@@ -2,13 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\user\models; |
4 | 4 | |
5 | -use app\modules\shop\models\Customer; |
|
6 | -use app\properties\HasProperties; |
|
5 | +use Yii; |
|
7 | 6 | use app\models\PropertyGroup; |
8 | -use app\models\ObjectPropertyGroup; |
|
9 | - |
|
7 | +use app\properties\HasProperties; |
|
10 | 8 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
11 | -use Yii; |
|
12 | 9 | use yii\base\NotSupportedException; |
13 | 10 | use yii\behaviors\TimestampBehavior; |
14 | 11 | use yii\caching\TagDependency; |
@@ -52,7 +52,7 @@ |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
55 | - * @param $name |
|
55 | + * @param string $name |
|
56 | 56 | */ |
57 | 57 | public function setFormName($name) |
58 | 58 | { |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\widgets\navigation\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backgroundtasks\traits\SearchModelTrait; |
6 | 7 | use app\behaviors\Tree; |
7 | 8 | use app\properties\HasProperties; |
8 | 9 | use app\traits\FindById; |
9 | 10 | use app\traits\GetImages; |
10 | -use Yii; |
|
11 | 11 | use yii\data\ActiveDataProvider; |
12 | 12 | |
13 | 13 | /** |
@@ -17,7 +17,7 @@ |
||
17 | 17 | private $baseModel = null; |
18 | 18 | private $propertyGroups = null; |
19 | 19 | /** |
20 | - * @param \yii\db\ActiveRecord $baseModel |
|
20 | + * @param \app\models\Submission $baseModel |
|
21 | 21 | * @param array $config |
22 | 22 | */ |
23 | 23 | public function __construct($baseModel, $propertyGroups, $config=[]) |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\widgets\navigation\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backgroundtasks\traits\SearchModelTrait; |
6 | 7 | use app\behaviors\Tree; |
7 | 8 | use app\properties\HasProperties; |
8 | 9 | use app\traits\FindById; |
9 | 10 | use app\traits\GetImages; |
10 | -use Yii; |
|
11 | 11 | use yii\data\ActiveDataProvider; |
12 | 12 | |
13 | 13 | /** |
@@ -44,11 +44,11 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
47 | - * @param $property |
|
47 | + * @param \app\models\Property $property |
|
48 | 48 | * @param $model |
49 | 49 | * @param $values |
50 | 50 | * @param $form |
51 | - * @param $renderType |
|
51 | + * @param string $renderType |
|
52 | 52 | * @return string |
53 | 53 | */ |
54 | 54 | public function render($property, $model, $values, $form, $renderType) |
@@ -11,8 +11,6 @@ |
||
11 | 11 | * @var $this \app\properties\handlers\Handler |
12 | 12 | * @var $values array |
13 | 13 | */ |
14 | -use vova07\imperavi\Widget as ImperaviWidget; |
|
15 | -use yii\helpers\Url; |
|
16 | 14 | |
17 | 15 | ?> |
18 | 16 | <?=$form->field($model, $property_key.'[0]')->widget( |
@@ -2,13 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\properties; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\models\Object; |
6 | 7 | use app\models\ObjectPropertyGroup; |
7 | 8 | use app\models\Property; |
8 | 9 | use app\models\PropertyGroup; |
9 | -use app\models\PropertyStaticValues; |
|
10 | 10 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
11 | -use Yii; |
|
12 | 11 | use yii\base\Widget; |
13 | 12 | use yii\caching\TagDependency; |
14 | 13 | use yii\db\ActiveRecord; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
35 | - * @param null $id |
|
35 | + * @param integer $id |
|
36 | 36 | * @return null |
37 | 37 | */ |
38 | 38 | static public function getHandlerById($id = null) |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | -use yii\helpers\Html; |
|
3 | 2 | use app\properties\HasProperties; |
3 | +use yii\helpers\Html; |
|
4 | 4 | ?> |
5 | 5 | <div id="properties-widget-<?=$widget_id?>"> |
6 | 6 | <?php |
@@ -58,6 +58,9 @@ |
||
58 | 58 | }); |
59 | 59 | } |
60 | 60 | |
61 | + /** |
|
62 | + * @param null|User $user |
|
63 | + */ |
|
61 | 64 | private function mockUser($user) |
62 | 65 | { |
63 | 66 | $loginForm = $this->getMock('app\modules\user\models\LoginForm', ['getUser']); |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace tests\unit\models; |
4 | 4 | |
5 | -use app\modules\user\models\User; |
|
6 | 5 | use Yii; |
6 | +use app\modules\user\models\User; |
|
7 | 7 | use yii\codeception\TestCase; |
8 | 8 | |
9 | 9 | class LoginFormTest extends TestCase |