[pull] master from mstilkerich:master

.gitattributes

@@ -1,7 +1,9 @@
 .git*     export-ignore
 *.xml     export-ignore
 Makefile  export-ignore
-doc       export-ignore
+/doc/devdoc export-ignore
+/doc/img/*.drawio export-ignore
 /tests    export-ignore
+/vendor-bin export-ignore
 *.vcf     text eol=crlf
 *.vcf.new text eol=crlf

.github/actions/setup/action.yml

@@ -4,11 +4,11 @@ inputs:
   php-version:
     description: 'PHP version to use'
     required: false
-    default: '8.0'
+    default: '8.2'
   rcube-version:
     description: 'Roundcube version to use'
     required: false
-    default: 'master'
+    default: 'release-1.6'
 runs:
   using: "composite"
   steps:
@@ -20,7 +20,7 @@ runs:
           extensions: gd, xdebug, curl
           coverage: xdebug
       - name: Checkout roundcubemail
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: roundcubemail
           repository: mstilkerich/roundcubemail

.github/configs/composer-build-release.json

@@ -1,8 +1,8 @@
 {
     "config": {
         "platform": {
-            "php": "7.1.0"
+            "php": "7.4.0"
         },
-		"prepend-autoloader": false
+        "prepend-autoloader": false
     }
 }

.github/scripts/fixcov.php

@@ -0,0 +1,39 @@
+#!/usr/bin/env php
+<?php
+
+// Replace namespaces in cov files generated by PHPUnit PHAR so they are parseable
+// PHPCov PHAR
+// See https://github.com/sebastianbergmann/phpcov/issues/109
+
+$script = array_shift($argv);
+if (count($argv) < 1) {
+    echo "Usage: $script coverage.cov [coverage2.cov ...]\n";
+    exit(1);
+}
+
+foreach ($argv as $covfile) {
+    $content = file_get_contents($covfile);
+    if ($content === false) {
+        echo "Failed to read $covfile\n";
+        exit(1);
+    }
+
+    $content = preg_replace_callback(
+        "#\:(\d+)\:\"(.?)PHPUnit\\\SebastianBergmann\\\#",
+        function($matches): string {
+            $hasNull = strlen($matches[2]) === 1;
+            $size = $matches[1];
+            $size -= 8;
+
+            if ($hasNull) {
+                return sprintf(":%d:\"\0SebastianBergmann\\", $size);
+            }
+
+            return sprintf(':%d:"SebastianBergmann\\', $size);
+        }, $content);
+
+    if (file_put_contents($covfile, $content) === false) {
+        echo "Failed to write $covfile\n";
+        exit(1);
+    }
+}

.github/workflows/ci.yml

@@ -12,17 +12,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rcube-version: ['release-1.4', 'release-1.5', 'release-1.6', 'master']
+        rcube-version: ['release-1.6', 'release-1.7', 'master']
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout rcmcarddav
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up CI environment
         uses: ./.github/actions/setup
         with:
           rcube-version: ${{ matrix.rcube-version }}
+      - name: Install psalm
+        run: composer bin psalm update --no-interaction --no-progress
+        shell: bash
       - name: Check code style compliance with PSR12
         run: make stylecheck
       - name: Check code compatibility with minimum supported PHP version
@@ -36,50 +39,52 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.3', '8.0', '8.1']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       XDEBUG_MODE: coverage
 
     steps:
       - name: Checkout rcmcarddav
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up CI environment
         uses: ./.github/actions/setup
         with:
           php-version: ${{ matrix.php-version }}
       - name: Run unit tests
         run: make unittests
       - name: Upload unit test coverage reports to codecov.io
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v5
         with:
-          file: testreports/unit/clover.xml
+          files: testreports/unit/clover.xml
+          disable_search: true
           flags: unittests
+          token: ${{ secrets.CODECOV_TOKEN }}
           name: RCMCardDAV unit test coverage
-          fail_ci_if_error: false
 
   dbinterop-sqlite3:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       XDEBUG_MODE: coverage
 
     steps:
       - name: Checkout rcmcarddav
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up CI environment
         uses: ./.github/actions/setup
       - name: Database interoperability tests for SQLite3
         run: make tests-sqlite3
       - name: Upload DB interoperability test coverage reports to codecov.io
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v5
         with:
-          file: testreports/dbinterop-sqlite3/clover.xml
+          files: testreports/dbinterop-sqlite3/clover.xml
+          disable_search: true
           flags: dbinterop-sqlite3
+          token: ${{ secrets.CODECOV_TOKEN }}
           name: RCMCardDAV SQLite3 database interoperability test coverage
-          fail_ci_if_error: false
 
   dbinterop-mysql:
     strategy:
@@ -97,8 +102,11 @@ jobs:
           - 'mariadb:10.7'
           - 'mariadb:10.8'
           - 'mariadb:10.9'
+          - 'mariadb:10.10'
+          - 'mariadb:10.11'
+          - 'mariadb:11'
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       XDEBUG_MODE: coverage
@@ -111,7 +119,7 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: root
         options: >-
-          --health-cmd "mysqladmin ping"
+          --health-cmd "sh -c '$(command -v mariadb-admin || command -v mysqladmin) ping'"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
@@ -121,7 +129,7 @@ jobs:
 
     steps:
       - name: Checkout rcmcarddav
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up CI environment
         uses: ./.github/actions/setup
       - name: Set MySQL settings
@@ -130,20 +138,21 @@ jobs:
       - name: Database interoperability tests for MySQL
         run: make tests-mysql
       - name: Upload DB interoperability test coverage reports to codecov.io
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v5
         with:
-          file: testreports/dbinterop-mysql/clover.xml
+          files: testreports/dbinterop-mysql/clover.xml
+          disable_search: true
           flags: dbinterop-mysql
+          token: ${{ secrets.CODECOV_TOKEN }}
           name: RCMCardDAV MySQL database interoperability test coverage
-          fail_ci_if_error: false
 
   dbinterop-postgres:
     strategy:
       fail-fast: false
       matrix:
-        postgres-version: ['9', '10', '11', '12', '13', '14']
+        postgres-version: ['9', '10', '11', '12', '13', '14', '15', '16', '17']
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       XDEBUG_MODE: coverage
@@ -167,15 +176,16 @@ jobs:
 
     steps:
       - name: Checkout rcmcarddav
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up CI environment
         uses: ./.github/actions/setup
       - name: Database interoperability tests for Postgres
         run: make tests-postgres
       - name: Upload DB interoperability test coverage reports to codecov.io
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v5
         with:
-          file: testreports/dbinterop-postgres/clover.xml
+          files: testreports/dbinterop-postgres/clover.xml
+          disable_search: true
           flags: dbinterop-postgres
+          token: ${{ secrets.CODECOV_TOKEN }}
           name: RCMCardDAV PostgreSQL database interoperability test coverage
-          fail_ci_if_error: false

.gitignore

@@ -1,8 +1,11 @@
 .phpunit.result.cache
+.phpunit.cache
 .DS_Store
 ./config.inc.php
 /.phpdoc
 /vendor
+/vendor-bin/**/vendor/
+/vendor-bin/**/composer.lock
 /node_modules
 composer.lock
 *.tgz
