From be8aca2b8aa9cba2e9fa458b14c92d6f4a2e1be9 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Tue, 8 Mar 2022 10:53:33 -0100 Subject: [PATCH] switching import to Tools\ Signed-off-by: Maxence Lange --- composer.json | 3 - lib/CirclesManager.php | 2 +- .../v2/CollaboratorSearchPlugin.php | 4 +- lib/Command/CirclesCheck.php | 20 ++-- lib/Command/CirclesDetails.php | 2 +- lib/Command/CirclesList.php | 8 +- lib/Command/CirclesMemberships.php | 28 ++--- lib/Command/CirclesRemote.php | 22 ++-- lib/Command/CirclesReport.php | 13 +-- lib/Command/CirclesTest.php | 12 +- lib/Command/MembersAdd.php | 16 +-- lib/Command/MembersList.php | 40 +++---- lib/Command/SharesFiles.php | 2 +- lib/Controller/AdminController.php | 8 +- lib/Controller/EventWrapperController.php | 8 +- lib/Controller/LocalController.php | 8 +- lib/Controller/RemoteController.php | 108 +++++++++++++++--- lib/Cron/ContactsExistingShares.php | 2 +- lib/Cron/Maintenance.php | 2 +- lib/Db/AccountsRequest.php | 2 +- lib/Db/AccountsRequestBuilder.php | 2 +- lib/Db/CircleRequestBuilder.php | 2 +- lib/Db/CoreQueryBuilder.php | 30 ++--- lib/Db/DeprecatedMembersRequest.php | 2 +- lib/Db/EventWrapperRequestBuilder.php | 2 +- lib/Db/GSSharesRequest.php | 2 +- lib/Db/MemberRequestBuilder.php | 2 +- lib/Db/MembershipRequestBuilder.php | 2 +- lib/Db/MountRequest.php | 2 +- lib/Db/MountRequestBuilder.php | 2 +- lib/Db/RemoteRequest.php | 26 ++--- lib/Db/RemoteRequestBuilder.php | 2 +- lib/Db/ShareLockRequestBuilder.php | 2 +- lib/Db/ShareTokenRequestBuilder.php | 2 +- lib/Db/ShareWrapperRequestBuilder.php | 2 +- lib/Db/TokensRequestBuilder.php | 2 +- lib/Events/CircleResultGenericEvent.php | 2 +- lib/Events/Files/FileShareCreatedEvent.php | 2 +- lib/Exceptions/JsonNotRequestedException.php | 34 ++++++ lib/FederatedItems/CircleConfig.php | 4 +- lib/FederatedItems/CircleCreate.php | 4 +- lib/FederatedItems/CircleDestroy.php | 4 +- lib/FederatedItems/CircleEdit.php | 4 +- lib/FederatedItems/CircleJoin.php | 10 +- lib/FederatedItems/CircleLeave.php | 8 +- lib/FederatedItems/CircleSettings.php | 4 +- lib/FederatedItems/Files/FileShare.php | 10 +- lib/FederatedItems/Files/FileUnshare.php | 12 +- lib/FederatedItems/ItemLock.php | 2 +- lib/FederatedItems/LoopbackTest.php | 2 +- lib/FederatedItems/MassiveMemberAdd.php | 6 +- lib/FederatedItems/MemberDisplayName.php | 7 +- lib/FederatedItems/MemberLevel.php | 4 +- lib/FederatedItems/SharedItemsSync.php | 2 +- lib/FederatedItems/SingleMemberAdd.php | 10 +- lib/GlobalScale/FileShare.php | 4 +- lib/GlobalScale/GSMount/Mount.php | 2 +- lib/GlobalScale/GSMount/MountProvider.php | 2 +- lib/GlobalScale/MemberAdd.php | 2 +- lib/GlobalScale/Test.php | 2 +- lib/Handlers/WebfingerHandler.php | 4 +- lib/IFederatedSync.php | 2 +- .../Examples/ExampleAddingCircleMember.php | 4 +- .../Examples/ExampleMembershipsCreated.php | 6 +- .../Examples/ExampleMembershipsRemoved.php | 6 +- .../ExampleRequestingCircleMember.php | 4 +- lib/Listeners/Files/AddingMemberSendMail.php | 6 +- lib/Listeners/Files/CreatingShareSendMail.php | 6 +- lib/Listeners/Files/DestroyingCircle.php | 6 +- lib/Listeners/Files/MemberAddedSendMail.php | 8 +- lib/Listeners/Files/MembershipsRemoved.php | 2 +- .../Files/PreparingMemberSendMail.php | 6 +- .../Files/PreparingShareSendMail.php | 6 +- lib/Listeners/Files/RemovingMember.php | 6 +- lib/Listeners/Files/ShareCreatedSendMail.php | 6 +- .../Notifications/RequestingMember.php | 4 +- lib/Migration/Migration.php | 4 +- lib/Model/Circle.php | 44 +++++-- lib/Model/DavCard.php | 2 +- lib/Model/DeprecatedCircle.php | 2 +- lib/Model/Federated/EventWrapper.php | 14 +-- lib/Model/Federated/FederatedEvent.php | 6 +- lib/Model/Federated/FederatedShare.php | 14 +-- lib/Model/Federated/RemoteInstance.php | 14 +-- lib/Model/FederatedUser.php | 18 +-- lib/Model/FileCacheWrapper.php | 14 +-- lib/Model/GlobalScale/GSEvent.php | 4 +- lib/Model/GlobalScale/GSShare.php | 2 +- lib/Model/GlobalScale/GSShareMountpoint.php | 2 +- lib/Model/GlobalScale/GSWrapper.php | 2 +- lib/Model/Helpers/MemberHelper.php | 2 +- lib/Model/Member.php | 20 ++-- lib/Model/Membership.php | 14 +-- lib/Model/ModelManager.php | 8 +- lib/Model/Mount.php | 10 +- lib/Model/Mountpoint.php | 2 +- lib/Model/Report.php | 4 +- lib/Model/ShareToken.php | 14 +-- lib/Model/ShareWrapper.php | 18 +-- lib/Model/SharesToken.php | 2 +- lib/MountManager/CircleMount.php | 2 +- lib/MountManager/CircleMountProvider.php | 2 +- lib/Notification/Notifier.php | 4 +- lib/Search/GlobalScaleUsers.php | 16 +-- lib/Search/LocalUsers.php | 2 +- lib/Service/CircleService.php | 10 +- lib/Service/CirclesService.php | 2 +- lib/Service/ConfigService.php | 18 +-- lib/Service/ContactService.php | 8 +- lib/Service/EventService.php | 6 +- lib/Service/EventWrapperService.php | 10 +- lib/Service/FederatedEventService.php | 18 +-- lib/Service/FederatedShareService.php | 12 +- lib/Service/FederatedUserService.php | 14 +-- lib/Service/GSUpstreamService.php | 28 ++--- lib/Service/GlobalScaleService.php | 14 +-- lib/Service/InterfaceService.php | 8 +- lib/Service/MaintenanceService.php | 4 +- lib/Service/MemberService.php | 16 +-- lib/Service/MembersService.php | 16 +-- lib/Service/MembershipService.php | 6 +- lib/Service/MigrationService.php | 8 +- lib/Service/MiscService.php | 2 +- lib/Service/NotificationService.php | 4 +- lib/Service/OutputService.php | 6 +- lib/Service/RemoteDownstreamService.php | 12 +- lib/Service/RemoteService.php | 14 +-- lib/Service/RemoteStreamService.php | 56 ++++----- lib/Service/RemoteUpstreamService.php | 8 +- lib/Service/ShareTokenService.php | 2 +- lib/Service/ShareWrapperService.php | 2 +- lib/Service/SyncService.php | 6 +- lib/ShareByCircleProvider.php | 8 +- lib/ShareByCircleProviderDeprecated.php | 2 +- lib/UnifiedSearch/UnifiedSearchProvider.php | 4 +- .../lib/Controller/AdminControllerTest.php | 4 +- .../lib/Controller/LocalControllerTest.php | 12 +- 137 files changed, 673 insertions(+), 548 deletions(-) create mode 100644 lib/Exceptions/JsonNotRequestedException.php diff --git a/composer.json b/composer.json index 1ae78a36..16f5aef1 100644 --- a/composer.json +++ b/composer.json @@ -22,9 +22,6 @@ "OCA\\Circles\\": "lib/" } }, - "require": { - "artificial-owl/my-small-php-tools": "~23" - }, "scripts": { "cs:check": "php-cs-fixer fix --dry-run --diff", "cs:fix": "php-cs-fixer fix", diff --git a/lib/CirclesManager.php b/lib/CirclesManager.php index a3b43676..3959ec0f 100644 --- a/lib/CirclesManager.php +++ b/lib/CirclesManager.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\InvalidItemException; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\ContactAddressBookNotFoundException; use OCA\Circles\Exceptions\ContactFormatException; diff --git a/lib/Collaboration/v2/CollaboratorSearchPlugin.php b/lib/Collaboration/v2/CollaboratorSearchPlugin.php index 345b408f..6cc49e0e 100644 --- a/lib/Collaboration/v2/CollaboratorSearchPlugin.php +++ b/lib/Collaboration/v2/CollaboratorSearchPlugin.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Collaboration\v2; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OC\Share20\Share; use OCA\Circles\AppInfo\Application; @@ -51,7 +51,7 @@ use OCP\Share\IShare; * @package OCA\Circles\Collaboration\v2 */ class CollaboratorSearchPlugin implements ISearchPlugin { - use TNC22Logger; + use TNCLogger; /** @var IRequest */ diff --git a/lib/Command/CirclesCheck.php b/lib/Command/CirclesCheck.php index ce609840..b5dcdb8a 100644 --- a/lib/Command/CirclesCheck.php +++ b/lib/Command/CirclesCheck.php @@ -31,14 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use Exception; use OC; use OC\AppConfig; @@ -63,6 +55,14 @@ use OCA\Circles\Service\InterfaceService; use OCA\Circles\Service\RemoteService; use OCA\Circles\Service\RemoteStreamService; use OCA\Circles\Service\RemoteUpstreamService; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TNCRequest; +use OCA\Circles\Tools\Traits\TStringTools; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -77,7 +77,7 @@ use Symfony\Component\Console\Question\Question; class CirclesCheck extends Base { use TStringTools; use TArrayTools; - use TNC22Request; + use TNCRequest; public static $checks = [ @@ -791,7 +791,7 @@ class CirclesCheck extends Base { string $route, array $args = [] ): bool { - $request = new NC22Request('', Request::type($type)); + $request = new NCRequest('', Request::type($type)); $this->configService->configureLoopbackRequest($request, $route, $args); $request->setFollowLocation(false); diff --git a/lib/Command/CirclesDetails.php b/lib/Command/CirclesDetails.php index 106233fa..98442e3e 100644 --- a/lib/Command/CirclesDetails.php +++ b/lib/Command/CirclesDetails.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\InvalidItemException; use OC\Core\Command\Base; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\FederatedItemException; diff --git a/lib/Command/CirclesList.php b/lib/Command/CirclesList.php index c8b8a95a..967cc1a2 100644 --- a/lib/Command/CirclesList.php +++ b/lib/Command/CirclesList.php @@ -31,10 +31,10 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TStringTools; use OC\Core\Command\Base; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\FederatedItemException; diff --git a/lib/Command/CirclesMemberships.php b/lib/Command/CirclesMemberships.php index 3326a82d..a8cb821c 100644 --- a/lib/Command/CirclesMemberships.php +++ b/lib/Command/CirclesMemberships.php @@ -31,13 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException; -use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22TreeNode; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22ConsoleTree; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use Exception; use OC\Core\Command\Base; use OCA\Circles\Db\CircleRequest; @@ -66,6 +59,13 @@ use OCA\Circles\Service\CircleService; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\MembershipService; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\ItemNotFoundException; +use OCA\Circles\Tools\Exceptions\UnknownTypeException; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\TreeNode; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TConsoleTree; use OCP\IUserManager; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputArgument; @@ -81,7 +81,7 @@ use Symfony\Component\Console\Output\OutputInterface; */ class CirclesMemberships extends Base { use TArrayTools; - use TNC22ConsoleTree; + use TConsoleTree; /** @var IUserManager */ @@ -237,7 +237,7 @@ class CirclesMemberships extends Base { $output->writeln(''); - $tree = new NC22TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser])); + $tree = new TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser])); $this->generateTree($federatedUser->getSingleId(), $tree); $this->drawTree( @@ -255,10 +255,10 @@ class CirclesMemberships extends Base { /** * @param string $id - * @param NC22TreeNode $tree + * @param TreeNode $tree * @param array $knownIds */ - private function generateTree(string $id, NC22TreeNode $tree, array $knownIds = []) { + private function generateTree(string $id, TreeNode $tree, array $knownIds = []) { if (in_array($id, $knownIds)) { return; } @@ -271,11 +271,11 @@ class CirclesMemberships extends Base { continue; } - $item = new NC22TreeNode( + $item = new TreeNode( $tree, new SimpleDataStore( [ - 'member' => $member, - 'cycling' => in_array($member->getCircleId(), $knownIds) + 'member' => $member, + 'cycling' => in_array($member->getCircleId(), $knownIds) ] ) ); diff --git a/lib/Command/CirclesRemote.php b/lib/Command/CirclesRemote.php index 05572c2c..b893b1ab 100644 --- a/lib/Command/CirclesRemote.php +++ b/lib/Command/CirclesRemote.php @@ -31,13 +31,13 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22SignedRequest; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22WellKnown; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Exceptions\SignatureException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\NCSignedRequest; +use OCA\Circles\Tools\Traits\TNCWellKnown; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OC\Core\Command\Base; use OCA\Circles\AppInfo\Application; @@ -63,7 +63,7 @@ use Symfony\Component\Console\Question\ConfirmationQuestion; * @package OCA\Circles\Command */ class CirclesRemote extends Base { - use TNC22WellKnown; + use TNCWellKnown; use TStringTools; @@ -395,12 +395,12 @@ class CirclesRemote extends Base { * @param string $remote * @param array $payload * - * @return NC22SignedRequest + * @return NCSignedRequest * @throws RequestNetworkException * @throws SignatoryException */ - private function outgoingTest(string $remote, array $payload): NC22SignedRequest { - $request = new NC22Request(); + private function outgoingTest(string $remote, array $payload): NCSignedRequest { + $request = new NCRequest(); $request->basedOnUrl($remote); $request->setFollowLocation(true); $request->setLocalAddressAllowed(true); diff --git a/lib/Command/CirclesReport.php b/lib/Command/CirclesReport.php index f14bc2db..2668f022 100644 --- a/lib/Command/CirclesReport.php +++ b/lib/Command/CirclesReport.php @@ -31,12 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Console\Nextcloud\nc22\NC22InteractiveShell; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\IInteractiveShellClient; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22InteractiveShellSession; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TArrayTools; use OC\Core\Command\Base; use OCA\Circles\Exceptions\InitiatorNotFoundException; use OCA\Circles\Exceptions\UnknownInterfaceException; @@ -63,7 +60,7 @@ use Symfony\Component\Console\Output\OutputInterface; * @package OCA\Circles\Command */ class CirclesReport extends Base implements IInteractiveShellClient { - use TNC22Deserialize; + use TDeserialize; use TArrayTools; @@ -136,6 +133,8 @@ class CirclesReport extends Base implements IInteractiveShellClient { * @throws InitiatorNotFoundException */ protected function execute(InputInterface $input, OutputInterface $output): int { + throw new \Exception('not available'); + $filename = $input->getOption('read'); $local = $input->getOption('local'); $this->output = $output; diff --git a/lib/Command/CirclesTest.php b/lib/Command/CirclesTest.php index bf9cfe60..d62783ce 100644 --- a/lib/Command/CirclesTest.php +++ b/lib/Command/CirclesTest.php @@ -31,11 +31,11 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\ItemNotFoundException; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OC\Core\Command\Base; use OCA\Circles\AppInfo\Application; @@ -63,7 +63,7 @@ use Symfony\Component\Process\Process; class CirclesTest extends Base { use TArrayTools; use TStringTools; - use TNC22Deserialize; + use TDeserialize; public static $INSTANCES = [ diff --git a/lib/Command/MembersAdd.php b/lib/Command/MembersAdd.php index b1e0faae..7496c036 100644 --- a/lib/Command/MembersAdd.php +++ b/lib/Command/MembersAdd.php @@ -31,13 +31,13 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestContentException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultNotJsonException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultSizeException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestServerException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Request; +use OCA\Circles\Tools\Exceptions\RequestContentException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; +use OCA\Circles\Tools\Exceptions\RequestResultSizeException; +use OCA\Circles\Tools\Exceptions\RequestServerException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; use Exception; use OC\Core\Command\Base; use OCA\Circles\Exceptions\FederatedItemException; @@ -162,7 +162,7 @@ class MembersAdd extends Base { return ''; } - $request = new NC22Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET); + $request = new NCRequest(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET); $this->configService->configureRequest($request); $request->basedOnUrl($lookup); $request->addParam('search', $search); diff --git a/lib/Command/MembersList.php b/lib/Command/MembersList.php index 6e9110cf..fff413ef 100644 --- a/lib/Command/MembersList.php +++ b/lib/Command/MembersList.php @@ -31,15 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22TreeNode; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22ConsoleTree; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use Exception; use OC\Core\Command\Base; use OCA\Circles\Db\MemberRequest; @@ -65,6 +56,15 @@ use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\MemberService; use OCA\Circles\Service\RemoteService; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\ItemNotFoundException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Exceptions\UnknownTypeException; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\TreeNode; +use OCA\Circles\Tools\Traits\TConsoleTree; +use OCA\Circles\Tools\Traits\TStringTools; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -78,7 +78,7 @@ use Symfony\Component\Console\Output\OutputInterface; * @package OCA\Circles\Command */ class MembersList extends Base { - use TNC22ConsoleTree; + use TConsoleTree; use TStringTools; @@ -194,7 +194,7 @@ class MembersList extends Base { $output->writeln('Config: ' . $type); $output->writeln(' '); - $tree = new NC22TreeNode(null, new SimpleDataStore(['circle' => $circle])); + $tree = new TreeNode(null, new SimpleDataStore(['circle' => $circle])); $inherited = false; } @@ -275,7 +275,7 @@ class MembersList extends Base { * @param string $instance * @param string $initiator * @param int $initiatorType - * @param NC22TreeNode|null $tree + * @param TreeNode|null $tree * @param array $knownIds * * @return array @@ -303,7 +303,7 @@ class MembersList extends Base { string $instance, string $initiator, int $initiatorType, - ?NC22TreeNode $tree, + ?TreeNode $tree, array $knownIds = [] ): array { if (in_array($circleId, $knownIds)) { @@ -358,12 +358,12 @@ class MembersList extends Base { ); $circle = $this->circleService->getCircle($member->getSingleId()); } - $node = new NC22TreeNode( + $node = new TreeNode( $tree, new SimpleDataStore( [ - 'circle' => $circle, - 'member' => $member, - 'cycling' => in_array($member->getSingleId(), $knownIds), + 'circle' => $circle, + 'member' => $member, + 'cycling' => in_array($member->getSingleId(), $knownIds), ] ) ); @@ -378,11 +378,11 @@ class MembersList extends Base { ); } else { if ($this->treeType !== 'circles-only') { - new NC22TreeNode( + new TreeNode( $tree, new SimpleDataStore( [ - 'member' => $member, - 'cycling' => in_array($member->getSingleId(), $knownIds) + 'member' => $member, + 'cycling' => in_array($member->getSingleId(), $knownIds) ] ) ); diff --git a/lib/Command/SharesFiles.php b/lib/Command/SharesFiles.php index d51ab0bc..e0b3a0d3 100644 --- a/lib/Command/SharesFiles.php +++ b/lib/Command/SharesFiles.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Command; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use OC\Core\Command\Base; use OCA\Circles\Exceptions\FederatedUserException; use OCA\Circles\Exceptions\FederatedUserNotFoundException; diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php index ed0aefaa..37d7d31a 100644 --- a/lib/Controller/AdminController.php +++ b/lib/Controller/AdminController.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Controller; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\Exceptions\ContactAddressBookNotFoundException; use OCA\Circles\Exceptions\ContactFormatException; @@ -64,8 +64,8 @@ use OCP\IUserSession; * @package OCA\Circles\Controller */ class AdminController extends OcsController { - use TNC22Deserialize; - use TNC22Logger; + use TDeserialize; + use TNCLogger; /** @var IUserSession */ diff --git a/lib/Controller/EventWrapperController.php b/lib/Controller/EventWrapperController.php index ca3466bf..0e09afe4 100644 --- a/lib/Controller/EventWrapperController.php +++ b/lib/Controller/EventWrapperController.php @@ -31,15 +31,14 @@ declare(strict_types=1); namespace OCA\Circles\Controller; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Async; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Controller; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\EventWrapperService; use OCA\Circles\Service\FederatedEventService; use OCA\Circles\Service\RemoteDownstreamService; use OCA\Circles\Service\RemoteUpstreamService; +use OCA\Circles\Tools\Traits\TAsync; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; @@ -52,8 +51,7 @@ use OCP\IRequest; */ class EventWrapperController extends Controller { use TStringTools; - use TNC22Async; - use TNC22Controller; + use TAsync; /** @var EventWrapperService */ diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php index 4a6ec822..efa78363 100644 --- a/lib/Controller/LocalController.php +++ b/lib/Controller/LocalController.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Controller; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\Exceptions\FederatedUserException; use OCA\Circles\Exceptions\FederatedUserNotFoundException; @@ -62,8 +62,8 @@ use OCP\IUserSession; * @package OCA\Circles\Controller */ class LocalController extends OcsController { - use TNC22Deserialize; - use TNC22Logger; + use TDeserialize; + use TNCLogger; /** @var IUserSession */ diff --git a/lib/Controller/RemoteController.php b/lib/Controller/RemoteController.php index f04159cc..35db6689 100644 --- a/lib/Controller/RemoteController.php +++ b/lib/Controller/RemoteController.php @@ -31,25 +31,14 @@ declare(strict_types=1); namespace OCA\Circles\Controller; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidOriginException; -use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException; -use ArtificialOwl\MySmallPhpTools\Exceptions\JsonNotRequestedException; -use ArtificialOwl\MySmallPhpTools\Exceptions\MalformedArrayException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException; -use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22SignedRequest; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Controller; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22LocalSignatory; use Exception; +use OC; use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Exceptions\FederatedItemException; use OCA\Circles\Exceptions\FederatedUserException; use OCA\Circles\Exceptions\FederatedUserNotFoundException; +use OCA\Circles\Exceptions\JsonNotRequestedException; use OCA\Circles\Exceptions\UnknownInterfaceException; use OCA\Circles\Model\Circle; use OCA\Circles\Model\Federated\FederatedEvent; @@ -66,10 +55,22 @@ use OCA\Circles\Service\MemberService; use OCA\Circles\Service\MembershipService; use OCA\Circles\Service\RemoteDownstreamService; use OCA\Circles\Service\RemoteStreamService; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\InvalidOriginException; +use OCA\Circles\Tools\Exceptions\ItemNotFoundException; +use OCA\Circles\Tools\Exceptions\MalformedArrayException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Exceptions\SignatureException; +use OCA\Circles\Tools\Exceptions\UnknownTypeException; +use OCA\Circles\Tools\Model\NCSignedRequest; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLocalSignatory; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; +use OCP\IUserSession; /** * Class RemoteController @@ -77,9 +78,8 @@ use OCP\IRequest; * @package OCA\Circles\Controller */ class RemoteController extends Controller { - use TNC22Controller; - use TNC22LocalSignatory; - use TNC22Deserialize; + use TNCLocalSignatory; + use TDeserialize; /** @var CircleRequest */ @@ -486,12 +486,12 @@ class RemoteController extends Controller { /** - * @param NC22SignedRequest $signedRequest + * @param NCSignedRequest $signedRequest * * @return RemoteInstance * @throws SignatoryException */ - private function confirmRemoteInstance(NC22SignedRequest $signedRequest): RemoteInstance { + private function confirmRemoteInstance(NCSignedRequest $signedRequest): RemoteInstance { /** @var RemoteInstance $signatory */ $signatory = $signedRequest->getSignatory(); @@ -534,4 +534,76 @@ class RemoteController extends Controller { ($e->getCode() > 0) ? $e->getCode() : $httpErrorCode ); } + + + /** + * use this one if a method from a Controller is only PublicPage when remote client asking for Json + * + * try { + * $this->publicPageJsonLimited(); + * return new DataResponse(['test' => 42]); + * } catch (JsonNotRequestedException $e) {} + * + * + * @throws NotLoggedInException + * @throws JsonNotRequestedException + */ + private function publicPageJsonLimited(): void { + if (!$this->jsonRequested()) { + if (!OC::$server->get(IUserSession::class) + ->isLoggedIn()) { + throw new NotLoggedInException(); + } + + throw new JsonNotRequestedException(); + } + } + + + /** + * @return bool + */ + private function jsonRequested(): bool { + return ($this->areWithinAcceptHeader( + [ + 'application/json', + 'application/ld+json', + 'application/activity+json' + ] + )); + } + + + /** + * @param array $needles + * + * @return bool + */ + private function areWithinAcceptHeader(array $needles): bool { + $request = OC::$server->get(IRequest::class); + $accepts = array_map([$this, 'trimHeader'], explode(',', $request->getHeader('Accept'))); + + foreach ($accepts as $accept) { + if (in_array($accept, $needles)) { + return true; + } + } + + return false; + } + + /** + * @param string $header + * + * @return string + */ + private function trimHeader(string $header): string { + $header = trim($header); + $pos = strpos($header, ';'); + if ($pos === false) { + return $header; + } + + return substr($header, 0, $pos); + } } diff --git a/lib/Cron/ContactsExistingShares.php b/lib/Cron/ContactsExistingShares.php index 7362cf17..a71e7bd1 100644 --- a/lib/Cron/ContactsExistingShares.php +++ b/lib/Cron/ContactsExistingShares.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Cron; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use OC\BackgroundJob\TimedJob; use OC\Share20\Share; use OCA\Circles\AppInfo\Application; diff --git a/lib/Cron/Maintenance.php b/lib/Cron/Maintenance.php index 98588df4..43ba53b5 100644 --- a/lib/Cron/Maintenance.php +++ b/lib/Cron/Maintenance.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Cron; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; use OC\BackgroundJob\TimedJob; use OCA\Circles\Exceptions\MaintenanceException; use OCA\Circles\Service\ConfigService; diff --git a/lib/Db/AccountsRequest.php b/lib/Db/AccountsRequest.php index 8044af5f..20557d98 100644 --- a/lib/Db/AccountsRequest.php +++ b/lib/Db/AccountsRequest.php @@ -27,7 +27,7 @@ namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Exceptions\MemberDoesNotExistException; class AccountsRequest extends AccountsRequestBuilder { diff --git a/lib/Db/AccountsRequestBuilder.php b/lib/Db/AccountsRequestBuilder.php index e6b5d386..792960e9 100644 --- a/lib/Db/AccountsRequestBuilder.php +++ b/lib/Db/AccountsRequestBuilder.php @@ -28,7 +28,7 @@ namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\DB\QueryBuilder\IQueryBuilder; /** diff --git a/lib/Db/CircleRequestBuilder.php b/lib/Db/CircleRequestBuilder.php index 1f707a21..12663a0f 100644 --- a/lib/Db/CircleRequestBuilder.php +++ b/lib/Db/CircleRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Model\Circle; diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php index 293b336c..f02cb259 100644 --- a/lib/Db/CoreQueryBuilder.php +++ b/lib/Db/CoreQueryBuilder.php @@ -31,8 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\NC22ExtendedQueryBuilder; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use Doctrine\DBAL\Query\QueryBuilder; use OC; use OCA\Circles\Exceptions\RequestBuilderException; @@ -44,6 +42,8 @@ use OCA\Circles\Model\FederatedUser; use OCA\Circles\Model\Member; use OCA\Circles\Model\Probes\CircleProbe; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Tools\Db\ExtendedQueryBuilder; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\DB\QueryBuilder\ICompositeExpression; use OCP\DB\QueryBuilder\IQueryBuilder; @@ -52,7 +52,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder; * * @package OCA\Circles\Db */ -class CoreQueryBuilder extends NC22ExtendedQueryBuilder { +class CoreQueryBuilder extends ExtendedQueryBuilder { use TArrayTools; @@ -267,7 +267,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param string $id */ public function limitToCircleId(string $id): void { - $this->limitToDBField('circle_id', $id, true); + $this->limit('circle_id', $id, '', true); } /** @@ -295,14 +295,14 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param int $config */ public function limitToConfig(int $config): void { - $this->limitToDBFieldInt('config', $config); + $this->limitInt('config', $config); } /** * @param int $source */ public function limitToSource(int $source): void { - $this->limitToDBFieldInt('source', $source); + $this->limitInt('source', $source); } /** @@ -318,7 +318,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param string $singleId */ public function limitToSingleId(string $singleId): void { - $this->limitToDBField('single_id', $singleId, true); + $this->limit('single_id', $singleId, '', true); } @@ -326,7 +326,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param string $itemId */ public function limitToItemId(string $itemId): void { - $this->limitToDBField('item_id', $itemId, true); + $this->limit('item_id', $itemId, '', true); } @@ -334,7 +334,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param string $host */ public function limitToInstance(string $host): void { - $this->limitToDBField('instance', $host, false); + $this->limit('instance', $host, '', false); } @@ -342,7 +342,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param int $userType */ public function limitToUserType(int $userType): void { - $this->limitToDBFieldInt('user_type', $userType); + $this->limitInt('user_type', $userType); } @@ -350,7 +350,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param int $shareType */ public function limitToShareType(int $shareType): void { - $this->limitToDBFieldInt('share_type', $shareType); + $this->limitInt('share_type', $shareType); } @@ -358,7 +358,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param string $shareWith */ public function limitToShareWith(string $shareWith): void { - $this->limitToDBField('share_with', $shareWith); + $this->limit('share_with', $shareWith, '', true); } @@ -366,14 +366,14 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param int $nodeId */ public function limitToFileSource(int $nodeId): void { - $this->limitToDBFieldInt('file_source', $nodeId); + $this->limitInt('file_source', $nodeId); } /** * @param array $files */ public function limitToFileSourceArray(array $files): void { - $this->limitToDBFieldInArray('file_source', $files); + $this->limitArray('file_source', $files); } @@ -381,7 +381,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { * @param int $shareId */ public function limitToShareParent(int $shareId): void { - $this->limitToDBFieldInt('parent', $shareId); + $this->limitInt('parent', $shareId); } diff --git a/lib/Db/DeprecatedMembersRequest.php b/lib/Db/DeprecatedMembersRequest.php index c452bf46..8a0be9cb 100644 --- a/lib/Db/DeprecatedMembersRequest.php +++ b/lib/Db/DeprecatedMembersRequest.php @@ -27,7 +27,7 @@ namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TStringTools; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Exception; use OCA\Circles\Exceptions\GSStatusException; diff --git a/lib/Db/EventWrapperRequestBuilder.php b/lib/Db/EventWrapperRequestBuilder.php index 3f5c5cc9..2e060e9e 100644 --- a/lib/Db/EventWrapperRequestBuilder.php +++ b/lib/Db/EventWrapperRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\EventWrapperNotFoundException; use OCA\Circles\Model\Federated\EventWrapper; diff --git a/lib/Db/GSSharesRequest.php b/lib/Db/GSSharesRequest.php index c0054e67..9fa9944f 100644 --- a/lib/Db/GSSharesRequest.php +++ b/lib/Db/GSSharesRequest.php @@ -27,7 +27,7 @@ namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Model\GlobalScale\GSShare; use OCA\Circles\Model\GlobalScale\GSShareMountpoint; use OCA\Circles\Model\DeprecatedMember; diff --git a/lib/Db/MemberRequestBuilder.php b/lib/Db/MemberRequestBuilder.php index f61d610c..701dbfcb 100644 --- a/lib/Db/MemberRequestBuilder.php +++ b/lib/Db/MemberRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\MemberNotFoundException; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\IFederatedUser; diff --git a/lib/Db/MembershipRequestBuilder.php b/lib/Db/MembershipRequestBuilder.php index 1363d692..a6a2ed32 100644 --- a/lib/Db/MembershipRequestBuilder.php +++ b/lib/Db/MembershipRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\MembershipNotFoundException; use OCA\Circles\Model\Membership; diff --git a/lib/Db/MountRequest.php b/lib/Db/MountRequest.php index 7aaebe5f..af1ee0cc 100644 --- a/lib/Db/MountRequest.php +++ b/lib/Db/MountRequest.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\IFederatedUser; use OCA\Circles\Model\Mount; diff --git a/lib/Db/MountRequestBuilder.php b/lib/Db/MountRequestBuilder.php index 0625dbb7..ecdc677d 100644 --- a/lib/Db/MountRequestBuilder.php +++ b/lib/Db/MountRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\MountNotFoundException; use OCA\Circles\Model\Mount; diff --git a/lib/Db/RemoteRequest.php b/lib/Db/RemoteRequest.php index a6d3fd19..423db931 100644 --- a/lib/Db/RemoteRequest.php +++ b/lib/Db/RemoteRequest.php @@ -95,7 +95,7 @@ class RemoteRequest extends RemoteRequestBuilder { $qb = $this->getRemoteUpdateSql(); $qb->set('item', $qb->createNamedParameter(json_encode($remote->getOrigData()))); - $qb->limitToDBField('uid', $remote->getUid(true), false); + $qb->limit('uid', $remote->getUid(true), '', false); $qb->execute(); } @@ -111,7 +111,7 @@ class RemoteRequest extends RemoteRequestBuilder { $qb = $this->getRemoteUpdateSql(); $qb->set('instance', $qb->createNamedParameter($remote->getInstance())); - $qb->limitToDBField('uid', $remote->getUid(true), false); + $qb->limit('uid', $remote->getUid(true), '', false); $qb->execute(); } @@ -127,7 +127,7 @@ class RemoteRequest extends RemoteRequestBuilder { $qb = $this->getRemoteUpdateSql(); $qb->set('type', $qb->createNamedParameter($remote->getType())); - $qb->limitToDBField('uid', $remote->getUid(true), false); + $qb->limit('uid', $remote->getUid(true), '', false); $qb->execute(); } @@ -143,7 +143,7 @@ class RemoteRequest extends RemoteRequestBuilder { $qb = $this->getRemoteUpdateSql(); $qb->set('href', $qb->createNamedParameter($remote->getId())); - $qb->limitToDBField('uid', $remote->getUid(true), false); + $qb->limit('uid', $remote->getUid(true), '', false); $qb->execute(); } @@ -163,7 +163,7 @@ class RemoteRequest extends RemoteRequestBuilder { */ public function getKnownInstances(): array { $qb = $this->getRemoteSelectSql(); - $qb->filterDBField('type', RemoteInstance::TYPE_UNKNOWN, false); + $qb->filter('type', RemoteInstance::TYPE_UNKNOWN, '', false); return $this->getItemsFromRequest($qb); } @@ -186,12 +186,12 @@ class RemoteRequest extends RemoteRequestBuilder { $expr = $qb->expr(); $orX = $expr->orX(); - $orX->add($qb->exprLimitToDBField('type', RemoteInstance::TYPE_GLOBALSCALE, true, false)); + $orX->add($qb->exprLimit('type', RemoteInstance::TYPE_GLOBALSCALE, '', false)); if ($circle->isConfig(Circle::CFG_FEDERATED) || $broadcastAsFederated) { // get all TRUSTED - $orX->add($qb->exprLimitToDBField('type', RemoteInstance::TYPE_TRUSTED, true, false)); + $orX->add($qb->exprLimit('type', RemoteInstance::TYPE_TRUSTED, '', false)); // get EXTERNAL with Members $aliasMember = $qb->generateAlias(CoreQueryBuilder::REMOTE, CoreQueryBuilder::MEMBER); @@ -208,7 +208,7 @@ class RemoteRequest extends RemoteRequestBuilder { ); $external = $expr->andX(); - $external->add($qb->exprLimitToDBField('type', RemoteInstance::TYPE_EXTERNAL, true, false)); + $external->add($qb->exprLimit('type', RemoteInstance::TYPE_EXTERNAL, '', false)); $external->add($expr->isNotNull($aliasMember . '.instance')); $orX->add($external); } @@ -242,7 +242,7 @@ class RemoteRequest extends RemoteRequestBuilder { */ public function getFromHref(string $href): RemoteInstance { $qb = $this->getRemoteSelectSql(); - $qb->limitToDBField('href', $href, false); + $qb->limit('href', $href, '', false); return $this->getItemFromRequest($qb); } @@ -267,12 +267,12 @@ class RemoteRequest extends RemoteRequestBuilder { * @return RemoteInstance * @throws RemoteNotFoundException */ - public function searchDuplicate(RemoteInstance $remoteInstance) { + public function searchDuplicate(RemoteInstance $remoteInstance): RemoteInstance { $qb = $this->getRemoteSelectSql(); $orX = $qb->expr()->orX(); - $orX->add($qb->exprLimitToDBField('href', $remoteInstance->getId(), true, false)); - $orX->add($qb->exprLimitToDBField('uid', $remoteInstance->getUid(true), true)); - $orX->add($qb->exprLimitToDBField('instance', $remoteInstance->getInstance(), true, false)); + $orX->add($qb->exprLimit('href', $remoteInstance->getId(), '', false)); + $orX->add($qb->exprLimit('uid', $remoteInstance->getUid(true), '', false)); + $orX->add($qb->exprLimit('instance', $remoteInstance->getInstance(), '', false)); $qb->andWhere($orX); return $this->getItemFromRequest($qb); diff --git a/lib/Db/RemoteRequestBuilder.php b/lib/Db/RemoteRequestBuilder.php index d178ffcf..84746109 100644 --- a/lib/Db/RemoteRequestBuilder.php +++ b/lib/Db/RemoteRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\RemoteNotFoundException; use OCA\Circles\Model\Federated\RemoteInstance; diff --git a/lib/Db/ShareLockRequestBuilder.php b/lib/Db/ShareLockRequestBuilder.php index 10d8ecb8..ae9a90c7 100644 --- a/lib/Db/ShareLockRequestBuilder.php +++ b/lib/Db/ShareLockRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\FederatedShareNotFoundException; use OCA\Circles\Model\Federated\FederatedShare; diff --git a/lib/Db/ShareTokenRequestBuilder.php b/lib/Db/ShareTokenRequestBuilder.php index 076b2e39..83234338 100644 --- a/lib/Db/ShareTokenRequestBuilder.php +++ b/lib/Db/ShareTokenRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\ShareTokenNotFoundException; use OCA\Circles\Model\ShareToken; diff --git a/lib/Db/ShareWrapperRequestBuilder.php b/lib/Db/ShareWrapperRequestBuilder.php index ce0a4e84..9c924577 100644 --- a/lib/Db/ShareWrapperRequestBuilder.php +++ b/lib/Db/ShareWrapperRequestBuilder.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OC\Share20\Share; use OCA\Circles\Exceptions\ShareWrapperNotFoundException; use OCA\Circles\Model\ShareWrapper; diff --git a/lib/Db/TokensRequestBuilder.php b/lib/Db/TokensRequestBuilder.php index 2c08f2d6..e87c6e1c 100644 --- a/lib/Db/TokensRequestBuilder.php +++ b/lib/Db/TokensRequestBuilder.php @@ -28,8 +28,8 @@ namespace OCA\Circles\Db; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use OCA\Circles\Model\SharesToken; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\DB\QueryBuilder\IQueryBuilder; /** diff --git a/lib/Events/CircleResultGenericEvent.php b/lib/Events/CircleResultGenericEvent.php index 59ff21ae..26a93b15 100644 --- a/lib/Events/CircleResultGenericEvent.php +++ b/lib/Events/CircleResultGenericEvent.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Events; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\Model\Circle; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Member; diff --git a/lib/Events/Files/FileShareCreatedEvent.php b/lib/Events/Files/FileShareCreatedEvent.php index df056c7d..b0d1ff20 100644 --- a/lib/Events/Files/FileShareCreatedEvent.php +++ b/lib/Events/Files/FileShareCreatedEvent.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Events\Files; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\Events\CircleResultGenericEvent; use OCA\Circles\Model\Federated\FederatedEvent; diff --git a/lib/Exceptions/JsonNotRequestedException.php b/lib/Exceptions/JsonNotRequestedException.php new file mode 100644 index 00000000..718bd8ec --- /dev/null +++ b/lib/Exceptions/JsonNotRequestedException.php @@ -0,0 +1,34 @@ + + * @copyright 2022 + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\Circles\Exceptions; + +class JsonNotRequestedException extends FederatedItemNotFoundException { +} diff --git a/lib/FederatedItems/CircleConfig.php b/lib/FederatedItems/CircleConfig.php index 8287bd20..fceefd03 100644 --- a/lib/FederatedItems/CircleConfig.php +++ b/lib/FederatedItems/CircleConfig.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; +use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Exceptions\FederatedItemBadRequestException; use OCA\Circles\Exceptions\FederatedItemException; @@ -50,7 +50,7 @@ use OCA\Circles\Service\ConfigService; class CircleConfig implements IFederatedItem, IFederatedItemAsyncProcess { - use TNC22Deserialize; + use TDeserialize; /** @var CircleRequest */ diff --git a/lib/FederatedItems/CircleCreate.php b/lib/FederatedItems/CircleCreate.php index eab1d4bc..5f280301 100644 --- a/lib/FederatedItems/CircleCreate.php +++ b/lib/FederatedItems/CircleCreate.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; +use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\CircleNotFoundException; @@ -58,7 +58,7 @@ class CircleCreate implements IFederatedItemHighSeverity, IFederatedItemCircleCheckNotRequired, IFederatedItemMustBeInitializedLocally { - use TNC22Deserialize; + use TDeserialize; /** @var CircleRequest */ diff --git a/lib/FederatedItems/CircleDestroy.php b/lib/FederatedItems/CircleDestroy.php index 1672d27d..c074f173 100644 --- a/lib/FederatedItems/CircleDestroy.php +++ b/lib/FederatedItems/CircleDestroy.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; +use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\RequestBuilderException; @@ -54,7 +54,7 @@ class CircleDestroy implements IFederatedItemHighSeverity, IFederatedItemAsyncProcess, IFederatedItemMemberEmpty { - use TNC22Deserialize; + use TDeserialize; /** @var CircleRequest */ diff --git a/lib/FederatedItems/CircleEdit.php b/lib/FederatedItems/CircleEdit.php index 2a73b37b..d41b59e8 100644 --- a/lib/FederatedItems/CircleEdit.php +++ b/lib/FederatedItems/CircleEdit.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; +use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Exceptions\CircleNameTooShortException; use OCA\Circles\Exceptions\RequestBuilderException; @@ -47,7 +47,7 @@ use OCA\Circles\Service\EventService; * @package OCA\Circles\FederatedItems */ class CircleEdit implements IFederatedItem { - use TNC22Deserialize; + use TDeserialize; /** @var CircleRequest */ diff --git a/lib/FederatedItems/CircleJoin.php b/lib/FederatedItems/CircleJoin.php index d98d2a9a..3fbcedbb 100644 --- a/lib/FederatedItems/CircleJoin.php +++ b/lib/FederatedItems/CircleJoin.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\FederatedItemBadRequestException; @@ -77,8 +77,8 @@ class CircleJoin implements IFederatedItemMemberCheckNotRequired, IFederatedItemMemberOptional { use TStringTools; - use TNC22Logger; - use TNC22Deserialize; + use TNCLogger; + use TDeserialize; /** @var IUserManager */ diff --git a/lib/FederatedItems/CircleLeave.php b/lib/FederatedItems/CircleLeave.php index c0173476..1fb74967 100644 --- a/lib/FederatedItems/CircleLeave.php +++ b/lib/FederatedItems/CircleLeave.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; @@ -67,8 +67,8 @@ class CircleLeave implements IFederatedItemAsyncProcess, IFederatedItemInitiatorMembershipNotRequired, IFederatedItemMemberOptional { - use TNC22Deserialize; - use TNC22Logger; + use TDeserialize; + use TNCLogger; /** @var MemberRequest */ diff --git a/lib/FederatedItems/CircleSettings.php b/lib/FederatedItems/CircleSettings.php index 4f58f588..0521c23f 100644 --- a/lib/FederatedItems/CircleSettings.php +++ b/lib/FederatedItems/CircleSettings.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; +use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\CircleRequest; use OCA\Circles\IFederatedItem; use OCA\Circles\Model\Federated\FederatedEvent; @@ -42,7 +42,7 @@ use OCA\Circles\Model\Federated\FederatedEvent; * @package OCA\Circles\FederatedItems */ class CircleSettings implements IFederatedItem { - use TNC22Deserialize; + use TDeserialize; /** @var CircleRequest */ diff --git a/lib/FederatedItems/Files/FileShare.php b/lib/FederatedItems/Files/FileShare.php index b531ada5..58bbd49e 100644 --- a/lib/FederatedItems/Files/FileShare.php +++ b/lib/FederatedItems/Files/FileShare.php @@ -31,10 +31,10 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems\Files; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\UnknownTypeException; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\MountRequest; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\IFederatedItem; @@ -58,7 +58,7 @@ class FileShare implements IFederatedItemAsyncProcess, IFederatedItemMemberEmpty { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var MountRequest */ diff --git a/lib/FederatedItems/Files/FileUnshare.php b/lib/FederatedItems/Files/FileUnshare.php index d9520651..b98a6dc1 100644 --- a/lib/FederatedItems/Files/FileUnshare.php +++ b/lib/FederatedItems/Files/FileUnshare.php @@ -31,11 +31,11 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems\Files; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException; -use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\ItemNotFoundException; +use OCA\Circles\Tools\Exceptions\UnknownTypeException; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\MountRequest; use OCA\Circles\IFederatedItem; use OCA\Circles\IFederatedItemAsyncProcess; @@ -57,7 +57,7 @@ class FileUnshare implements IFederatedItemAsyncProcess, IFederatedItemMemberEmpty { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var MountRequest */ diff --git a/lib/FederatedItems/ItemLock.php b/lib/FederatedItems/ItemLock.php index 0babe32b..f3254a66 100644 --- a/lib/FederatedItems/ItemLock.php +++ b/lib/FederatedItems/ItemLock.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\ShareLockRequest; use OCA\Circles\Exceptions\FederatedShareNotFoundException; use OCA\Circles\Exceptions\InvalidIdException; diff --git a/lib/FederatedItems/LoopbackTest.php b/lib/FederatedItems/LoopbackTest.php index fce737a5..8b1a692f 100644 --- a/lib/FederatedItems/LoopbackTest.php +++ b/lib/FederatedItems/LoopbackTest.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\IFederatedItem; use OCA\Circles\IFederatedItemAsyncProcess; use OCA\Circles\IFederatedItemLoopbackTest; diff --git a/lib/FederatedItems/MassiveMemberAdd.php b/lib/FederatedItems/MassiveMemberAdd.php index 31af1298..fe1f27b4 100644 --- a/lib/FederatedItems/MassiveMemberAdd.php +++ b/lib/FederatedItems/MassiveMemberAdd.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\IFederatedItem; use OCA\Circles\IFederatedItemAsyncProcess; @@ -54,7 +54,7 @@ class MassiveMemberAdd extends SingleMemberAdd implements IFederatedItemHighSeverity, IFederatedItemMemberEmpty { use TStringTools; - use TNC22Logger; + use TNCLogger; /** diff --git a/lib/FederatedItems/MemberDisplayName.php b/lib/FederatedItems/MemberDisplayName.php index 22807795..2f5941f3 100644 --- a/lib/FederatedItems/MemberDisplayName.php +++ b/lib/FederatedItems/MemberDisplayName.php @@ -31,7 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\FederatedItemBadRequestException; use OCA\Circles\Exceptions\FederatedItemException; @@ -44,6 +43,7 @@ use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\EventService; use OCA\Circles\Service\MembershipService; use OCA\Circles\StatusCode; +use OCA\Circles\Tools\Traits\TDeserialize; /** * Class MemberDisplayName @@ -54,7 +54,7 @@ class MemberDisplayName implements IFederatedItem, IFederatedItemHighSeverity, IFederatedItemMemberEmpty { - use TNC22Deserialize; + use TDeserialize; /** @var MemberRequest */ @@ -99,7 +99,8 @@ class MemberDisplayName implements * @throws MemberLevelException */ public function verify(FederatedEvent $event): void { - $member = $event->getCircle()->getInitiator(); + $member = $event->getCircle() + ->getInitiator(); $displayName = $event->getParams()->g('displayName'); diff --git a/lib/FederatedItems/MemberLevel.php b/lib/FederatedItems/MemberLevel.php index af3b1f28..c1a36817 100644 --- a/lib/FederatedItems/MemberLevel.php +++ b/lib/FederatedItems/MemberLevel.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; +use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\FederatedItemBadRequestException; use OCA\Circles\Exceptions\FederatedItemException; @@ -57,7 +57,7 @@ class MemberLevel implements IFederatedItem, IFederatedItemHighSeverity, IFederatedItemMemberRequired { - use TNC22Deserialize; + use TDeserialize; /** @var MemberRequest */ diff --git a/lib/FederatedItems/SharedItemsSync.php b/lib/FederatedItems/SharedItemsSync.php index c69323a5..ff7edcc5 100644 --- a/lib/FederatedItems/SharedItemsSync.php +++ b/lib/FederatedItems/SharedItemsSync.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\IFederatedItem; use OCA\Circles\IFederatedItemLimitedToInstanceWithMembership; use OCA\Circles\Model\Federated\FederatedEvent; diff --git a/lib/FederatedItems/SingleMemberAdd.php b/lib/FederatedItems/SingleMemberAdd.php index 239f7bae..bc9399a4 100644 --- a/lib/FederatedItems/SingleMemberAdd.php +++ b/lib/FederatedItems/SingleMemberAdd.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\FederatedItems; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\FederatedItemBadRequestException; @@ -86,11 +86,11 @@ class SingleMemberAdd implements IFederatedItemHighSeverity, IFederatedItemMemberRequired, IFederatedItemMemberCheckNotRequired { - use TNC22Deserialize; + use TDeserialize; use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var IUserManager */ diff --git a/lib/GlobalScale/FileShare.php b/lib/GlobalScale/FileShare.php index 2a2da0a3..4a1a089c 100644 --- a/lib/GlobalScale/FileShare.php +++ b/lib/GlobalScale/FileShare.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\GlobalScale; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OC\Share20\Share; diff --git a/lib/GlobalScale/GSMount/Mount.php b/lib/GlobalScale/GSMount/Mount.php index 002d19bd..21eae973 100644 --- a/lib/GlobalScale/GSMount/Mount.php +++ b/lib/GlobalScale/GSMount/Mount.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\GlobalScale\GSMount; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC\Files\Mount\MountPoint; use OC\Files\Mount\MoveableMount; diff --git a/lib/GlobalScale/GSMount/MountProvider.php b/lib/GlobalScale/GSMount/MountProvider.php index 3f18ca55..94773729 100644 --- a/lib/GlobalScale/GSMount/MountProvider.php +++ b/lib/GlobalScale/GSMount/MountProvider.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\GlobalScale\GSMount; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OCA\Circles\Db\GSSharesRequest; diff --git a/lib/GlobalScale/MemberAdd.php b/lib/GlobalScale/MemberAdd.php index 288f02f5..26b4e8bb 100644 --- a/lib/GlobalScale/MemberAdd.php +++ b/lib/GlobalScale/MemberAdd.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\GlobalScale; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; use Exception; use OC\User\NoUserException; use OCA\Circles\Exceptions\CircleDoesNotExistException; diff --git a/lib/GlobalScale/Test.php b/lib/GlobalScale/Test.php index c0f2f96d..4d419110 100644 --- a/lib/GlobalScale/Test.php +++ b/lib/GlobalScale/Test.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\GlobalScale; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\Model\GlobalScale\GSEvent; /** diff --git a/lib/Handlers/WebfingerHandler.php b/lib/Handlers/WebfingerHandler.php index d3449db6..f3dbd56c 100644 --- a/lib/Handlers/WebfingerHandler.php +++ b/lib/Handlers/WebfingerHandler.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Handlers; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Traits\TArrayTools; use OC\URLGenerator; use OCA\Circles\AppInfo\Application; use OCA\Circles\Exceptions\UnknownInterfaceException; diff --git a/lib/IFederatedSync.php b/lib/IFederatedSync.php index 38fe2438..25683e68 100644 --- a/lib/IFederatedSync.php +++ b/lib/IFederatedSync.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; /** * Interface IFederatedSync diff --git a/lib/Listeners/Examples/ExampleAddingCircleMember.php b/lib/Listeners/Examples/ExampleAddingCircleMember.php index 3e8f5195..e023f068 100644 --- a/lib/Listeners/Examples/ExampleAddingCircleMember.php +++ b/lib/Listeners/Examples/ExampleAddingCircleMember.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Examples; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\AddingCircleMemberEvent; use OCA\Circles\Events\CircleGenericEvent; @@ -47,7 +47,7 @@ use OCP\EventDispatcher\IEventListener; * @package OCA\Circles\Listeners\Files */ class ExampleAddingCircleMember implements IEventListener { - use TNC22Logger; + use TNCLogger; /** @var ConfigService */ diff --git a/lib/Listeners/Examples/ExampleMembershipsCreated.php b/lib/Listeners/Examples/ExampleMembershipsCreated.php index 441e68aa..6218ddaf 100644 --- a/lib/Listeners/Examples/ExampleMembershipsCreated.php +++ b/lib/Listeners/Examples/ExampleMembershipsCreated.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Examples; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\CirclesManager; @@ -50,7 +50,7 @@ use OCP\EventDispatcher\IEventListener; */ class ExampleMembershipsCreated implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var CirclesManager */ diff --git a/lib/Listeners/Examples/ExampleMembershipsRemoved.php b/lib/Listeners/Examples/ExampleMembershipsRemoved.php index a46901ad..7458ece1 100644 --- a/lib/Listeners/Examples/ExampleMembershipsRemoved.php +++ b/lib/Listeners/Examples/ExampleMembershipsRemoved.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Examples; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\CirclesManager; @@ -50,7 +50,7 @@ use OCP\EventDispatcher\IEventListener; */ class ExampleMembershipsRemoved implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var CirclesManager */ diff --git a/lib/Listeners/Examples/ExampleRequestingCircleMember.php b/lib/Listeners/Examples/ExampleRequestingCircleMember.php index da1053dd..aebe9260 100644 --- a/lib/Listeners/Examples/ExampleRequestingCircleMember.php +++ b/lib/Listeners/Examples/ExampleRequestingCircleMember.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Examples; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\CircleGenericEvent; use OCA\Circles\Events\RequestingCircleMemberEvent; @@ -46,7 +46,7 @@ use OCP\EventDispatcher\IEventListener; * @package OCA\Circles\Listeners\Examples */ class ExampleRequestingCircleMember implements IEventListener { - use TNC22Logger; + use TNCLogger; /** @var ConfigService */ diff --git a/lib/Listeners/Files/AddingMemberSendMail.php b/lib/Listeners/Files/AddingMemberSendMail.php index 15992d95..a1dcbb07 100644 --- a/lib/Listeners/Files/AddingMemberSendMail.php +++ b/lib/Listeners/Files/AddingMemberSendMail.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\AddingCircleMemberEvent; @@ -52,7 +52,7 @@ use OCP\EventDispatcher\IEventListener; */ class AddingMemberSendMail implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var ShareWrapperService */ diff --git a/lib/Listeners/Files/CreatingShareSendMail.php b/lib/Listeners/Files/CreatingShareSendMail.php index 532eac91..6e72b9f3 100644 --- a/lib/Listeners/Files/CreatingShareSendMail.php +++ b/lib/Listeners/Files/CreatingShareSendMail.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\Files\CreatingFileShareEvent; @@ -59,7 +59,7 @@ use OCP\EventDispatcher\IEventListener; */ class CreatingShareSendMail implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var ShareWrapperService */ diff --git a/lib/Listeners/Files/DestroyingCircle.php b/lib/Listeners/Files/DestroyingCircle.php index 81181e65..9d19f10e 100644 --- a/lib/Listeners/Files/DestroyingCircle.php +++ b/lib/Listeners/Files/DestroyingCircle.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\DestroyingCircleEvent; use OCA\Circles\Exceptions\RequestBuilderException; @@ -47,7 +47,7 @@ use OCP\EventDispatcher\IEventListener; */ class DestroyingCircle implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var ShareWrapperService */ diff --git a/lib/Listeners/Files/MemberAddedSendMail.php b/lib/Listeners/Files/MemberAddedSendMail.php index 833fa515..738e9e3f 100644 --- a/lib/Listeners/Files/MemberAddedSendMail.php +++ b/lib/Listeners/Files/MemberAddedSendMail.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\CircleMemberAddedEvent; use OCA\Circles\Model\Member; @@ -50,7 +50,7 @@ use OCP\EventDispatcher\IEventListener; */ class MemberAddedSendMail implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var ShareWrapperService */ diff --git a/lib/Listeners/Files/MembershipsRemoved.php b/lib/Listeners/Files/MembershipsRemoved.php index 0f133143..78fd23a7 100644 --- a/lib/Listeners/Files/MembershipsRemoved.php +++ b/lib/Listeners/Files/MembershipsRemoved.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\CirclesManager; use OCA\Circles\Db\ShareWrapperRequest; use OCA\Circles\Events\MembershipsRemovedEvent; diff --git a/lib/Listeners/Files/PreparingMemberSendMail.php b/lib/Listeners/Files/PreparingMemberSendMail.php index b473984f..5b557d37 100644 --- a/lib/Listeners/Files/PreparingMemberSendMail.php +++ b/lib/Listeners/Files/PreparingMemberSendMail.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\PreparingCircleMemberEvent; use OCA\Circles\Exceptions\FederatedItemException; @@ -57,7 +57,7 @@ use OCP\EventDispatcher\IEventListener; */ class PreparingMemberSendMail implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var ShareWrapperService */ diff --git a/lib/Listeners/Files/PreparingShareSendMail.php b/lib/Listeners/Files/PreparingShareSendMail.php index 233349a6..9ae0ded7 100644 --- a/lib/Listeners/Files/PreparingShareSendMail.php +++ b/lib/Listeners/Files/PreparingShareSendMail.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\Files\PreparingFileShareEvent; use OCA\Circles\Exceptions\FederatedItemException; @@ -58,7 +58,7 @@ use OCP\Security\IHasher; */ class PreparingShareSendMail implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var IHasher */ diff --git a/lib/Listeners/Files/RemovingMember.php b/lib/Listeners/Files/RemovingMember.php index 93bd55f2..8355a7e0 100644 --- a/lib/Listeners/Files/RemovingMember.php +++ b/lib/Listeners/Files/RemovingMember.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\RemovingCircleMemberEvent; use OCA\Circles\Exceptions\MembershipNotFoundException; @@ -50,7 +50,7 @@ use OCP\EventDispatcher\IEventListener; */ class RemovingMember implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var MemberService */ diff --git a/lib/Listeners/Files/ShareCreatedSendMail.php b/lib/Listeners/Files/ShareCreatedSendMail.php index 605766a9..0b776f0d 100644 --- a/lib/Listeners/Files/ShareCreatedSendMail.php +++ b/lib/Listeners/Files/ShareCreatedSendMail.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Files; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\Files\FileShareCreatedEvent; @@ -60,7 +60,7 @@ use OCP\EventDispatcher\IEventListener; */ class ShareCreatedSendMail implements IEventListener { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var ShareWrapperService */ diff --git a/lib/Listeners/Notifications/RequestingMember.php b/lib/Listeners/Notifications/RequestingMember.php index b2f78036..50a91c0c 100644 --- a/lib/Listeners/Notifications/RequestingMember.php +++ b/lib/Listeners/Notifications/RequestingMember.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Listeners\Notifications; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\CircleGenericEvent; use OCA\Circles\Events\RequestingCircleMemberEvent; @@ -46,7 +46,7 @@ use OCP\EventDispatcher\IEventListener; * @package OCA\Circles\Listeners\Notifications */ class RequestingMember implements IEventListener { - use TNC22Logger; + use TNCLogger; /** @var NotificationService */ diff --git a/lib/Migration/Migration.php b/lib/Migration/Migration.php index 7ef0bd2c..75ad6adb 100644 --- a/lib/Migration/Migration.php +++ b/lib/Migration/Migration.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Migration; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\MigrationService; @@ -45,7 +45,7 @@ use OCP\Migration\IRepairStep; * @package OCA\Circles\Migration */ class Migration implements IRepairStep { - use TNC22Logger; + use TNCLogger; /** @var MigrationService */ diff --git a/lib/Model/Circle.php b/lib/Model/Circle.php index a4803a2a..5b8858a1 100644 --- a/lib/Model/Circle.php +++ b/lib/Model/Circle.php @@ -31,11 +31,11 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TArrayTools; use DateTime; use JsonSerializable; use OCA\Circles\Db\CircleRequest; @@ -82,9 +82,9 @@ use OCP\Security\IHasher; * * @package OCA\Circles\Model */ -class Circle extends ManagedModel implements IEntity, IDeserializable, INC22QueryRow, JsonSerializable { +class Circle extends ManagedModel implements IEntity, IDeserializable, IQueryRow, JsonSerializable { use TArrayTools; - use TNC22Deserialize; + use TDeserialize; public const FLAGS_SHORT = 1; @@ -219,6 +219,9 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, INC22Quer /** @var int */ private $population = 0; + /** @var int */ + private $populationInherited = 0; + // /** @var bool */ // private $hidden = false; @@ -663,6 +666,25 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, INC22Quer } + /** + * @param int $population + * + * @return Circle + */ + public function setPopulationInherited(int $population): self { + $this->populationInherited = $population; + + return $this; + } + + /** + * @return int + */ + public function getPopulationInherited(): int { + return $this->populationInherited; + } + + /** * @param array $settings * @@ -866,10 +888,10 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, INC22Quer * @param array $data * @param string $prefix * - * @return INC22QueryRow + * @return IQueryRow * @throws CircleNotFoundException */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { if ($this->get($prefix . 'unique_id', $data) === '') { throw new CircleNotFoundException(); } @@ -881,7 +903,6 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, INC22Quer ->setConfig($this->getInt($prefix . 'config', $data)) ->setSource($this->getInt($prefix . 'source', $data)) ->setInstance($this->get($prefix . 'instance', $data)) - ->setPopulation($this->getInt($prefix . 'population', $data)) ->setSettings($this->getArray($prefix . 'settings', $data)) ->setContactAddressBook($this->getInt($prefix . 'contact_addressbook', $data)) ->setContactGroupName($this->get($prefix . 'contact_groupname', $data)) @@ -890,6 +911,9 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, INC22Quer $creation = $this->get($prefix . 'creation', $data); $this->setCreation(DateTime::createFromFormat('Y-m-d H:i:s', $creation)->getTimestamp()); + $this->setPopulation($this->getInt('population', $this->getSettings())); + $this->setPopulationInherited($this->getInt('populationInherited', $this->getSettings())); + $this->getManager()->manageImportFromDatabase($this, $data, $prefix); diff --git a/lib/Model/DavCard.php b/lib/Model/DavCard.php index 112968e5..bcad4192 100644 --- a/lib/Model/DavCard.php +++ b/lib/Model/DavCard.php @@ -29,7 +29,7 @@ namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; /** diff --git a/lib/Model/DeprecatedCircle.php b/lib/Model/DeprecatedCircle.php index 56b530fa..9471e9e1 100644 --- a/lib/Model/DeprecatedCircle.php +++ b/lib/Model/DeprecatedCircle.php @@ -26,7 +26,7 @@ namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\CircleTypeNotValidException; use OCA\Circles\Exceptions\FederatedCircleNotAllowedException; diff --git a/lib/Model/Federated/EventWrapper.php b/lib/Model/Federated/EventWrapper.php index 798ceb75..7338941d 100644 --- a/lib/Model/Federated/EventWrapper.php +++ b/lib/Model/Federated/EventWrapper.php @@ -31,10 +31,10 @@ declare(strict_types=1); namespace OCA\Circles\Model\Federated; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; /** @@ -42,7 +42,7 @@ use JsonSerializable; * * @package OCA\Circles\Model\Remote */ -class EventWrapper implements INC22QueryRow, JsonSerializable { +class EventWrapper implements IQueryRow, JsonSerializable { use TArrayTools; @@ -306,10 +306,10 @@ class EventWrapper implements INC22QueryRow, JsonSerializable { /** * @param array $data * - * @return INC22QueryRow + * @return IQueryRow * @throws InvalidItemException */ - public function importFromDatabase(array $data): INC22QueryRow { + public function importFromDatabase(array $data): IQueryRow { $this->setToken($this->get('token', $data)); $this->setInstance($this->get('instance', $data)); $this->setInterface($this->getInt('interface', $data)); diff --git a/lib/Model/Federated/FederatedEvent.php b/lib/Model/Federated/FederatedEvent.php index c172b3ec..8443f67c 100644 --- a/lib/Model/Federated/FederatedEvent.php +++ b/lib/Model/Federated/FederatedEvent.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Model\Federated; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Model\Circle; use OCA\Circles\Model\Member; diff --git a/lib/Model/Federated/FederatedShare.php b/lib/Model/Federated/FederatedShare.php index 44b52caa..8b049441 100644 --- a/lib/Model/Federated/FederatedShare.php +++ b/lib/Model/Federated/FederatedShare.php @@ -31,10 +31,10 @@ declare(strict_types=1); namespace OCA\Circles\Model\Federated; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\IFederatedModel; use OCA\Circles\Model\ManagedModel; @@ -44,7 +44,7 @@ use OCA\Circles\Model\ManagedModel; * * @package OCA\Circles\Model\Federated */ -class FederatedShare extends ManagedModel implements IFederatedModel, JsonSerializable, INC22QueryRow, IDeserializable { +class FederatedShare extends ManagedModel implements IFederatedModel, JsonSerializable, IQueryRow, IDeserializable { use TArrayTools; @@ -195,9 +195,9 @@ class FederatedShare extends ManagedModel implements IFederatedModel, JsonSerial /** * @param array $data * - * @return INC22QueryRow + * @return IQueryRow */ - public function importFromDatabase(array $data): INC22QueryRow { + public function importFromDatabase(array $data): IQueryRow { $this->setId($this->getInt('id', $data)); $this->setItemId($this->get('item_id', $data)); $this->setCircleId($this->get('circle_id', $data)); diff --git a/lib/Model/Federated/RemoteInstance.php b/lib/Model/Federated/RemoteInstance.php index a3acd9a3..34eab92c 100644 --- a/lib/Model/Federated/RemoteInstance.php +++ b/lib/Model/Federated/RemoteInstance.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Model\Federated; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Signatory; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Model\NCSignatory; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\RemoteNotFoundException; use OCA\Circles\Exceptions\RemoteUidException; @@ -43,7 +43,7 @@ use OCA\Circles\Exceptions\RemoteUidException; * * @package OCA\Circles\Model */ -class RemoteInstance extends NC22Signatory implements INC22QueryRow, JsonSerializable { +class RemoteInstance extends NCSignatory implements IQueryRow, JsonSerializable { use TArrayTools; public const TYPE_UNKNOWN = 'Unknown'; // not trusted @@ -476,9 +476,9 @@ class RemoteInstance extends NC22Signatory implements INC22QueryRow, JsonSeriali /** * @param array $data * - * @return NC22Signatory + * @return NCSignatory */ - public function import(array $data): NC22Signatory { + public function import(array $data): NCSignatory { parent::import($data); $this->setTest($this->get(self::TEST, $data)) @@ -544,7 +544,7 @@ class RemoteInstance extends NC22Signatory implements INC22QueryRow, JsonSeriali * @return self * @throws RemoteNotFoundException */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { if ($this->getInt($prefix . 'id', $data) === 0) { throw new RemoteNotFoundException(); } diff --git a/lib/Model/FederatedUser.php b/lib/Model/FederatedUser.php index 97f12560..e9f4e930 100644 --- a/lib/Model/FederatedUser.php +++ b/lib/Model/FederatedUser.php @@ -31,11 +31,11 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\FederatedUserNotFoundException; use OCA\Circles\Exceptions\MembershipNotFoundException; @@ -54,10 +54,10 @@ class FederatedUser extends ManagedModel implements IFederatedUser, IEntity, IDeserializable, - INC22QueryRow, + IQueryRow, JsonSerializable { use TArrayTools; - use TNC22Deserialize; + use TDeserialize; /** @var string */ @@ -414,10 +414,10 @@ class FederatedUser extends ManagedModel implements * @param array $data * @param string $prefix * - * @return INC22QueryRow + * @return IQueryRow * @throws FederatedUserNotFoundException */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { if ($this->get($prefix . 'single_id', $data) === '') { throw new FederatedUserNotFoundException(); } diff --git a/lib/Model/FileCacheWrapper.php b/lib/Model/FileCacheWrapper.php index 535d83ee..fa659f8e 100644 --- a/lib/Model/FileCacheWrapper.php +++ b/lib/Model/FileCacheWrapper.php @@ -31,10 +31,10 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Db\CoreQueryBuilder; use OCA\Circles\Exceptions\FileCacheNotFoundException; @@ -44,7 +44,7 @@ use OCA\Circles\Exceptions\FileCacheNotFoundException; * * @package OCA\Circles\Model */ -class FileCacheWrapper extends ManagedModel implements INC22QueryRow, IDeserializable, JsonSerializable { +class FileCacheWrapper extends ManagedModel implements IQueryRow, IDeserializable, JsonSerializable { use TArrayTools; @@ -497,10 +497,10 @@ class FileCacheWrapper extends ManagedModel implements INC22QueryRow, IDeseriali * @param array $data * @param string $prefix * - * @return INC22QueryRow + * @return IQueryRow * @throws FileCacheNotFoundException */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { if ($this->getInt($prefix . 'fileid', $data) === 0) { throw new FileCacheNotFoundException(); } diff --git a/lib/Model/GlobalScale/GSEvent.php b/lib/Model/GlobalScale/GSEvent.php index 39a0fce0..93e57e07 100644 --- a/lib/Model/GlobalScale/GSEvent.php +++ b/lib/Model/GlobalScale/GSEvent.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Model\GlobalScale; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\JsonException; use OCA\Circles\Exceptions\ModelException; diff --git a/lib/Model/GlobalScale/GSShare.php b/lib/Model/GlobalScale/GSShare.php index 8c2b3da2..5a0c3cd0 100644 --- a/lib/Model/GlobalScale/GSShare.php +++ b/lib/Model/GlobalScale/GSShare.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Model\GlobalScale; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; /** diff --git a/lib/Model/GlobalScale/GSShareMountpoint.php b/lib/Model/GlobalScale/GSShareMountpoint.php index 2cb146e8..d4e8326d 100644 --- a/lib/Model/GlobalScale/GSShareMountpoint.php +++ b/lib/Model/GlobalScale/GSShareMountpoint.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Model\GlobalScale; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; /** diff --git a/lib/Model/GlobalScale/GSWrapper.php b/lib/Model/GlobalScale/GSWrapper.php index 235b4aa9..c9bbbb7f 100644 --- a/lib/Model/GlobalScale/GSWrapper.php +++ b/lib/Model/GlobalScale/GSWrapper.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Model\GlobalScale; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\JsonException; use OCA\Circles\Exceptions\ModelException; diff --git a/lib/Model/Helpers/MemberHelper.php b/lib/Model/Helpers/MemberHelper.php index 0ae5fb7b..5e81e0e5 100644 --- a/lib/Model/Helpers/MemberHelper.php +++ b/lib/Model/Helpers/MemberHelper.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Model\Helpers; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use OCA\Circles\Exceptions\MemberHelperException; use OCA\Circles\Exceptions\MemberLevelException; use OCA\Circles\Exceptions\ParseMemberLevelException; diff --git a/lib/Model/Member.php b/lib/Model/Member.php index a763c15a..233b7aae 100644 --- a/lib/Model/Member.php +++ b/lib/Model/Member.php @@ -31,11 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use DateTime; use JsonSerializable; use OCA\Circles\AppInfo\Capabilities; @@ -45,9 +40,14 @@ use OCA\Circles\Exceptions\ParseMemberLevelException; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\Exceptions\UnknownInterfaceException; use OCA\Circles\Exceptions\UserTypeNotFoundException; -use OCA\Circles\IFederatedUser; use OCA\Circles\IEntity; +use OCA\Circles\IFederatedUser; use OCA\Circles\Model\Federated\RemoteInstance; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TDeserialize; /** * Class Member @@ -58,10 +58,10 @@ class Member extends ManagedModel implements IEntity, IFederatedUser, IDeserializable, - INC22QueryRow, + IQueryRow, JsonSerializable { use TArrayTools; - use TNC22Deserialize; + use TDeserialize; public const LEVEL_NONE = 0; @@ -844,10 +844,10 @@ class Member extends ManagedModel implements * @param array $data * @param string $prefix * - * @return INC22QueryRow + * @return IQueryRow * @throws MemberNotFoundException */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { if ($this->get($prefix . 'single_id', $data) === '') { throw new MemberNotFoundException(); } diff --git a/lib/Model/Membership.php b/lib/Model/Membership.php index 6aacd4df..bba5145c 100644 --- a/lib/Model/Membership.php +++ b/lib/Model/Membership.php @@ -31,19 +31,19 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\MembershipNotFoundException; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class Membership * * @package OCA\Circles\Model */ -class Membership extends ManagedModel implements IDeserializable, INC22QueryRow, JsonSerializable { +class Membership extends ManagedModel implements IDeserializable, IQueryRow, JsonSerializable { use TArrayTools; @@ -298,10 +298,10 @@ class Membership extends ManagedModel implements IDeserializable, INC22QueryRow, * @param array $data * @param string $prefix * - * @return INC22QueryRow + * @return IQueryRow * @throws MembershipNotFoundException */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { if ($this->get($prefix . 'single_id', $data) === '') { throw new MembershipNotFoundException(); } diff --git a/lib/Model/ModelManager.php b/lib/Model/ModelManager.php index cdc03653..175214b9 100644 --- a/lib/Model/ModelManager.php +++ b/lib/Model/ModelManager.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\CoreQueryBuilder; @@ -65,7 +65,7 @@ use OCP\IURLGenerator; * @package OCA\Circles\Model */ class ModelManager { - use TNC22Logger; + use TNCLogger; /** @var IURLGenerator */ @@ -554,9 +554,7 @@ class ModelManager { */ public function generateLinkToCircle(string $singleId): string { return $this->urlGenerator->linkToRoute( - $this->configService->getAppValue( - ConfigService::ROUTE_TO_CIRCLE - ), + $this->configService->getAppValue(ConfigService::ROUTE_TO_CIRCLE), ['singleId' => $singleId] ); } diff --git a/lib/Model/Mount.php b/lib/Model/Mount.php index c32d9a7f..6a09132e 100644 --- a/lib/Model/Mount.php +++ b/lib/Model/Mount.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\MountManager\CircleMountManager; @@ -45,7 +45,7 @@ use OCP\Http\Client\IClientService; * * @package OCA\Circles\Model */ -class Mount extends ManagedModel implements IDeserializable, INC22QueryRow, JsonSerializable { +class Mount extends ManagedModel implements IDeserializable, IQueryRow, JsonSerializable { use TArrayTools; @@ -458,7 +458,7 @@ class Mount extends ManagedModel implements IDeserializable, INC22QueryRow, Json * * @return Mount */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { $this->setId($this->getInt('id', $data)); $this->setCircleId($this->get('circle_id', $data)); $this->setToken($this->get('token', $data)); diff --git a/lib/Model/Mountpoint.php b/lib/Model/Mountpoint.php index aaee6817..231d4bf7 100644 --- a/lib/Model/Mountpoint.php +++ b/lib/Model/Mountpoint.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; /** diff --git a/lib/Model/Report.php b/lib/Model/Report.php index 1400dd7d..c799ec5c 100644 --- a/lib/Model/Report.php +++ b/lib/Model/Report.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; /** diff --git a/lib/Model/ShareToken.php b/lib/Model/ShareToken.php index 02d22bab..7ef3bc3a 100644 --- a/lib/Model/ShareToken.php +++ b/lib/Model/ShareToken.php @@ -31,15 +31,15 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\ShareTokenNotFoundException; use OCP\Share\IShare; -class ShareToken implements IDeserializable, INC22QueryRow, JsonSerializable { +class ShareToken implements IDeserializable, IQueryRow, JsonSerializable { use TArrayTools; @@ -277,10 +277,10 @@ class ShareToken implements IDeserializable, INC22QueryRow, JsonSerializable { * @param array $data * @param string $prefix * - * @return INC22QueryRow + * @return IQueryRow * @throws ShareTokenNotFoundException */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { if ($this->get($prefix . 'token', $data) === '') { throw new ShareTokenNotFoundException(); } diff --git a/lib/Model/ShareWrapper.php b/lib/Model/ShareWrapper.php index d5772ae5..2a242f99 100644 --- a/lib/Model/ShareWrapper.php +++ b/lib/Model/ShareWrapper.php @@ -31,11 +31,11 @@ declare(strict_types=1); namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\IDeserializable; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TArrayTools; use DateTime; use JsonSerializable; use OC; @@ -54,9 +54,9 @@ use OCP\Share\IShare; * * @package OCA\Circles\Model */ -class ShareWrapper extends ManagedModel implements IDeserializable, INC22QueryRow, JsonSerializable { +class ShareWrapper extends ManagedModel implements IDeserializable, IQueryRow, JsonSerializable { use TArrayTools; - use TNC22Deserialize; + use TDeserialize; /** @var string */ @@ -781,9 +781,9 @@ class ShareWrapper extends ManagedModel implements IDeserializable, INC22QueryRo * @param array $data * @param string $prefix * - * @return INC22QueryRow + * @return IQueryRow */ - public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { + public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { $shareTime = new DateTime(); $shareTime->setTimestamp($this->getInt($prefix . 'stime', $data)); diff --git a/lib/Model/SharesToken.php b/lib/Model/SharesToken.php index cd9eb19c..ab807b03 100644 --- a/lib/Model/SharesToken.php +++ b/lib/Model/SharesToken.php @@ -26,7 +26,7 @@ namespace OCA\Circles\Model; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCP\Share\IShare; diff --git a/lib/MountManager/CircleMount.php b/lib/MountManager/CircleMount.php index 29ac827d..33de496e 100644 --- a/lib/MountManager/CircleMount.php +++ b/lib/MountManager/CircleMount.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\MountManager; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use JsonSerializable; use OC\Files\Mount\MountPoint; diff --git a/lib/MountManager/CircleMountProvider.php b/lib/MountManager/CircleMountProvider.php index 8aec5410..a205e461 100644 --- a/lib/MountManager/CircleMountProvider.php +++ b/lib/MountManager/CircleMountProvider.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\MountManager; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OCA\Circles\Db\MountRequest; use OCA\Circles\Exceptions\FederatedUserException; diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php index eed06294..a43d5740 100644 --- a/lib/Notification/Notifier.php +++ b/lib/Notification/Notifier.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Notification; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use InvalidArgumentException; use OCA\Circles\AppInfo\Application; @@ -60,7 +60,7 @@ use OCP\Notification\INotifier; * @package OCA\Circles\Notification */ class Notifier implements INotifier { - use TNC22Logger; + use TNCLogger; /** @var IL10N */ diff --git a/lib/Search/GlobalScaleUsers.php b/lib/Search/GlobalScaleUsers.php index 9b59e6f3..f05f6945 100644 --- a/lib/Search/GlobalScaleUsers.php +++ b/lib/Search/GlobalScaleUsers.php @@ -26,12 +26,12 @@ namespace OCA\Circles\Search; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultNotJsonException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Traits\TNCRequest; +use OCA\Circles\Tools\Traits\TArrayTools; use OCA\Circles\Exceptions\GSStatusException; use OCA\Circles\ISearch; use OCA\Circles\Model\DeprecatedMember; @@ -45,7 +45,7 @@ use OCA\Circles\Service\MiscService; * @package OCA\Circles\Search */ class GlobalScaleUsers implements ISearch { - use TNC22Request; + use TNCRequest; use TArrayTools; @@ -79,7 +79,7 @@ class GlobalScaleUsers implements ISearch { return []; } - $request = new NC22Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET); + $request = new NCRequest(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET); $this->configService->configureRequest($request); $request->basedOnUrl($lookup); $request->addParam('search', $search); diff --git a/lib/Search/LocalUsers.php b/lib/Search/LocalUsers.php index 44dc2685..21e60e21 100644 --- a/lib/Search/LocalUsers.php +++ b/lib/Search/LocalUsers.php @@ -26,7 +26,7 @@ namespace OCA\Circles\Search; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use OCA\Circles\ISearch; use OCA\Circles\Model\DeprecatedMember; use OCA\Circles\Model\SearchResult; diff --git a/lib/Service/CircleService.php b/lib/Service/CircleService.php index 0d9079f0..7f206a7d 100644 --- a/lib/Service/CircleService.php +++ b/lib/Service/CircleService.php @@ -31,10 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; @@ -68,13 +64,17 @@ use OCA\Circles\Model\Member; use OCA\Circles\Model\Probes\CircleProbe; use OCA\Circles\Model\Probes\MemberProbe; use OCA\Circles\StatusCode; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\IL10N; use OCP\Security\IHasher; class CircleService { use TArrayTools; use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var IL10N */ diff --git a/lib/Service/CirclesService.php b/lib/Service/CirclesService.php index af5cd8d3..4761b7cd 100644 --- a/lib/Service/CirclesService.php +++ b/lib/Service/CirclesService.php @@ -29,7 +29,7 @@ namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OCA\Circles\AppInfo\Application; diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php index 1409a203..2ad77110 100644 --- a/lib/Service/ConfigService.php +++ b/lib/Service/ConfigService.php @@ -31,10 +31,10 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TStringTools; use OC; use OCA\Circles\AppInfo\Application; use OCA\Circles\Exceptions\GSStatusException; @@ -52,7 +52,7 @@ use OCP\IURLGenerator; class ConfigService { use TStringTools; use TArrayTools; - use TNC22Logger; + use TNCLogger; public const FRONTAL_CLOUD_BASE = 'frontal_cloud_base'; @@ -696,12 +696,12 @@ class ConfigService { * - Create route using getLoopbackAddress() * - perfect for loopback request. * - * @param NC22Request $request + * @param NCRequest $request * @param string $route * @param array $args */ public function configureLoopbackRequest( - NC22Request $request, + NCRequest $request, string $route = '', array $args = [] ): void { @@ -712,9 +712,9 @@ class ConfigService { /** - * @param NC22Request $request + * @param NCRequest $request */ - public function configureRequest(NC22Request $request): void { + public function configureRequest(NCRequest $request): void { $request->setVerifyPeer($this->getAppValue(ConfigService::SELF_SIGNED_CERT) !== '1'); $request->setProtocols(['https', 'http']); $request->setHttpErrorsAllowed(true); diff --git a/lib/Service/ContactService.php b/lib/Service/ContactService.php index 9f63623c..73153997 100644 --- a/lib/Service/ContactService.php +++ b/lib/Service/ContactService.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OC; use OCA\Circles\Exceptions\ContactAddressBookNotFoundException; @@ -53,7 +53,7 @@ use OCP\IURLGenerator; class ContactService { use TArrayTools; use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var IURLGenerator */ diff --git a/lib/Service/EventService.php b/lib/Service/EventService.php index 79f7636d..004a3228 100644 --- a/lib/Service/EventService.php +++ b/lib/Service/EventService.php @@ -34,8 +34,8 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\AddingCircleMemberEvent; use OCA\Circles\Events\CircleCreatedEvent; @@ -70,7 +70,7 @@ use OCP\EventDispatcher\IEventDispatcher; * @package OCA\Circles\Service */ class EventService { - use TNC22Logger; + use TNCLogger; /** @var IEventDispatcher */ diff --git a/lib/Service/EventWrapperService.php b/lib/Service/EventWrapperService.php index fbc71879..07ad792d 100644 --- a/lib/Service/EventWrapperService.php +++ b/lib/Service/EventWrapperService.php @@ -30,21 +30,21 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use Exception; use OCA\Circles\Db\EventWrapperRequest; use OCA\Circles\Model\Federated\EventWrapper; use OCA\Circles\Model\Federated\FederatedEvent; +use OCA\Circles\Tools\ActivityPub\NCSignature; +use OCA\Circles\Tools\Traits\TNCRequest; +use OCA\Circles\Tools\Traits\TStringTools; /** * Class EventWrapperService * * @package OCA\Circles\Service */ -class EventWrapperService extends NC22Signature { - use TNC22Request; +class EventWrapperService extends NCSignature { + use TNCRequest; use TStringTools; diff --git a/lib/Service/FederatedEventService.php b/lib/Service/FederatedEventService.php index bfa335c6..9759da74 100644 --- a/lib/Service/FederatedEventService.php +++ b/lib/Service/FederatedEventService.php @@ -30,12 +30,6 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use OC; use OCA\Circles\Db\EventWrapperRequest; use OCA\Circles\Db\MemberRequest; @@ -72,6 +66,12 @@ use OCA\Circles\Model\Federated\EventWrapper; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Federated\RemoteInstance; use OCA\Circles\Model\Member; +use OCA\Circles\Tools\ActivityPub\NCSignature; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Traits\TNCRequest; +use OCA\Circles\Tools\Traits\TStringTools; use ReflectionClass; use ReflectionException; @@ -80,8 +80,8 @@ use ReflectionException; * * @package OCA\Circles\Service */ -class FederatedEventService extends NC22Signature { - use TNC22Request; +class FederatedEventService extends NCSignature { + use TNCRequest; use TStringTools; @@ -415,7 +415,7 @@ class FederatedEventService extends NC22Signature { $this->eventWrapperRequest->save($wrapper); } - $request = new NC22Request('', Request::TYPE_POST); + $request = new NCRequest('', Request::TYPE_POST); $this->configService->configureLoopbackRequest( $request, 'circles.EventWrapper.asyncBroadcast', diff --git a/lib/Service/FederatedShareService.php b/lib/Service/FederatedShareService.php index a8f047b9..5ed5afa2 100644 --- a/lib/Service/FederatedShareService.php +++ b/lib/Service/FederatedShareService.php @@ -30,11 +30,6 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\FederatedEventDSyncException; use OCA\Circles\Exceptions\FederatedEventException; @@ -49,13 +44,18 @@ use OCA\Circles\Exceptions\UnknownRemoteException; use OCA\Circles\FederatedItems\ItemLock; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Federated\FederatedShare; +use OCA\Circles\Tools\ActivityPub\NCSignature; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Exceptions\UnknownTypeException; /** * Class FederatedShareService * * @package OCA\Circles\Service */ -class FederatedShareService extends NC22Signature { +class FederatedShareService extends NCSignature { /** @var FederatedEventService */ diff --git a/lib/Service/FederatedUserService.php b/lib/Service/FederatedUserService.php index 4394f138..3828c8b6 100644 --- a/lib/Service/FederatedUserService.php +++ b/lib/Service/FederatedUserService.php @@ -31,11 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use Exception; use OC; use OCA\Circles\AppInfo\Application; @@ -71,6 +66,11 @@ use OCA\Circles\Model\FederatedUser; use OCA\Circles\Model\ManagedModel; use OCA\Circles\Model\Member; use OCA\Circles\Model\Probes\CircleProbe; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\ICache; use OCP\ICacheFactory; use OCP\IGroupManager; @@ -86,8 +86,8 @@ use OCP\IUserSession; class FederatedUserService { use TArrayTools; use TStringTools; - use TNC22Logger; - use TNC22Deserialize; + use TNCLogger; + use TDeserialize; public const CACHE_SINGLE_CIRCLE = 'circles/singleCircle'; diff --git a/lib/Service/GSUpstreamService.php b/lib/Service/GSUpstreamService.php index ac7f12ff..7684f558 100644 --- a/lib/Service/GSUpstreamService.php +++ b/lib/Service/GSUpstreamService.php @@ -31,15 +31,15 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestContentException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultNotJsonException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultSizeException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestServerException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request; +use OCA\Circles\Tools\Exceptions\RequestContentException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; +use OCA\Circles\Tools\Exceptions\RequestResultSizeException; +use OCA\Circles\Tools\Exceptions\RequestServerException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TNCRequest; use Exception; use OCA\Circles\Db\DeprecatedCirclesRequest; use OCA\Circles\Db\DeprecatedMembersRequest; @@ -60,7 +60,7 @@ use OCP\IURLGenerator; * @package OCA\Circles\Service */ class GSUpstreamService { - use TNC22Request; + use TNCRequest; /** @var string */ @@ -189,11 +189,11 @@ class GSUpstreamService { $this->signEvent($event); if ($this->configService->isLocalInstance($instance)) { - $request = new NC22Request('', Request::TYPE_POST); + $request = new NCRequest('', Request::TYPE_POST); $this->configService->configureRequest($request, 'circles.EventWrapper.broadcast'); } else { $path = $this->urlGenerator->linkToRoute('circles.EventWrapper.broadcast'); - $request = new NC22Request($path, Request::TYPE_POST); + $request = new NCRequest($path, Request::TYPE_POST); $this->configService->configureRequest($request); $request->setInstance($instance); } @@ -222,7 +222,7 @@ class GSUpstreamService { $owner = $circle->getOwner(); $path = $this->urlGenerator->linkToRoute('circles.EventWrapper.event'); - $request = new NC22Request($path, Request::TYPE_POST); + $request = new NCRequest($path, Request::TYPE_POST); $this->configService->configureRequest($request); $request->basedOnUrl($owner->getInstance()); @@ -404,7 +404,7 @@ class GSUpstreamService { $this->signEvent($event); $path = $this->urlGenerator->linkToRoute('circles.EventWrapper.status'); - $request = new NC22Request($path, Request::TYPE_POST); + $request = new NCRequest($path, Request::TYPE_POST); $this->configService->configureRequest($request); $request->setDataSerialize($event); diff --git a/lib/Service/GlobalScaleService.php b/lib/Service/GlobalScaleService.php index 1735562e..4d37f90e 100644 --- a/lib/Service/GlobalScaleService.php +++ b/lib/Service/GlobalScaleService.php @@ -31,11 +31,11 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Traits\TNCRequest; +use OCA\Circles\Tools\Traits\TStringTools; use OC\Security\IdentityProof\Signer; use OCA\Circles\Db\EventWrapperRequest; use OCA\Circles\Exceptions\GSStatusException; @@ -49,7 +49,7 @@ use OCP\IUserSession; * @package OCA\Circles\Service */ class GlobalScaleService { - use TNC22Request; + use TNCRequest; use TStringTools; @@ -116,7 +116,7 @@ class GlobalScaleService { try { $lookup = $this->configService->getGSLookup(); - $request = new NC22Request(ConfigService::GS_LOOKUP_INSTANCES, Request::TYPE_POST); + $request = new NCRequest(ConfigService::GS_LOOKUP_INSTANCES, Request::TYPE_POST); $this->configService->configureRequest($request); $request->basedOnUrl($lookup); $request->addData('authKey', $this->configService->getGSInfo(ConfigService::GS_KEY)); diff --git a/lib/Service/InterfaceService.php b/lib/Service/InterfaceService.php index 33eac4b2..d72fdf5f 100644 --- a/lib/Service/InterfaceService.php +++ b/lib/Service/InterfaceService.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\RemoteRequest; use OCA\Circles\Exceptions\RemoteNotFoundException; @@ -69,7 +69,7 @@ class InterfaceService { use TStringTools; use TArrayTools; - use TNC22Logger; + use TNCLogger; /** @var IURLGenerator */ diff --git a/lib/Service/MaintenanceService.php b/lib/Service/MaintenanceService.php index 4d5f0a47..e10c8081 100644 --- a/lib/Service/MaintenanceService.php +++ b/lib/Service/MaintenanceService.php @@ -31,7 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; use Exception; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; @@ -43,6 +42,7 @@ use OCA\Circles\Model\Circle; use OCA\Circles\Model\Member; use OCA\Circles\Model\Probes\CircleProbe; use OCA\Circles\Model\ShareWrapper; +use OCA\Circles\Tools\Traits\TNCLogger; use OCP\IUserManager; use Symfony\Component\Console\Output\OutputInterface; @@ -52,7 +52,7 @@ use Symfony\Component\Console\Output\OutputInterface; * @package OCA\Circles\Service */ class MaintenanceService { - use TNC22Logger; + use TNCLogger; public const TIMEOUT = 18000; diff --git a/lib/Service/MemberService.php b/lib/Service/MemberService.php index f38a6022..58e1d261 100644 --- a/lib/Service/MemberService.php +++ b/lib/Service/MemberService.php @@ -31,10 +31,6 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\CircleNotFoundException; @@ -64,6 +60,10 @@ use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\FederatedUser; use OCA\Circles\Model\Member; use OCA\Circles\Model\Probes\MemberProbe; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; /** * Class MemberService @@ -73,7 +73,7 @@ use OCA\Circles\Model\Probes\MemberProbe; class MemberService { use TArrayTools; use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var CircleRequest */ @@ -296,8 +296,10 @@ class MemberService { */ public function removeMember(string $memberId): array { $this->federatedUserService->mustHaveCurrentUser(); - $member = - $this->memberRequest->getMemberById($memberId, $this->federatedUserService->getCurrentUser()); + $member = $this->memberRequest->getMemberById( + $memberId, + $this->federatedUserService->getCurrentUser() + ); $event = new FederatedEvent(MemberRemove::class); $event->setCircle($member->getCircle()); diff --git a/lib/Service/MembersService.php b/lib/Service/MembersService.php index 11288df0..e1558f6b 100644 --- a/lib/Service/MembersService.php +++ b/lib/Service/MembersService.php @@ -26,12 +26,12 @@ namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultNotJsonException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Traits\TNCRequest; +use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OC\User\NoUserException; @@ -64,7 +64,7 @@ use OCP\IUserManager; * @package OCA\Circles\Service */ class MembersService { - use TNC22Request; + use TNCRequest; use TArrayTools; @@ -719,7 +719,7 @@ class MembersService { private function getGlobalScaleUserDisplayName(string $ident): string { $lookup = $this->configService->getGSLookup(); - $request = new NC22Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET); + $request = new NCRequest(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET); $this->configService->configureRequest($request); $request->basedOnUrl($lookup); $request->addParam('search', $ident); diff --git a/lib/Service/MembershipService.php b/lib/Service/MembershipService.php index d1366306..e91b9ccc 100644 --- a/lib/Service/MembershipService.php +++ b/lib/Service/MembershipService.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Exceptions\ItemNotFoundException; +use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Db\MembershipRequest; @@ -51,7 +51,7 @@ use OCA\Circles\Model\Membership; * @package OCA\Circles\Service */ class MembershipService { - use TNC22Logger; + use TNCLogger; /** @var MembershipRequest */ diff --git a/lib/Service/MigrationService.php b/lib/Service/MigrationService.php index e70e01ed..5ae0689a 100644 --- a/lib/Service/MigrationService.php +++ b/lib/Service/MigrationService.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OC; use OCA\Circles\AppInfo\Application; @@ -77,7 +77,7 @@ use OCP\Share\IShare; */ class MigrationService { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var IDBConnection */ diff --git a/lib/Service/MiscService.php b/lib/Service/MiscService.php index 03d17197..f7e59d06 100644 --- a/lib/Service/MiscService.php +++ b/lib/Service/MiscService.php @@ -26,7 +26,7 @@ namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OC\User\NoUserException; diff --git a/lib/Service/NotificationService.php b/lib/Service/NotificationService.php index 5d5c4cbc..6853c68c 100644 --- a/lib/Service/NotificationService.php +++ b/lib/Service/NotificationService.php @@ -34,7 +34,7 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\RequestBuilderException; @@ -49,7 +49,7 @@ use OCP\Notification\INotification; * @package OCA\Circles\Service */ class NotificationService { - use TNC22Logger; + use TNCLogger; /** @var IURLGenerator */ diff --git a/lib/Service/OutputService.php b/lib/Service/OutputService.php index cb6f628e..a988b814 100644 --- a/lib/Service/OutputService.php +++ b/lib/Service/OutputService.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\Migration\IOutput; use Symfony\Component\Console\Output\OutputInterface; @@ -43,7 +43,7 @@ use Symfony\Component\Console\Output\OutputInterface; */ class OutputService { use TStringTools; - use TNC22Logger; + use TNCLogger; /** @var IOutput */ diff --git a/lib/Service/RemoteDownstreamService.php b/lib/Service/RemoteDownstreamService.php index 8b6d19e3..3385292b 100644 --- a/lib/Service/RemoteDownstreamService.php +++ b/lib/Service/RemoteDownstreamService.php @@ -31,11 +31,11 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TAsync; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Traits\TAsync; +use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; @@ -61,7 +61,7 @@ use OCA\Circles\Model\Probes\CircleProbe; * @package OCA\Circles\Service */ class RemoteDownstreamService { - use TNC22Logger; + use TNCLogger; use TAsync; diff --git a/lib/Service/RemoteService.php b/lib/Service/RemoteService.php index 5cbabed1..826b3fd3 100644 --- a/lib/Service/RemoteService.php +++ b/lib/Service/RemoteService.php @@ -30,12 +30,6 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature; -use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\CircleNotFoundException; @@ -53,13 +47,19 @@ use OCA\Circles\Model\Federated\RemoteInstance; use OCA\Circles\Model\FederatedUser; use OCA\Circles\Model\Member; use OCA\Circles\Model\Membership; +use OCA\Circles\Tools\ActivityPub\NCSignature; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Model\SimpleDataStore; /** * Class RemoteService * * @package OCA\Circles\Service */ -class RemoteService extends NC22Signature { +class RemoteService extends NCSignature { /** @var CircleRequest */ diff --git a/lib/Service/RemoteStreamService.php b/lib/Service/RemoteStreamService.php index 1ebe3dbf..8ff9232d 100644 --- a/lib/Service/RemoteStreamService.php +++ b/lib/Service/RemoteStreamService.php @@ -30,21 +30,6 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature; -use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException; -use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException; -use ArtificialOwl\MySmallPhpTools\Exceptions\WellKnownLinkNotFoundException; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22RequestResult; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Signatory; -use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22SignedRequest; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22LocalSignatory; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22WellKnown; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; use JsonSerializable; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\RemoteRequest; @@ -57,6 +42,21 @@ use OCA\Circles\Exceptions\RemoteUidException; use OCA\Circles\Exceptions\UnknownInterfaceException; use OCA\Circles\Exceptions\UnknownRemoteException; use OCA\Circles\Model\Federated\RemoteInstance; +use OCA\Circles\Tools\ActivityPub\NCSignature; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Exceptions\SignatureException; +use OCA\Circles\Tools\Exceptions\WellKnownLinkNotFoundException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\NCRequestResult; +use OCA\Circles\Tools\Model\NCSignatory; +use OCA\Circles\Tools\Model\NCSignedRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLocalSignatory; +use OCA\Circles\Tools\Traits\TNCWellKnown; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\AppFramework\Http; use OCP\IURLGenerator; use ReflectionClass; @@ -67,11 +67,11 @@ use ReflectionException; * * @package OCA\Circles\Service */ -class RemoteStreamService extends NC22Signature { - use TNC22Deserialize; - use TNC22LocalSignatory; +class RemoteStreamService extends NCSignature { + use TDeserialize; + use TNCLocalSignatory; use TStringTools; - use TNC22WellKnown; + use TNCWellKnown; public const UPDATE_DATA = 'data'; @@ -253,7 +253,7 @@ class RemoteStreamService extends NC22Signature { * @param JsonSerializable|null $object * @param array $params * - * @return NC22SignedRequest + * @return NCSignedRequest * @throws RemoteNotFoundException * @throws RemoteResourceNotFoundException * @throws UnknownRemoteException @@ -266,8 +266,8 @@ class RemoteStreamService extends NC22Signature { int $type = Request::TYPE_GET, ?JsonSerializable $object = null, array $params = [] - ): NC22SignedRequest { - $request = new NC22Request('', $type); + ): NCSignedRequest { + $request = new NCRequest('', $type); $this->configService->configureRequest($request); $link = $this->getRemoteInstanceEntry($instance, $item, $params); $request->basedOnUrl($link); @@ -283,7 +283,7 @@ class RemoteStreamService extends NC22Signature { try { $app = $this->getAppSignatory(); -// $app->setAlgorithm(NC22Signatory::SHA512); +// $app->setAlgorithm(NCSignatory::SHA512); $signedRequest = $this->signOutgoingRequest($request, $app); $this->doRequest($signedRequest->getOutgoingRequest(), false); } catch (RequestNetworkException | SignatoryException $e) { @@ -369,10 +369,10 @@ class RemoteStreamService extends NC22Signature { * @throws SignatoryException * @throws SignatureException */ - public function retrieveSignatory(string $keyId, bool $refresh = true): NC22Signatory { + public function retrieveSignatory(string $keyId, bool $refresh = true): NCSignatory { if (!$refresh) { try { - return $this->remoteRequest->getFromHref(NC22Signatory::removeFragment($keyId)); + return $this->remoteRequest->getFromHref(NCSignatory::removeFragment($keyId)); } catch (RemoteNotFoundException $e) { throw new SignatoryException(); } @@ -381,7 +381,7 @@ class RemoteStreamService extends NC22Signature { $remoteInstance = new RemoteInstance($keyId); $confirm = $this->uuid(); - $request = new NC22Request(); + $request = new NCRequest(); $this->configService->configureRequest($request); $this->downloadSignatory($remoteInstance, $keyId, ['auth' => $confirm], $request); @@ -502,11 +502,11 @@ class RemoteStreamService extends NC22Signature { /** - * @param NC22RequestResult $result + * @param NCRequestResult $result * * @return FederatedItemException */ - private function getFederatedItemExceptionFromResult(NC22RequestResult $result): FederatedItemException { + private function getFederatedItemExceptionFromResult(NCRequestResult $result): FederatedItemException { $data = $result->getAsArray(); $message = $this->get('message', $data); diff --git a/lib/Service/RemoteUpstreamService.php b/lib/Service/RemoteUpstreamService.php index abeaa116..e5346e84 100644 --- a/lib/Service/RemoteUpstreamService.php +++ b/lib/Service/RemoteUpstreamService.php @@ -31,9 +31,9 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Model\Request; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TNCRequest; use OCA\Circles\Db\EventWrapperRequest; use OCA\Circles\Exceptions\FederatedItemException; use OCA\Circles\Exceptions\OwnerNotFoundException; @@ -51,7 +51,7 @@ use OCA\Circles\Model\Federated\RemoteInstance; * @package OCA\Circles\Service */ class RemoteUpstreamService { - use TNC22Request; + use TNCRequest; /** @var EventWrapperRequest */ diff --git a/lib/Service/ShareTokenService.php b/lib/Service/ShareTokenService.php index 3930cd86..122e8bf3 100644 --- a/lib/Service/ShareTokenService.php +++ b/lib/Service/ShareTokenService.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\ShareTokenRequest; use OCA\Circles\Exceptions\ShareTokenAlreadyExistException; use OCA\Circles\Exceptions\ShareTokenNotFoundException; diff --git a/lib/Service/ShareWrapperService.php b/lib/Service/ShareWrapperService.php index 78c32354..0636c1e9 100644 --- a/lib/Service/ShareWrapperService.php +++ b/lib/Service/ShareWrapperService.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\ShareWrapperRequest; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\Exceptions\ShareWrapperNotFoundException; diff --git a/lib/Service/SyncService.php b/lib/Service/SyncService.php index 5eab05c8..0fb12f43 100644 --- a/lib/Service/SyncService.php +++ b/lib/Service/SyncService.php @@ -31,8 +31,8 @@ declare(strict_types=1); namespace OCA\Circles\Service; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\CircleRequest; @@ -71,7 +71,7 @@ use OCP\IUserManager; */ class SyncService { use TStringTools; - use TNC22Logger; + use TNCLogger; public const SYNC_APPS = 1; diff --git a/lib/ShareByCircleProvider.php b/lib/ShareByCircleProvider.php index 81d8f5e1..393de658 100644 --- a/lib/ShareByCircleProvider.php +++ b/lib/ShareByCircleProvider.php @@ -34,9 +34,9 @@ declare(strict_types=1); namespace OCA\Circles; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; -use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools; -use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TStringTools; use OC; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\ContactAddressBookNotFoundException; @@ -93,7 +93,7 @@ use OCP\Share\IShareProvider; class ShareByCircleProvider implements IShareProvider { use TArrayTools; use TStringTools; - use TNC22Logger; + use TNCLogger; public const IDENTIFIER = 'ocCircleShare'; diff --git a/lib/ShareByCircleProviderDeprecated.php b/lib/ShareByCircleProviderDeprecated.php index b1ad6073..2ab31d66 100644 --- a/lib/ShareByCircleProviderDeprecated.php +++ b/lib/ShareByCircleProviderDeprecated.php @@ -30,7 +30,7 @@ namespace OCA\Circles; -use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; +use OCA\Circles\Tools\Model\SimpleDataStore; use Exception; use OC; use OC\Files\Cache\Cache; diff --git a/lib/UnifiedSearch/UnifiedSearchProvider.php b/lib/UnifiedSearch/UnifiedSearchProvider.php index dc5ec91c..a8df02cf 100644 --- a/lib/UnifiedSearch/UnifiedSearchProvider.php +++ b/lib/UnifiedSearch/UnifiedSearchProvider.php @@ -31,7 +31,7 @@ declare(strict_types=1); namespace OCA\Circles\UnifiedSearch; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; +use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Model\Circle; @@ -51,7 +51,7 @@ use OCP\Search\SearchResult; * @package OCA\Circles\UnifiedSearch */ class UnifiedSearchProvider implements IProvider { - use TNC22Logger; + use TNCLogger; public const ORDER = 9; diff --git a/tests/unit/lib/Controller/AdminControllerTest.php b/tests/unit/lib/Controller/AdminControllerTest.php index 9274846e..5564ad79 100644 --- a/tests/unit/lib/Controller/AdminControllerTest.php +++ b/tests/unit/lib/Controller/AdminControllerTest.php @@ -23,7 +23,6 @@ namespace OCA\Circles\Tests\Controller; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; use OCA\Circles\AppInfo\Application; use OCA\Circles\Controller\AdminController; use OCA\Circles\Model\Circle; @@ -35,6 +34,7 @@ use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\MemberService; use OCA\Circles\Service\MembershipService; use OCA\Circles\Service\SearchService; +use OCA\Circles\Tools\Traits\TDeserialize; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; use OCP\IRequest; @@ -47,7 +47,7 @@ use Test\TestCase; * @group DB */ class AdminControllerTest extends TestCase { - use TNC22Deserialize; + use TDeserialize; /** @var IRequest|MockObject */ private $request; diff --git a/tests/unit/lib/Controller/LocalControllerTest.php b/tests/unit/lib/Controller/LocalControllerTest.php index 9d42f0cd..80b36343 100644 --- a/tests/unit/lib/Controller/LocalControllerTest.php +++ b/tests/unit/lib/Controller/LocalControllerTest.php @@ -23,7 +23,6 @@ namespace OCA\Circles\Tests\Controller; -use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize; use OCA\Circles\AppInfo\Application; use OCA\Circles\Controller\LocalController; use OCA\Circles\Model\Circle; @@ -35,6 +34,7 @@ use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\MemberService; use OCA\Circles\Service\MembershipService; use OCA\Circles\Service\SearchService; +use OCA\Circles\Tools\Traits\TDeserialize; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; use OCP\IRequest; @@ -46,7 +46,7 @@ use Test\TestCase; * @group DB */ class LocalControllerTest extends TestCase { - use TNC22Deserialize; + use TDeserialize; /** @var IRequest|MockObject */ private $request; @@ -100,10 +100,10 @@ class LocalControllerTest extends TestCase { public function testCirclesList(int $limit, int $offset): void { $probe = new CircleProbe(); $probe->filterHiddenCircles() - ->filterBackendCircles() - ->addDetail(BasicProbe::DETAILS_POPULATION) - ->setItemsOffset($offset) - ->setItemsLimit($limit); + ->filterBackendCircles() + ->addDetail(BasicProbe::DETAILS_POPULATION) + ->setItemsOffset($offset) + ->setItemsLimit($limit); $circle1 = new Circle(); $circle1->setName('Circle One'); $circle2 = new Circle();