Merge branch 'nextcloud:master' into master

Author: memurats

.devcontainer/Dockerfile

@@ -52,6 +52,9 @@ RUN { \
 	echo "xdebug.start_with_request=yes"; \
 } >> /etc/php/8.3/apache2/conf.d/20-xdebug.ini
 
+# Increase PHP memory limit to 512mb
+RUN sed -i 's/memory_limit = .*/memory_limit = 512M/' /etc/php/8.3/apache2/php.ini
+
 # Docker
 RUN apt-get -y install \
     apt-transport-https \

.eslintrc.js

@@ -36,4 +36,13 @@ module.exports = {
 			mode: 'typescript',
 		},
 	},
+	overrides: [
+		// Allow any in tests
+		{
+			files: ['**/*.spec.ts'],
+			rules: {
+				'@typescript-eslint/no-explicit-any': 'warn',
+			},
+		}
+	],
 }

.git-blame-ignore-revs

@@ -0,0 +1,17 @@
+# .git-blame-ignore-revs
+
+# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# Format control structures
+caff1023ea72bb2ea94130e18a2a6e2ccf819e5f
+# Update to coding-standard 1.1.1
+aa5f037af71c915424c6dcfd5ad2dc82797dc0d6
+# Update to coding-standard 1.2.3
+af6de04e9e141466dc229e444ff3f146f4a34765
+0bd284cb81b6866338aaaa67aa1d81ef9bfbb2ab
+8af7ecb2576071f170ecbb0aa2311b26581e40e2
+# Update to coding-standard 1.3.1
+9836e9b16484582d309c8437ab46d82e34956941
+# Automated refactorings
+49dd79eabb2b8902559a7a4e8f8fcad54f46b604

.github/CODEOWNERS

@@ -1,11 +1,15 @@
 # App maintainers
 /apps/admin_audit/appinfo/info.xml            @luka-nextcloud @blizzz
 /apps/cloud_federation_api/appinfo/info.xml   @mejo-
-/apps/comments/appinfo/info.xml               @marcelklehr @Pytal
-/apps/contactsinteraction/appinfo/info.xml    @kesselb @miaulalala @ChristophWurst @GretaD @hamza221 @st3iny
-/apps/dashboard/appinfo/info.xml              @julien-nc @juliushaertl
-/apps/dav/lib/CalDAV                          @ChristophWurst @miaulalala @tcitworld
-/apps/dav/lib/CardDAV                         @ChristophWurst @miaulalala @tcitworld
+/apps/comments/appinfo/info.xml               @edward-ly @Pytal
+/apps/contactsinteraction/appinfo/info.xml    @kesselb @SebastianKrupinski
+/apps/contactsinteraction/lib                 @kesselb @SebastianKrupinski
+/apps/contactsinteraction/tests               @kesselb @SebastianKrupinski
+/apps/dashboard/appinfo/info.xml              @julien-nc @juliusknorr
+/apps/dav/lib/CalDAV                          @miaulalala @st3iny @SebastianKrupinski
+/apps/dav/lib/CardDAV                         @miaulalala @st3iny @SebastianKrupinski
+/apps/dav/tests/unit/CalDAV                   @miaulalala @st3iny @SebastianKrupinski
+/apps/dav/tests/unit/CardDAV                  @miaulalala @st3iny @SebastianKrupinski
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
 /apps/federation/appinfo/info.xml             @datenangebot
@@ -20,13 +24,14 @@
 /apps/settings/appinfo/info.xml               @Pytal @JuliaKirschenheuter
 /apps/sharebymail/appinfo/info.xml            @Altahrim
 /apps/systemtags/appinfo/info.xml             @Antreesy @marcelklehr
-/apps/theming/appinfo/info.xml                @skjnldsv @juliushaertl
+/apps/theming/appinfo/info.xml                @skjnldsv @juliusknorr
 /apps/twofactor_backupcodes/appinfo/info.xml  @st3iny @miaulalala @ChristophWurst
 /apps/updatenotification/appinfo/info.xml     @Pytal @JuliaKirschenheuter
 /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 @juliushaertl
-/apps/workflowengine/appinfo/info.xml         @blizzz @juliushaertl
+/apps/weather_status/appinfo/info.xml         @julien-nc @juliusknorr
+/apps/webhook_listeners/appinfo/info.xml      @come-nc @julien-nc
+/apps/workflowengine/appinfo/info.xml         @blizzz @juliusknorr
 
 # Frontend expertise
 /apps/files/src*                  @skjnldsv
@@ -36,9 +41,9 @@
 /apps/files_trashbin/src*         @skjnldsv
 
 # Security team
+/build/psalm-baseline-security.xml  @nickvergessen
 /resources/codesigning              @mgallien @miaulalala @nickvergessen
 /resources/config/ca-bundle.crt     @ChristophWurst @miaulalala @nickvergessen
-/.drone.yml                         @nickvergessen
 
 # Two-Factor Authentication
 # https://github.com/nextcloud/wg-two-factor-authentication#members
@@ -64,6 +69,10 @@ ResponseDefinitions.php @provokateurin
 /lib/public/Talk                    @nickvergessen
 /lib/public/UserStatus              @nickvergessen
 
