From 6bbd26b95503a6c857dce562e3cf5ed09dda2063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 27 Dec 2021 09:57:29 +0100
Subject: [PATCH 1/2] Allow using composer plugin with composer 2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index fe27a1928a0b9..b17734c859102 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": {

From d81768b2e2677635a6471e4bcbb1ced2be5b1b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 30 Dec 2021 13:57:56 +0100
Subject: [PATCH 2/2] Ignore composer/bin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 psalm-ocp.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/psalm-ocp.xml b/psalm-ocp.xml
index 5574ae0fb5dc1..407e08264355e 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"/>