update to nextcloud versions to 33, 34, 35

.github/workflows/php.yml

@@ -87,9 +87,9 @@ jobs:
       fail-fast: false
       matrix:
         nextcloud_version:
-          - 28
-          - 29
-          - 30
+          - 33
+          - 34
+          - 35
     steps:
       - uses: actions/checkout@v5
       # @CHECKME: cp site.conf /etc/apache2/sites-enabled/000-default.conf (?)
@@ -152,9 +152,8 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '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)
+          - '8.4'
     steps:
       - uses: actions/checkout@v4
       - uses: docker://pipelinecomponents/php-codesniffer

.github/workflows/solid-tests-suites.yml

@@ -4,7 +4,7 @@ name: Solid Test Suites
 env:
   # Docker Hub digest (i.e. hash) of the used Docker Images that do not have a version tag.
   PUBSUB_TAG: latest@sha256:b73a2a5c98d2005bb667dfc69d1c859d704366024298b9caa24ea2e182c456c2
-  COOKIE_TAG: latest@sha256:b2815496a1291a8f0f8bf2524c42d6000a4a1d6a202b319fe01e1afacf1cec7d
+  COOKIE_TAG: rewrite_curl-based@sha256:0d0a5a4d90651e2f38f2d881da6a5087e17aa3ca08c342b7af59a539726115f5
 
 on:
   push:
@@ -34,9 +34,9 @@ jobs:
         # Version 24 comes with PHP 8.0, which is no longer supported;
         # Latest is not tested here, as that could cause failures unrelated to project changes
         nextcloud_version:
-          - 28
-          - 29
-          - 30
+          - 33
+          - 34
+          - 35
 
     steps:
       - name: Create docker tag from git reference
@@ -82,16 +82,16 @@ jobs:
       fail-fast: false
       matrix:
         nextcloud_version:
-          - 28
-          - 29
-          - 30
+          - 33
+          - 34
+          - 35
         test:
           - 'solidtestsuite/solid-crud-tests:v7.0.5'
           - 'solidtestsuite/web-access-control-tests:v7.1.0'
           - 'solidtestsuite/webid-provider-tests:v2.1.1'
 
     # Prevent EOL or non-stable versions of Nextcloud to fail the test-suite
-    continue-on-error: ${{ contains(fromJson('[28,29,30]'), matrix.nextcloud_version) == false }}
+    continue-on-error: ${{ contains(fromJson('[33,34,35]'), matrix.nextcloud_version) == false }}
 
     steps:
       - name: Create docker tag from git reference
@@ -119,7 +119,7 @@ jobs:
       - name: Pull docker Images
         run: |
           docker image load --input ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar
-          docker pull michielbdejong/nextcloud-cookie:${{ env.COOKIE_TAG }}
+          docker pull ghcr.io/pdsinterop/docker-nextcloud-cookie:${{ env.COOKIE_TAG }}
           docker pull ${{ matrix.test }}
           docker pull ghcr.io/pdsinterop/php-solid-pubsub-server:${{ env.PUBSUB_TAG }}
 

run-solid-test-suite.sh

@@ -2,17 +2,17 @@
 
 set -e
 
-: "${COOKIE_TAG:=latest@sha256:b2815496a1291a8f0f8bf2524c42d6000a4a1d6a202b319fe01e1afacf1cec7d}"
+: "${COOKIE_TAG:=rewrite_curl-based@sha256:0d0a5a4d90651e2f38f2d881da6a5087e17aa3ca08c342b7af59a539726115f5}"
 
 # Note that .github/workflows/solid-tests-suites.yml does not use this, this function is just for manual runs of this script.
 # You can pick different values for the NEXTCLOUD_VERSION build arg, as required:
 function setup {
   docker build -t pubsub-server  https://github.com/pdsinterop/php-solid-pubsub-server.git#main
-  docker build -t solid-nextcloud --build-arg NEXTCLOUD_VERSION=25 .
+  docker build -t solid-nextcloud --build-arg NEXTCLOUD_VERSION=33 .
 
   docker network create testnet
 
-  docker pull "michielbdejong/nextcloud-cookie:${COOKIE_TAG}"
+  docker pull "ghcr.io/pdsinterop/docker-nextcloud-cookie:${COOKIE_TAG}"
   docker pull solidtestsuite/solid-crud-tests:v7.0.5
   docker pull solidtestsuite/web-access-control-tests:v7.1.0
   docker pull solidtestsuite/webid-provider-tests:v2.1.1
@@ -52,7 +52,7 @@ function startSolidNextcloud {
         --cap-add=SYS_ADMIN \
         --network=testnet \
         --env-file "./env-vars-$1.list" \
-        "michielbdejong/nextcloud-cookie:${COOKIE_TAG}"
+        "ghcr.io/pdsinterop/docker-nextcloud-cookie:${COOKIE_TAG}"
     )"
 }
 

solid/appinfo/info.xml

@@ -21,7 +21,7 @@ When you do this, the Solid App can store data in your Nextcloud account through
     </types>
     <bugs>https://github.com/pdsinterop/solid-nextcloud/issues</bugs>
     <dependencies>
-        <nextcloud min-version="28" max-version="30"/>
+        <nextcloud min-version="33" max-version="35"/>
     </dependencies>
     <settings>
         <admin>OCA\Solid\Settings\SolidAdmin</admin>

solid/composer.json

@@ -21,20 +21,19 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "easyrdf/easyrdf": "^1.1.1",
-        "laminas/laminas-diactoros": "^2.8",
+        "sweetrdf/easyrdf": ">=1.15.0 <1.16.0",
+        "laminas/laminas-diactoros": "^3",
         "lcobucci/jwt": "^4.1",
-        "pdsinterop/flysystem-nextcloud": "^0.2",
-        "pdsinterop/flysystem-rdf": "^0.6",
-        "pdsinterop/solid-auth": "^0.13",
-        "pdsinterop/solid-crud": "^0.8",
-        "phrity/websocket": "^3.5",
-        "psr/log": "^1.1"
+        "pdsinterop/flysystem-nextcloud": "dev-feature/flysystem-3",
+        "pdsinterop/flysystem-rdf": "dev-main",
+        "pdsinterop/solid-auth": "dev-feature/flysystem-3",
+        "pdsinterop/solid-crud": "dev-feature/flysystem-3#3265bb8",
+        "phrity/websocket": "^3.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^8 || ^9"