Merge pull request #1785 from nextcloud/artonge/use_composer_bin

chore: Use composer-bin-plugin to manage dev deps

.github/workflows/update-nextcloud-ocp.yml

@@ -57,7 +57,7 @@ jobs:
       - name: Composer update nextcloud/ocp
         id: update_branch
         if: ${{ steps.checkout.outcome == 'success' && matrix.branches != 'main' }}
-        run: composer require --dev 'nextcloud/ocp:dev-${{ matrix.branches }}'
+        run: composer bin psalm require --dev 'nextcloud/ocp:dev-${{ matrix.branches }}'
 
       - name: Raise on issue on failure
         uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0
@@ -70,7 +70,7 @@ jobs:
       - name: Composer update nextcloud/ocp
         id: update_main
         if: ${{ steps.checkout.outcome == 'success' && matrix.branches == 'main' }}
-        run: composer require --dev nextcloud/ocp:dev-master
+        run: composer bin psalm require --dev nextcloud/ocp:dev-master
 
       - name: Raise on issue on failure
         uses: dacbd/create-issue-action@cdb57ab6ff8862aa09fee2be6ba77a59581921c2 # v2.0.0

composer.json

@@ -13,10 +13,9 @@
 			"bamarni/composer-bin-plugin": true
 		}
 	},
-	"autoload-dev": {
+	"autoload": {
 		"psr-4": {
-			"OCP\\": "vendor/nextcloud/ocp/OCP",
-			"OCA\\Activity\\": "lib/"
+			"OCA\\Activity\\": "./lib/"
 		}
 	},
 	"scripts": {
@@ -27,26 +26,22 @@
 		"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
 		"psalm:clear": "psalm.phar --clear-cache && psalm.phar--clear-global-cache",
 		"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
-		"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml --color --fail-on-warning --fail-on-risky",
+		"test:unit": "phpunit -c tests/phpunit.xml --color --fail-on-warning --fail-on-risky",
 		"post-install-cmd": [
-			"@composer bin all install --ansi"
+			"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all install --ansi"
 		],
 		"post-update-cmd": [
-			"@composer bin all update --ansi"
+			"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all update --ansi"
 		]
 	},
 	"require-dev": {
-		"nextcloud/ocp": "dev-master",
-		"phpunit/phpunit": "^9.5",
-		"psalm/phar": "^5.15"
+		"bamarni/composer-bin-plugin": "^1.8",
+		"phpunit/phpunit": "^9.5"
 	},
 	"extra": {
 		"bamarni-bin": {
 			"bin-links": true,
 			"forward-command": false
 		}
-	},
-	"require": {
-		"bamarni/composer-bin-plugin": "^1.8"
 	}
-}
+}