Merge branch 'master' into master

Author: Phreeman33

.github/CODEOWNERS

@@ -24,8 +24,8 @@ package-lock.json                             @nextcloud/server-dependabot
 
 # App maintainers
 /apps/admin_audit/appinfo/info.xml            @luka-nextcloud @blizzz
-/apps/cloud_federation_api/appinfo/info.xml   @mejo-
-/apps/comments/appinfo/info.xml               @edward-ly @Pytal
+/apps/cloud_federation_api/appinfo/info.xml   @nfebe @mejo-
+/apps/comments/appinfo/info.xml               @edward-ly @sorbaugh
 /apps/contactsinteraction/appinfo/info.xml    @kesselb @SebastianKrupinski
 /apps/contactsinteraction/lib                 @kesselb @SebastianKrupinski
 /apps/contactsinteraction/tests               @kesselb @SebastianKrupinski
@@ -36,21 +36,21 @@ package-lock.json                             @nextcloud/server-dependabot
 /apps/dav/tests/unit/CardDAV                  @hamza221 @SebastianKrupinski
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
-/apps/federation/appinfo/info.xml             @nfebe
-/apps/files/appinfo/info.xml                  @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
+/apps/federation/appinfo/info.xml             @nfebe @sorbaugh
+/apps/files/appinfo/info.xml                  @skjnldsv @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
 /apps/files_external/appinfo/info.xml         @icewind1991 @artonge
-/apps/files_reminders/appinfo/info.xml        @Pytal
+/apps/files_reminders/appinfo/info.xml        @skjnldsv @sorbaugh
 /apps/files_sharing/appinfo/info.xml          @skjnldsv @come-nc
-/apps/files_trashbin/appinfo/info.xml         @Pytal @icewind1991
+/apps/files_trashbin/appinfo/info.xml         @icewind1991 @sorbaugh
 /apps/files_versions/appinfo/info.xml         @artonge @icewind1991
 /apps/oauth2/appinfo/info.xml                 @julien-nc @ChristophWurst
 /apps/provisioning_api/appinfo/info.xml       @provokateurin @nickvergessen
-/apps/settings/appinfo/info.xml               @Pytal @JuliaKirschenheuter
-/apps/sharebymail/appinfo/info.xml            @Altahrim
+/apps/settings/appinfo/info.xml               @JuliaKirschenheuter @sorbaugh
+/apps/sharebymail/appinfo/info.xml            @Altahrim @skjnldsv
 /apps/systemtags/appinfo/info.xml             @Antreesy @marcelklehr
 /apps/theming/appinfo/info.xml                @skjnldsv @juliusknorr
 /apps/twofactor_backupcodes/appinfo/info.xml  @st3iny @miaulalala @ChristophWurst
-/apps/updatenotification/appinfo/info.xml     @Pytal @JuliaKirschenheuter
+/apps/updatenotification/appinfo/info.xml     @JuliaKirschenheuter @sorbaugh
 /apps/user_ldap/appinfo/info.xml              @come-nc @blizzz
 /apps/user_status/appinfo/info.xml            @Antreesy @nickvergessen
 /apps/weather_status/appinfo/info.xml         @julien-nc @juliusknorr
@@ -80,8 +80,8 @@ package-lock.json                             @nextcloud/server-dependabot
 /core/routes.php                    @Altahrim @nextcloud/server-backend
 
 # OpenAPI
-openapi*.json                       @provokateurin
-ResponseDefinitions.php             @provokateurin
+openapi*.json                       @provokateurin @nextcloud/server-backend
+ResponseDefinitions.php             @provokateurin @nextcloud/server-backend
 
 # Talk team
 /lib/private/Comments               @nickvergessen @nextcloud/talk-backend

.github/dependabot.yml

@@ -81,7 +81,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  open-pull-requests-limit: 10
+  open-pull-requests-limit: 20
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -121,6 +121,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
+  open-pull-requests-limit: 20
   target-branch: stable29
   labels:
     - "3. to review"
@@ -140,6 +141,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
+  open-pull-requests-limit: 20
   target-branch: stable30
   labels:
     - "3. to review"
