@@ -5,11 +5,9 @@ |
||
| 5 | 5 | use craft\elements\User; |
| 6 | 6 | use flipbox\craft\ember\helpers\QueryHelper; |
| 7 | 7 | use flipbox\organizations\elements\Organization; |
| 8 | -use flipbox\organizations\relationships\RelationshipInterface; |
|
| 9 | -use flipbox\organizations\relationships\UserTypeRelationship; |
|
| 10 | 8 | use flipbox\organizations\queries\UserTypeQuery; |
| 11 | 9 | use flipbox\organizations\records\UserType; |
| 12 | -use Tightenco\Collect\Support\Collection; |
|
| 10 | +use flipbox\organizations\relationships\RelationshipInterface; |
|
| 13 | 11 | use yii\base\Behavior; |
| 14 | 12 | use yii\base\Exception; |
| 15 | 13 | |
@@ -12,8 +12,8 @@ |
||
| 12 | 12 | use craft\elements\User; |
| 13 | 13 | use craft\events\SetElementTableAttributeHtmlEvent; |
| 14 | 14 | use craft\helpers\Html; |
| 15 | -use flipbox\organizations\behaviors\OrganizationsAssociatedToUserBehavior; |
|
| 16 | 15 | use flipbox\organizations\Organizations; |
| 16 | +use flipbox\organizations\behaviors\OrganizationsAssociatedToUserBehavior; |
|
| 17 | 17 | use flipbox\organizations\records\UserAssociation; |
| 18 | 18 | use flipbox\organizations\records\UserType; |
| 19 | 19 | |
@@ -9,10 +9,10 @@ |
||
| 9 | 9 | namespace flipbox\organizations\relationships; |
| 10 | 10 | |
| 11 | 11 | use Craft; |
| 12 | +use Tightenco\Collect\Support\Collection; |
|
| 12 | 13 | use craft\base\ElementInterface; |
| 13 | 14 | use craft\helpers\ArrayHelper; |
| 14 | 15 | use flipbox\organizations\records\UserAssociation; |
| 15 | -use Tightenco\Collect\Support\Collection; |
|
| 16 | 16 | use yii\base\Exception; |
| 17 | 17 | use yii\db\ActiveRecord; |
| 18 | 18 | use yii\db\QueryInterface; |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | * |
| 146 | 146 | * @param $objects |
| 147 | 147 | * @param array $attributes |
| 148 | - * @return RelationshipInterface |
|
| 148 | + * @return RelationshipTrait |
|
| 149 | 149 | */ |
| 150 | 150 | public function add($objects, array $attributes = []): RelationshipInterface |
| 151 | 151 | { |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | /** |
| 160 | 160 | * @param $object |
| 161 | 161 | * @param array $attributes |
| 162 | - * @return RelationshipInterface |
|
| 162 | + * @return RelationshipTrait |
|
| 163 | 163 | */ |
| 164 | 164 | protected function addOne($object, array $attributes = []): RelationshipInterface |
| 165 | 165 | { |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | |
| 196 | 196 | /** |
| 197 | 197 | * @param $objects |
| 198 | - * @return RelationshipInterface |
|
| 198 | + * @return RelationshipTrait |
|
| 199 | 199 | */ |
| 200 | 200 | public function remove($objects): RelationshipInterface |
| 201 | 201 | { |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | /** |
| 217 | 217 | * Reset associations |
| 218 | - * @return RelationshipInterface |
|
| 218 | + * @return RelationshipTrait |
|
| 219 | 219 | */ |
| 220 | 220 | public function reset(): RelationshipInterface |
| 221 | 221 | { |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | |
| 227 | 227 | /** |
| 228 | 228 | * Reset associations |
| 229 | - * @return RelationshipInterface |
|
| 229 | + * @return RelationshipTrait |
|
| 230 | 230 | */ |
| 231 | 231 | public function clear(): RelationshipInterface |
| 232 | 232 | { |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | * Update a relation that's already association. |
| 335 | 335 | * |
| 336 | 336 | * @param Collection $collection |
| 337 | - * @param $association |
|
| 337 | + * @param ActiveRecord $association |
|
| 338 | 338 | */ |
| 339 | 339 | protected function updateCollection(Collection $collection, $association) |
| 340 | 340 | { |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | - * @return OrganizationType|null |
|
| 81 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
| 82 | 82 | */ |
| 83 | 83 | public function getType() |
| 84 | 84 | { |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | - * @return OrganizationType|null |
|
| 101 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
| 102 | 102 | */ |
| 103 | 103 | protected function resolveType() |
| 104 | 104 | { |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
| 113 | - * @return OrganizationType|null |
|
| 113 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 114 | 114 | */ |
| 115 | 115 | private function resolveTypeFromId() |
| 116 | 116 | { |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | /** |
| 125 | 125 | * @param $type |
| 126 | - * @return OrganizationType|null |
|
| 126 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 127 | 127 | */ |
| 128 | 128 | protected function internalResolveType($type = null) |
| 129 | 129 | { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | - * @return UserType|null |
|
| 80 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
| 81 | 81 | */ |
| 82 | 82 | public function getType() |
| 83 | 83 | { |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | /** |
| 100 | - * @return UserType|null |
|
| 100 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
| 101 | 101 | */ |
| 102 | 102 | protected function resolveType() |
| 103 | 103 | { |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
| 112 | - * @return UserType|null |
|
| 112 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 113 | 113 | */ |
| 114 | 114 | private function resolveTypeFromId() |
| 115 | 115 | { |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | |
| 123 | 123 | /** |
| 124 | 124 | * @param $type |
| 125 | - * @return UserType|null |
|
| 125 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 126 | 126 | */ |
| 127 | 127 | protected function internalResolveType($type = null) |
| 128 | 128 | { |
@@ -227,8 +227,8 @@ |
||
| 227 | 227 | *******************************************/ |
| 228 | 228 | |
| 229 | 229 | /** |
| 230 | - * @param UserAssociation|Organization|int|array|null $object |
|
| 231 | - * @return int|null |
|
| 230 | + * @param UserAssociation $object |
|
| 231 | + * @return string |
|
| 232 | 232 | */ |
| 233 | 233 | protected function findKey($object = null) |
| 234 | 234 | { |
@@ -8,16 +8,14 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\organizations\relationships; |
| 10 | 10 | |
| 11 | +use Tightenco\Collect\Support\Collection; |
|
| 11 | 12 | use craft\elements\User; |
| 12 | 13 | use craft\helpers\ArrayHelper; |
| 13 | -use craft\helpers\Json; |
|
| 14 | -use flipbox\craft\ember\helpers\QueryHelper; |
|
| 15 | -use flipbox\organizations\elements\Organization; |
|
| 16 | 14 | use flipbox\organizations\Organizations; |
| 15 | +use flipbox\organizations\elements\Organization; |
|
| 17 | 16 | use flipbox\organizations\queries\OrganizationQuery; |
| 18 | 17 | use flipbox\organizations\queries\UserAssociationQuery; |
| 19 | 18 | use flipbox\organizations\records\UserAssociation; |
| 20 | -use Tightenco\Collect\Support\Collection; |
|
| 21 | 19 | |
| 22 | 20 | /** |
| 23 | 21 | * Manages Organizations associated to Users |
@@ -179,8 +179,8 @@ discard block |
||
| 179 | 179 | *******************************************/ |
| 180 | 180 | |
| 181 | 181 | /** |
| 182 | - * @param OrganizationTypeAssociation|OrganizationType|int|array|null $object |
|
| 183 | - * @return int|null |
|
| 182 | + * @param OrganizationTypeAssociation $object |
|
| 183 | + * @return string |
|
| 184 | 184 | */ |
| 185 | 185 | protected function findKey($object = null) |
| 186 | 186 | { |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | |
| 214 | 214 | /** |
| 215 | 215 | * @param OrganizationTypeAssociation|OrganizationType|int|array $type |
| 216 | - * @return OrganizationType|null |
|
| 216 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
| 217 | 217 | */ |
| 218 | 218 | protected function resolveObjectInternal($type) |
| 219 | 219 | { |
@@ -8,16 +8,13 @@ |
||
| 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\elements\Organization; |
|
| 15 | 13 | use flipbox\organizations\Organizations; |
| 14 | +use flipbox\organizations\elements\Organization; |
|
| 16 | 15 | use flipbox\organizations\queries\OrganizationTypeAssociationQuery; |
| 17 | 16 | use flipbox\organizations\records\OrganizationType; |
| 18 | 17 | use flipbox\organizations\records\OrganizationTypeAssociation; |
| 19 | -use flipbox\organizations\records\UserAssociation; |
|
| 20 | -use Tightenco\Collect\Support\Collection; |
|
| 21 | 18 | |
| 22 | 19 | /** |
| 23 | 20 | * Manages Organization Types associated to Organizations |
@@ -219,8 +219,8 @@ |
||
| 219 | 219 | *******************************************/ |
| 220 | 220 | |
| 221 | 221 | /** |
| 222 | - * @param UserAssociation|User|int|array|null $object |
|
| 223 | - * @return int|null |
|
| 222 | + * @param UserAssociation $object |
|
| 223 | + * @return string |
|
| 224 | 224 | */ |
| 225 | 225 | protected function findKey($object = null) |
| 226 | 226 | { |
@@ -8,13 +8,13 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\organizations\relationships; |
| 10 | 10 | |
| 11 | -use craft\elements\db\UserQuery; |
|
| 11 | +use Tightenco\Collect\Support\Collection; |
|
| 12 | 12 | use craft\elements\User; |
| 13 | +use craft\elements\db\UserQuery; |
|
| 13 | 14 | use craft\helpers\ArrayHelper; |
| 14 | 15 | use flipbox\organizations\elements\Organization; |
| 15 | 16 | use flipbox\organizations\queries\UserAssociationQuery; |
| 16 | 17 | use flipbox\organizations\records\UserAssociation; |
| 17 | -use Tightenco\Collect\Support\Collection; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * Manages Users associated to Organizations |
@@ -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 |