@@ -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 | { |
@@ -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 | { |
@@ -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\UserType; |
| 18 | 18 | |
| 19 | 19 | /** |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | /** |
| 23 | 23 | * @noinspection PhpDocMissingThrowsInspection |
| 24 | 24 | * |
| 25 | - * @param $value |
|
| 25 | + * @param DateTime $value |
|
| 26 | 26 | * @return $this |
| 27 | 27 | */ |
| 28 | 28 | public function setDateJoined($value) |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | /** |
| 39 | 39 | * Validates a single attribute. |
| 40 | 40 | * Child classes must implement this method to provide the actual validation logic. |
| 41 | - * @param Model|OrganizationsAssociatedToUserBehavior $model the data model to be validated |
|
| 41 | + * @param \craft\elements\User $model the data model to be validated |
|
| 42 | 42 | * @param string $attribute the name of the attribute to be validated. |
| 43 | 43 | */ |
| 44 | 44 | public function validateAttribute($model, $attribute) |
@@ -9,8 +9,8 @@ |
||
| 9 | 9 | namespace flipbox\organizations\validators; |
| 10 | 10 | |
| 11 | 11 | use craft\helpers\Json; |
| 12 | -use flipbox\organizations\behaviors\OrganizationsAssociatedToUserBehavior; |
|
| 13 | 12 | use flipbox\organizations\Organizations as OrganizationPlugin; |
| 13 | +use flipbox\organizations\behaviors\OrganizationsAssociatedToUserBehavior; |
|
| 14 | 14 | use yii\base\Model; |
| 15 | 15 | use yii\validators\Validator; |
| 16 | 16 | |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | public $id; |
| 62 | 62 | |
| 63 | 63 | /** |
| 64 | - * @param $value |
|
| 64 | + * @param \Tightenco\Collect\Support\Collection $value |
|
| 65 | 65 | * @return $this |
| 66 | 66 | */ |
| 67 | 67 | public function id($value) |
@@ -3,16 +3,16 @@ |
||
| 3 | 3 | namespace flipbox\organizations\behaviors; |
| 4 | 4 | |
| 5 | 5 | use Craft; |
| 6 | +use Tightenco\Collect\Support\Collection; |
|
| 6 | 7 | use craft\elements\User; |
| 7 | 8 | use craft\events\ModelEvent; |
| 8 | 9 | use flipbox\craft\ember\helpers\QueryHelper; |
| 10 | +use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 9 | 11 | use flipbox\organizations\elements\Organization; |
| 10 | -use flipbox\organizations\managers\RelationshipManagerInterface; |
|
| 11 | 12 | use flipbox\organizations\managers\OrganizationRelationshipManager; |
| 12 | -use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 13 | +use flipbox\organizations\managers\RelationshipManagerInterface; |
|
| 13 | 14 | use flipbox\organizations\queries\OrganizationQuery; |
| 14 | 15 | use flipbox\organizations\validators\OrganizationsValidator; |
| 15 | -use Tightenco\Collect\Support\Collection; |
|
| 16 | 16 | use yii\base\Behavior; |
| 17 | 17 | use yii\base\Event; |
| 18 | 18 | use yii\base\Exception; |
@@ -2,13 +2,13 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace flipbox\organizations\behaviors; |
| 4 | 4 | |
| 5 | +use Tightenco\Collect\Support\Collection; |
|
| 5 | 6 | use craft\elements\User; |
| 6 | 7 | use flipbox\craft\ember\helpers\QueryHelper; |
| 7 | 8 | use flipbox\organizations\elements\Organization; |
| 8 | 9 | use flipbox\organizations\managers\RelationshipManagerInterface; |
| 9 | 10 | use flipbox\organizations\queries\UserTypeQuery; |
| 10 | 11 | use flipbox\organizations\records\UserType; |
| 11 | -use Tightenco\Collect\Support\Collection; |
|
| 12 | 12 | use yii\base\Behavior; |
| 13 | 13 | use yii\base\Exception; |
| 14 | 14 | |
@@ -9,12 +9,12 @@ |
||
| 9 | 9 | namespace flipbox\organizations\elements; |
| 10 | 10 | |
| 11 | 11 | use Craft; |
| 12 | +use Tightenco\Collect\Support\Collection; |
|
| 12 | 13 | use flipbox\craft\ember\helpers\QueryHelper; |
| 13 | -use flipbox\organizations\managers\RelationshipManagerInterface; |
|
| 14 | 14 | use flipbox\organizations\managers\OrganizationTypeRelationshipManager; |
| 15 | +use flipbox\organizations\managers\RelationshipManagerInterface; |
|
| 15 | 16 | use flipbox\organizations\queries\OrganizationTypeQuery; |
| 16 | 17 | use flipbox\organizations\records\OrganizationType; |
| 17 | -use Tightenco\Collect\Support\Collection; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * @author Flipbox Factory <[email protected]> |