diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml
index 895d0fb4..5a2aacb1 100644
--- a/.github/workflows/solid-tests-suites.yml
+++ b/.github/workflows/solid-tests-suites.yml
@@ -34,9 +34,7 @@ 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
+ - 31
steps:
- name: Create docker tag from git reference
@@ -82,16 +80,14 @@ jobs:
fail-fast: false
matrix:
nextcloud_version:
- - 28
- - 29
- - 30
+ - 31
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('[31]'), matrix.nextcloud_version) == false }}
steps:
- name: Create docker tag from git reference
@@ -140,6 +136,9 @@ jobs:
echo "COOKIE_server=${COOKIE_server}" >> "${GITHUB_ENV}"
echo "COOKIE_thirdparty=${COOKIE_thirdparty}" >> "${GITHUB_ENV}"
+# - name: Setup tmate session
+# uses: mxschmitt/action-tmate@v3
+
- name: Run tests - ${{ matrix.test }}
run: |
export COOKIE_server="${{ env.COOKIE_server }}"
@@ -152,3 +151,8 @@ jobs:
--env COOKIE_BOB="$COOKIE_thirdparty" \
--env-file ./env-vars-testers.list \
${{ matrix.test }}
+
+ - name: Show nextcloud logs - ${{ matrix.test }}
+ if: always()
+ run: |
+ docker exec -i server cat /var/www/html/data/nextcloud.log
diff --git a/solid/appinfo/info.xml b/solid/appinfo/info.xml
index ae64a0ff..86c0ea28 100644
--- a/solid/appinfo/info.xml
+++ b/solid/appinfo/info.xml
@@ -18,7 +18,7 @@ When you do this, the Solid App can store data in your Nextcloud account through
integration
https://github.com/pdsinterop/solid-nextcloud/issues
-
+
OCA\Solid\Settings\SolidAdmin
diff --git a/solid/composer.json b/solid/composer.json
index 349c3cdc..f6cb1694 100644
--- a/solid/composer.json
+++ b/solid/composer.json
@@ -32,11 +32,9 @@
"pdsinterop/flysystem-nextcloud": "^0.2",
"pdsinterop/flysystem-rdf": "^0.6",
"pdsinterop/solid-auth": "^0.12.2",
- "pdsinterop/solid-crud": "^0.8",
- "psr/log": "^1.1"
+ "pdsinterop/solid-crud": "^0.8"
},
"require-dev": {
- "doctrine/dbal": "*",
"phpunit/phpunit": "^8 || ^9"
}
}
diff --git a/solid/composer.lock b/solid/composer.lock
index 23eec227..0a659ffe 100644
--- a/solid/composer.lock
+++ b/solid/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "a5c29aca1210cdfafb93daaada201232",
+ "content-hash": "d76205695c5c47a21bdd481e02553e8a",
"packages": [
{
"name": "arc/base",
@@ -1972,30 +1972,30 @@
},
{
"name": "psr/log",
- "version": "1.1.4",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=8.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "3.x-dev"
}
},
"autoload": {
"psr-4": {
- "Psr\\Log\\": "Psr/Log/"
+ "Psr\\Log\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2016,9 +2016,9 @@
"psr-3"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/1.1.4"
+ "source": "https://github.com/php-fig/log/tree/3.0.2"
},
- "time": "2021-05-03T11:20:27+00:00"
+ "time": "2024-09-11T13:17:53+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -2335,160 +2335,6 @@
}
],
"packages-dev": [
- {
- "name": "doctrine/dbal",
- "version": "4.2.3",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/dbal.git",
- "reference": "33d2d7fe1269b2301640c44cf2896ea607b30e3e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/33d2d7fe1269b2301640c44cf2896ea607b30e3e",
- "reference": "33d2d7fe1269b2301640c44cf2896ea607b30e3e",
- "shasum": ""
- },
- "require": {
- "doctrine/deprecations": "^0.5.3|^1",
- "php": "^8.1",
- "psr/cache": "^1|^2|^3",
- "psr/log": "^1|^2|^3"
- },
- "require-dev": {
- "doctrine/coding-standard": "12.0.0",
- "fig/log-test": "^1",
- "jetbrains/phpstorm-stubs": "2023.2",
- "phpstan/phpstan": "2.1.1",
- "phpstan/phpstan-phpunit": "2.0.3",
- "phpstan/phpstan-strict-rules": "^2",
- "phpunit/phpunit": "10.5.39",
- "slevomat/coding-standard": "8.13.1",
- "squizlabs/php_codesniffer": "3.10.2",
- "symfony/cache": "^6.3.8|^7.0",
- "symfony/console": "^5.4|^6.3|^7.0"
- },
- "suggest": {
- "symfony/console": "For helpful console commands such as SQL execution and import of files."
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Doctrine\\DBAL\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- }
- ],
- "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.",
- "homepage": "https://www.doctrine-project.org/projects/dbal.html",
- "keywords": [
- "abstraction",
- "database",
- "db2",
- "dbal",
- "mariadb",
- "mssql",
- "mysql",
- "oci8",
- "oracle",
- "pdo",
- "pgsql",
- "postgresql",
- "queryobject",
- "sasql",
- "sql",
- "sqlite",
- "sqlserver",
- "sqlsrv"
- ],
- "support": {
- "issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/4.2.3"
- },
- "funding": [
- {
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
- "type": "tidelift"
- }
- ],
- "time": "2025-03-07T18:29:05+00:00"
- },
- {
- "name": "doctrine/deprecations",
- "version": "1.1.5",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/deprecations.git",
- "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
- "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
- "shasum": ""
- },
- "require": {
- "php": "^7.1 || ^8.0"
- },
- "conflict": {
- "phpunit/phpunit": "<=7.5 || >=13"
- },
- "require-dev": {
- "doctrine/coding-standard": "^9 || ^12 || ^13",
- "phpstan/phpstan": "1.4.10 || 2.1.11",
- "phpstan/phpstan-phpunit": "^1.0 || ^2",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12",
- "psr/log": "^1 || ^2 || ^3"
- },
- "suggest": {
- "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Doctrine\\Deprecations\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
- "homepage": "https://www.doctrine-project.org/",
- "support": {
- "issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/1.1.5"
- },
- "time": "2025-04-07T20:06:18+00:00"
- },
{
"name": "doctrine/instantiator",
"version": "2.0.0",