From b630899ab70380ffda4e87dacd302f1024f6f524 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Wed, 12 Mar 2025 17:04:46 +0100 Subject: [PATCH 01/13] update versions --- solid/appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 05386ec0c37acb1cd268526ed720550b1e4d8223 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Wed, 12 Mar 2025 17:05:07 +0100 Subject: [PATCH 02/13] update versions --- .github/workflows/solid-tests-suites.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 895d0fb4..33e2c75c 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -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 + - 31 steps: - name: Create docker tag from git reference @@ -82,16 +82,16 @@ 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('[29,30,31]'), matrix.nextcloud_version) == false }} steps: - name: Create docker tag from git reference From b5cdc6257601926443ac7906dca66738ce55c829 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 16:24:03 +0200 Subject: [PATCH 03/13] update psr/log --- solid/composer.json | 2 +- solid/composer.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/solid/composer.json b/solid/composer.json index 349c3cdc..1d85f9f7 100644 --- a/solid/composer.json +++ b/solid/composer.json @@ -33,7 +33,7 @@ "pdsinterop/flysystem-rdf": "^0.6", "pdsinterop/solid-auth": "^0.12.2", "pdsinterop/solid-crud": "^0.8", - "psr/log": "^1.1" + "psr/log": "^3.0" }, "require-dev": { "doctrine/dbal": "*", diff --git a/solid/composer.lock b/solid/composer.lock index 23eec227..568e5524 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": "1ecc7c22c83c7870543e9be45c1e341f", "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", From 8b7d778ee38fcc3d8e2b2956b4ffe8eabec7ab53 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 16:47:54 +0200 Subject: [PATCH 04/13] does psr/log 2.0 work with 29? --- solid/composer.json | 2 +- solid/composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/solid/composer.json b/solid/composer.json index 1d85f9f7..515b8e0a 100644 --- a/solid/composer.json +++ b/solid/composer.json @@ -33,7 +33,7 @@ "pdsinterop/flysystem-rdf": "^0.6", "pdsinterop/solid-auth": "^0.12.2", "pdsinterop/solid-crud": "^0.8", - "psr/log": "^3.0" + "psr/log": "^2.0" }, "require-dev": { "doctrine/dbal": "*", diff --git a/solid/composer.lock b/solid/composer.lock index 568e5524..822d4920 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": "1ecc7c22c83c7870543e9be45c1e341f", + "content-hash": "eea492e6743aaaf19cb917abd7abbe25", "packages": [ { "name": "arc/base", @@ -1972,16 +1972,16 @@ }, { "name": "psr/log", - "version": "3.0.2", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", - "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { @@ -1990,7 +1990,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2016,9 +2016,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.2" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2024-09-11T13:17:53+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { "name": "ralouphie/getallheaders", From e711b9c7b288e171de858687579679ab46ed1b37 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 17:00:08 +0200 Subject: [PATCH 05/13] Revert "does psr/log 2.0 work with 29?" answer: no. it breaks both 31 and 29 This reverts commit 8b7d778ee38fcc3d8e2b2956b4ffe8eabec7ab53. --- solid/composer.json | 2 +- solid/composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/solid/composer.json b/solid/composer.json index 515b8e0a..1d85f9f7 100644 --- a/solid/composer.json +++ b/solid/composer.json @@ -33,7 +33,7 @@ "pdsinterop/flysystem-rdf": "^0.6", "pdsinterop/solid-auth": "^0.12.2", "pdsinterop/solid-crud": "^0.8", - "psr/log": "^2.0" + "psr/log": "^3.0" }, "require-dev": { "doctrine/dbal": "*", diff --git a/solid/composer.lock b/solid/composer.lock index 822d4920..568e5524 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": "eea492e6743aaaf19cb917abd7abbe25", + "content-hash": "1ecc7c22c83c7870543e9be45c1e341f", "packages": [ { "name": "arc/base", @@ -1972,16 +1972,16 @@ }, { "name": "psr/log", - "version": "2.0.0", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -1990,7 +1990,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { @@ -2016,9 +2016,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/2.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2021-07-14T16:41:46+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "ralouphie/getallheaders", From ad814ad77458026e2f799acd2ac4434084fdf22a Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 17:02:08 +0200 Subject: [PATCH 06/13] drop support for nc-29 --- .github/workflows/php.yml | 3 +-- .github/workflows/solid-tests-suites.yml | 4 +--- solid/appinfo/info.xml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index d1a2ef3e..348877ba 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -74,9 +74,8 @@ jobs: fail-fast: false matrix: nextcloud_version: - - 28 - - 29 - 30 + - 31 steps: - uses: actions/checkout@v4 - uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 33e2c75c..3722c401 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -34,7 +34,6 @@ 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: - - 29 - 30 - 31 @@ -82,7 +81,6 @@ jobs: fail-fast: false matrix: nextcloud_version: - - 29 - 30 - 31 test: @@ -91,7 +89,7 @@ jobs: - '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('[29,30,31]'), matrix.nextcloud_version) == false }} + continue-on-error: ${{ contains(fromJson('[30,31]'), matrix.nextcloud_version) == false }} steps: - name: Create docker tag from git reference diff --git a/solid/appinfo/info.xml b/solid/appinfo/info.xml index 86c0ea28..76674760 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 From 4c56c8dcbe06ee860aff444b242c0ff31ed4c3ca Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 10:55:26 +0200 Subject: [PATCH 07/13] Revert "drop support for nc-29" This reverts commit ad814ad77458026e2f799acd2ac4434084fdf22a. --- .github/workflows/php.yml | 3 ++- .github/workflows/solid-tests-suites.yml | 4 +++- solid/appinfo/info.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 348877ba..d1a2ef3e 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -74,8 +74,9 @@ jobs: fail-fast: false matrix: nextcloud_version: + - 28 + - 29 - 30 - - 31 steps: - uses: actions/checkout@v4 - uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 3722c401..33e2c75c 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -34,6 +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: + - 29 - 30 - 31 @@ -81,6 +82,7 @@ jobs: fail-fast: false matrix: nextcloud_version: + - 29 - 30 - 31 test: @@ -89,7 +91,7 @@ jobs: - '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('[30,31]'), matrix.nextcloud_version) == false }} + continue-on-error: ${{ contains(fromJson('[29,30,31]'), matrix.nextcloud_version) == false }} steps: - name: Create docker tag from git reference diff --git a/solid/appinfo/info.xml b/solid/appinfo/info.xml index 76674760..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 From 190025b97dd7c8a63ad3ae37034c03a36a7a7fbb Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 10:56:37 +0200 Subject: [PATCH 08/13] allow both versions of psr/log --- solid/composer.json | 2 +- solid/composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solid/composer.json b/solid/composer.json index 1d85f9f7..e897cf10 100644 --- a/solid/composer.json +++ b/solid/composer.json @@ -33,7 +33,7 @@ "pdsinterop/flysystem-rdf": "^0.6", "pdsinterop/solid-auth": "^0.12.2", "pdsinterop/solid-crud": "^0.8", - "psr/log": "^3.0" + "psr/log": "^1.1||^3.0" }, "require-dev": { "doctrine/dbal": "*", diff --git a/solid/composer.lock b/solid/composer.lock index 568e5524..7a276a87 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": "1ecc7c22c83c7870543e9be45c1e341f", + "content-hash": "f075502dbe91353b4a314dee71be9618", "packages": [ { "name": "arc/base", From 46927af583faf7e179befe114a93ae48d92edc4a Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 21:40:24 +0200 Subject: [PATCH 09/13] remove psr/log --- solid/composer.json | 3 +-- solid/composer.lock | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/solid/composer.json b/solid/composer.json index e897cf10..1f3ea639 100644 --- a/solid/composer.json +++ b/solid/composer.json @@ -32,8 +32,7 @@ "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||^3.0" + "pdsinterop/solid-crud": "^0.8" }, "require-dev": { "doctrine/dbal": "*", diff --git a/solid/composer.lock b/solid/composer.lock index 7a276a87..7c6c9900 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": "f075502dbe91353b4a314dee71be9618", + "content-hash": "94e55870139f52bc15dcd71955cd689d", "packages": [ { "name": "arc/base", From 3c8287dc63524ab48b482bab6283fb43ef72ec51 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:23:58 +0200 Subject: [PATCH 10/13] add log dump on the end --- .github/workflows/solid-tests-suites.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 33e2c75c..faf4af4c 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -152,3 +152,7 @@ jobs: --env COOKIE_BOB="$COOKIE_thirdparty" \ --env-file ./env-vars-testers.list \ ${{ matrix.test }} + + - name: Show nextcloud logs - ${{ matrix.test }} + run: | + docker exec -it server cat /var/www/html/data/nextcloud.log From 99396a153607543242b3c942f7db8efebf608674 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:30:15 +0200 Subject: [PATCH 11/13] show logs even on error --- .github/workflows/solid-tests-suites.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index faf4af4c..79957c60 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -153,6 +153,4 @@ jobs: --env-file ./env-vars-testers.list \ ${{ matrix.test }} - - name: Show nextcloud logs - ${{ matrix.test }} - run: | docker exec -it server cat /var/www/html/data/nextcloud.log From 2c1aa9fb96ab883e550e30c3e9a5e53efbfdb167 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:46:01 +0200 Subject: [PATCH 12/13] run always --- .github/workflows/solid-tests-suites.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 79957c60..fdf5f1ac 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -153,4 +153,7 @@ jobs: --env-file ./env-vars-testers.list \ ${{ matrix.test }} - docker exec -it server cat /var/www/html/data/nextcloud.log + - name: Show nextcloud logs - ${{ matrix.test }} + if: always() + run: | + docker exec server cat /var/www/html/data/nextcloud.log From 1053c9c1fe897b2d8a5bda0dc3791f0114141a53 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 23:17:49 +0200 Subject: [PATCH 13/13] update composer.lock --- solid/composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solid/composer.lock b/solid/composer.lock index 0d38f316..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": "0dfcf10433b54d08c6bf8c7ed8115e1f", + "content-hash": "d76205695c5c47a21bdd481e02553e8a", "packages": [ { "name": "arc/base",