chore(deps): Update nextcloud/coding-standard to v1.3.1 #48181

provokateurin · 2024-09-18T16:33:59Z

Summary

Psalm baseline had to be updated due to it referencing code snippets where the formatting was changed.

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

apps/dav/lib/CalDAV/BirthdayService.php

@@ -108,7 +110,7 @@

 			$calendar = $this->ensureCalendarExists($principalUri);
 			foreach (['', '-death', '-anniversary'] as $tag) {
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
+				$objectUri = $book['uri'] . '-' . $cardUri . $tag . '.ics';


apps/dav/lib/CalDAV/Calendar.php

@@ -189,15 +193,16 @@
 		$acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
 		$allowedPrincipals = [
 			$this->getOwner(),
-			$this->getOwner(). '/calendar-proxy-read',
-			$this->getOwner(). '/calendar-proxy-write',
+			$this->getOwner() . '/calendar-proxy-read',


apps/dav/lib/CalDAV/Calendar.php

-			$this->getOwner(). '/calendar-proxy-read',
-			$this->getOwner(). '/calendar-proxy-write',
+			$this->getOwner() . '/calendar-proxy-read',
+			$this->getOwner() . '/calendar-proxy-write',


come-nc · 2024-09-18T16:50:04Z

diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php
index d8abbc39631..7e48867fcfa 100644
--- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php
+++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php
@@ -68,7 +68,9 @@ class PushProvider extends AbstractProvider {
                $eventUUID = (string)$vevent->UID;
                if (!$eventUUID) {
                        return;
-               };
+               }
+
+;
                $eventUUIDHash = hash('sha256', $eventUUID, false);
 
                foreach ($users as $user) {

🤔

provokateurin · 2024-09-18T16:51:08Z

Unfortunately it also seems to generate a different result than locally.

come-nc · 2024-09-18T16:51:43Z

diff --git a/apps/dav/templates/schedule-response-error.php b/apps/dav/templates/schedule-response-error.php
index 9604c83f922..7bdb37f73dd 100644
--- a/apps/dav/templates/schedule-response-error.php
+++ b/apps/dav/templates/schedule-response-error.php
@@ -11,6 +11,8 @@
                <p><?php p($l->t('Please contact the organizer directly.'));?></p>
                <?php if (isset($_['organizer'])): ?>
                        <p><a href="<?php p($_['organizer']) ?>"><?php p(substr($_['organizer'], 7)) ?></a></p>
-               <?php endif; ?>
+               <?php endif;
+
+ ?>
        </div>
 </div>

also not ideal

come-nc · 2024-09-18T16:53:36Z

You also need to composer install --no-dev before commit

come-nc · 2024-09-18T16:54:54Z

I used git diff master..chore/deps/nextcloud-coding-standard --ignore-all-space --ignore-blank-lines to keep my sanity.
It basically looks good everywhere but in templates files, where it’s not that nice 😕

provokateurin · 2024-09-18T17:00:41Z

Unfortunately it also seems to generate a different result than locally.

Deleting the cache did the trick and it also changed some things in the templates.

provokateurin · 2024-09-18T17:20:38Z

Changes to the templates seem to break *DAV.

nickvergessen · 2024-09-18T21:08:21Z

Yeah let's just revert the 2 new line rules

apps/files_external/lib/Lib/PersonalMount.php

@@ -39,7 +39,7 @@
 		$arguments = null,
 		$loader = null,
 		$mountOptions = null,
-		$mountId = null
+		$mountId = null,


apps/files_versions/lib/Storage.php

@@ -91,7 +91,7 @@
 		Filesystem::initMountPoints($uid);
 		if ($uid !== OC_User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/'.$uid.'/files');
+			$ownerView = new View('/' . $uid . '/files');


apps/user_ldap/ajax/getNewServerConfigPrefix.php

@@ -15,7 +15,7 @@
 sort($serverConnections);
 $lk = array_pop($serverConnections);
 $ln = (int)str_replace('s', '', $lk);
-$nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT);
+$nk = 's' . str_pad($ln + 1, 2, '0', STR_PAD_LEFT);


apps/user_ldap/lib/Connection.php

@@ -259,11 +259,11 @@
 	 * @param string|null $key
 	 */
 	private function getCacheKey($key): string {
-		$prefix = 'LDAP-'.$this->configID.'-'.$this->configPrefix.'-';
+		$prefix = 'LDAP-' . $this->configID . '-' . $this->configPrefix . '-';


apps/user_ldap/lib/LDAPProvider.php

@@ -36,15 +36,15 @@
 		$userBackendFound = false;
 		$groupBackendFound = false;
 		foreach ($serverContainer->getUserManager()->getBackends() as $backend) {
-			$this->logger->debug('instance '.get_class($backend).' user backend.', ['app' => 'user_ldap']);
+			$this->logger->debug('instance ' . get_class($backend) . ' user backend.', ['app' => 'user_ldap']);


apps/user_ldap/lib/User_LDAP.php

@@ -237,7 +237,7 @@
 		]);

 		$this->logger->debug(
-			'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter,
+			'getUsers: Options: search ' . $search . ' limit ' . $limit . ' offset ' . $offset . ' Filter: ' . $filter,


apps/user_ldap/lib/User_LDAP.php

@@ -495,7 +495,7 @@
 	 * @return array an array of all displayNames (value) and the corresponding uids (key)
 	 */
 	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$cacheKey = 'getDisplayNames-'.$search.'-'.$limit.'-'.$offset;
+		$cacheKey = 'getDisplayNames-' . $search . '-' . $limit . '-' . $offset;


apps/user_ldap/lib/User_LDAP.php

@@ -495,7 +495,7 @@
 	 * @return array an array of all displayNames (value) and the corresponding uids (key)
 	 */
 	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$cacheKey = 'getDisplayNames-'.$search.'-'.$limit.'-'.$offset;
+		$cacheKey = 'getDisplayNames-' . $search . '-' . $limit . '-' . $offset;


apps/webhook_listeners/lib/BackgroundJobs/WebhookCall.php

@@ -81,12 +81,12 @@
 			}
 			$statusCode = $response->getStatusCode();
 			if ($statusCode >= 200 && $statusCode < 300) {
-				$this->logger->debug('Webhook returned status code '.$statusCode, ['body' => $response->getBody()]);
+				$this->logger->debug('Webhook returned status code ' . $statusCode, ['body' => $response->getBody()]);


apps/webhook_listeners/lib/BackgroundJobs/WebhookCall.php

 			} else {
-				$this->logger->warning('Webhook(' . $webhookId . ') returned unexpected status code '.$statusCode, ['body' => $response->getBody()]);
+				$this->logger->warning('Webhook(' . $webhookId . ') returned unexpected status code ' . $statusCode, ['body' => $response->getBody()]);


provokateurin · 2024-09-19T10:10:44Z

Sharding tests are expected to fail, can someone force-merge?

Signed-off-by: provokateurin <[email protected]>

provokateurin added the 3. to review Waiting for reviews label Sep 18, 2024

provokateurin added this to the Nextcloud 31 milestone Sep 18, 2024

provokateurin requested review from kesselb and come-nc September 18, 2024 16:33

provokateurin requested review from CarlSchwan, nickvergessen, ChristophWurst, miaulalala, st3iny and tcitworld as code owners September 18, 2024 16:34

github-advanced-security bot found potential problems Sep 18, 2024

View reviewed changes

kesselb approved these changes Sep 18, 2024

View reviewed changes

provokateurin force-pushed the chore/deps/nextcloud-coding-standard branch from 9313fba to 2a664db Compare September 18, 2024 16:59

provokateurin force-pushed the chore/deps/nextcloud-coding-standard branch from 2a664db to 367ff22 Compare September 19, 2024 09:11

provokateurin changed the title ~~chore(deps): Update nextcloud/coding-standard to v1.3.0~~ chore(deps): Update nextcloud/coding-standard to v1.3.1 Sep 19, 2024

provokateurin requested a review from kesselb September 19, 2024 09:13

kesselb approved these changes Sep 19, 2024

View reviewed changes

github-advanced-security bot found potential problems Sep 19, 2024

View reviewed changes

miaulalala approved these changes Sep 19, 2024

View reviewed changes

provokateurin added 2 commits September 19, 2024 14:21

chore(deps): Update nextcloud/coding-standard to v1.3.1

9836e9b

Signed-off-by: provokateurin <[email protected]>

chore: Add nextcloud/coding-standard v1.3.1 update to git blame ignores

6285f55

Signed-off-by: provokateurin <[email protected]>

provokateurin force-pushed the chore/deps/nextcloud-coding-standard branch from 367ff22 to 6285f55 Compare September 19, 2024 12:21

provokateurin enabled auto-merge September 19, 2024 12:22

come-nc approved these changes Sep 19, 2024

View reviewed changes

provokateurin merged commit 74c38b8 into master Sep 19, 2024
174 checks passed

provokateurin deleted the chore/deps/nextcloud-coding-standard branch September 19, 2024 13:49

provokateurin mentioned this pull request Sep 19, 2024

fix(psalm): Update psalm baseline #48212

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(deps): Update nextcloud/coding-standard to v1.3.1 #48181

chore(deps): Update nextcloud/coding-standard to v1.3.1 #48181

provokateurin commented Sep 18, 2024

come-nc commented Sep 18, 2024

provokateurin commented Sep 18, 2024

come-nc commented Sep 18, 2024

come-nc commented Sep 18, 2024

come-nc commented Sep 18, 2024

provokateurin commented Sep 18, 2024

provokateurin commented Sep 18, 2024

nickvergessen commented Sep 18, 2024

provokateurin commented Sep 19, 2024

chore(deps): Update nextcloud/coding-standard to v1.3.1 #48181

chore(deps): Update nextcloud/coding-standard to v1.3.1 #48181

Conversation

provokateurin commented Sep 18, 2024

Summary

Checklist

come-nc commented Sep 18, 2024

provokateurin commented Sep 18, 2024

come-nc commented Sep 18, 2024

come-nc commented Sep 18, 2024

come-nc commented Sep 18, 2024

provokateurin commented Sep 18, 2024

provokateurin commented Sep 18, 2024

nickvergessen commented Sep 18, 2024

provokateurin commented Sep 19, 2024