@@ -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 | /** |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
89 | - * @return Order[]|null |
|
89 | + * @return \yii\db\ActiveQuery |
|
90 | 90 | */ |
91 | 91 | public function getOrders() |
92 | 92 | { |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
97 | - * @return Customer|null |
|
97 | + * @return \yii\db\ActiveQuery |
|
98 | 98 | */ |
99 | 99 | public function getCustomer() |
100 | 100 | { |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
105 | - * @return DeliveryInformation|null |
|
105 | + * @return \yii\db\ActiveQuery |
|
106 | 106 | */ |
107 | 107 | public function getDeliveryInformation() |
108 | 108 | { |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
121 | - * @return PropertyGroup|null |
|
121 | + * @return PropertyGroup |
|
122 | 122 | */ |
123 | 123 | public function getPropertyGroup() |
124 | 124 | { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | /** |
129 | 129 | * @param Customer $customer |
130 | 130 | * @param bool $dummyObject |
131 | - * @return Contragent|null |
|
131 | + * @return Contragent |
|
132 | 132 | */ |
133 | 133 | public static function createEmptyContragent(Customer $customer, $dummyObject = true) |
134 | 134 | { |
@@ -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 | /** |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
106 | - * @return Order[]|null |
|
106 | + * @return \yii\db\ActiveQuery |
|
107 | 107 | */ |
108 | 108 | public function getOrders() |
109 | 109 | { |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
114 | - * @return User|null |
|
114 | + * @return \yii\db\ActiveQuery |
|
115 | 115 | */ |
116 | 116 | public function getUser() |
117 | 117 | { |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
122 | - * @return Contragent[]|null |
|
122 | + * @return \yii\db\ActiveQuery |
|
123 | 123 | */ |
124 | 124 | public function getContragents() |
125 | 125 | { |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
130 | - * @return Contragent|null |
|
130 | + * @return \yii\db\ActiveQuery |
|
131 | 131 | */ |
132 | 132 | public function getContragent() |
133 | 133 | { |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
227 | - * @return PropertyGroup|null |
|
227 | + * @return PropertyGroup |
|
228 | 228 | */ |
229 | 229 | public function getPropertyGroup() |
230 | 230 | { |
@@ -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 | /** |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
62 | - * @return Contragent|null |
|
62 | + * @return \yii\db\ActiveQuery |
|
63 | 63 | */ |
64 | 64 | public function getContragent() |
65 | 65 | { |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
70 | - * @return Country|null |
|
70 | + * @return \yii\db\ActiveQuery |
|
71 | 71 | */ |
72 | 72 | public function getCountry() |
73 | 73 | { |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
78 | - * @return City|null |
|
78 | + * @return \yii\db\ActiveQuery |
|
79 | 79 | */ |
80 | 80 | public function getCity() |
81 | 81 | { |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | /** |
86 | 86 | * @param Contragent $contragent |
87 | - * @return DeliveryInformation|null |
|
87 | + * @return DeliveryInformation |
|
88 | 88 | */ |
89 | 89 | public static function createNewDeliveryInformation(Contragent $contragent, $dummyObject = true) |
90 | 90 | { |
@@ -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 | /** |
@@ -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 | /** |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | } |
253 | 253 | |
254 | 254 | /** |
255 | - * @return Customer|null |
|
255 | + * @return \yii\db\ActiveQuery |
|
256 | 256 | */ |
257 | 257 | public function getCustomer() |
258 | 258 | { |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | } |
296 | 296 | |
297 | 297 | /** |
298 | - * @return OrderDeliveryInformation|null |
|
298 | + * @return \yii\db\ActiveQuery |
|
299 | 299 | */ |
300 | 300 | public function getOrderDeliveryInformation() |
301 | 301 | { |
@@ -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 | /** |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | } |
98 | 98 | |
99 | 99 | /** |
100 | - * @return Order|null |
|
100 | + * @return \yii\db\ActiveQuery |
|
101 | 101 | */ |
102 | 102 | public function getOrder() |
103 | 103 | { |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
108 | - * @return ShippingOption|null |
|
108 | + * @return \yii\db\ActiveQuery |
|
109 | 109 | */ |
110 | 110 | public function getShippingOption() |
111 | 111 | { |
@@ -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 |
@@ -27,7 +27,7 @@ |
||
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
30 | - * @return User|\yii\db\ActiveQuery |
|
30 | + * @return \yii\db\ActiveQuery |
|
31 | 31 | */ |
32 | 32 | public function getUser() |
33 | 33 | { |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace app\traits; |
4 | 4 | |
5 | -use devgroup\TagDependencyHelper\ActiveRecordHelper; |
|
6 | 5 | use Yii; |
6 | +use devgroup\TagDependencyHelper\ActiveRecordHelper; |
|
7 | 7 | use yii\caching\TagDependency; |
8 | 8 | use yii\db\ActiveRecord; |
9 | 9 | use yii\web\NotFoundHttpException; |
@@ -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 |