@@ -159,6 +161,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
+  open-pull-requests-limit: 20
   target-branch: stable31
   labels:
     - "3. to review"

.github/workflows/autocheckers.yml

@@ -110,6 +110,9 @@ jobs:
       - name: Check that all and only expected files are included
         run: php ./build/files-checker.php
 
+      - name: Check that all shipped apps are linted by psalm
+        run: sh ./build/psalm-checker.sh
+
   summary:
     permissions:
       contents: none

.scrutinizer.yml

@@ -5,7 +5,6 @@
 -->
 # Nextcloud Server ☁
 [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
 [![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
 [![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)

README.md

@@ -2,6 +2,6 @@ OC.L10N.register(
     "admin_audit",
     {
     "Auditing / Logging" : "Auditēšana / Žurnalizēšana",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalizēšanas iespējas, piemēram, faila piekļuves žurnalizēšanu vai citas sensitīvas darbības."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalēšanas spējas, piemēram, datņu piekļuves žurnalēšanu vai citas jūtīgas darbības."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");

apps/admin_audit/l10n/lv.js

@@ -1,5 +1,5 @@
 { "translations": {
     "Auditing / Logging" : "Auditēšana / Žurnalizēšana",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalizēšanas iespējas, piemēram, faila piekļuves žurnalizēšanu vai citas sensitīvas darbības."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nodrošina Nextcloud žurnalēšanas spējas, piemēram, datņu piekļuves žurnalēšanu vai citas jūtīgas darbības."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }

apps/admin_audit/l10n/lv.json

@@ -2,6 +2,6 @@ OC.L10N.register(
     "admin_audit",
     {
     "Auditing / Logging" : "Auditoria / Registro",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece habilidades de registro para o NextCloud, como acessos de arquivo de log ou ações sensíveis."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para o Nextcloud, como acessos a arquivos de registro ou outras ações sensíveis."
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");

apps/admin_audit/l10n/pt_BR.js

@@ -1,5 +1,5 @@
 { "translations": {
     "Auditing / Logging" : "Auditoria / Registro",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece habilidades de registro para o NextCloud, como acessos de arquivo de log ou ações sensíveis."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para o Nextcloud, como acessos a arquivos de registro ou outras ações sensíveis."
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }

apps/admin_audit/l10n/pt_BR.json

@@ -12,13 +12,14 @@
 use NCU\Security\Signature\Exceptions\SignatoryException;
 use OC\OCM\OCMSignatoryManager;
 use OCP\Capabilities\ICapability;
+use OCP\Capabilities\IInitialStateExcludedCapability;
 use OCP\IAppConfig;
 use OCP\IURLGenerator;
 use OCP\OCM\Exceptions\OCMArgumentException;
 use OCP\OCM\IOCMProvider;
 use Psr\Log\LoggerInterface;
 
-class Capabilities implements ICapability {
+class Capabilities implements ICapability, IInitialStateExcludedCapability {
 	public const API_VERSION = '1.1'; // informative, real version.
 
 	public function __construct(
@@ -54,15 +55,13 @@ public function __construct(
 	 */
 	public function getCapabilities() {
 		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
-
-		$this->provider->setEnabled(true);
-		$this->provider->setApiVersion(self::API_VERSION);
-
 		$pos = strrpos($url, '/');
 		if ($pos === false) {
-			throw new OCMArgumentException('generated route should contains a slash character');
+			throw new OCMArgumentException('generated route should contain a slash character');
 		}
 
+		$this->provider->setEnabled(true);
+		$this->provider->setApiVersion(self::API_VERSION);
 		$this->provider->setEndPoint(substr($url, 0, $pos));
 
 		$resource = $this->provider->createNewResourceType();
@@ -87,6 +86,6 @@ public function getCapabilities() {
 			$this->logger->warning('cannot generate local signatory', ['exception' => $e]);
 		}
 
-		return ['ocm' => json_decode(json_encode($this->provider->jsonSerialize()), true)];
+		return ['ocm' => $this->provider->jsonSerialize()];
 	}
 }