Skip to content

Commit 7cd39b3

Browse files
More changes
Signed-off-by: SebastianKrupinski <[email protected]>
1 parent 67b0b7c commit 7cd39b3

File tree

164 files changed

+18970
-20099
lines changed

Some content is hidden

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

164 files changed

+18970
-20099
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/js/
33
/node_modules/
44
/vendor/
5-
/.php_cs.cache
65
.vscode
76
.idea
7+
*.cache
88
*.iml
99
*.log
1010
*.log.*

appinfo/info.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,19 @@
2626
<database>sqlite</database>
2727
<database>mysql</database>
2828
<command>php</command>
29-
<command>ps</command>
30-
<command>kill</command>
3129
<lib>curl</lib>
3230
<nextcloud min-version="26" max-version="32"/>
3331
</dependencies>
32+
<repair-steps>
33+
<post-migration>
34+
<step>OCA\JMAPC\Migration\DefaultServiceTemplates</step>
35+
</post-migration>
36+
</repair-steps>
3437
<commands>
3538
<command>OCA\JMAPC\Commands\Connect</command>
3639
<command>OCA\JMAPC\Commands\Disconnect</command>
3740
<command>OCA\JMAPC\Commands\Harmonize</command>
41+
<command>OCA\JMAPC\Commands\Show</command>
3842
</commands>
3943
<settings>
4044
<admin>OCA\JMAPC\Settings\AdminSettings</admin>
@@ -44,10 +48,12 @@
4448
</settings>
4549
<sabre>
4650
<address-book-plugins>
47-
<plugin>OCA\JMAPC\Providers\DAV\Contacts\Provider</plugin>
51+
<plugin>OCA\JMAPC\Providers\DAV\Contacts\Cached\Provider</plugin>
52+
<plugin>OCA\JMAPC\Providers\DAV\Contacts\Live\Provider</plugin>
4853
</address-book-plugins>
4954
<calendar-plugins>
50-
<plugin>OCA\JMAPC\Providers\DAV\Calendar\Provider</plugin>
55+
<plugin>OCA\JMAPC\Providers\DAV\Calendar\Cached\Provider</plugin>
56+
<plugin>OCA\JMAPC\Providers\DAV\Calendar\Live\Provider</plugin>
5157
</calendar-plugins>
5258
</sabre>
5359
</info>

babel.config.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
4949
"psalm:update-baseline:force": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
5050
"psalm:clear": "psalm.phar --clear-cache && psalm --clear-global-cache",
51-
"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType"
51+
"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
52+
"test:unit": "phpunit -c tests/unit/php.unit.xml --fail-on-warning",
53+
"test:integration": "phpunit -c tests/integration/php.integration.xml --fail-on-warning"
5254
}
5355
}

css/AdminSettings-Ckff3myA.chunk.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/JmapIcon-CNTeZXhe.chunk.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/UserSettings-BBtHrUjf.chunk.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* extracted by css-entry-points-plugin */
2+
@import './AdminSettings-Ckff3myA.chunk.css';
3+
@import './JmapIcon-CNTeZXhe.chunk.css';
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* extracted by css-entry-points-plugin */
2+
@import './UserSettings-BBtHrUjf.chunk.css';
3+
@import './JmapIcon-CNTeZXhe.chunk.css';

lib/AppInfo/Application.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ public function __construct(array $urlParams = []) {
5252
if ((@include_once __DIR__ . '/../../vendor/autoload.php') === false) {
5353
throw new \Exception('Cannot include autoload. Did you run install dependencies using composer?');
5454
}
55-
5655
parent::__construct(self::APP_ID, $urlParams);
57-
5856
}
5957

6058
public function register(IRegistrationContext $context): void {
@@ -70,6 +68,19 @@ public function register(IRegistrationContext $context): void {
7068
if (method_exists($context, 'registerMailProvider')) {
7169
$context->registerMailProvider(MailProvider::class);
7270
}
71+
72+
/*
73+
try {
74+
if (class_exists('\OCA\ContactsService\ContactsManager', true)) {
75+
\OCA\ContactsService\ContactsManager::registerProvider(
76+
'jmapc',
77+
\OCA\JMAPC\Providers\Contacts\Provider::class
78+
);
79+
}
80+
} catch (\Exception $e) {
81+
// Handle the exception if needed
82+
}
83+
*/
7384
}
7485

7586
public function boot(IBootContext $context): void {

0 commit comments

Comments
 (0)