@@ -280,8 +280,8 @@ discard block |
||
280 | 280 | } |
281 | 281 | |
282 | 282 | /** |
283 | - * @param UserTypeAssociation|UserType|int|array|null $object |
|
284 | - * @return int|null |
|
283 | + * @param UserAssociation $object |
|
284 | + * @return string |
|
285 | 285 | */ |
286 | 286 | protected function findKey($object = null) |
287 | 287 | { |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | |
315 | 315 | /** |
316 | 316 | * @param UserTypeAssociation|UserType|int|array|null $type |
317 | - * @return UserType|null |
|
317 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
318 | 318 | */ |
319 | 319 | protected function resolveObjectInternal($type) |
320 | 320 | { |
@@ -8,17 +8,12 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\organizations\relationships; |
10 | 10 | |
11 | +use Tightenco\Collect\Support\Collection; |
|
11 | 12 | use craft\helpers\ArrayHelper; |
12 | -use craft\helpers\Json; |
|
13 | -use flipbox\craft\ember\helpers\QueryHelper; |
|
14 | -use flipbox\organizations\Organizations; |
|
15 | 13 | use flipbox\organizations\queries\UserTypeAssociationQuery; |
16 | -use flipbox\organizations\records\OrganizationType; |
|
17 | -use flipbox\organizations\records\OrganizationTypeAssociation; |
|
18 | 14 | use flipbox\organizations\records\UserAssociation; |
19 | 15 | use flipbox\organizations\records\UserType; |
20 | 16 | use flipbox\organizations\records\UserTypeAssociation; |
21 | -use Tightenco\Collect\Support\Collection; |
|
22 | 17 | |
23 | 18 | /** |
24 | 19 | * Manages User Types associated to Organization/User associations |