From d657a80154c6d2c10a1af8dfbff6a0a894e0600e Mon Sep 17 00:00:00 2001 From: yemkareems Date: Wed, 19 Nov 2025 16:00:12 +0530 Subject: [PATCH] fix: replace circle/circles text with team/teams Signed-off-by: yemkareems --- lib/Command/CirclesConfig.php | 6 +++--- lib/Command/CirclesCreate.php | 10 +++++----- lib/Command/CirclesDetails.php | 6 +++--- lib/Command/CirclesEdit.php | 4 ++-- lib/Command/CirclesJoin.php | 4 ++-- lib/Command/CirclesLeave.php | 4 ++-- lib/Command/CirclesList.php | 18 +++++++++--------- lib/Command/CirclesSetting.php | 4 ++-- lib/Command/CirclesTest.php | 6 +++--- lib/Command/MembersAdd.php | 4 ++-- lib/Command/MembersLevel.php | 6 +++--- lib/Command/MembersList.php | 6 +++--- lib/Command/MembersRemove.php | 4 ++-- lib/Command/MembersSearch.php | 2 +- lib/Command/MigrateCustomGroups.php | 2 +- lib/Model/DeprecatedCircle.php | 2 +- lib/Model/DeprecatedMember.php | 8 ++++---- lib/Model/Mount.php | 2 +- lib/Service/FederatedEventService.php | 2 +- lib/Service/RemoteDownstreamService.php | 4 ++-- lib/StatusCode.php | 24 ++++++++++++------------ 21 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lib/Command/CirclesConfig.php b/lib/Command/CirclesConfig.php index a0024ec04..04e629964 100644 --- a/lib/Command/CirclesConfig.php +++ b/lib/Command/CirclesConfig.php @@ -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' ) ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') ->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0') diff --git a/lib/Command/CirclesCreate.php b/lib/Command/CirclesCreate.php index 3f591368b..3f8b4ae15 100644 --- a/lib/Command/CirclesCreate.php +++ b/lib/Command/CirclesCreate.php @@ -61,11 +61,11 @@ public function __construct( protected function configure() { parent::configure(); $this->setName('circles:manage:create') - ->setDescription('create a new circle') - ->addArgument('owner', InputArgument::REQUIRED, 'owner of the circle') - ->addArgument('name', InputArgument::REQUIRED, 'name of the circle') - ->addOption('personal', '', InputOption::VALUE_NONE, 'create a personal circle') - ->addOption('local', '', InputOption::VALUE_NONE, 'create a local circle') + ->setDescription('create a new team') + ->addArgument('owner', InputArgument::REQUIRED, 'owner of the team') + ->addArgument('name', InputArgument::REQUIRED, 'name of the team') + ->addOption('personal', '', InputOption::VALUE_NONE, 'create a personal team') + ->addOption('local', '', InputOption::VALUE_NONE, 'create a local team') ->addOption('status-code', '', InputOption::VALUE_NONE, 'display status code on exception') ->addOption( 'type', '', InputOption::VALUE_REQUIRED, 'type of the owner', diff --git a/lib/Command/CirclesDetails.php b/lib/Command/CirclesDetails.php index 2aec229b8..7952f7671 100644 --- a/lib/Command/CirclesDetails.php +++ b/lib/Command/CirclesDetails.php @@ -90,9 +90,9 @@ public function __construct( protected function configure() { parent::configure(); $this->setName('circles:manage:details') - ->setDescription('get details about a circle by its ID') - ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') - ->addOption('instance', '', InputOption::VALUE_REQUIRED, 'Instance of the circle', '') + ->setDescription('get details about a team by its ID') + ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the team') + ->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('status-code', '', InputOption::VALUE_NONE, 'display status code on exception'); diff --git a/lib/Command/CirclesEdit.php b/lib/Command/CirclesEdit.php index c3a391fd4..9aec390d0 100644 --- a/lib/Command/CirclesEdit.php +++ b/lib/Command/CirclesEdit.php @@ -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') + ->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', '') diff --git a/lib/Command/CirclesJoin.php b/lib/Command/CirclesJoin.php index d28855f4b..428285ead 100644 --- a/lib/Command/CirclesJoin.php +++ b/lib/Command/CirclesJoin.php @@ -73,8 +73,8 @@ public function __construct( protected function configure() { parent::configure(); $this->setName('circles:manage:join') - ->setDescription('emulate a user joining a Circle') - ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') + ->setDescription('emulate a user joining a Team') + ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the team') ->addArgument('initiator', InputArgument::REQUIRED, 'initiator to the request') ->addOption('type', '', InputOption::VALUE_REQUIRED, 'type of the initiator', '0') ->addOption('status-code', '', InputOption::VALUE_NONE, 'display status code on exception'); diff --git a/lib/Command/CirclesLeave.php b/lib/Command/CirclesLeave.php index 31f6d9b89..10be64b6d 100644 --- a/lib/Command/CirclesLeave.php +++ b/lib/Command/CirclesLeave.php @@ -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') + ->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'); diff --git a/lib/Command/CirclesList.php b/lib/Command/CirclesList.php index 874a017ab..2824aef70 100644 --- a/lib/Command/CirclesList.php +++ b/lib/Command/CirclesList.php @@ -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') + ->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'); } diff --git a/lib/Command/CirclesSetting.php b/lib/Command/CirclesSetting.php index 5786c4b97..6821981d2 100644 --- a/lib/Command/CirclesSetting.php +++ b/lib/Command/CirclesSetting.php @@ -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') + ->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') diff --git a/lib/Command/CirclesTest.php b/lib/Command/CirclesTest.php index 567466170..80941f779 100644 --- a/lib/Command/CirclesTest.php +++ b/lib/Command/CirclesTest.php @@ -373,7 +373,7 @@ private function testCirclesApp() { $this->t('Building Local Database'); $this->buildingLocalDatabase(); - $this->t('Testing Basic Circle Creation'); + $this->t('Testing Basic Team Creation'); $this->circleCreation001(); $this->t('Adding local users and moderators'); @@ -714,7 +714,7 @@ private function buildingLocalDatabase() { * @throws ItemNotFoundException */ private function circleCreation001() { - $this->p('Creating basic circle'); + $this->p('Creating basic team'); $localInstanceId = 'global-scale-1'; $name = self::$TEST_CIRCLES[0]; @@ -1085,7 +1085,7 @@ private function getSingleCircleForMember(array $circles, string $userId, string } } - throw new CircleNotFoundException('cannot find ' . $userId . ' in the list of Single Circle'); + throw new CircleNotFoundException('cannot find ' . $userId . ' in the list of Single Team'); } diff --git a/lib/Command/MembersAdd.php b/lib/Command/MembersAdd.php index 2e24341bd..e8fa548c1 100644 --- a/lib/Command/MembersAdd.php +++ b/lib/Command/MembersAdd.php @@ -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') + ->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') diff --git a/lib/Command/MembersLevel.php b/lib/Command/MembersLevel.php index f2c50669b..9d5b2641f 100644 --- a/lib/Command/MembersLevel.php +++ b/lib/Command/MembersLevel.php @@ -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') + ->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') diff --git a/lib/Command/MembersList.php b/lib/Command/MembersList.php index 9972e50f5..d690c445b 100644 --- a/lib/Command/MembersList.php +++ b/lib/Command/MembersList.php @@ -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') + ->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') diff --git a/lib/Command/MembersRemove.php b/lib/Command/MembersRemove.php index b89c12834..ce17dff63 100644 --- a/lib/Command/MembersRemove.php +++ b/lib/Command/MembersRemove.php @@ -74,8 +74,8 @@ public function __construct( protected function configure() { parent::configure(); $this->setName('circles:members:remove') - ->setDescription('remove a member from a circle') - ->addArgument('member_id', InputArgument::REQUIRED, 'ID of the member from the Circle') + ->setDescription('remove a member from a team') + ->addArgument('member_id', InputArgument::REQUIRED, 'ID of the member from the Team') ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') ->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0'); } diff --git a/lib/Command/MembersSearch.php b/lib/Command/MembersSearch.php index 2808952b0..7abf85471 100644 --- a/lib/Command/MembersSearch.php +++ b/lib/Command/MembersSearch.php @@ -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') ->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'); diff --git a/lib/Command/MigrateCustomGroups.php b/lib/Command/MigrateCustomGroups.php index ebbfa0b9e..d41252025 100644 --- a/lib/Command/MigrateCustomGroups.php +++ b/lib/Command/MigrateCustomGroups.php @@ -96,7 +96,7 @@ public function migrateTeams(): void { $circle = $this->circlesManager->createCircle($name); } catch (\Exception $e) { $this->output->writeln('' . get_class($e) . ' ' . $e->getMessage() . ' with data ' . json_encode($rowCG)); - $this->logger->log(2, 'error while creating circle', ['exception' => $e]); + $this->logger->log(2, 'error while creating team', ['exception' => $e]); $this->circlesManager->stopSession(); continue; } diff --git a/lib/Model/DeprecatedCircle.php b/lib/Model/DeprecatedCircle.php index 3f72dc776..9bc9014d9 100644 --- a/lib/Model/DeprecatedCircle.php +++ b/lib/Model/DeprecatedCircle.php @@ -221,7 +221,7 @@ public static function fromJSON($json) { public function cantBePersonal() { if ($this->getType() === self::CIRCLES_PERSONAL) { throw new CircleTypeNotValidException( - $this->l10n->t('This feature is not available for personal circles') + $this->l10n->t('This feature is not available for personal teams') ); } } diff --git a/lib/Model/DeprecatedMember.php b/lib/Model/DeprecatedMember.php index 6bab66d84..c76e06cf8 100644 --- a/lib/Model/DeprecatedMember.php +++ b/lib/Model/DeprecatedMember.php @@ -204,13 +204,13 @@ public function levelHasToBeEditable() { public function hasToBeAbleToJoinTheCircle() { if ($this->getLevel() > 0) { throw new MemberAlreadyExistsException( - $this->l10n->t('You are already a member of this circle') + $this->l10n->t('You are already a member of this team') ); } if ($this->getStatus() === DeprecatedMember::STATUS_BLOCKED) { throw new MemberIsBlockedException( - $this->l10n->t('You have been blocked from this circle') + $this->l10n->t('You have been blocked from this team') ); } } @@ -222,13 +222,13 @@ public function hasToBeAbleToJoinTheCircle() { public function hasToBeInviteAble() { if ($this->getLevel() > 0) { throw new MemberAlreadyExistsException( - $this->l10n->t('The account is already a member of this circle') + $this->l10n->t('The account is already a member of this team') ); } if ($this->getStatus() === DeprecatedMember::STATUS_INVITED) { throw new MemberAlreadyExistsException( - $this->l10n->t('The account has already been invited into this circle') + $this->l10n->t('The account has already been invited into this team') ); } } diff --git a/lib/Model/Mount.php b/lib/Model/Mount.php index 260072424..3f1b25db9 100644 --- a/lib/Model/Mount.php +++ b/lib/Model/Mount.php @@ -374,7 +374,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'); } $circle = $wrappedShare->getCircle(); diff --git a/lib/Service/FederatedEventService.php b/lib/Service/FederatedEventService.php index 6ebc1eaea..25e0e6088 100644 --- a/lib/Service/FederatedEventService.php +++ b/lib/Service/FederatedEventService.php @@ -224,7 +224,7 @@ public function confirmInitiator(FederatedEvent $event, bool $local = false): vo if (!$event->canBypass(FederatedEvent::BYPASS_INITIATORMEMBERSHIP) && $circle->getInitiator()->getLevel() < Member::LEVEL_MEMBER) { - throw new InitiatorNotConfirmedException('Initiator must be a member of the Circle'); + throw new InitiatorNotConfirmedException('Initiator must be a member of the Team'); } } diff --git a/lib/Service/RemoteDownstreamService.php b/lib/Service/RemoteDownstreamService.php index 75758f54e..e336212f6 100644 --- a/lib/Service/RemoteDownstreamService.php +++ b/lib/Service/RemoteDownstreamService.php @@ -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'); } } @@ -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'); } /** diff --git a/lib/StatusCode.php b/lib/StatusCode.php index bdba461e8..0d9c2a901 100644 --- a/lib/StatusCode.php +++ b/lib/StatusCode.php @@ -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', + 128 => 'Cannot add Team as its own Member', 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', 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 = [