@@ -17,3 +20,4 @@ composer.lock
 /tags
 /.eslintrc.json
 /.idea
+.*.drawio.bkp

CHANGELOG.md

@@ -1,9 +1,54 @@
 # Changelog for RCMCardDAV
 
-## Changes since 5.0.0-beta1
+## Version 5.1.3 (to 5.1.2)
+- Postgres: Support tables in a schema within the Postgres database through roundcube's `db_prefix` option, for example
+  "rcschema.". (Fixes #495)
+- readonly attribute for preset addressbooks was not honored for accounts for that the user had never saved settings
+  (Fixes #497)
+- Improvement: Do not query CardDAV addressbook when no communication is needed (#500)
 
+## Version 5.1.2 (to 5.1.1)
+
+- Re-release of 5.1.1 the only change being that the dependencies shipped in the tarball release are updated, notably
+  including carddavclient 1.4.2 with a workaround for bearer authentication with `nextcloud/user_oidc` plugin
+
+## Version 5.1.1 (to 5.1.0)
+
+- Fix migration 7: The migration replaced placeholders in the addressbook URLs with the data of the user during whose
+  login the migration was executed. This would result in broken URLs in such cases.
+- Adjust interfaces for roundcube 1.7 changes (Fixes: #467, #468, and #473 (thanks @nick-oconnor))
+- VCards imported via Roundcube import function are stored to server as is (except for compatibility fixes, e.g. adding
+  UID) (Fixes #470)
+
+## Version 5.1.0 (to 5.0.1)
+
+- Allow to hide contacts without email also for user-defined addressbooks (Fixes #429)
+- Re-introduced option `preemptive_basic_auth` to send HTTP basic Authorization header with every request. Also settable
+  via user-interface. (Fixes #407)
+- Support setting roundcube's default addressbook to an addressbook from a preset (Fixes #440)
+- New option `ssl_noverify` to disable verification of the CardDAV server`s SSL certificate in HTTPS connections. Also
+  settable via user-interface.
+
+## Version 5.0.1 (to 5.0.0)
+
+- Fix: Tarball release failed to add its autoloader in time (Fixes: #415)
+- Fix: Removed string interpolation variants deprecated with PHP 8.2
+
+## Version 5.0.0 (to 5.0.0-beta1)
+
+- Minimum supported PHP version for 5.0 is PHP 7.4 (Fixes #414)
 - Fix: Internal server error with PHP8 when searching address fields of contacts (Fixes: #410)
 - Fix: Assertion failure in DelayedPhotoLoader (Fixes: #404)
+- Fixes for better handling of incoming vCard4 (Fixes: #411)
+  - Handle data-URI-style inline PHOTO as used in vCard4
+  - Use VCard conversion to handle v4 properties such as KIND=group for which extensions are used in v3 vCards
+- Fix: Do not attempt to download photos from URIs with unsupported URI scheme (supported are http and https) (#411)
+- When an invalid value is submitted in one of the settings forms, RCMCardDAV will now abort with an error. Previous
+  versions of RCMCardDAV would ignore the value when possible an instead keep the existing value or use a default value.
+- Backend will refuse Frontend request to remove user account created from preset
+- On initial installation of RCMCardDAV, the database schema is created from a single script with the current schema
+  version. Previous versions incrementally executed all migration scripts since the very beginning (Fixes #395)
+- In the settings forms, some simple browser form validation has been added (Fixes #400)
 
 ## Version 5.0.0-beta1 (to 4.4.4)