Skip to content

[stable22] removing deprecated code #656

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.

Sign up for GitHub

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

Merged
ArtificialOwl merged 1 commit into from
Jun 28, 2021
Merged

[stable22] removing deprecated code #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ Those groups of users (or "circles") can then be used by any other app for shari
<command>OCA\Circles\Command\MembersDetails</command>
<command>OCA\Circles\Command\MembersLevel</command>
<command>OCA\Circles\Command\MembersRemove</command>
<command>OCA\Circles\Command\SyncContact</command>
<!--<command>OCA\Circles\Command\Groups</command>-->
<command>OCA\Circles\Command\FixUniqueId</command>
<!-- <command>OCA\Circles\Command\SyncContact</command>-->
</commands>

<settings>
Expand Down
5 changes: 5 additions & 0 deletions lib/Circles/FileSharingBroadcaster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
use OCP\Util;


/**
* Class FileSharingBroadcaster
* @deprecated
* @package OCA\Circles\Circles
*/
class FileSharingBroadcaster implements IBroadcaster {


Expand Down
39 changes: 35 additions & 4 deletions lib/Command/MembersRemove.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,27 @@
use Exception;
use OC\Core\Command\Base;
use OCA\Circles\Db\MemberRequest;
use OCA\Circles\Exceptions\CircleNotFoundException;
use OCA\Circles\Exceptions\FederatedEventException;
use OCA\Circles\Exceptions\FederatedItemException;
use OCA\Circles\Exceptions\FederatedUserException;
use OCA\Circles\Exceptions\FederatedUserNotFoundException;
use OCA\Circles\Exceptions\InitiatorNotConfirmedException;
use OCA\Circles\Exceptions\InitiatorNotFoundException;
use OCA\Circles\Exceptions\InvalidIdException;
use OCA\Circles\Exceptions\MemberDoesNotExistException;
use OCA\Circles\Exceptions\MemberNotFoundException;
use OCA\Circles\Exceptions\OwnerNotFoundException;
use OCA\Circles\Exceptions\RemoteInstanceException;
use OCA\Circles\Exceptions\RemoteNotFoundException;
use OCA\Circles\Exceptions\RemoteResourceNotFoundException;
use OCA\Circles\Exceptions\RequestBuilderException;
use OCA\Circles\Exceptions\SingleCircleNotFoundException;
use OCA\Circles\Exceptions\UnknownRemoteException;
use OCA\Circles\Exceptions\UserTypeNotFoundException;
use OCA\Circles\Model\Member;
use OCA\Circles\Service\FederatedUserService;
use OCA\Circles\Service\MemberService;
use OCA\Circles\Service\MembersService;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
Expand All @@ -59,7 +75,7 @@ class MembersRemove extends Base {
/** @var FederatedUserService */
private $federatedUserService;

/** @var MembersService */
/** @var MemberService */
private $memberService;


Expand Down Expand Up @@ -95,8 +111,23 @@ protected function configure() {
* @param OutputInterface $output
*
* @return int
* @throws MemberDoesNotExistException
* @throws Exception
* @throws CircleNotFoundException
* @throws FederatedEventException
* @throws FederatedItemException
* @throws FederatedUserException
* @throws FederatedUserNotFoundException
* @throws InitiatorNotConfirmedException
* @throws InitiatorNotFoundException
* @throws InvalidIdException
* @throws MemberNotFoundException
* @throws OwnerNotFoundException
* @throws RemoteInstanceException
* @throws RemoteNotFoundException
* @throws RemoteResourceNotFoundException
* @throws RequestBuilderException
* @throws SingleCircleNotFoundException
* @throws UnknownRemoteException
* @throws UserTypeNotFoundException
*/
protected function execute(InputInterface $input, OutputInterface $output): int {
$memberId = $input->getArgument('member_id');
Expand Down
34 changes: 17 additions & 17 deletions lib/Cron/GlobalSync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@ public function __construct() {
*/
protected function run($argument) {
return;
$app = \OC::$server->query(Application::class);
$c = $app->getContainer();

/** @var CirclesService $circlesService */
$circlesService = $c->query(CirclesService::class);
/** @var MembersService $membersService */
$membersService = $c->query(MembersService::class);
/** @var GSUpstreamService $gsUpstreamService */
$gsUpstreamService = $c->query(GSUpstreamService::class);

$circles = $circlesService->getCirclesToSync();

foreach ($circles as $circle) {
$membersService->updateCachedFromCircle($circle);
}

$gsUpstreamService->synchronize($circles);
// $app = \OC::$server->query(Application::class);
// $c = $app->getContainer();
//
// /** @var CirclesService $circlesService */
// $circlesService = $c->query(CirclesService::class);
// /** @var MembersService $membersService */
// $membersService = $c->query(MembersService::class);
// /** @var GSUpstreamService $gsUpstreamService */
// $gsUpstreamService = $c->query(GSUpstreamService::class);
//
// $circles = $circlesService->getCirclesToSync();
//
// foreach ($circles as $circle) {
// $membersService->updateCachedFromCircle($circle);
// }
//
// $gsUpstreamService->synchronize($circles);
}

}
Expand Down
2 changes: 1 addition & 1 deletion lib/MountManager/CircleMountManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

/**
* Class CircleMountManager
*
* @deprecated
* @package OCA\Circles\MountManager
*/
class CircleMountManager {
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/DavService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

/**
* Class DavService
*
* @deprecated
* @package OCA\Circles\Service
*/
class DavService {
Expand Down
2 changes: 2 additions & 0 deletions lib/ShareByCircleProviderDeprecated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ public function __construct(
IDBConnection $connection, ISecureRandom $secureRandom, IUserManager $userManager,
IRootFolder $rootFolder, IL10N $l10n, ILogger $logger, IURLGenerator $urlGenerator
) {
// kept but should not be loaded
exit();
$app = \OC::$server->query(Application::class);
$container = $app->getContainer();
$configService = $container->query(ConfigService::class);
Expand Down