Skip to content

Commit b059d12

Browse files
come-nccome-nc
committed
chore: composer run cs:fix
Signed-off-by: Côme Chilliet <[email protected]>
1 parent 749fa2d commit b059d12

File tree

82 files changed

+9260
-9533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+9260
-9533
lines changed

‎appinfo/routes.php

Lines changed: 93 additions & 93 deletions
Large diffs are not rendered by default.

‎lib/AppInfo/Application.php

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,34 @@
1111

1212
namespace OCA\Maps\AppInfo;
1313

14-
14+
use OCA\DAV\Events\CardCreatedEvent;
15+
use OCA\DAV\Events\CardDeletedEvent;
16+
use OCA\DAV\Events\CardUpdatedEvent;
17+
use OCA\Files\Event\LoadAdditionalScriptsEvent;
1518
use OCA\Files\Event\LoadSidebar;
19+
use OCA\Maps\Hooks\FileHooks;
20+
use OCA\Maps\Listener\CardCreatedListener;
21+
use OCA\Maps\Listener\CardDeletedListener;
22+
use OCA\Maps\Listener\CardUpdatedListener;
23+
use OCA\Maps\Listener\LoadAdditionalScriptsListener;
1624
use OCA\Maps\Listener\LoadSidebarListener;
17-
use \OCP\AppFramework\App;
25+
use OCA\Maps\Service\PhotofilesService;
26+
use OCA\Maps\Service\TracksService;
27+
use OCP\AppFramework\App;
1828
use OCP\AppFramework\Bootstrap\IBootContext;
1929
use OCP\AppFramework\Bootstrap\IBootstrap;
30+
use OCP\AppFramework\Bootstrap\IRegistrationContext;
2031
use OCP\AppFramework\Http\EmptyFeaturePolicy;
2132
use OCP\EventDispatcher\IEventDispatcher;
22-
use \OCP\IServerContainer;
23-
use OCA\Maps\Hooks\FileHooks;
24-
use OCA\Maps\Service\PhotofilesService;
25-
use OCA\Maps\Service\TracksService;
26-
use OCP\AppFramework\Bootstrap\IRegistrationContext;
27-
use OCA\Files\Event\LoadAdditionalScriptsEvent;
28-
use OCA\DAV\Events\CardCreatedEvent;
29-
use OCA\DAV\Events\CardUpdatedEvent;
30-
use OCA\DAV\Events\CardDeletedEvent;
31-
use OCA\Maps\Listener\LoadAdditionalScriptsListener;
32-
use OCA\Maps\Listener\CardCreatedListener;
33-
use OCA\Maps\Listener\CardUpdatedListener;
34-
use OCA\Maps\Listener\CardDeletedListener;
33+
use OCP\IServerContainer;
3534
use OCP\Security\FeaturePolicy\AddFeaturePolicyEvent;
3635

