Skip to content

Commit 5d6ca98

Browse files
ArtificialOwlArtificialOwl
authored
Merge pull request #656 from nextcloud/backport/649/stable22
[stable22] removing deprecated code
2 parents 0ebc137 + 3ab83cc commit 5d6ca98

7 files changed

Lines changed: 62 additions & 26 deletions

File tree

‎appinfo/info.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ Those groups of users (or "circles") can then be used by any other app for shari
6767
<command>OCA\Circles\Command\MembersDetails</command>
6868
<command>OCA\Circles\Command\MembersLevel</command>
6969
<command>OCA\Circles\Command\MembersRemove</command>
70-
<command>OCA\Circles\Command\SyncContact</command>
71-
<!--<command>OCA\Circles\Command\Groups</command>-->
72-
<command>OCA\Circles\Command\FixUniqueId</command>
70+
<!-- <command>OCA\Circles\Command\SyncContact</command>-->
7371
</commands>
7472

7573
<settings>

‎lib/Circles/FileSharingBroadcaster.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
use OCP\Util;
6060

6161

62+
/**
63+
* Class FileSharingBroadcaster
64+
* @deprecated
65+
* @package OCA\Circles\Circles
66+
*/
6267
class FileSharingBroadcaster implements IBroadcaster {
6368

6469

‎lib/Command/MembersRemove.php‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,27 @@
3434
use Exception;
3535
use OC\Core\Command\Base;
3636
use OCA\Circles\Db\MemberRequest;
37+
use OCA\Circles\Exceptions\CircleNotFoundException;
38+
use OCA\Circles\Exceptions\FederatedEventException;
39+
use OCA\Circles\Exceptions\FederatedItemException;
40+
use OCA\Circles\Exceptions\FederatedUserException;
41+
use OCA\Circles\Exceptions\FederatedUserNotFoundException;
42+
use OCA\Circles\Exceptions\InitiatorNotConfirmedException;
43+
use OCA\Circles\Exceptions\InitiatorNotFoundException;
44+
use OCA\Circles\Exceptions\InvalidIdException;
3745
use OCA\Circles\Exceptions\MemberDoesNotExistException;
46+
use OCA\Circles\Exceptions\MemberNotFoundException;
47+
use OCA\Circles\Exceptions\OwnerNotFoundException;
48+
use OCA\Circles\Exceptions\RemoteInstanceException;
49+
use OCA\Circles\Exceptions\RemoteNotFoundException;
50+
use OCA\Circles\Exceptions\RemoteResourceNotFoundException;
51+
use OCA\Circles\Exceptions\RequestBuilderException;
52+
use OCA\Circles\Exceptions\SingleCircleNotFoundException;
53+
use OCA\Circles\Exceptions\UnknownRemoteException;
54+
use OCA\Circles\Exceptions\UserTypeNotFoundException;
3855
use OCA\Circles\Model\Member;
3956
use OCA\Circles\Service\FederatedUserService;
4057
use OCA\Circles\Service\MemberService;
41-
use OCA\Circles\Service\MembersService;
4258
use Symfony\Component\Console\Input\InputArgument;
4359
use Symfony\Component\Console\Input\InputInterface;
4460
use Symfony\Component\Console\Input\InputOption;
@@ -59,7 +75,7 @@ class MembersRemove extends Base {
5975
/** @var FederatedUserService */
6076
private $federatedUserService;
6177

62-
/** @var MembersService */
78+
/** @var MemberService */
6379
private $memberService;
6480

6581

@@ -95,8 +111,23 @@ protected function configure() {
95111
* @param OutputInterface $output
96112
*
97113
* @return int
98-
* @throws MemberDoesNotExistException
99-
* @throws Exception
114+
* @throws CircleNotFoundException
115+
* @throws FederatedEventException
116+
* @throws FederatedItemException
117+
* @throws FederatedUserException
118+
* @throws FederatedUserNotFoundException
119+
* @throws InitiatorNotConfirmedException
120+
* @throws InitiatorNotFoundException
121+
* @throws InvalidIdException
122+
* @throws MemberNotFoundException
123+
* @throws OwnerNotFoundException
124+
* @throws RemoteInstanceException
125+
* @throws RemoteNotFoundException
126+
* @throws RemoteResourceNotFoundException
127+
* @throws RequestBuilderException
128+
* @throws SingleCircleNotFoundException
129+
* @throws UnknownRemoteException
130+
* @throws UserTypeNotFoundException
100131
*/
101132
protected function execute(InputInterface $input, OutputInterface $output): int {
102133
$memberId = $input->getArgument('member_id');

‎lib/Cron/GlobalSync.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,23 @@ public function __construct() {
6161
*/
6262
protected function run($argument) {
6363
return;
64-
$app = \OC::$server->query(Application::class);
65-
$c = $app->getContainer();
66-
67-
/** @var CirclesService $circlesService */
68-
$circlesService = $c->query(CirclesService::class);
69-
/** @var MembersService $membersService */
70-
$membersService = $c->query(MembersService::class);
71-
/** @var GSUpstreamService $gsUpstreamService */
72-
$gsUpstreamService = $c->query(GSUpstreamService::class);
73-
74-
$circles = $circlesService->getCirclesToSync();
75-
76-
foreach ($circles as $circle) {
77-
$membersService->updateCachedFromCircle($circle);
78-
}
79-
80-
$gsUpstreamService->synchronize($circles);
64+
// $app = \OC::$server->query(Application::class);
65+
// $c = $app->getContainer();
66+
//
67+
// /** @var CirclesService $circlesService */
68+
// $circlesService = $c->query(CirclesService::class);
69+
// /** @var MembersService $membersService */
70+
// $membersService = $c->query(MembersService::class);
71+
// /** @var GSUpstreamService $gsUpstreamService */
72+
// $gsUpstreamService = $c->query(GSUpstreamService::class);
73+
//
74+
// $circles = $circlesService->getCirclesToSync();
75+
//
76+
// foreach ($circles as $circle) {
77+
// $membersService->updateCachedFromCircle($circle);
78+
// }
79+
//
80+
// $gsUpstreamService->synchronize($circles);
8181
}
8282

8383
}

‎lib/MountManager/CircleMountManager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* Class CircleMountManager
40-
*
40+
* @deprecated
4141
* @package OCA\Circles\MountManager
4242
*/
4343
class CircleMountManager {

‎lib/Service/DavService.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
/**
5353
* Class DavService
54-
*
54+
* @deprecated
5555
* @package OCA\Circles\Service
5656
*/
5757
class DavService {

‎lib/ShareByCircleProviderDeprecated.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ public function __construct(
129129
IDBConnection $connection, ISecureRandom $secureRandom, IUserManager $userManager,
130130
IRootFolder $rootFolder, IL10N $l10n, ILogger $logger, IURLGenerator $urlGenerator
131131
) {
132+
// kept but should not be loaded
133+
exit();
132134
$app = \OC::$server->query(Application::class);
133135
$container = $app->getContainer();
134136
$configService = $container->query(ConfigService::class);

0 commit comments

Comments
 (0)