nextcloud
/
bookmarks
mirror of https://github.com/nextcloud/bookmarks
0
0
Fork 0
Code Issues Releases Wiki Activity

php-cs lint fix 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2020-08-02 16:05:52 +02:00 committed by Marcel Klehr
parent 03eda33eda
commit 6c2b2fbd0b
64 changed files with 100 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Activity/ActivityPublisher.php
View File

@ -119,7 +119,7 @@ class ActivityPublisher implements IEventListener {
return;
}
foreach([$activity->getAuthor(), $sharedFolder->getUserId()] as $user) {
foreach ([$activity->getAuthor(), $sharedFolder->getUserId()] as $user) {
$activity->setAffectedUser($user);
$this->activityManager->publish($activity);
}
@ -160,10 +160,10 @@ class ActivityPublisher implements IEventListener {
*/
$shares = $this->sharedFolderMapper->findByOwner($this->authorizer->getUserId());
$shares = array_merge($shares, $this->sharedFolderMapper->findByUser($this->authorizer->getUserId()));
$affectedShares = array_filter($shares, function($sharedFolder) use ($folder){
$affectedShares = array_filter($shares, function ($sharedFolder) use ($folder) {
return $this->treeMapper->hasDescendant($sharedFolder->getFolderId(), TreeMapper::TYPE_FOLDER, $folder->getId());
});
$affectedUsers = array_map(static function($sharedFolder) {
$affectedUsers = array_map(static function ($sharedFolder) {
return $sharedFolder->getUserId();
}, $affectedShares);
$affectedUsers[] = $folder->getUserId();
@ -171,7 +171,7 @@ class ActivityPublisher implements IEventListener {
$affectedUsers = array_unique($affectedUsers);
foreach($affectedUsers as $user) {
foreach ($affectedUsers as $user) {
$activity->setAffectedUser($user);
$this->activityManager->publish($activity);
}
@ -210,10 +210,10 @@ class ActivityPublisher implements IEventListener {
*/
$shares = $this->sharedFolderMapper->findByOwner($this->authorizer->getUserId());
$shares = array_merge($shares, $this->sharedFolderMapper->findByUser($this->authorizer->getUserId()));
$affectedShares = array_filter($shares, function($sharedFolder) use ($bookmark) {
$affectedShares = array_filter($shares, function ($sharedFolder) use ($bookmark) {
return $this->treeMapper->hasDescendant($sharedFolder->getFolderId(), TreeMapper::TYPE_BOOKMARK, $bookmark->getId());
});
$affectedUsers = array_map(static function($sharedFolder) {
$affectedUsers = array_map(static function ($sharedFolder) {
return $sharedFolder->getUserId();
}, $affectedShares);
$affectedUsers[] = $bookmark->getUserId();
@ -221,10 +221,9 @@ class ActivityPublisher implements IEventListener {
$affectedUsers = array_unique($affectedUsers);
foreach($affectedUsers as $user) {
foreach ($affectedUsers as $user) {
$activity->setAffectedUser($user);
$this->activityManager->publish($activity);
}
}
}

1
lib/Activity/Filter.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks\Activity;
use OCP\Activity\IFilter;
class Filter implements IFilter {

42
lib/Activity/Provider.php
View File

@ -1,6 +1,6 @@
<?php
namespace OCA\Bookmarks\Activity;
namespace OCA\Bookmarks\Activity;
use OCA\Bookmarks\Db\Folder;
use OCA\Bookmarks\Db\TreeMapper;
@ -64,7 +64,7 @@ class Provider implements IProvider {
$sharee = $this->userManager->get($subjectParameters['sharee']);
if ($sharee !== null) {
$shareeName = $sharee->getDisplayName();
}else{
} else {
$shareeName = null;
}
@ -72,22 +72,22 @@ class Provider implements IProvider {
$author = $this->userManager->get($event->getAuthor());
if ($author !== null) {
$authorName = $author->getDisplayName();
}else{
} else {
$authorName = null;
}
switch($event->getSubject()) {
switch ($event->getSubject()) {
case 'bookmark_created':
if ($isAuthor) {
$event->setParsedSubject($this->l->t('You bookmarked "%s"', [
$subjectParameters['bookmark']
]));
}elseif ($authorName){
} elseif ($authorName) {
$event->setParsedSubject($this->l->t('%1$s bookmarked "%2$s"', [
$authorName,
$subjectParameters['bookmark'],
]));
}else {
} else {
$event->setParsedSubject($this->l->t('Someone bookmarked "%s"', [
$subjectParameters['bookmark']
]));
@ -98,12 +98,12 @@ class Provider implements IProvider {
$event->setParsedSubject($this->l->t('You deleted "%s"', [
$subjectParameters['bookmark']
]));
}elseif ($authorName){
} elseif ($authorName) {
$event->setParsedSubject($this->l->t('%1$s deleted "%2$s"', [
$authorName,
$subjectParameters['bookmark'],
]));
}else {
} else {
$event->setParsedSubject($this->l->t('Someone deleted "%s"', [
$subjectParameters['bookmark']
]));
@ -114,12 +114,12 @@ class Provider implements IProvider {
$event->setParsedSubject($this->l->t('You created folder "%s"', [
$subjectParameters['folder']
]));
}elseif ($authorName){
} elseif ($authorName) {
$event->setParsedSubject($this->l->t('%1$s created folder "%2$s"', [
$authorName,
$subjectParameters['folder']
]));
}else {
} else {
$event->setParsedSubject($this->l->t('Someone created folder "%s"', [
$subjectParameters['folder']
]));
@ -130,12 +130,12 @@ class Provider implements IProvider {
$event->setParsedSubject($this->l->t('You moved folder "%s"', [
$subjectParameters['folder']
]));
}elseif ($authorName){
} elseif ($authorName) {
$event->setParsedSubject($this->l->t('%1$s moved folder "%2$s"', [
$authorName,
$subjectParameters['folder']
]));
}else {
} else {
$event->setParsedSubject($this->l->t('Someone moved folder "%s"', [
$subjectParameters['folder']
]));
@ -146,12 +146,12 @@ class Provider implements IProvider {
$event->setParsedSubject($this->l->t('You deleted folder "%s"', [
$subjectParameters['folder']
]));
}elseif ($authorName){
} elseif ($authorName) {
$event->setParsedSubject($this->l->t('%1$s deleted folder "%2$s"', [
$authorName,
$subjectParameters['folder'],
]));
}else {
} else {
$event->setParsedSubject($this->l->t('Someone deleted folder "%s"', [
$subjectParameters['folder']
]));
@ -163,16 +163,16 @@ class Provider implements IProvider {
$subjectParameters['folder'],
$shareeName
]));
}elseif ($isAuthor){
} elseif ($isAuthor) {
$event->setParsedSubject($this->l->t('You shared folder "%s" with someone', [
$subjectParameters['folder']
]));
}elseif ($authorName && $isSharee) {
} elseif ($authorName && $isSharee) {
$event->setParsedSubject($this->l->t('%1$s shared folder "%2$s" with you', [
$authorName,
$subjectParameters['folder'],
]));
}elseif ($isSharee) {
} elseif ($isSharee) {
$event->setParsedSubject($this->l->t('Someone shared folder "%s" with you', [
$subjectParameters['folder']
]));
@ -184,16 +184,16 @@ class Provider implements IProvider {
$subjectParameters['folder'],
$shareeName
]));
}elseif ($isAuthor){
} elseif ($isAuthor) {
$event->setParsedSubject($this->l->t('You unshared folder "%s" with someone', [
$subjectParameters['folder']
]));
}elseif ($authorName && $isSharee) {
} elseif ($authorName && $isSharee) {
$event->setParsedSubject($this->l->t('%1$s unshared folder "%2$s" with you', [
$subjectParameters['folder'],
$authorName
]));
}elseif ($isSharee) {
} elseif ($isSharee) {
$event->setParsedSubject($this->l->t('Someone unshared folder "%s" with you', [
$subjectParameters['folder']
]));
@ -211,7 +211,7 @@ class Provider implements IProvider {
* @var $folders Folder[]
*/
$folders = $this->treeMapper->findParentsOf(TreeMapper::TYPE_BOOKMARK, $event->getObjectId());
$folders = array_filter($folders, function($folder) {
$folders = array_filter($folders, function ($folder) {
return $folder->getUserId() === $this->activityManager->getCurrentUserId();
});
if (isset($folders[0])) {

1
lib/AppInfo/Application.php
View File

@ -20,7 +20,6 @@ use OCA\Bookmarks\Events\CreateEvent;
use OCA\Bookmarks\Events\MoveEvent;
use OCA\Bookmarks\Events\UpdateEvent;
use OCA\Bookmarks\Hooks\UserGroupListener;
use OCA\Bookmarks\Hooks\UserHooks;
use OCA\Bookmarks\Service\HashManager;
use OCP\AppFramework\App;
use OCP\EventDispatcher\IEventDispatcher;

1
lib/BackgroundJobs/PreviewsJob.php
View File

@ -8,7 +8,6 @@ use OCA\Bookmarks\Service\BookmarkPreviewer;
use OCA\Bookmarks\Service\FaviconPreviewer;
use OCA\Bookmarks\Service\Previewers\DefaultBookmarkPreviewer;
use OCP\IConfig;
use OCP\IUserManager;
class PreviewsJob extends TimedJob {
/**

1
lib/Contract/IImage.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks\Contract;
interface IImage {
public function getContentType(): string;

9
lib/Controller/BookmarkController.php
View File

@ -33,7 +33,6 @@ use OCA\Bookmarks\Service\Authorizer;
use OCA\Bookmarks\Service\BookmarkService;
use OCA\Bookmarks\Service\FolderService;
use OCA\Bookmarks\Service\HtmlExporter;
use OCA\Bookmarks\Service\HtmlImporter;
use OCP\AppFramework\ApiController;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
@ -49,8 +48,6 @@ use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IL10N;
use OCP\ILogger;
use OCP\IURLGenerator;
use OCP\IUserManager;
use OCP\IUserSession;
class BookmarkController extends ApiController {
private const IMAGES_CACHE_TTL = 7 * 24 * 60 * 60;
@ -359,7 +356,7 @@ class BookmarkController extends ApiController {
if ($this->authorizer->getUserId() !== null) {
if ($untagged) {
$result = $this->bookmarkMapper->findUntagged($this->authorizer->getUserId(), $params);
} else if ($tagsOnly && count($filterTag) > 0) {
} elseif ($tagsOnly && count($filterTag) > 0) {
$result = $this->bookmarkMapper->findByTags($this->authorizer->getUserId(), $filterTag, $params);
} else {
$result = $this->bookmarkMapper->findAll($this->authorizer->getUserId(), $filterTag, $params);
@ -377,7 +374,7 @@ class BookmarkController extends ApiController {
try {
if ($untagged) {
$result = $this->bookmarkMapper->findUntaggedInPublicFolder($this->authorizer->getToken(), $params);
} else if ($tagsOnly && count($filterTag) > 0) {
} elseif ($tagsOnly && count($filterTag) > 0) {
$result = $this->bookmarkMapper->findByTagsInPublicFolder($this->authorizer->getToken(), $filterTag, $params);
} else {
$result = $this->bookmarkMapper->findAllInPublicFolder($this->authorizer->getToken(), $filterTag, $params);
@ -643,7 +640,7 @@ class BookmarkController extends ApiController {
if ($folder !== null) {
$folder = $this->toInternalFolderId($folder);
}else{
} else {
$folder = $this->_getRootFolderId();
}

3
lib/Controller/FoldersController.php
View File

@ -167,7 +167,6 @@ class FoldersController extends ApiController {
$returnFolder['parent_folder'] = $this->toExternalFolderId($parent->getId());
return $returnFolder;
}
}
/**
@ -437,7 +436,7 @@ class FoldersController extends ApiController {
$internalRoot = $this->toInternalFolderId($root);
$folders = $this->treeMapper->getSubFolders($internalRoot, $layers);
if ($root === -1 || $root === '-1') {
foreach($folders as $folder) {
foreach ($folders as $folder) {
$folder['parent_folder'] = -1;
}
}

2
lib/Controller/InternalBookmarkController.php
View File

@ -10,8 +10,6 @@
namespace OCA\Bookmarks\Controller;
use OCA\Bookmarks\Db\FolderMapper;
use OCA\Bookmarks\Db\TreeMapper;
use OCA\Bookmarks\Exception\AlreadyExistsError;
use OCA\Bookmarks\Exception\UnsupportedOperation;
use OCA\Bookmarks\Exception\UrlParseError;

1
lib/Controller/WebViewController.php
View File

@ -24,7 +24,6 @@ use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\StreamResponse;
use OCP\AppFramework\Http\Template\PublicTemplateResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IUserManager;

32
lib/Db/BookmarkMapper.php
View File

@ -3,8 +3,6 @@
namespace OCA\Bookmarks\Db;
use OCA\Bookmarks\Events\BeforeDeleteEvent;
use OCA\Bookmarks\Events\CreateEvent;
use OCA\Bookmarks\Events\UpdateEvent;
use OCA\Bookmarks\Exception\AlreadyExistsError;
use OCA\Bookmarks\Exception\UrlParseError;
use OCA\Bookmarks\Exception\UserLimitExceededError;
@ -161,7 +159,7 @@ class BookmarkMapper extends QBMapper {
if ($sqlSortColumn === 'title') {
$qb->addOrderBy($qb->createFunction('UPPER(`b`.`title`)'), 'ASC');
} else if ($sqlSortColumn === 'index') {
} elseif ($sqlSortColumn === 'index') {
$qb->addOrderBy('tr.'.$sqlSortColumn, 'ASC');
$qb->addGroupBy('tr.'.$sqlSortColumn);
} else {
@ -249,7 +247,7 @@ class BookmarkMapper extends QBMapper {
*/
public function findByTag($userId, string $tag, QueryParameters $params): array {
$qb = $this->db->getQueryBuilder();
$qb->select(array_map(static function($col) {
$qb->select(array_map(static function ($col) {
return 'b.'.$col;
}, Bookmark::$columns));
@ -271,7 +269,7 @@ class BookmarkMapper extends QBMapper {
private function _findByTags($userId): IQueryBuilder {
$qb = $this->db->getQueryBuilder();
$qb->select(array_map(static function($col) {
$qb->select(array_map(static function ($col) {
return 'b.'.$col;
}, Bookmark::$columns));
@ -309,7 +307,7 @@ class BookmarkMapper extends QBMapper {
$expr[] = $qb->expr()->iLike($tagsCol, $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($tag) . '%'));
}
$filterExpression = call_user_func_array([$qb->expr(), 'andX'], $expr);
$qb->groupBy('tr.index', ...array_map(static function($col) {
$qb->groupBy('tr.index', ...array_map(static function ($col) {
return 'b.'.$col;
}, Bookmark::$columns));
$qb->having($filterExpression);
@ -477,7 +475,6 @@ class BookmarkMapper extends QBMapper {
$exists = true;
try {
$this->findByUrl($entity->getUserId(), $entity->getUrl());
} catch (DoesNotExistException $e) {
$exists = false;
@ -533,16 +530,15 @@ class BookmarkMapper extends QBMapper {
return $qb->execute()->fetch(\PDO::FETCH_COLUMN);
}
/**
* Returns the list of possible sort by columns.
*
* @return string[]
*/
/**
* Returns the list of possible sort by columns.
*
* @return string[]
*/
private function getSortByColumns(): array {
$treeFields = [
'index',
];
return array_merge(Bookmark::$columns, $treeFields);
}
$treeFields = [
'index',
];
return array_merge(Bookmark::$columns, $treeFields);
}
}

2
lib/Db/FolderMapper.php
View File

@ -2,8 +2,6 @@
namespace OCA\Bookmarks\Db;
use OCA\Bookmarks\Events\CreateEvent;
use OCA\Bookmarks\Events\UpdateEvent;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;

6
lib/Db/TagMapper.php
View File

@ -122,14 +122,14 @@ class TagMapper {
public function addTo($tags, int $bookmarkId): void {
if (is_string($tags)) {
$tags = [$tags];
} else if (!is_array($tags)) {
} elseif (!is_array($tags)) {
throw new InvalidArgumentException('$tag must be string or array of strings');
}
if(count($tags) === 0) {
if (count($tags) === 0) {
return;
}
$currentTags = $this->findByBookmark($bookmarkId);
$tags = array_filter($tags, function($tag) use($currentTags) {
$tags = array_filter($tags, function ($tag) use ($currentTags) {
return !in_array($tag, $currentTags);
});
foreach ($tags as $tag) {

2
lib/Db/TreeMapper.php
View File

@ -17,14 +17,12 @@ use OCP\ICache;
use OCP\IConfig;
use OCP\IDBConnection;
/**
* Class TreeMapper
*
* @package OCA\Bookmarks\Db
*/
class TreeMapper extends QBMapper {
public const TYPE_SHARE = 'share';
public const TYPE_FOLDER = 'folder';
public const TYPE_BOOKMARK = 'bookmark';

2
lib/Events/BeforeDeleteEvent.php
View File

@ -1,6 +1,6 @@
<?php
namespace OCA\Bookmarks\Events;
class BeforeDeleteEvent extends ChangeEvent {
}

1
lib/Events/ChangeEvent.php
View File

@ -1,4 +1,5 @@
<?php
namespace OCA\Bookmarks\Events;
use OCP\EventDispatcher\Event;

1
lib/Events/CreateEvent.php
View File

@ -3,5 +3,4 @@
namespace OCA\Bookmarks\Events;
class CreateEvent extends ChangeEvent {
}

2
lib/Events/MoveEvent.php
View File

@ -1,4 +1,5 @@
<?php
namespace OCA\Bookmarks\Events;
class MoveEvent extends ChangeEvent {
@ -32,5 +33,4 @@ class MoveEvent extends ChangeEvent {
public function getNewParent(): ?int {
return $this->newParent;
}
}

2
lib/Events/UpdateEvent.php
View File

@ -1,6 +1,6 @@
<?php
namespace OCA\Bookmarks\Events;
class UpdateEvent extends ChangeEvent {
}

2
lib/Exception/AlreadyExistsError.php
View File

@ -3,7 +3,5 @@
namespace OCA\Bookmarks\Exception;
class AlreadyExistsError extends Exception {
}

2
lib/Exception/ChildrenOrderValidationError.php
View File

@ -3,7 +3,5 @@
namespace OCA\Bookmarks\Exception;
class ChildrenOrderValidationError extends Exception {
}

2
lib/Exception/Exception.php
View File

@ -3,7 +3,5 @@
namespace OCA\Bookmarks\Exception;
class Exception extends \Exception {
}

1
lib/Exception/HtmlParseError.php
View File

@ -3,5 +3,4 @@
namespace OCA\Bookmarks\Exception;
class HtmlParseError extends Exception {
}

1
lib/Exception/UnauthorizedAccessError.php
View File

@ -3,5 +3,4 @@
namespace OCA\Bookmarks\Exception;
class UnauthorizedAccessError extends Exception {
}

1
lib/Exception/UrlParseError.php
View File

@ -3,5 +3,4 @@
namespace OCA\Bookmarks\Exception;
class UrlParseError extends Exception {
}

2
lib/Exception/UserLimitExceededError.php
View File

@ -3,7 +3,5 @@
namespace OCA\Bookmarks\Exception;
class UserLimitExceededError extends Exception {
}

2
lib/Hooks/UserGroupListener.php
View File

@ -17,12 +17,10 @@ use OCP\Group\Events\UserAddedEvent;
use OCP\Group\Events\UserRemovedEvent;
use OCP\IGroup;
use OCP\IUser;
use OCP\IUserManager;
use OCP\Share\IShare;
use OCP\User\Events\BeforeUserDeletedEvent;
class UserGroupListener implements IEventListener {
private $userManager;
/**
* @var ShareMapper

2
lib/Image.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks;
use OCA\Bookmarks\Contract\IImage;
class Image implements IImage {
@ -48,6 +47,5 @@ class Image implements IImage {
'contentType' => $this->getContentType(),
'data' => base64_encode($this->getData()),
]);
}
}

2
lib/Migration/DeduplicateSharedFoldersRepairStep.php
View File

@ -3,8 +3,6 @@
namespace OCA\Bookmarks\Migration;
use OCA\Bookmarks\Db\SharedFolder;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

4
lib/Migration/GroupSharesUpdateRepairStep.php
View File

@ -3,17 +3,13 @@
namespace OCA\Bookmarks\Migration;
use OCA\Bookmarks\Db\Folder;
use OCA\Bookmarks\Db\FolderMapper;
use OCA\Bookmarks\Db\Share;
use OCA\Bookmarks\Db\SharedFolder;
use OCA\Bookmarks\Db\SharedFolderMapper;
use OCA\Bookmarks\Db\ShareMapper;
use OCA\Bookmarks\Db\TreeMapper;
use OCA\Bookmarks\Service\FolderService;
use OCP\IDBConnection;
use OCP\IUser;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
use OCP\Share\IShare;

1
lib/Migration/OrphanedSharesRepairStep.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks\Migration;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

1
lib/Migration/OrphanedTreeItemsRepairStep.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks\Migration;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

1
lib/Migration/SuperfluousSharedFoldersRepairStep.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks\Migration;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

1
lib/Migration/UninstallRepairStep.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks\Migration;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

1
lib/Migration/Version003000009Date20200505094721.php
View File

@ -2,7 +2,6 @@
namespace OCA\Bookmarks\Migration;
use Doctrine\DBAL\Types\BigIntType;
use Doctrine\DBAL\Types\Type;
use OCP\DB\ISchemaWrapper;
use OCP\IDBConnection;

6
lib/Migration/Version003001000Date20200526094721.php
View File

@ -2,8 +2,6 @@
namespace OCA\Bookmarks\Migration;
use Doctrine\DBAL\Types\BigIntType;
use Doctrine\DBAL\Types\Type;
use OCP\DB\ISchemaWrapper;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
@ -75,7 +73,7 @@ class Version003001000Date20200526094721 extends SimpleMigrationStep {
->from('bookmarks_shared_folders', 'sf')
->leftJoin('sf', 'bookmarks_shares', 's', $qb->expr()->eq('sf.share_id', 's.id'))
->execute();
while($sharedFolder = $sharedFolders->fetch()) {
while ($sharedFolder = $sharedFolders->fetch()) {
// Find a shared folder with folder_id already set. This is gonna be the only one we will have for this folder from now on.
$qb = $this->db->getQueryBuilder();
$canonicalSharedFolder = $qb->select('sf.id', 'sf.folder_id')
@ -92,7 +90,7 @@ class Version003001000Date20200526094721 extends SimpleMigrationStep {
->where($qb->expr()->eq('id', $qb->createPositionalParameter($sharedFolder['id'])))
->execute();
$canonicalSharedFolder = $sharedFolder;
}else{
} else {
// ...otherwise delete this shared folder.
$qb = $this->db->getQueryBuilder();
$qb->delete('bookmarks_shared_folders')

2
lib/Migration/Version003001000Date20200526124721.php
View File

@ -2,8 +2,6 @@
namespace OCA\Bookmarks\Migration;
use Doctrine\DBAL\Types\BigIntType;
use Doctrine\DBAL\Types\Type;
use OCP\DB\ISchemaWrapper;
use OCP\IDBConnection;
use OCP\Migration\IOutput;

3
lib/QueryParameters.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks;
class QueryParameters {
public const CONJ_AND = 'and';
public const CONJ_OR = 'or';
@ -87,6 +86,4 @@ class QueryParameters {
$this->conjunction = $conjunction;
return $this;
}
}

1
lib/Search/Provider.php
View File

@ -1,4 +1,5 @@
<?php
namespace OCA\Bookmarks\Search;
use OCA\Bookmarks\Db\Bookmark;

1
lib/Search/SearchResultEntry.php
View File

@ -4,5 +4,4 @@
namespace OCA\Bookmarks\Search;
class SearchResultEntry extends \OCP\Search\ASearchResultEntry {
}

2
lib/Service/Authorizer.php
View File

@ -77,7 +77,7 @@ class Authorizer {
return;
}
$this->setUserId($this->userSession->getUser()->getUID());
} elseif($auth !== null && $auth !== '') {
} elseif ($auth !== null && $auth !== '') {
[$type, $credentials] = explode(' ', $auth);
if (strtolower($type) === 'basic') {
[$username, $password] = explode(':', base64_decode($credentials));

2
lib/Service/BookmarkPreviewer.php
View File

@ -34,7 +34,7 @@ use OCP\IConfig;
class BookmarkPreviewer implements IBookmarkPreviewer {
// Cache for one month
const CACHE_TTL = 4 * 4 * 7 * 24 * 60 * 60;
public const CACHE_TTL = 4 * 4 * 7 * 24 * 60 * 60;
/**
* @var string

7
lib/Service/BookmarkService.php
View File

@ -2,7 +2,6 @@
namespace OCA\Bookmarks\Service;
use OCA\Bookmarks\Contract\IImage;
use OCA\Bookmarks\Db\Bookmark;
use OCA\Bookmarks\Db\BookmarkMapper;
@ -247,10 +246,10 @@ class BookmarkService {
$currentInaccessibleOwnFolders = array_map(static function ($f) {
return $f->getId();
}, array_filter($currentOwnFolders, function ($folder) use ($userId) {
return $this->folders->findShareByDescendantAndUser($folder, $userId) === null;
})
return $this->folders->findShareByDescendantAndUser($folder, $userId) === null;
})
);
}else{
} else {
$currentInaccessibleOwnFolders = [];
}

14
lib/Service/BookmarksParser.php
View File

@ -16,7 +16,7 @@ class BookmarksParser {
/**
* Netscape Bookmark File Format DOCTYPE
*/
const DOCTYPE = 'NETSCAPE-Bookmark-file-1';
public const DOCTYPE = 'NETSCAPE-Bookmark-file-1';
/**
* DOMXPath
*
@ -128,10 +128,14 @@ class BookmarksParser {
private function traverse(\DOMNode $node = null) {
$query = './*';
$entries = $this->xpath->query($query, $node ?: null);
if (!$entries) return;
if (!$entries) {
return;
}
for ($i = 0; $i < $entries->length; $i++) {
$entry = $entries->item($i);
if ($entry === null) continue;
if ($entry === null) {
continue;
}
switch ($entry->nodeName) {
case 'dl':
$this->traverse($entry);
@ -234,7 +238,9 @@ class BookmarksParser {
$length = $node->attributes->length;
for ($i = 0; $i < $length; ++$i) {
$item = $node->attributes->item($i);
if ($item === null) continue;
if ($item === null) {
continue;
}
$attributes[strtolower($item->nodeName)] = $item->nodeValue;
}
$lastModified = null;

2
lib/Service/FaviconPreviewer.php
View File

@ -33,7 +33,7 @@ use OCP\ILogger;
class FaviconPreviewer implements IBookmarkPreviewer {
public const CACHE_TTL = 4 * 4 * 7 * 24 * 60 * 60; // cache for one month
public const HTTP_TIMEOUT = 10 * 1000;
public const CACHE_PREFIX = 'bookmarks.FaviconPreviewer';
public const CACHE_PREFIX = 'bookmarks.FaviconPreviewer';
/**
* @var FileCache

2
lib/Service/FileCache.php
View File

@ -33,7 +33,7 @@ use OCP\Files\NotPermittedException;
use OCP\ICache;
class FileCache implements ICache {
const TIMEOUT = 60 * 60 * 24 * 30 * 2; // two months
public const TIMEOUT = 60 * 60 * 24 * 30 * 2; // two months
protected $storage;

6
lib/Service/FolderService.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks\Service;
use OCA\Bookmarks\Db\Folder;
use OCA\Bookmarks\Db\FolderMapper;
use OCA\Bookmarks\Db\PublicFolder;
@ -14,7 +13,6 @@ use OCA\Bookmarks\Db\SharedFolderMapper;
use OCA\Bookmarks\Db\ShareMapper;
use OCA\Bookmarks\Db\TreeMapper;
use OCA\Bookmarks\Events\CreateEvent;
use OCA\Bookmarks\Events\MoveEvent;
use OCA\Bookmarks\Events\UpdateEvent;
use OCA\Bookmarks\Exception\AlreadyExistsError;
use OCA\Bookmarks\Exception\HtmlParseError;
@ -312,7 +310,7 @@ class FolderService {
throw new UnsupportedOperation('Cannot share with oneself');
}
$this->addSharedFolder($share, $folder, $participant);
} else if ($type === IShare::TYPE_GROUP) {
} elseif ($type === IShare::TYPE_GROUP) {
$group = $this->groupManager->get($participant);
if ($group === null) {
throw new DoesNotExistException('Group does not exist');
@ -327,7 +325,7 @@ class FolderService {
try {
$this->sharedFolderMapper->findByFolderAndUser($folder->getId(), $user->getUID());
continue;
}catch (DoesNotExistException $e) {
} catch (DoesNotExistException $e) {
// do nothing
}

4
lib/Service/HashManager.php
View File

@ -1,6 +1,6 @@
<?php
namespace OCA\Bookmarks\Service;
namespace OCA\Bookmarks\Service;
use OCA\Bookmarks\Db\BookmarkMapper;
use OCA\Bookmarks\Db\FolderMapper;
@ -134,7 +134,7 @@ class HashManager {
$folder = [];
if ($entity->getUserId() !== $userId) {
$folder['title'] = $this->sharedFolderMapper->findByFolderAndUser($folderId, $userId)->getTitle();
} else if ($entity->getTitle() !== null) {
} elseif ($entity->getTitle() !== null) {
$folder['title'] = $entity->getTitle();
}
$folder['children'] = $childHashes;

2
lib/Service/HtmlExporter.php
View File

@ -3,7 +3,6 @@
namespace OCA\Bookmarks\Service;
use OCA\Bookmarks\Db\BookmarkMapper;
use OCA\Bookmarks\Db\FolderMapper;
use OCA\Bookmarks\Db\TagMapper;
@ -119,5 +118,4 @@ class HtmlExporter {
$output .= '</p></DL>';
return $output;
}
}

4
lib/Service/Previewers/DefaultBookmarkPreviewer.php
View File

@ -31,8 +31,8 @@ use OCP\Http\Client\IClientService;
use OCP\ILogger;
class DefaultBookmarkPreviewer implements IBookmarkPreviewer {
const CACHE_PREFIX = 'bookmarks.DefaultPreviewService';
const HTTP_TIMEOUT = 10 * 1000;
public const CACHE_PREFIX = 'bookmarks.DefaultPreviewService';
public const HTTP_TIMEOUT = 10 * 1000;
/** @var IClient */
protected $client;

13
lib/Service/Previewers/PageresBookmarkPreviewer.php
View File

@ -26,17 +26,12 @@ use OCA\Bookmarks\Contract\IBookmarkPreviewer;
use OCA\Bookmarks\Contract\IImage;
use OCA\Bookmarks\Db\Bookmark;
use OCA\Bookmarks\Image;
use OCA\Bookmarks\Service\FileCache;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
use OCP\ITempManager;
class PageresBookmarkPreviewer implements IBookmarkPreviewer {
const CACHE_PREFIX = 'bookmarks.WebshotPreviewService';
const CAPTURE_MAX_RETRIES = 3;
public const CACHE_PREFIX = 'bookmarks.WebshotPreviewService';
public const CAPTURE_MAX_RETRIES = 3;
/** @var ILogger */
private $logger;
@ -111,7 +106,9 @@ class PageresBookmarkPreviewer implements IBookmarkPreviewer {
*/
public static function getPageresPath(): ?string {
$serverPath = @exec('which pageres');
if (!empty($serverPath) && is_readable($serverPath)) return $serverPath;
if (!empty($serverPath) && is_readable($serverPath)) {
return $serverPath;
}
return null;
}

6
lib/Service/Previewers/ScreeenlyBookmarkPreviewer.php
View File

@ -25,16 +25,14 @@ use OCA\Bookmarks\Contract\IImage;
use OCA\Bookmarks\Db\Bookmark;
use OCA\Bookmarks\Image;
use OCA\Bookmarks\Service\FileCache;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
class ScreeenlyBookmarkPreviewer implements IBookmarkPreviewer {
const CACHE_PREFIX = 'bookmarks.ScreenlyPreviewService';
public const CACHE_PREFIX = 'bookmarks.ScreenlyPreviewService';
const HTTP_TIMEOUT = 10 * 1000;
public const HTTP_TIMEOUT = 10 * 1000;
private $apiKey;

7
lib/Service/Previewers/ScreenshotMachineBookmarkPreviewer.php
View File

@ -25,17 +25,14 @@ use OCA\Bookmarks\Contract\IImage;
use OCA\Bookmarks\Db\Bookmark;
use OCA\Bookmarks\Image;
use OCA\Bookmarks\Service\FileCache;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
class ScreenshotMachineBookmarkPreviewer implements IBookmarkPreviewer {
public const CACHE_PREFIX = 'bookmarks.ScreenshotMachinePreviewService';
const CACHE_PREFIX = 'bookmarks.ScreenshotMachinePreviewService';
const HTTP_TIMEOUT = 10 * 1000;
public const HTTP_TIMEOUT = 10 * 1000;
private $apiKey;

7
lib/Service/Previewers/WebshotBookmarkPreviewer.php
View File

@ -25,17 +25,14 @@ use OCA\Bookmarks\Contract\IImage;
use OCA\Bookmarks\Db\Bookmark;
use OCA\Bookmarks\Image;
use OCA\Bookmarks\Service\FileCache;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
class WebshotBookmarkPreviewer implements IBookmarkPreviewer {
public const CACHE_PREFIX = 'bookmarks.WebshotPreviewService';
const CACHE_PREFIX = 'bookmarks.WebshotPreviewService';
const HTTP_TIMEOUT = 10 * 1000;
public const HTTP_TIMEOUT = 10 * 1000;
private $client;

5
tests/BackgroundJobTest.php
View File

@ -6,7 +6,6 @@ use OCA\Bookmarks\BackgroundJobs\PreviewsJob;
use OC\BackgroundJob\JobList;
use OCA\Bookmarks\Db\Bookmark;
use OCA\Bookmarks\Db\BookmarkMapper;
use OCA\Bookmarks\Service\Authorizer;
use PHPUnit\Framework\TestCase;
/**
@ -21,7 +20,7 @@ class BackgroundJobTest extends TestCase {
$this->jobList = \OC::$server->query(JobList::class);
$this->userId = 'test';
array_map(function($bm) {
array_map(function ($bm) {
$this->bookmarkMapper->insert($bm);
}, $this->singleBookmarksProvider());
}
@ -37,7 +36,7 @@ class BackgroundJobTest extends TestCase {
* @return array
*/
public function singleBookmarksProvider() {
return array_map(function($props) {
return array_map(function ($props) {
return Bookmark::fromArray($props);
}, [
'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],

3
tests/BookmarkControllerTest.php
View File

@ -24,7 +24,6 @@ use OCA\Bookmarks\Service\Authorizer;
use OCA\Bookmarks\Service\BookmarkService;
use OCA\Bookmarks\Service\FolderService;
use OCA\Bookmarks\Service\HtmlExporter;
use OCA\Bookmarks\Service\HtmlImporter;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCP\AppFramework\Http;
@ -416,7 +415,7 @@ class BookmarkControllerTest extends TestCase {
$parents = $this->treeMapper->findParentsOf(TreeMapper::TYPE_BOOKMARK, $id);
$this->assertEquals('https://www.heise.de/', $bookmark->getUrl()); // normalized URL
$this->assertEquals('', $bookmark->getTitle()); // normalized URL
$this->assertEquals([$this->folder2->getId()], array_map(function($f){
$this->assertEquals([$this->folder2->getId()], array_map(function ($f) {
return $f->getId();
}, $parents)); // has the folders we set
}

3
tests/BookmarkMapperTest.php
View File

@ -12,7 +12,6 @@ use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
class BookmarkMapperTest extends TestCase {
/**
@ -137,7 +136,7 @@ class BookmarkMapperTest extends TestCase {
* @return array
*/
public function singleBookmarksProvider(): array {
return array_map(static function($props) {
return array_map(static function ($props) {
return [Db\Bookmark::fromArray($props)];
}, [
'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],

4
tests/FindTest.php
View File

@ -1,4 +1,5 @@
<?php
namespace OCA\Bookmarks\Tests;
use OCA\Bookmarks\Db;
@ -9,7 +10,6 @@ use OCA\Bookmarks\QueryParameters;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCP\AppFramework\QueryException;
class FindTest extends TestCase {
/**
@ -62,7 +62,7 @@ class FindTest extends TestCase {
}
$this->userId = $this->userManager->get($this->user)->getUID();
foreach($this->singleBookmarksProvider() as $bookmarkEntry) {
foreach ($this->singleBookmarksProvider() as $bookmarkEntry) {
$bookmarkEntry[1]->setUserId($this->userId);
$bookmark = $this->bookmarkMapper->insertOrUpdate($bookmarkEntry[1]);
$this->tagMapper->addTo($bookmarkEntry[0], $bookmark->getId());

1
tests/FolderMapperTest.php
View File

@ -8,7 +8,6 @@ use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
class FolderMapperTest extends TestCase {
/**
* @var Db\FolderMapper

1
tests/HtmlImportExportTest.php
View File

@ -14,7 +14,6 @@ use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCP\AppFramework\QueryException;
class HtmlImportExportTest extends TestCase {
/**

1
tests/PublicFolderTest.php
View File

@ -1,4 +1,5 @@
<?php
namespace OCA\Bookmarks\Tests;
use OCA\Bookmarks\Db;

5
tests/TagMapperTest.php
View File

@ -11,7 +11,6 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCP\AppFramework\QueryException;
use PHPUnit\Framework\TestCase;
class TagMapperTest extends TestCase {
/**
@ -67,7 +66,7 @@ class TagMapperTest extends TestCase {
$this->tagMapper->addTo($tags, $bookmark->getId());
$actualTags = $this->tagMapper->findByBookmark($bookmark->getId());
foreach($tags as $tag) {
foreach ($tags as $tag) {
$this->assertContains($tag, $actualTags);
}
}
@ -154,7 +153,7 @@ class TagMapperTest extends TestCase {
$newTags = ['foo', 'bar'];
$this->tagMapper->setOn($newTags, $bookmark->getId());
$actualTags = $this->tagMapper->findByBookmark($bookmark->getId());
foreach($newTags as $tag) {
foreach ($newTags as $tag) {
$this->assertContains($tag, $actualTags);
}
}

1
tests/TestCase.php
View File

@ -26,7 +26,6 @@ namespace OCA\Bookmarks\Tests;
use PHPUnit\Framework;
class TestCase extends Framework\TestCase {
protected function cleanUp(): void {
parent::setUp();

2
tests/bootstrap.php
View File

@ -15,7 +15,7 @@ if (!class_exists('\PHPUnit\Framework\TestCase')) {
// OC >= 9.1 Tests?
$dummyClass = \OC::$SERVERROOT . '/tests/lib/Util/User/Dummy.php';
if(file_exists($dummyClass)) {
if (file_exists($dummyClass)) {
require_once($dummyClass);
}