aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2021-12-31 09:21:03 +0100
committerGitHub <noreply@github.com>2021-12-31 09:21:03 +0100
commit2c50f85e2fba2e7dae3209d57448613cd8ca5948 (patch)
tree3d3ede228cd26c23c397db1bb6920b7968812748
parent56309b789d0f1d16b2ef9f23ee00d99a24fb1156 (diff)
parentaeab52362a5e250341cce1eecc840d491b68eb45 (diff)
downloadnextcloud-server-2c50f85e2fba2e7dae3209d57448613cd8ca5948.tar.gz
nextcloud-server-2c50f85e2fba2e7dae3209d57448613cd8ca5948.zip
Merge pull request #30409 from nextcloud/bugfix/composer-plugin
-rw-r--r--composer.json3
-rw-r--r--psalm-ocp.xml3
2 files changed, 6 insertions, 0 deletions
diff --git a/composer.json b/composer.json
index fe27a1928a0..b17734c8591 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,9 @@
"sort-packages": true,
"platform": {
"php": "7.3"
+ },
+ "allow-plugins": {
+ "bamarni/composer-bin-plugin": true
}
},
"autoload": {
diff --git a/psalm-ocp.xml b/psalm-ocp.xml
index 5574ae0fb5d..407e0826435 100644
--- a/psalm-ocp.xml
+++ b/psalm-ocp.xml
@@ -12,6 +12,9 @@
</plugins>
<projectFiles>
<directory name="lib/public"/>
+ <ignoreFiles>
+ <directory name="lib/composer/bin"/>
+ </ignoreFiles>
</projectFiles>
<extraFiles>
<directory name="3rdparty"/>