Merge branch 'feature/qa' into prep-release-0.10

Author: ylebre

.github/workflows/php.yml

@@ -73,25 +73,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php:
-          - '8.0'  # from 2020-11 to 2022-11 (2023-11)
-          - '8.1'  # from 2021-11 to 2023-11 (2025-12)
-          - '8.2'  # from 2022-12 to 2024-12 (2026-12)
-          - '8.3'  # from 2023-11 to 2025-12 (2027-12)
+        nextcloud_version:
+          - 28
+          - 29
+          - 30
     steps:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          coverage: xdebug
           ini-values: error_reporting=E_ALL, display_errors=On
-          php-version: ${{ matrix.php }}
+          php-version: 8.3
       - name: Install and Cache Composer dependencies
         uses: "ramsey/composer-install@v2"
         with:
           working-directory: "solid"
         env:
           COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
-      - run: bin/phpunit --configuration .config/phpunit.xml.dist
+      - run: |
+            docker run \
+            --env 'XDEBUG_MODE=coverage' \
+            --rm \
+            --volume="./solid:/var/www/html/apps/solid" \
+            --workdir=/var/www/html/apps/solid \
+            ghcr.io/pdsinterop/solid-nextcloud:179_merge-${{ matrix.nextcloud_version }} \
+            bin/phpunit --configuration phpunit.xml
+
   # 03.quality.php.scan.dependencies-vulnerabilities.yml
   scan-dependencies-vulnerabilities:
     name: Scan Dependencies Vulnerabilities

Dockerfile

@@ -1,11 +1,18 @@
 ARG NEXTCLOUD_VERSION
+ARG XDEBUG_VERSION
+
 FROM nextcloud:${NEXTCLOUD_VERSION}
 
-RUN apt-get update && apt-get install --no-install-recommends -yq \
+SHELL ["/bin/bash", "-c"]
+
+RUN apt-get update \
+    && read -ra PHPIZE_DEPS <<< "${PHPIZE_DEPS}" \
+    && apt-get install --no-install-recommends -yq \
       git \
       sudo \
       vim \
       zip \
+      "${PHPIZE_DEPS[@]}" \
     && rm -rf /var/lib/apt/lists/* \
     && a2enmod ssl \
     && mkdir /tls \
@@ -15,13 +22,24 @@ RUN apt-get update && apt-get install --no-install-recommends -yq \
       -subj "/C=RO/ST=Bucharest/L=Bucharest/O=IT/CN=www.example.ro"
 
 COPY solid/ /usr/src/nextcloud/apps/solid
+COPY docker/xdebug.sh /xdebug.sh
 COPY init.sh /
 COPY init-live.sh /
 COPY site.conf /etc/apache2/sites-enabled/000-default.conf
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
-RUN composer install --working-dir=/usr/src/nextcloud/apps/solid --no-dev --prefer-dist \
-    && rm  /usr/local/bin/composer
+
+RUN composer install --working-dir=/usr/src/nextcloud/apps/solid --prefer-dist \
+    && sh /xdebug.sh \
+    && pecl install "xdebug-$(cat /xdebug.version)" \
+    && docker-php-ext-enable xdebug \
+    && NEXTCLOUD_ADMIN_PASSWORD='alice123' \
+       NEXTCLOUD_ADMIN_USER='alice' \
+       NEXTCLOUD_TRUSTED_DOMAINS='localhost server thirdparty nextcloud.local *.nextcloud.local' \
+       NEXTCLOUD_UPDATE=1 \
+       /entrypoint.sh 'echo' \
+    && php /var/www/html/console.php maintenance:install --admin-user='alice' --admin-pass='alice123' \
+    && php /var/www/html/console.php app:enable solid
 
 WORKDIR /var/www/html
 EXPOSE 443

docker/xdebug.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+set -o errexit  # Exit script when a command exits with non-zero status.
+#set -o errtrace # Exit on error inside any functions or sub-shells.
+set -o nounset  # Exit script on use of an undefined variable.
+#set -o pipefail # Return exit status of the last command in the pipe that exited with a non-zero exit code
+
+if [ -z "${NEXTCLOUD_VERSION}" ]; then
+    echo >&2 'The "NEXTCLOUD_VERSION" variable MUST be set during build: docker build --build-arg "NEXTCLOUD_VERSION=..."'
+    exit 65
+else
+    echo "NEXTCLOUD_VERSION is set to '${NEXTCLOUD_VERSION}'"
+fi
+
+PHP_VERSION="${PHP_VERSION:-$(php -r 'echo PHP_VERSION;')}"
+PHP_MAJOR="${PHP_VERSION%%.*}"
+PHP_MINOR="$(echo "${PHP_VERSION}" | awk -F. '{print $2}')"
+
+if [ -z "${XDEBUG_VERSION:-}" ]; then
+    if [ "$PHP_MAJOR" -eq 8 ]; then
+        XDEBUG_VERSION=3.4.3
+    elif [ "$PHP_MAJOR" -eq 7 ]; then
+        if [ "$PHP_MINOR" -ge 2 ] && [ "$PHP_MINOR" -le 4 ]; then
+            XDEBUG_VERSION=3.1.6
+        elif [ "$PHP_MINOR" -eq 1 ]; then
+            XDEBUG_VERSION=2.9.8
+        elif [ "$PHP_MINOR" -eq 0 ]; then
+            XDEBUG_VERSION=2.7.2
+        else
+            echo >&2 "Unsupported PHP 7 minor version: $PHP_MINOR"
+            exit 66
+        fi
+    elif [ "$PHP_MAJOR" -eq 5 ]; then
+        if [ "$PHP_MINOR" -ge 5 ] && [ "$PHP_MINOR" -le 6 ]; then
+            XDEBUG_VERSION=2.5.5
+        elif [ "$PHP_MINOR" -eq 4 ]; then
+            XDEBUG_VERSION=2.4.1
+        else
+            echo >&2 "Unsupported PHP 5 minor version: $PHP_MINOR"
+            exit 67
+        fi
+    else
+        echo >&2 "Unsupported PHP version: ${PHP_VERSION}"
+        exit 68
+    fi
+fi
+
+echo "${XDEBUG_VERSION}" > /xdebug.version

solid/composer.json

@@ -37,33 +37,6 @@
     },
     "require-dev": {
         "doctrine/dbal": "*",
-        "nextcloud/server": "*",
         "phpunit/phpunit": "^8 || ^9"
-    },
-    "repositories": [
-        {
-            "type": "package",
-            "package": {
-                "name": "nextcloud/server",
-                "version": "27.0.0",
-                "dist": {
-                    "url": "https://github.com/nextcloud/server/archive/refs/tags/v27.0.0.zip",
-                    "type": "zip"
-                },
-                "source": {
-                    "url": "https://github.com/nextcloud/server.git",
-                    "type": "git",
-                    "reference": "master"
-                },
-                "autoload": {
-                    "psr-4": {
-                        "": "lib/private/legacy",
-                        "OC\\": "lib/private",
-                        "OC\\Core\\": "core/",
-                        "OCP\\": "lib/public"
-                    }
-                }
-            }
-        }
-    ]
+    }
 }