fix(deps): Do not ship psr/log

It is provided by server's 3rdparty. Shipping another copy can lead to a dependency hell. Signed-off-by: Christoph Wurst <[email protected]>
nextcloud · Feb 17, 2025 · 2f8f9bd · 2f8f9bd
1 parent 506dcac
commit 2f8f9bd
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 55 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -63,16 +63,16 @@ jobs:
       strategy:
           matrix:
               php-versions: ['8.3']
-              nextcloud-versions: ['master']
+              nextcloud-versions: ['chore/mail-bisect-6e1d9a26209ec5524fbc2fb9c7cbb53315e64d72']
               db: ['sqlite', 'mysql', 'pgsql']
               cache: ['nocache']
               include:
                 - php-versions: 8.1
-                  nextcloud-versions: master
+                  nextcloud-versions: 'chore/mail-bisect-6e1d9a26209ec5524fbc2fb9c7cbb53315e64d72'
                   db: 'sqlite'
                   cache: 'redis'
                 - php-versions: 8.2
-                  nextcloud-versions: master
+                  nextcloud-versions: 'chore/mail-bisect-6e1d9a26209ec5524fbc2fb9c7cbb53315e64d72'
                   db: 'mysql'
                   cache: 'redis'
                 - php-versions: 8.2

diff --git a/REUSE.toml b/REUSE.toml
@@ -78,7 +78,7 @@ SPDX-FileCopyrightText = "2021 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = ["vendor-bin/cs-fixer/composer.json", "vendor-bin/cs-fixer/composer.lock", "vendor-bin/mozart/composer.json", "vendor-bin/mozart/composer.lock", "vendor-bin/openapi/composer.*", "vendor-bin/phpunit/composer.json", "vendor-bin/phpunit/composer.lock", "vendor-bin/rector/composer.json", "vendor-bin/rector/composer.lock"]
+path = ["vendor-bin/*/composer.json", "vendor-bin/*/composer.lock"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2021-2024 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

diff --git a/composer.json b/composer.json
@@ -43,6 +43,9 @@
 		"sabberworm/php-css-parser": "^8.7.0",
 		"youthweb/urllinker": "^2.0"
 	},
+	"provide": {
+		"psr/log": "^1.0.4|^2|^3"
+	},
 	"require-dev": {
 		"fig/log-test": "^1.1",
 		"psalm/phar": "^5.26.1",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm.xml b/psalm.xml
@@ -21,6 +21,7 @@
     <extraFiles>
         <directory name="vendor" />
 		<directory name="lib/Vendor" />
+		<directory name="vendor-bin/psalm-stubs" />
     </extraFiles>
 	<issueHandlers>
 		<UndefinedAttributeClass>

diff --git a/vendor-bin/psalm-stubs/composer.json b/vendor-bin/psalm-stubs/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "psr/log": "^3.0"
+    }
+}
diff --git a/vendor-bin/psalm-stubs/composer.lock b/vendor-bin/psalm-stubs/composer.lock