37-
3836
class Application extends App implements IBootstrap {
3937
public const APP_ID = 'maps';
4038

41-
public function __construct (array $urlParams=array()) {
42-
parent::__construct('maps', $urlParams);
43-
}
39+
public function __construct(array $urlParams = []) {
40+
parent::__construct('maps', $urlParams);
41+
}
4442

4543
public function register(IRegistrationContext $context): void {
4644
// ... registration logic goes here ...
@@ -73,7 +71,7 @@ public function register(IRegistrationContext $context): void {
7371

7472
public function boot(IBootContext $context): void {
7573
// ... boot logic goes here ...
76-
$context->getAppContainer()->registerService('FileHooks', function($c) {
74+
$context->getAppContainer()->registerService('FileHooks', function ($c) {
7775
return new FileHooks(
7876
$c->query(IServerContainer::class)->getRootFolder(),
7977
\OC::$server->query(PhotofilesService::class),

‎lib/BackgroundJob/AddPhotoJob.php

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@
1212

1313
namespace OCA\Maps\BackgroundJob;
1414

15-
use \OCP\BackgroundJob\QueuedJob;
16-
use \OCP\BackgroundJob\IJobList;
17-
use \OCP\AppFramework\Utility\ITimeFactory;
18-
use OCP\ICache;
19-
use OCP\ICacheFactory;
20-
use OCP\IUserManager;
21-
use OCP\IConfig;
22-
use OCP\Files\IRootFolder;
23-
2415
use OCA\Maps\Service\PhotofilesService;
16+
use OCP\AppFramework\Utility\ITimeFactory;
17+
use OCP\BackgroundJob\QueuedJob;
18+
use OCP\Files\IRootFolder;
19+
use OCP\ICache;
2520

21+
use OCP\ICacheFactory;
2622

2723
class AddPhotoJob extends QueuedJob {
2824

@@ -38,35 +34,35 @@ class AddPhotoJob extends QueuedJob {
3834
/** @var ICache */
3935
private ICache $backgroundJobCache;
4036

41-
/**
42-
* UserInstallScanJob constructor.
43-
*
44-
* A QueuedJob to scan user storage for photos and tracks
45-
*
37+
/**
38+
* UserInstallScanJob constructor.
39+
*
40+
* A QueuedJob to scan user storage for photos and tracks
41+
*
4642
* @param ITimeFactory $timeFactory
4743
* @param PhotofilesService $photofilesService
48-
*/
49-
public function __construct(ITimeFactory $timeFactory,
50-
IRootFolder $root,
51-
PhotofilesService $photofilesService,
52-
ICacheFactory $cacheFactory) {
53-
parent::__construct($timeFactory);
54-
$this->photofilesService = $photofilesService;
55-
$this->root = $root;
44+
*/
45+
public function __construct(ITimeFactory $timeFactory,
46+
IRootFolder $root,
47+
PhotofilesService $photofilesService,
48+
ICacheFactory $cacheFactory) {
49+
parent::__construct($timeFactory);
50+
$this->photofilesService = $photofilesService;
51+
$this->root = $root;
5652
$this->cacheFactory = $cacheFactory;
5753
$this->backgroundJobCache = $this->cacheFactory->createDistributed('maps:background-jobs');
58-
}
54+
}
5955

60-
public function run($arguments) {
61-
$userFolder = $this->root->getUserFolder($arguments['userId']);
62-
$files = $userFolder->getById($arguments['photoId']);
63-
if (empty($files)) {
64-
return;
65-
}
66-
$file = array_shift($files);
67-
$this->photofilesService->addPhotoNow($file, $arguments['userId']);
56+
public function run($arguments) {
57+
$userFolder = $this->root->getUserFolder($arguments['userId']);
58+
$files = $userFolder->getById($arguments['photoId']);
59+
if (empty($files)) {
60+
return;
61+
}
62+
$file = array_shift($files);
63+
$this->photofilesService->addPhotoNow($file, $arguments['userId']);
6864

6965
$counter = $this->backgroundJobCache->get('recentlyAdded:'.$arguments['userId']) ?? 0;
70-
$this->backgroundJobCache->set('recentlyAdded:'.$arguments['userId'], (int) $counter + 1, 60 * 60 * 3);
71-
}
66+
$this->backgroundJobCache->set('recentlyAdded:'.$arguments['userId'], (int)$counter + 1, 60 * 60 * 3);
67+
}
7268
}

‎lib/BackgroundJob/LaunchUsersInstallScanJob.php

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,33 @@
1212

1313
namespace OCA\Maps\BackgroundJob;
1414

15-
use \OCP\BackgroundJob\QueuedJob;
16-
use \OCP\BackgroundJob\IJobList;
17-
use \OCP\AppFramework\Utility\ITimeFactory;
18-
use OCP\IUserManager;
15+
use OCP\AppFramework\Utility\ITimeFactory;
16+
use OCP\BackgroundJob\IJobList;
17+
use OCP\BackgroundJob\QueuedJob;
1918
use OCP\IUser;
20-
21-
use \OCA\Maps\BackgroundJob\UserInstallScanJob;
19+
use OCP\IUserManager;
2220

2321
class LaunchUsersInstallScanJob extends QueuedJob {
2422

25-
private $jobList;
26-
27-
/**
28-
* LaunchUsersInstallScanJob constructor.
29-
*
30-
* A QueuedJob to launch a scan job for each user
31-
*
32-
* @param IJobList $jobList
33-
*/
34-
public function __construct(ITimeFactory $timeFactory, IJobList $jobList, IUserManager $userManager) {
35-
parent::__construct($timeFactory);
36-
$this->jobList = $jobList;
37-
$this->userManager = $userManager;
38-
}
39-
40-
public function run($arguments) {
41-
\OC::$server->getLogger()->debug('Launch users install scan jobs cronjob executed');
42-
$this->userManager->callForSeenUsers(function (IUser $user) {
43-
$this->jobList->add(UserInstallScanJob::class, ['userId' => $user->getUID()]);
44-
});
45-
}
23+
private $jobList;
24+
25+
/**
26+
* LaunchUsersInstallScanJob constructor.
27+
*
28+
* A QueuedJob to launch a scan job for each user
29+
*
30+
* @param IJobList $jobList
31+
*/
32+
public function __construct(ITimeFactory $timeFactory, IJobList $jobList, IUserManager $userManager) {
33+
parent::__construct($timeFactory);
34+
$this->jobList = $jobList;
35+
$this->userManager = $userManager;
36+
}
37+
38+
public function run($arguments) {
39+
\OC::$server->getLogger()->debug('Launch users install scan jobs cronjob executed');
40+
$this->userManager->callForSeenUsers(function (IUser $user) {
41+
$this->jobList->add(UserInstallScanJob::class, ['userId' => $user->getUID()]);
42+
});
43+
}
4644
}

‎lib/BackgroundJob/LookupMissingGeoJob.php

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,39 @@
1212

1313
namespace OCA\Maps\BackgroundJob;
1414

15-
use \OCA\Maps\Service\AddressService;
16-
use \OCP\BackgroundJob\QueuedJob;
17-
use \OCP\BackgroundJob\IJobList;
18-
use \OCP\AppFramework\Utility\ITimeFactory;
15+
use OCA\Maps\Service\AddressService;
16+
use OCP\AppFramework\Utility\ITimeFactory;
17+
use OCP\BackgroundJob\IJobList;
18+
use OCP\BackgroundJob\QueuedJob;
1919

2020
class LookupMissingGeoJob extends QueuedJob {
2121

22-
/** @var AddressService */
23-
private $addressService;
24-
25-
/** @var AddressService */
26-
private $jobList;
27-
28-
/**
29-
* LookupMissingGeoJob constructor.
30-
*
31-
* A QueuedJob to lookup missing geo information of addresses
32-
*
33-
* @param AddressService $service
34-
* @param IJobList $jobList
35-
*/
36-
public function __construct(ITimeFactory $timeFactory, AddressService $service, IJobList $jobList) {
37-
parent::__construct($timeFactory);
38-
$this->addressService = $service;
39-
$this->jobList = $jobList;
40-
}
41-
42-
public function run($arguments) {
43-
\OC::$server->getLogger()->debug('Maps address lookup cronjob executed');
44-
// lookup at most 200 addresses
45-
if (!$this->addressService->lookupMissingGeo(200)){
46-
// if not all addresses where looked up successfully add a new job for next time
47-
$this->jobList->add(LookupMissingGeoJob::class, []);
48-
}
49-
}
22+
/** @var AddressService */
23+
private $addressService;
24+
25+
/** @var AddressService */
26+
private $jobList;
27+
28+
/**
29+
* LookupMissingGeoJob constructor.
30+
*
31+
* A QueuedJob to lookup missing geo information of addresses
32+
*
33+
* @param AddressService $service
34+
* @param IJobList $jobList
35+
*/
36+
public function __construct(ITimeFactory $timeFactory, AddressService $service, IJobList $jobList) {
37+
parent::__construct($timeFactory);
38+
$this->addressService = $service;
39+
$this->jobList = $jobList;
40+
}
41+
42+
public function run($arguments) {
43+
\OC::$server->getLogger()->debug('Maps address lookup cronjob executed');
44+
// lookup at most 200 addresses
45+
if (!$this->addressService->lookupMissingGeo(200)) {
46+
// if not all addresses where looked up successfully add a new job for next time
47+
$this->jobList->add(LookupMissingGeoJob::class, []);
48+
}
49+
}
5050
}

‎lib/BackgroundJob/UpdatePhotoByFileJob.php

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@
1212

1313
namespace OCA\Maps\BackgroundJob;
1414

15-
use \OCP\BackgroundJob\QueuedJob;
16-
use \OCP\BackgroundJob\IJobList;
17-
use \OCP\AppFramework\Utility\ITimeFactory;
18-
use OCP\ICache;
19-
use OCP\ICacheFactory;
20-
use OCP\IUserManager;
21-
use OCP\IConfig;
22-
use OCP\Files\IRootFolder;
23-
2415
use OCA\Maps\Service\PhotofilesService;
16+
use OCP\AppFramework\Utility\ITimeFactory;
17+
use OCP\BackgroundJob\QueuedJob;
18+
use OCP\Files\IRootFolder;
19+
use OCP\ICache;
2520

21+
use OCP\ICacheFactory;
2622

2723
class UpdatePhotoByFileJob extends QueuedJob {
2824

@@ -38,35 +34,35 @@ class UpdatePhotoByFileJob extends QueuedJob {
3834
/** @var ICache */
3935
private ICache $backgroundJobCache;
4036

41-
/**
42-
* UserInstallScanJob constructor.
43-
*
44-
* A QueuedJob to scan user storage for photos and tracks
45-
*
46-
* @param ITimeFactory $timeFactory
37+
/**
38+
* UserInstallScanJob constructor.
39+
*
40+
* A QueuedJob to scan user storage for photos and tracks
41+
*
42+
* @param ITimeFactory $timeFactory
4743
* @param PhotofilesService $photofilesService
48-
*/
49-
public function __construct(ITimeFactory $timeFactory,
50-
IRootFolder $root,
51-
PhotofilesService $photofilesService,
52-
ICacheFactory $cacheFactory) {
53-
parent::__construct($timeFactory);
54-
$this->photofilesService = $photofilesService;
55-
$this->root = $root;
44+
*/
45+
public function __construct(ITimeFactory $timeFactory,
46+
IRootFolder $root,
47+
PhotofilesService $photofilesService,
48+
ICacheFactory $cacheFactory) {
49+
parent::__construct($timeFactory);
50+
$this->photofilesService = $photofilesService;
51+
$this->root = $root;
5652
$this->cacheFactory = $cacheFactory;
5753
$this->backgroundJobCache = $this->cacheFactory->createDistributed('maps:background-jobs');
58-
}
54+
}
5955

60-
public function run($arguments) {
61-
$userFolder = $this->root->getUserFolder($arguments['userId']);
62-
$files = $userFolder->getById($arguments['fileId']);
63-
if (empty($files)) {
64-
return;
65-
}
66-
$file = array_shift($files);
67-
$this->photofilesService->updateByFileNow($file);
56+
public function run($arguments) {
57+
$userFolder = $this->root->getUserFolder($arguments['userId']);
58+
$files = $userFolder->getById($arguments['fileId']);
59+
if (empty($files)) {
60+
return;
61+
}
62+
$file = array_shift($files);
63+
$this->photofilesService->updateByFileNow($file);
6864

6965
$counter = $this->backgroundJobCache->get('recentlyUpdated:'.$arguments['userId']) ?? 0;
70-
$this->backgroundJobCache->set('recentlyUpdated:'.$arguments['userId'], (int) $counter + 1, 60 * 60 * 3);
71-
}
66+
$this->backgroundJobCache->set('recentlyUpdated:'.$arguments['userId'], (int)$counter + 1, 60 * 60 * 3);
67+
}
7268
}

0 commit comments

Comments
 (0)