Merge remote-tracking branch 'origin/main' into merge-main

Author: ylebre

build/phpcs.xml.dist

@@ -18,7 +18,7 @@
     <exclude-pattern>*/vendor/*|*/build/*</exclude-pattern>
 
     <rule ref="PHPCompatibility"/>
-    <config name="testVersion" value="7.3-"/>
+    <config name="testVersion" value="8.0-"/>
 
     <!-- Include the whole PSR-12 standard -->
     <rule ref="PSR12">

run-solid-test-suite.sh

@@ -6,8 +6,8 @@ function setup {
   docker build -t solid-nextcloud .
   docker build -t pubsub-server  https://github.com/pdsinterop/php-solid-pubsub-server.git#main
   docker pull michielbdejong/nextcloud-cookie
-  docker pull solidtestsuite/webid-provider-tests:v2.0.3
-  docker tag solidtestsuite/webid-provider-tests:v2.0.3 webid-provider-tests
+  docker pull solidtestsuite/webid-provider-tests:v2.1.0
+  docker tag solidtestsuite/webid-provider-tests:v2.1.0 webid-provider-tests
   docker pull solidtestsuite/solid-crud-tests:v6.0.0
   docker tag solidtestsuite/solid-crud-tests:v6.0.0 solid-crud-tests
   docker pull solidtestsuite/web-access-control-tests:v7.1.0

solid/composer.json

@@ -22,18 +22,48 @@
     ],
     "require": {
         "php": "^8.0",
+        "ext-dom": "*",
         "ext-json": "*",
+        "ext-mbstring": "*",
         "ext-openssl": "*",
         "easyrdf/easyrdf": "^1.1.1",
         "laminas/laminas-diactoros": "^2.8",
         "lcobucci/jwt": "^4.1",
-        "pdsinterop/flysystem-nextcloud":"^0.2",
+        "pdsinterop/flysystem-nextcloud": "^0.2",
         "pdsinterop/flysystem-rdf": "^0.5",
-        "pdsinterop/solid-auth": "^0.7",
+        "pdsinterop/solid-auth": "v0.10.1",
         "pdsinterop/solid-crud": "dev-feature/notificationsInterface",
         "psr/log" : "^1.1"
     },
     "require-dev": {
+        "doctrine/dbal": "*",
+        "nextcloud/server": "*",
         "phpunit/phpunit": "^8 || ^9"
-    }
+    },
+    "repositories": [
+        {
+            "type": "package",
+            "package": {
+                "name": "nextcloud/server",
+                "version": "24.0.0",
+                "dist": {
+                    "url": "https://github.com/nextcloud/server/archive/refs/tags/v24.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"
+                    }
+                }
+            }
+        }
+    ]
 }