@@ -7,9 +7,9 @@ |
||
| 7 | 7 | use craft\events\ModelEvent; |
| 8 | 8 | use craft\helpers\ArrayHelper; |
| 9 | 9 | use flipbox\craft\ember\helpers\QueryHelper; |
| 10 | +use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 10 | 11 | use flipbox\organizations\elements\Organization; |
| 11 | 12 | use flipbox\organizations\managers\OrganizationsAssociatedToUserManager; |
| 12 | -use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 13 | 13 | use flipbox\organizations\queries\OrganizationQuery; |
| 14 | 14 | use flipbox\organizations\validators\OrganizationsValidator; |
| 15 | 15 | use yii\base\Behavior; |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | use flipbox\craft\ember\helpers\QueryHelper; |
| 14 | 14 | use flipbox\organizations\managers\OrganizationTypeAssociationManager; |
| 15 | 15 | use flipbox\organizations\queries\OrganizationTypeQuery; |
| 16 | -use flipbox\organizations\records\OrganizationType; |
|
| 17 | 16 | use flipbox\organizations\records\OrganizationType as TypeModel; |
| 18 | 17 | |
| 19 | 18 | /** |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | *******************************************/ |
| 330 | 330 | |
| 331 | 331 | /** |
| 332 | - * @param OrganizationTypeAssociation|OrganizationType|int|array $object |
|
| 332 | + * @param OrganizationType $object |
|
| 333 | 333 | * @param int|null $sortOrder |
| 334 | 334 | * @return bool |
| 335 | 335 | */ |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | *******************************************/ |
| 379 | 379 | |
| 380 | 380 | /** |
| 381 | - * @param OrganizationTypeAssociation|OrganizationType|int|array $object |
|
| 381 | + * @param OrganizationType $object |
|
| 382 | 382 | * @return bool |
| 383 | 383 | * @throws \Throwable |
| 384 | 384 | * @throws \yii\db\StaleObjectException |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | |
| 451 | 451 | /** |
| 452 | 452 | * @param OrganizationTypeAssociation|OrganizationType|int|array|null $type |
| 453 | - * @return OrganizationType|null |
|
| 453 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 454 | 454 | */ |
| 455 | 455 | protected function resolveType($type = null) |
| 456 | 456 | { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | *******************************************/ |
| 141 | 141 | |
| 142 | 142 | /** |
| 143 | - * @param $object |
|
| 143 | + * @param User $object |
|
| 144 | 144 | * @param int|null $sortOrder |
| 145 | 145 | * @return bool |
| 146 | 146 | */ |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /** |
| 167 | - * @param QueryInterface|User[] $objects |
|
| 167 | + * @param \craft\elements\db\UserQuery $objects |
|
| 168 | 168 | * @return bool |
| 169 | 169 | * @throws \Throwable |
| 170 | 170 | */ |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | *******************************************/ |
| 190 | 190 | |
| 191 | 191 | /** |
| 192 | - * @param $object |
|
| 192 | + * @param User $object |
|
| 193 | 193 | * @return bool |
| 194 | 194 | * @throws \Throwable |
| 195 | 195 | * @throws \yii\db\StaleObjectException |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | /** |
| 215 | - * @param QueryInterface|User[] $objects |
|
| 215 | + * @param \craft\elements\db\UserQuery $objects |
|
| 216 | 216 | * @return bool |
| 217 | 217 | * @throws \Throwable |
| 218 | 218 | */ |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
| 93 | - * @return UserType|null |
|
| 93 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
| 94 | 94 | */ |
| 95 | 95 | protected function resolveType() |
| 96 | 96 | { |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
| 105 | - * @return UserType|null |
|
| 105 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 106 | 106 | */ |
| 107 | 107 | private function resolveTypeFromId() |
| 108 | 108 | { |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | /** |
| 117 | 117 | * @param $type |
| 118 | - * @return UserType|null |
|
| 118 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 119 | 119 | */ |
| 120 | 120 | protected function internalResolveType($type = null) |
| 121 | 121 | { |