@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | /** |
| 91 | - * @param User|self $user |
|
| 91 | + * @param User $user |
|
| 92 | 92 | * @throws Exception |
| 93 | 93 | * @throws \Exception |
| 94 | 94 | * @throws \Throwable |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | - * @param User|self $user |
|
| 121 | + * @param User $user |
|
| 122 | 122 | * @return void |
| 123 | 123 | */ |
| 124 | 124 | private function onAfterValidate(User $user) |
@@ -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\OrganizationsToUserAssociatedManager; |
| 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; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | /** |
| 142 | 142 | * Associate types to an organization |
| 143 | 143 | * |
| 144 | - * @param $types |
|
| 144 | + * @param OrganizationType[] $types |
|
| 145 | 145 | * @return $this |
| 146 | 146 | * |
| 147 | 147 | * @deprecated |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | /** |
| 224 | 224 | * Get an associated type by identifier (id/handle) |
| 225 | 225 | * |
| 226 | - * @param $identifier |
|
| 226 | + * @param integer|null $identifier |
|
| 227 | 227 | * @return null|TypeModel |
| 228 | 228 | */ |
| 229 | 229 | public function getType($identifier) |
@@ -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 | /** |
@@ -11,8 +11,8 @@ |
||
| 11 | 11 | use craft\helpers\ArrayHelper; |
| 12 | 12 | use craft\helpers\Json; |
| 13 | 13 | use flipbox\craft\ember\helpers\QueryHelper; |
| 14 | -use flipbox\organizations\elements\Organization; |
|
| 15 | 14 | use flipbox\organizations\Organizations; |
| 15 | +use flipbox\organizations\elements\Organization; |
|
| 16 | 16 | use flipbox\organizations\queries\OrganizationTypeAssociationQuery; |
| 17 | 17 | use flipbox\organizations\records\OrganizationType; |
| 18 | 18 | use flipbox\organizations\records\OrganizationTypeAssociation; |
@@ -162,7 +162,7 @@ |
||
| 162 | 162 | |
| 163 | 163 | /** |
| 164 | 164 | * @param OrganizationTypeAssociation|OrganizationType|int|array|null $type |
| 165 | - * @return OrganizationType|null |
|
| 165 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 166 | 166 | */ |
| 167 | 167 | protected function resolveType($type = null) |
| 168 | 168 | { |
@@ -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 | { |
@@ -12,8 +12,8 @@ |
||
| 12 | 12 | use craft\helpers\ArrayHelper; |
| 13 | 13 | use craft\helpers\Json; |
| 14 | 14 | use flipbox\craft\ember\helpers\QueryHelper; |
| 15 | -use flipbox\organizations\elements\Organization; |
|
| 16 | 15 | use flipbox\organizations\Organizations; |
| 16 | +use flipbox\organizations\elements\Organization; |
|
| 17 | 17 | use flipbox\organizations\queries\UserAssociationQuery; |
| 18 | 18 | use flipbox\organizations\records\UserAssociation; |
| 19 | 19 | |
@@ -12,8 +12,8 @@ |
||
| 12 | 12 | use craft\helpers\ArrayHelper; |
| 13 | 13 | use craft\helpers\Json; |
| 14 | 14 | use flipbox\craft\ember\helpers\QueryHelper; |
| 15 | -use flipbox\organizations\elements\Organization; |
|
| 16 | 15 | use flipbox\organizations\Organizations; |
| 16 | +use flipbox\organizations\elements\Organization; |
|
| 17 | 17 | use flipbox\organizations\queries\UserAssociationQuery; |
| 18 | 18 | use flipbox\organizations\records\UserAssociation; |
| 19 | 19 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | - * @param $type |
|
| 53 | + * @param \flipbox\craft\ember\records\ActiveRecord $type |
|
| 54 | 54 | * @return static |
| 55 | 55 | */ |
| 56 | 56 | public function setType($type = null) |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
| 93 | - * @return OrganizationType|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 OrganizationType|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 OrganizationType|null |
|
| 118 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
| 119 | 119 | */ |
| 120 | 120 | protected function internalResolveType($type = null) |
| 121 | 121 | { |