Merge pull request #537 from nextcloud/6.2.0-prep

Chores in preparation of next release

Author: icewind1991

.github/workflows/scanner.yml

@@ -90,7 +90,7 @@ jobs:
           ICAP_REQUEST: avscan
           ICAP_HEADER: X-Infection-Found
           ICAP_MODE: reqmod
-        run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml tests/Scanner/ICAPTest.php
+        run: ./vendor-bin/phpunit/vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml tests/Scanner/ICAPTest.php
       - name: PHPUnit respmod
         working-directory: apps/${{ env.APP_NAME }}
         env:
@@ -100,7 +100,7 @@ jobs:
           ICAP_REQUEST: avscan
           ICAP_HEADER: X-Infection-Found
           ICAP_MODE: respmod
-        run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml tests/Scanner/ICAPTest.php
+        run: ./vendor-bin/phpunit/vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml tests/Scanner/ICAPTest.php
 
   icap-kaspersky:
     runs-on: ubuntu-latest
@@ -164,7 +164,7 @@ jobs:
           ICAP_REQUEST: req
           ICAP_HEADER: X-Virus-ID
           ICAP_MODE: reqmod
-        run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml tests/Scanner/ICAPTest.php
+        run: ./vendor-bin/phpunit/vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml tests/Scanner/ICAPTest.php
 
   kaspersky:
     runs-on: ubuntu-latest
@@ -225,7 +225,7 @@ jobs:
         env:
           KASPERSKY_HOST: localhost
           KASPERSKY_PORT: 1234
-        run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml tests/Scanner/ExternalKasperskyTest.php
+        run: ./vendor-bin/phpunit/vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml tests/Scanner/ExternalKasperskyTest.php
 
   summary:
     permissions:

.php-cs-fixer.dist.php

@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-require_once './vendor/autoload.php';
+require_once './vendor-bin/cs-fixer/vendor/autoload.php';
 
 use Nextcloud\CodingStandard\Config;
 
@@ -14,8 +14,8 @@
 	->getFinder()
 	->ignoreVCSIgnored(true)
 	->notPath('build')
+	->notPath('tests/stubs')
 	->notPath('l10n')
-	->notPath('lib/Vendor')
 	->notPath('src')
 	->notPath('vendor')
 	->in(__DIR__);

REUSE.toml

@@ -12,7 +12,7 @@ SPDX-FileCopyrightText = "2013-2016 ownCloud Inc., 2016-2024 Nextcloud GmbH and
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = [".envrc", "Cargo.lock", "composer.json", "composer.lock", "tests/stub.phpstub"]
+path = [".envrc", "Cargo.lock", "composer.*", "vendor-bin/*/composer.*", "tests/stub.phpstub"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2021 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

composer.json

@@ -1,25 +1,34 @@
 {
 	"config": {
+		"allow-plugins": {
+			"bamarni/composer-bin-plugin": true
+		},
 		"platform": {
-			"php": "8.1"
+			"php": "8.2"
 		}
 	},
+	"require": {
+		"bamarni/composer-bin-plugin": "^1.9"
+	},
 	"require-dev": {
 		"nextcloud/ocp": "dev-master",
 		"doctrine/dbal": "3.1.4",
-		"phpunit/phpunit": "^9",
-		"psalm/phar": "^5.26",
 		"icewind/streams": "v0.7.5",
 		"sabre/dav": "^4.2.1",
-		"nextcloud/coding-standard": "^v1.1.1",
 		"symfony/event-dispatcher": "4.4.30",
 		"psr/clock": "^1.0"
 	},
 	"scripts": {
-		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -not -path './tests/integration/vendor/*' -print0 | xargs -0 -n1 php -l",
+		"post-install-cmd": [
+			"@composer bin all install --ansi"
+		],
+		"post-update-cmd": [
+			"@composer bin all update --ansi"
+		],
+		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './vendor-bin/*' -not -path './build/*' -not -path './tests/integration/vendor/*' -print0 | xargs -0 -n1 php -l",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
-		"psalm": "psalm.phar",
+		"psalm": "psalm",
 		"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml"
 	}
 }