Merge pull request #142 from pdsinterop/feature/nextcloud26

Update to support up to Nextcloud 27

Author: Potherca

.github/workflows/ci.yml

@@ -35,6 +35,8 @@ jobs:
         # Latest is not tested here, as that could cause failures unrelated to project changes
         nextcloud_version:
           - 25
+          - 26
+          - 27
 
     steps:
       - name: Create docker tag from git reference
@@ -81,13 +83,15 @@ jobs:
       matrix:
         nextcloud_version:
           - 25
+          - 26
+          - 27
         test:
           - 'solidtestsuite/solid-crud-tests:v7.0.5'
           - 'solidtestsuite/web-access-control-tests:v7.1.0'
           - 'solidtestsuite/webid-provider-tests:v2.1.0'
 
     # Prevent EOL or non-stable versions of Nextcloud to fail the test-suite
-    continue-on-error: ${{ contains(fromJson('[25]'), matrix.nextcloud_version) == false }}
+    continue-on-error: ${{ contains(fromJson('[25,26,27]'), matrix.nextcloud_version) == false }}
 
     steps:
       - name: Create docker tag from git reference

init-live.sh

@@ -3,8 +3,8 @@ export PHP_MEMORY_LIMIT="512M"
 php console.php maintenance:install --admin-user admin --admin-pass $MARIADB_ROOT_PASSWORD --database "mysql" --database-name "nextcloud" --database-user "root" --database-pass "$MARIADB_ROOT_PASSWORD" --database-host "127.0.0.1"
 php console.php status
 php console.php app:enable solid
-sed -i "25 i\    1 => 'server'," /var/www/html/config/config.php
-sed -i "26 i\    2 => 'nextcloud.local'," /var/www/html/config/config.php
-sed -i "27 i\    3 => 'thirdparty'," /var/www/html/config/config.php
-sed -i "28 i\    4 => '$HOST'," /var/www/html/config/config.php
+php console.php config:system:set trusted_domains 1 --value=server
+php console.php config:system:set trusted_domains 2 --value=nextcloud.local
+php console.php config:system:set trusted_domains 3 --value=thirdparty
+php console.php config:system:set trusted_domains 4 --value=$HOST
 echo configured

init.sh

@@ -3,7 +3,7 @@ export PHP_MEMORY_LIMIT="512M"
 php console.php maintenance:install --admin-user alice --admin-pass alice123
 php console.php status
 php console.php app:enable solid
-sed -i "25 i\    1 => 'server'," /var/www/html/config/config.php
-sed -i "26 i\    2 => 'nextcloud.local'," /var/www/html/config/config.php
-sed -i "27 i\    3 => 'thirdparty'," /var/www/html/config/config.php
+php console.php config:system:set trusted_domains 1 --value=server
+php console.php config:system:set trusted_domains 2 --value=nextcloud.local
+php console.php config:system:set trusted_domains 3 --value=thirdparty
 echo configured

solid/appinfo/info.xml

@@ -11,14 +11,14 @@ It supports the webid-oidc-dpop-pkce login flow to connect to a Solid App with y
 When you do this, the Solid App can store data in your Nextcloud account through the Solid protocol.
 IMPORTANT: See https://github.com/pdsinterop/solid-nextcloud/blob/main/INSTALL.md for additional install instructions!
 ]]></description>
-    <version>0.7.2</version>
+    <version>0.7.3</version>
     <licence>agpl</licence>
     <author mail="auke@muze.nl" >Auke van Slooten</author>
     <namespace>Solid</namespace>
     <category>integration</category>
     <bugs>https://github.com/pdsinterop/solid-nextcloud/issues</bugs>
     <dependencies>
-        <nextcloud min-version="25" max-version="25"/>
+        <nextcloud min-version="25" max-version="27"/>
     </dependencies>
     <settings>
         <admin>\OCA\Solid\Settings</admin>