@@ -9,7 +9,6 @@ |
||
| 9 | 9 | namespace flipbox\organizations\actions\organizations; |
| 10 | 10 | |
| 11 | 11 | use flipbox\craft\ember\actions\elements\DeleteElement; |
| 12 | -use flipbox\organizations\elements\Organization; |
|
| 13 | 12 | use flipbox\organizations\elements\Organization as OrganizationElement; |
| 14 | 13 | |
| 15 | 14 | /** |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | namespace flipbox\organizations\actions\organizations; |
| 10 | 10 | |
| 11 | 11 | use flipbox\craft\ember\actions\elements\ViewElement; |
| 12 | -use flipbox\organizations\elements\Organization; |
|
| 13 | 12 | use flipbox\organizations\elements\Organization as OrganizationElement; |
| 14 | 13 | |
| 15 | 14 | /** |
@@ -26,7 +26,6 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * @inheritdoc |
| 29 | - * @param UserAssociation $record |
|
| 30 | 29 | * @return bool |
| 31 | 30 | */ |
| 32 | 31 | abstract protected function performAction(User $user, Organization $organization, int $sortOrder = null): bool; |
@@ -62,7 +61,7 @@ discard block |
||
| 62 | 61 | } |
| 63 | 62 | |
| 64 | 63 | /** |
| 65 | - * @param string|int $identifier |
|
| 64 | + * @param string $identifier |
|
| 66 | 65 | * @return User|null |
| 67 | 66 | */ |
| 68 | 67 | protected function findUser($identifier) |
@@ -10,10 +10,10 @@ |
||
| 10 | 10 | |
| 11 | 11 | use Craft; |
| 12 | 12 | use flipbox\craft\ember\actions\models\CreateModel; |
| 13 | +use flipbox\organizations\Organizations; |
|
| 13 | 14 | use flipbox\organizations\cp\actions\general\traits\SiteSettingAttributesTrait; |
| 14 | 15 | use flipbox\organizations\models\Settings; |
| 15 | 16 | use flipbox\organizations\models\SiteSettings; |
| 16 | -use flipbox\organizations\Organizations; |
|
| 17 | 17 | use yii\base\Model; |
| 18 | 18 | use yii\web\HttpException; |
| 19 | 19 | |
@@ -13,9 +13,8 @@ |
||
| 13 | 13 | use flipbox\craft\ember\actions\LookupTrait; |
| 14 | 14 | use flipbox\craft\ember\actions\PopulateTrait; |
| 15 | 15 | use flipbox\organizations\actions\organizations\PopulateOrganizationTrait; |
| 16 | -use flipbox\organizations\cp\controllers\OrganizationTabsTrait; |
|
| 17 | 16 | use flipbox\organizations\cp\controllers\OrganizationSitesTrait; |
| 18 | -use flipbox\organizations\elements\Organization; |
|
| 17 | +use flipbox\organizations\cp\controllers\OrganizationTabsTrait; |
|
| 19 | 18 | use flipbox\organizations\elements\Organization as OrganizationElement; |
| 20 | 19 | use yii\base\Action; |
| 21 | 20 | |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | 47 | * @inheritdoc |
| 48 | - * @return OrganizationType|null |
|
| 48 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
| 49 | 49 | */ |
| 50 | 50 | protected function find($identifier) |
| 51 | 51 | { |
@@ -10,21 +10,20 @@ |
||
| 10 | 10 | |
| 11 | 11 | use Craft; |
| 12 | 12 | use craft\base\Element; |
| 13 | +use craft\elements\User; |
|
| 13 | 14 | use craft\elements\actions\Edit as EditAction; |
| 14 | 15 | use craft\elements\actions\SetStatus; |
| 15 | 16 | use craft\elements\db\ElementQueryInterface; |
| 16 | -use craft\elements\User; |
|
| 17 | 17 | use craft\helpers\DateTimeHelper; |
| 18 | 18 | use craft\helpers\Json; |
| 19 | 19 | use craft\helpers\StringHelper; |
| 20 | 20 | use craft\helpers\UrlHelper as UrlHelper; |
| 21 | 21 | use flipbox\craft\ember\elements\ExplicitElementTrait; |
| 22 | 22 | use flipbox\craft\ember\helpers\ModelHelper; |
| 23 | -use flipbox\organizations\models\DateJoinedAttributeTrait; |
|
| 24 | 23 | use flipbox\organizations\Organizations as OrganizationPlugin; |
| 24 | +use flipbox\organizations\models\DateJoinedAttributeTrait; |
|
| 25 | 25 | use flipbox\organizations\queries\OrganizationQuery; |
| 26 | 26 | use flipbox\organizations\records\Organization as OrganizationRecord; |
| 27 | -use flipbox\organizations\records\OrganizationType; |
|
| 28 | 27 | use flipbox\organizations\records\OrganizationType as TypeModel; |
| 29 | 28 | use yii\base\ErrorException as Exception; |
| 30 | 29 | |
@@ -8,8 +8,8 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\organizations\objects; |
| 10 | 10 | |
| 11 | -use craft\helpers\DateTimeHelper; |
|
| 12 | 11 | use DateTime; |
| 12 | +use craft\helpers\DateTimeHelper; |
|
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * @property DateTime|null $dateJoined |
@@ -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) |
@@ -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) |
@@ -5,14 +5,11 @@ |
||
| 5 | 5 | use Craft; |
| 6 | 6 | use craft\elements\User; |
| 7 | 7 | use craft\events\ModelEvent; |
| 8 | -use flipbox\craft\ember\helpers\QueryHelper; |
|
| 8 | +use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 9 | 9 | use flipbox\organizations\elements\Organization; |
| 10 | -use flipbox\organizations\relationships\RelationshipInterface; |
|
| 11 | 10 | use flipbox\organizations\relationships\OrganizationRelationship; |
| 12 | -use flipbox\organizations\Organizations as OrganizationPlugin; |
|
| 13 | -use flipbox\organizations\queries\OrganizationQuery; |
|
| 11 | +use flipbox\organizations\relationships\RelationshipInterface; |
|
| 14 | 12 | use flipbox\organizations\validators\OrganizationsValidator; |
| 15 | -use Tightenco\Collect\Support\Collection; |
|
| 16 | 13 | use yii\base\Behavior; |
| 17 | 14 | use yii\base\Event; |
| 18 | 15 | use yii\base\Exception; |