Skip to content

Commit 96d2231

Browse files
authored
Merge branch 'master' into fix/s3-primary-storage-encryption
2 parents 71ef20b + cf1c70c commit 96d2231

File tree

1,207 files changed

+8905
-4467
lines changed

Some content is hidden

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

1,207 files changed

+8905
-4467
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -165,46 +165,3 @@ updates:
165165
# no major updates on stable branches
166166
- dependency-name: "*"
167167
update-types: ["version-update:semver-major"]
168-
169-
# Composer dependencies for linting and testing
170-
- package-ecosystem: composer
171-
target-branch: stable31
172-
directories:
173-
- "/"
174-
- "/build/integration"
175-
- "/vendor-bin/cs-fixer"
176-
- "/vendor-bin/openapi-extractor"
177-
- "/vendor-bin/phpunit"
178-
- "/vendor-bin/psalm"
179-
schedule:
180-
interval: weekly
181-
day: saturday
182-
time: "04:00"
183-
timezone: Europe/Paris
184-
labels:
185-
- "3. to review"
186-
- "feature: dependencies"
187-
ignore:
188-
# only patch updates on stable branches
189-
- dependency-name: "*"
190-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
191-
192-
# frontend dependencies
193-
- package-ecosystem: npm
194-
target-branch: stable31
195-
directory: "/"
196-
schedule:
197-
interval: weekly
198-
day: saturday
199-
time: "04:00"
200-
timezone: Europe/Paris
201-
open-pull-requests-limit: 20
202-
labels:
203-
- "3. to review"
204-
- "feature: dependencies"
205-
# Disable automatic rebasing because without a build CI will likely fail anyway
206-
rebase-strategy: "disabled"
207-
ignore:
208-
# no major updates on stable branches
209-
- dependency-name: "*"
210-
update-types: ["version-update:semver-major"]

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
persist-credentials: false
3838

3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
40+
uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
4141
with:
4242
languages: ${{ matrix.language }}
4343
build-mode: ${{ matrix.build-mode }}
4444
config-file: ./.github/codeql-config.yml
4545

4646
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
47+
uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
4848
with:
4949
category: "/language:${{matrix.language}}"

.github/workflows/cypress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
run: ./node_modules/cypress/bin/cypress install
172172

173173
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
174-
uses: cypress-io/github-action@0f330ebf0d60f87608ed72f1d6232e5644aa3171 # v7.1.1
174+
uses: cypress-io/github-action@84d178e4bbce871e23f2ffa3085898cde0e4f0ec # v7.1.2
175175
with:
176176
# We already installed the dependencies in the init job
177177
install: false

.github/workflows/integration-dav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7272

7373
- name: Set up Python
74-
uses: LizardByte/actions/actions/setup_python@09a6e10dc8175f2933c20bdf35fde0a193a9c00e # v2026.129.194351
74+
uses: LizardByte/actions/actions/setup_python@9bf3ef783775e17fe6b8dde3585d94ec570b93c2 # v2026.212.22356
7575
with:
7676
python-version: '2.7'
7777

.github/workflows/rector-apply.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-License-Identifier: MIT
8+
9+
name: Apply rector changes
10+
11+
on:
12+
workflow_dispatch:
13+
schedule:
14+
# At 14:30 on Sundays
15+
- cron: '30 14 * * 0'
16+
17+
permissions:
18+
contents: read
19+
20+
jobs:
21+
build:
22+
runs-on: ubuntu-latest
23+
24+
name: rector-apply
25+
26+
steps:
27+
- name: Checkout
28+
id: checkout
29+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30+
with:
31+
persist-credentials: false
32+
ref: ${{ github.event.repository.default_branch }}
33+
34+
- name: Get php version
35+
id: versions
36+
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
37+
38+
- name: Set up php${{ steps.versions.outputs.php-min }}
39+
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
40+
with:
41+
php-version: ${{ steps.versions.outputs.php-min }}
42+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
43+
coverage: none
44+
ini-file: development
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
48+
- name: Install dependencies
49+
run: |
50+
composer remove nextcloud/ocp --dev --no-scripts
51+
composer i
52+
53+
- name: Rector
54+
run: composer run rector
55+
56+
- name: Create Pull Request
57+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
58+
with:
59+
token: ${{ secrets.COMMAND_BOT_PAT }}
60+
commit-message: 'refactor: Apply rector changes'
61+
committer: GitHub <noreply@github.com>
62+
author: nextcloud-command <nextcloud-command@users.noreply.github.com>
63+
signoff: true
64+
branch: automated/noid/rector-changes
65+
title: 'Apply rector changes'
66+
labels: |
67+
technical debt
68+
3. to review

.github/workflows/static-code-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888

8989
- name: Upload Security Analysis results to GitHub
9090
if: always()
91-
uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v3
91+
uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v3
9292
with:
9393
sarif_file: results.sarif
9494

apps/admin_audit/lib/IAuditLogger.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/**
46
* SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
57
* SPDX-License-Identifier: AGPL-3.0-or-later
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
OC.L10N.register(
22
"cloud_federation_api",
33
{
4-
"Cloud Federation API" : "Asl faylni o'chirishda kutilmagan xatolik yuz berdi.",
4+
"Cloud Federation API" : "Jamg'armaning bulutli APIsi",
55
"Enable clouds to communicate with each other and exchange data" : "Bulutlar bir-biri bilan aloqa qilish va ma'lumot almashish imkonini beradi",
6-
"The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
6+
"The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Jamoada API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
77
},
88
"nplurals=1; plural=0;");
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ "translations": {
2-
"Cloud Federation API" : "Asl faylni o'chirishda kutilmagan xatolik yuz berdi.",
2+
"Cloud Federation API" : "Jamg'armaning bulutli APIsi",
33
"Enable clouds to communicate with each other and exchange data" : "Bulutlar bir-biri bilan aloqa qilish va ma'lumot almashish imkonini beradi",
4-
"The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
4+
"The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Jamoada API turli xil Nextcloud misollariga bir-biri bilan muloqot qilish va ma'lumotlarni almashish imkonini beradi."
55
},"pluralForm" :"nplurals=1; plural=0;"
66
}

apps/comments/appinfo/routes.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/**
46
* SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
57
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.

0 commit comments

Comments
 (0)