Merge branch 'master' into stable

Author: marcelklehr

.github/workflows/floccus.yml

@@ -48,7 +48,7 @@ jobs:
         run: npm i -g npm@"${{ matrix.npm-version }}"
 
       - name: Cache node modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:

.github/workflows/psalm.yml

@@ -20,39 +20,74 @@ concurrency:
   group: psalm-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-jobs:
-  static-analysis:
-    runs-on: ubuntu-latest
+permissions:
+  contents: read
 
-    name: static-psalm-analysis
+jobs:
+  matrix:
+    runs-on: ubuntu-latest-low
+    outputs:
+      ocp-matrix: ${{ steps.versions.outputs.ocp-matrix }}
     steps:
-      - name: Checkout
+      - name: Checkout app
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
 
-      - name: Get php version
+      - name: Get version matrix
         id: versions
         uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
 
       - name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
         run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
 
-      - name: Set up php${{ steps.versions.outputs.php-available }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
+  static-analysis:
+    runs-on: ubuntu-latest
+    needs: matrix
+    strategy:
+      # do not stop on another job's failure
+      fail-fast: false
+      matrix: ${{ fromJson(needs.matrix.outputs.ocp-matrix) }}
+
+    name: static-psalm-analysis ${{ matrix.ocp-version }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - name: Set up php${{ matrix.php-min }}
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
         with:
-          php-version: ${{ steps.versions.outputs.php-available }}
+          php-version: ${{ matrix.php-min }}
           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
+          # Temporary workaround for missing pcntl_* in PHP 8.3
+          ini-values: disable_functions=
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
         run: |
-          composer remove nextcloud/ocp --dev
+          composer remove nextcloud/ocp --dev --no-scripts
           composer i
 
-      - name: Install nextcloud/ocp
-        run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies
+
+      - name: Install dependencies # zizmor: ignore[template-injection]
+        run: composer require --dev 'nextcloud/ocp:${{ matrix.ocp-version }}' --ignore-platform-reqs --with-dependencies
 
       - name: Run coding standards check
-        run: composer run psalm
+        run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github
+
+  summary:
+    runs-on: ubuntu-latest-low
+    needs: static-analysis
+
+    if: always()
+
+    name: static-psalm-analysis-summary
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.static-analysis.result != 'success' }}; then exit 1; fi

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [15.1.1] - 2025-06-21
+
+### Fixed
+
+* fix(composer): Remove dependencies that are in server already
+* Fix(l10n): Update translations from Transifex
+
 ## [15.1.0] - 2025-02-23
 
 ### New

Makefile

@@ -7,7 +7,7 @@ source_dir=$(build_dir)/source
 sign_dir=$(build_dir)/sign
 package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
-version+=15.1.0
+version+=15.1.1
 
 all: dev-setup build-js-production composer-no-dev
 

appinfo/info.xml

@@ -23,7 +23,7 @@ Requirements:
    - mbstring: *
  - when using MySQL, use at least v8.0
 ]]></description>
-	<version>15.1.0</version>
+	<version>15.1.1</version>
 	<licence>agpl</licence>
 	<author mail="mklehr@gmx.net">Marcel Klehr</author>
 	<author mail="blizzz@arthur-schiwon.de" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>

composer.json

@@ -5,25 +5,21 @@
 		"ext-json": "*",
 		"ext-libxml": "*",
 		"ext-pdo": "*",
-		"guzzlehttp/psr7": "^2",
 		"marcelklehr/link-preview": "^3.0.5",
-		"psr/http-client": "^1.0",
-		"psr/http-factory": "^1.0",
-		"psr/http-message": "^1.0",
 		"rowbot/url": "^3.0",
 		"xantios/mimey": "^2.1",
 		"fivefilters/readability.php": "^3.1"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.5.26",
 		"nextcloud/coding-standard": "^1.0.0",
-		"vimeo/psalm": "5.x",
+		"vimeo/psalm": "6.x",
 		"nextcloud/ocp": "dev-master"
 	},
 	"config": {
 		"optimize-autoloader": true,
 		"platform": {
-			"php": "8.1.2"
+			"php": "8.1.31"
 		}
 	},
 	"autoload": {

l10n/af.js

@@ -12,6 +12,7 @@ OC.L10N.register(
     "New" : "Nuut",
     "New folder" : "Nuwe vouer",
     "Search" : "Soek",
+    "_%n folder_::_%n folders_" : ["%n gids","%n gidse"],
     "Add a bookmark" : "Voeg 'n boekmerk by",
     "Choose folder" : "Kies vouer",
     "Submit" : "Dien in",
@@ -27,10 +28,10 @@ OC.L10N.register(
     "Tags" : "Merkers",
     "Notes" : "Notas",
     "Download file" : "Laai lêer af",
+    "Link copied" : "Skakel gekopieer",
     "Owner" : "Eienaar",
     "Share link" : "Deelskakel",
     "Allow editing" : "Laat redigering toe",
-    "Link copied" : "Skakel gekopieer",
     "Privacy" : "Privaatheid",
     "Previews" : "Voorskoue",
     "This URL is already bookmarked! Overwrite?" : "'n Boekmerk van die URL bestaan reeds. Skryf oor?",

l10n/af.json

@@ -10,6 +10,7 @@
     "New" : "Nuut",
     "New folder" : "Nuwe vouer",
     "Search" : "Soek",
+    "_%n folder_::_%n folders_" : ["%n gids","%n gidse"],
     "Add a bookmark" : "Voeg 'n boekmerk by",
     "Choose folder" : "Kies vouer",
     "Submit" : "Dien in",
@@ -25,10 +26,10 @@
     "Tags" : "Merkers",
     "Notes" : "Notas",
     "Download file" : "Laai lêer af",
+    "Link copied" : "Skakel gekopieer",
     "Owner" : "Eienaar",
     "Share link" : "Deelskakel",
     "Allow editing" : "Laat redigering toe",
-    "Link copied" : "Skakel gekopieer",
     "Privacy" : "Privaatheid",
     "Previews" : "Voorskoue",
     "This URL is already bookmarked! Overwrite?" : "'n Boekmerk van die URL bestaan reeds. Skryf oor?",