-
Notifications
You must be signed in to change notification settings - Fork 56
fix: replace circle/circles text with team/teams #2226
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,11 +47,11 @@ public function __construct( | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:manage:config') | ||
| ->setDescription('edit config/type of a Circle') | ||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') | ||
| ->setDescription('edit config/type of a Team') | ||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the team') | ||
| ->addArgument( | ||
| 'config', InputArgument::IS_ARRAY, | ||
| 'list of value to change in the configuration of the Circle' | ||
| 'list of value to change in the configuration of the Team' | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ) | ||
| ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') | ||
| ->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0') | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,8 +43,8 @@ public function __construct( | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:manage:edit') | ||
| ->setDescription('edit displayName or description of a Circle') | ||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') | ||
| ->setDescription('edit displayName or description of a Team') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the team') | ||
| ->addArgument('edit', InputArgument::REQUIRED, 'displayName or description') | ||
| ->addArgument('value', InputArgument::REQUIRED, 'new value') | ||
| ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,8 +66,8 @@ public function __construct( | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:manage:leave') | ||
| ->setDescription('simulate a user joining a Circle') | ||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') | ||
| ->setDescription('simulate a user joining a Team') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the team') | ||
| ->addArgument('initiator', InputArgument::REQUIRED, 'initiator to the request') | ||
| ->addOption('type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0') | ||
| ->addOption('status-code', '', InputOption::VALUE_NONE, 'display status code on exception'); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,19 +101,19 @@ public function __construct( | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:manage:list') | ||
| ->setDescription('listing current circles') | ||
| ->addOption('instance', '', InputOption::VALUE_REQUIRED, 'Instance of the circle', '') | ||
| ->setDescription('listing current teams') | ||
| ->addOption('instance', '', InputOption::VALUE_REQUIRED, 'Instance of the team', '') | ||
| ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') | ||
| ->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0') | ||
| ->addOption('member', '', InputOption::VALUE_REQUIRED, 'search for member', '') | ||
| ->addOption('def', '', InputOption::VALUE_NONE, 'display complete circle configuration') | ||
| ->addOption('def', '', InputOption::VALUE_NONE, 'display complete team configuration') | ||
| ->addOption('display-name', '', InputOption::VALUE_NONE, 'display the displayName') | ||
| ->addOption('personal', '', InputOption::VALUE_NONE, 'include Personal Circles') | ||
| ->addOption('system', '', InputOption::VALUE_NONE, 'include System Circles') | ||
| ->addOption('hidden', '', InputOption::VALUE_NONE, 'include Hidden Circles') | ||
| ->addOption('backend', '', InputOption::VALUE_NONE, 'include Backend Circles') | ||
| ->addOption('single', '', InputOption::VALUE_NONE, 'returns only Single Circles') | ||
| ->addOption('all', '', InputOption::VALUE_NONE, 'include all Circles'); | ||
| ->addOption('personal', '', InputOption::VALUE_NONE, 'include Personal Teams') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ->addOption('system', '', InputOption::VALUE_NONE, 'include System Teams') | ||
| ->addOption('hidden', '', InputOption::VALUE_NONE, 'include Hidden Teams') | ||
| ->addOption('backend', '', InputOption::VALUE_NONE, 'include Backend Teams') | ||
| ->addOption('single', '', InputOption::VALUE_NONE, 'returns only Single Teams') | ||
| ->addOption('all', '', InputOption::VALUE_NONE, 'include all Teams'); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,8 +52,8 @@ public function __construct( | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:manage:setting') | ||
| ->setDescription('edit setting for a Circle') | ||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') | ||
| ->setDescription('edit setting for a Team') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the team') | ||
| ->addArgument('setting', InputArgument::OPTIONAL, 'setting to edit', '') | ||
| ->addArgument('value', InputArgument::OPTIONAL, 'value', '') | ||
| ->addOption('unset', '', InputOption::VALUE_NONE, 'unset the setting') | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,8 +70,8 @@ public function __construct( | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:members:add') | ||
| ->setDescription('Add a member to a Circle') | ||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') | ||
| ->setDescription('Add a member to a Team') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the team') | ||
| ->addArgument('user', InputArgument::REQUIRED, 'username of the member') | ||
| ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') | ||
| ->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0') | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,9 +76,9 @@ public function __construct( | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:members:level') | ||
| ->setDescription('Change the level of a member from a Circle') | ||
| ->addArgument('member_id', InputArgument::REQUIRED, 'ID of the member from the Circle') | ||
| ->addOption('circle', '', InputOption::VALUE_REQUIRED, 'ID of the circle', '') | ||
| ->setDescription('Change the level of a member from a Team') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ->addArgument('member_id', InputArgument::REQUIRED, 'ID of the member from the Team') | ||
| ->addOption('circle', '', InputOption::VALUE_REQUIRED, 'ID of the team', '') | ||
| ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') | ||
| ->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0') | ||
| ->addOption('status-code', '', InputOption::VALUE_NONE, 'display status code on exception') | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,9 +117,9 @@ public function __construct( | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:members:list') | ||
| ->setDescription('listing Members from a Circle') | ||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') | ||
| ->addOption('instance', '', InputOption::VALUE_REQUIRED, 'Instance of the circle', '') | ||
| ->setDescription('listing Members from a Team') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the team') | ||
| ->addOption('instance', '', InputOption::VALUE_REQUIRED, 'Instance of the team', '') | ||
| ->addOption('inherited', '', InputOption::VALUE_NONE, 'Display all inherited members') | ||
| ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') | ||
| ->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0') | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,7 +53,7 @@ public function __construct(SearchService $searchService, ConfigService $configS | |
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:members:search') | ||
| ->setDescription('Change the level of a member from a Circle') | ||
| ->setDescription('Change the level of a member from a Team') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| ->addArgument('term', InputArgument::REQUIRED, 'term to search') | ||
| ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') | ||
| ->addOption('status-code', '', InputOption::VALUE_NONE, 'display status code on exception'); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -371,7 +371,7 @@ public function toMount(): array { | |
| */ | ||
| public function fromShare(ShareWrapper $wrappedShare) { | ||
| if (!$wrappedShare->hasCircle()) { | ||
| throw new CircleNotFoundException('ShareWrapper has no Circle'); | ||
| throw new CircleNotFoundException('ShareWrapper has no Team'); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| } | ||
|
|
||
| $circle = $wrappedShare->getCircle(); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,7 +127,7 @@ public function requestedEvent(FederatedEvent $event): void { | |
| if ($event->isLimitedToInstanceWithMember()) { | ||
| $instances = $this->memberRequest->getMemberInstances($event->getCircle()->getSingleId()); | ||
| if (!in_array($event->getSender(), $instances)) { | ||
| throw new FederatedEventException('Instance have no members in this Circle'); | ||
| throw new FederatedEventException('Instance have no members in this Team'); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| } | ||
| } | ||
|
|
||
|
|
@@ -202,7 +202,7 @@ private function confirmCircle(FederatedEvent $event): void { | |
| return; | ||
| } | ||
|
|
||
| throw new FederatedEventDSyncException('Could not verify Circle'); | ||
| throw new FederatedEventDSyncException('Could not verify Team'); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| } | ||
|
|
||
| /** | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,10 +26,10 @@ class StatusCode { | |
| ]; | ||
|
|
||
| public static $CIRCLE_JOIN = [ | ||
| 121 => 'Circle is full', | ||
| 121 => 'Team is full', | ||
| 122 => 'You are already a member', | ||
| 123 => 'Already requesting to join the circle', | ||
| 124 => 'Circle is closed' | ||
| 123 => 'Already requesting to join the team', | ||
| 124 => 'Team is closed' | ||
| ]; | ||
|
|
||
| public static $CIRCLE_LEAVE = [ | ||
|
|
@@ -39,22 +39,22 @@ class StatusCode { | |
|
|
||
| public static $MEMBER_ADD = [ | ||
| 120 => 'Unknown entity', | ||
| 121 => 'Circle is full', | ||
| 122 => 'Already member of the circle', | ||
| 123 => 'Already invited into the circle', | ||
| 121 => 'Team is full', | ||
| 122 => 'Already member of the team', | ||
| 123 => 'Already invited into the team', | ||
| 124 => 'Member is blocked', | ||
| 125 => 'The designed circle cannot be added', | ||
| 126 => 'Circle only accepts local users', | ||
| 127 => 'Remote Users are not accepted in a non-federated Circle', | ||
| 128 => 'Cannot add Circle as its own Member', | ||
| 125 => 'The designed team cannot be added', | ||
| 126 => 'Team only accepts local users', | ||
| 127 => 'Remote Users are not accepted in a non-federated Team', | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| 128 => 'Cannot add Team as its own Member', | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| 129 => 'Member does not contains a patron', | ||
| 130 => 'Member is invited by an entity that does not belongs to the instance at the origin of the request', | ||
| 131 => 'Member is a non-local Circle', | ||
| 131 => 'Member is a non-local Team', | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Team -> team |
||
| 132 => 'Member type not allowed' | ||
| ]; | ||
|
|
||
| public static $CIRCLE_DESTROY = [ | ||
| 120 => 'Circle is managed from an other app' | ||
| 120 => 'Team is managed from an other app' | ||
| ]; | ||
|
|
||
| public static $MEMBER_LEVEL = [ | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Team -> team