+# Groupware
+/build/integration/dav_features/caldav.feature    @miaulalala @st3iny @SebastianKrupinski
+/build/integration/dav_features/carddav.feature   @miaulalala @st3iny @SebastianKrupinski
+
 # Personal interest
 */Activity/*                        @nickvergessen
 */Notifications/*                   @nickvergessen

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@
 -->
 ## Submitting issues
 
-If you have questions about how to install or use Nextcloud, please direct these to our [forum][forum]. We are also available on [IRC][irc].
+If you have questions about how to install or use Nextcloud, please direct these to our [forum][forum]. We are also available on [IRC][irc] (unofficial).
 
 ### Short version
 
@@ -25,7 +25,7 @@ Help us to maximize the effort we can spend fixing issues and adding new feature
 
 [templates]: ./ISSUE_TEMPLATE
 [forum]: https://help.nextcloud.com/
-[irc]: https://webchat.freenode.net/?channels=nextcloud
+[irc]: https://web.libera.chat/#nextcloud
 
 ## Contributing to Source Code
 
@@ -48,7 +48,7 @@ In some areas unit testing is hard (aka almost impossible) as of today - in thes
 
 ### Sign your work
 
-We use the Developer Certificate of Origin (DCO) as a additional safeguard
+We use the Developer Certificate of Origin (DCO) as an additional safeguard
 for the Nextcloud project. This is a well established and widely used
 mechanism to assure contributors have confirmed their right to license
 their contribution under the project's license.

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -62,22 +62,6 @@ body:
       description: Describe what you expected to happen instead.
     validations:
       required: true
-  - type: dropdown
-    id: install-method
-    attributes:
-      label: Installation method
-      description: |
-        Select installation method you've used.
-        _Describe the method in the "Additional info" section if you chose "Other"._
-      options:
-        - "Community Web installer on a VPS or web space"
-        - "Community Manual installation with Archive"
-        - "Community Docker image"
-        - "Community NextcloudPi appliance"
-        - "Community SNAP package"
-        - "Community VM appliance"
-        - "Other Community project"
-        - "Official All-in-One appliance"
   - type: dropdown
     id: nextcloud-version
     attributes:
@@ -88,6 +72,7 @@ body:
       options:
         - "28"
         - "29"
+        - "30"
         - "master"
     validations:
       required: true
@@ -110,10 +95,10 @@ body:
         Select PHP engine version serving Nextcloud Server.
         _Describe in the "Additional info" section if you chose "Other"._
       options:
-        - "PHP 8.0"
-        - "PHP 8.1"
-        - "PHP 8.2"
         - "PHP 8.3"
+        - "PHP 8.2"
+        - "PHP 8.1"
+        - "PHP 8.0"
         - "Other"
   - type: dropdown
     id: webserver
@@ -183,7 +168,7 @@ body:
         ./occ config:list system
         ```
         > NOTE: This will be automatically formatted into code for better readability.
-      render: shell
+      render: json
   - type: textarea
     id: apps
     attributes:
@@ -215,10 +200,10 @@ body:
     attributes:
       label: Nextcloud Logs
       description: |
-        Provide Nextcloud logs lines.
-        Copy all contents from `data/nextcloud.log` or a RAW from `/settings/admin/logging` section:
+        Provide relevant Nextcloud log entries (e.g. from the time period you reproduced the problem).
+        Copy full individual entries from `data/nextcloud.log` or use `Copy raw entry` from `/settings/admin/logging` section:
         > NOTE: This will be automatically formatted into code for better readability.
-      render: shell
+      render: json
   - type: textarea
     id: additional-info
     attributes:

.github/dependabot.yml

@@ -59,6 +59,20 @@ updates:
   reviewers:
     - "nextcloud/server-dependabot"
 
+# phpunit
+- package-ecosystem: composer
+  directory: "/vendor-bin/phpunit"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:40"
+    timezone: Europe/Madrid
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  reviewers:
+    - "nextcloud/server-dependabot"
+
 # Main master npm
 - package-ecosystem: npm
   directory: "/"
@@ -138,6 +152,25 @@ updates:
   # Disable automatic rebasing because without a build CI will likely fail anyway
   rebase-strategy: "disabled"
 
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  target-branch: stable30
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  reviewers:
+    - "nextcloud/server-dependabot"
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+
 - package-ecosystem: composer
   directory: "/build/integration"
   schedule:
@@ -174,6 +207,24 @@ updates:
     - dependency-name: "*"
       update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
 
+- package-ecosystem: composer
+  directory: "/build/integration"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  target-branch: stable30
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  reviewers:
+    - "nextcloud/server-dependabot"
+  ignore:
+    # ignore all GitHub linguist patch updates
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
+
 # GitHub Actions
 - package-ecosystem: "github-actions"
   directory: "/"

.github/workflows/autocheckers.yml

@@ -45,21 +45,21 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.3']
+        php-versions: ['8.1']
 
     name: PHP checkers
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
         with:
           submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b #v2.31.0
+        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, json, mbstring
+          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
         env:

.github/workflows/block-outdated-3rdparty.yml

@@ -31,7 +31,7 @@ jobs:
               - 'version.php'
 
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: 3rdparty commit hash on current branch
         id: actual

.github/workflows/block-unconventional-commits.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0
         with: