From b630899ab70380ffda4e87dacd302f1024f6f524 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Wed, 12 Mar 2025 17:04:46 +0100 Subject: [PATCH 01/19] 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/19] 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 745126e1488620e0de59c3ee7e2da35e21e44729 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 15:56:42 +0200 Subject: [PATCH 03/19] add tmate session after running test suite --- .github/workflows/solid-tests-suites.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 33e2c75c..4bee5f2b 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -152,3 +152,6 @@ jobs: --env COOKIE_BOB="$COOKIE_thirdparty" \ --env-file ./env-vars-testers.list \ ${{ matrix.test }} + + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 From 4c5ec106097481c36305a21b3b3fcd5d19b75765 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 15:57:30 +0200 Subject: [PATCH 04/19] add tmate and only run on 31 --- .github/workflows/solid-tests-suites.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 4bee5f2b..26802f38 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -34,8 +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 steps: @@ -82,8 +80,6 @@ jobs: fail-fast: false matrix: nextcloud_version: - - 29 - - 30 - 31 test: - 'solidtestsuite/solid-crud-tests:v7.0.5' @@ -91,7 +87,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('[31]'), matrix.nextcloud_version) == false }} steps: - name: Create docker tag from git reference From cc232c2ee945fbc3f052558c845b753ffb8ed313 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 16:04:04 +0200 Subject: [PATCH 05/19] move tmate --- .github/workflows/solid-tests-suites.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 26802f38..b4e130f7 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -136,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 }}" @@ -149,5 +152,3 @@ jobs: --env-file ./env-vars-testers.list \ ${{ matrix.test }} - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 From 232f6eb1350228ff374eccec13c98ebd1f28c269 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 16:22:46 +0200 Subject: [PATCH 06/19] 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 b5cdc6257601926443ac7906dca66738ce55c829 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Mon, 2 Jun 2025 16:24:03 +0200 Subject: [PATCH 07/19] 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 08/19] 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 09/19] 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 10/19] 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 11/19] 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 12/19] 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 13/19] 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 a1f2fe27695392a0ca4d82f5d9f18c54ba23051c Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:00:03 +0200 Subject: [PATCH 14/19] whitespace fi x --- .github/workflows/solid-tests-suites.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index b4e130f7..8fb3ab97 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -151,4 +151,3 @@ jobs: --env COOKIE_BOB="$COOKIE_thirdparty" \ --env-file ./env-vars-testers.list \ ${{ matrix.test }} - From 374a796b42b05c8448a6e0d0121af2ae83c1d669 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:15:54 +0200 Subject: [PATCH 15/19] remove doctrine/dbal as dev requirement --- solid/composer.json | 1 - solid/composer.lock | 156 +------------------------------------------- 2 files changed, 1 insertion(+), 156 deletions(-) diff --git a/solid/composer.json b/solid/composer.json index 1f3ea639..f6cb1694 100644 --- a/solid/composer.json +++ b/solid/composer.json @@ -35,7 +35,6 @@ "pdsinterop/solid-crud": "^0.8" }, "require-dev": { - "doctrine/dbal": "*", "phpunit/phpunit": "^8 || ^9" } } diff --git a/solid/composer.lock b/solid/composer.lock index 7c6c9900..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": "94e55870139f52bc15dcd71955cd689d", + "content-hash": "d76205695c5c47a21bdd481e02553e8a", "packages": [ { "name": "arc/base", @@ -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", From f70c3e26e3d8b511619083a87c86889ebf9a5f44 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:23:58 +0200 Subject: [PATCH 16/19] 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 8fb3ab97..84d0a653 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -151,3 +151,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 b3cca8dd840921c94a55ab6b686daac313365f76 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:26:09 +0200 Subject: [PATCH 17/19] remote tmate --- .github/workflows/solid-tests-suites.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 84d0a653..9d0703a2 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -136,8 +136,8 @@ 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: Setup tmate session +# uses: mxschmitt/action-tmate@v3 - name: Run tests - ${{ matrix.test }} run: | From 4c7eb07a344ad3295f6244702a8e5e2849bf0941 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:41:28 +0200 Subject: [PATCH 18/19] always run --- .github/workflows/solid-tests-suites.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 9d0703a2..9a8a47b6 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -153,5 +153,6 @@ jobs: ${{ matrix.test }} - name: Show nextcloud logs - ${{ matrix.test }} + if: always() run: | docker exec -it server cat /var/www/html/data/nextcloud.log From a00b4014d36138935a2a4ed6104c077a431f4f10 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Tue, 3 Jun 2025 22:43:21 +0200 Subject: [PATCH 19/19] remove -t, device is not a tty error --- .github/workflows/solid-tests-suites.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/solid-tests-suites.yml b/.github/workflows/solid-tests-suites.yml index 9a8a47b6..5a2aacb1 100644 --- a/.github/workflows/solid-tests-suites.yml +++ b/.github/workflows/solid-tests-suites.yml @@ -155,4 +155,4 @@ jobs: - name: Show nextcloud logs - ${{ matrix.test }} if: always() run: | - docker exec -it server cat /var/www/html/data/nextcloud.log + docker exec -i server cat /var/www/html/data/nextcloud.log