fix(ci): Add rector and move to vendor-bin

Signed-off-by: Joas Schilling <[email protected]>

.github/dependabot.yml

@@ -1,7 +1,12 @@
 version: 2
 updates:
 - package-ecosystem: composer
-  directory: "/"
+  directories:
+    - "/"
+    - "/vendor-bin/csfixer"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+    - "/vendor-bin/rector"
   schedule:
     interval: weekly
     day: saturday

.gitignore

@@ -1,55 +1,10 @@
-# just sane ignores
-.*.sw[po]
-*.bak
-*.BAK
-*~
-*.orig
-*.class
-.cvsignore
-Thumbs.db
-*.py[co]
-_darcs/*
-CVS/*
-.svn/*
-RCS/*
-*.backup*
-
-# kdevelop
-.kdev
-*.kdev4
-*.kate-swp
-
-# Lokalize
-*lokalize*
-
-# eclipse
-.project
-.settings
-
-# netbeans
-nbproject
-
 # phpStorm
 .idea
 *.iml
 
-# geany
-*.geany
-
-# Cloud9IDE
-.settings.xml
-.c9revisions
-
-# vim ex mode
-.vimrc
-
 # Mac OS
 .DS_Store
 
-# WebFinger
-.well-known
-/.buildpath
-
 # WebPack
 /node_modules
 
@@ -68,3 +23,4 @@ nbproject
 /npm-debug.log
 /build
 /vendor
+/vendor-bin/*/vendor

.php-cs-fixer.dist.php

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-require_once './vendor/autoload.php';
+require_once './vendor-bin/csfixer/vendor/autoload.php';
 
 use Nextcloud\CodingStandard\Config;
 

Makefile

@@ -56,6 +56,7 @@ appstore: dev-setup
 	--exclude=/src \
 	--exclude=/tests \
 	--exclude=/vendor \
+	--exclude=/vendor-bin \
 	--exclude=/.eslintrc.js \
 	--exclude=/.l10nignore \
 	--exclude=/.php-cs-fixer.cache \
@@ -72,6 +73,7 @@ appstore: dev-setup
 	--exclude=/package-lock.json \
 	--exclude=/psalm.xml \
 	--exclude=/README.md \
+	--exclude=/rector.php \
 	--exclude=/stylelint.config.js \
 	--exclude=/webpack.js \
 	$(project_dir)/ $(sign_dir)/$(app_name)

composer.json

@@ -4,22 +4,26 @@
 			"OCA\\CallSummaryBot\\": "lib/"
 		}
 	},
-	"name": "nextcloud/call_summary_bot",
-	"description": "Call summary bot",
-	"license": "AGPL",
-	"require-dev": {
-		"nextcloud/coding-standard": "^1.3.1",
-		"nextcloud/ocp": "dev-stable28",
-		"phpunit/phpunit": "^9.6",
-		"psalm/phar": "^5.13"
-	},
 	"config": {
 		"optimize-autoloader": true,
 		"classmap-authoritative": true,
 		"platform": {
 			"php": "8.0.2"
 		},
-		"sort-packages": true
+		"sort-packages": true,
+		"allow-plugins": {
+			"bamarni/composer-bin-plugin": true
+		}
+	},
+	"extra": {
+		"bamarni-bin": {
+			"bin-links": true,
+			"forward-command": true
+		}
+	},
+	"require-dev": {
+		"bamarni/composer-bin-plugin": "^1.8",
+		"nextcloud/ocp": "dev-stable28"
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
@@ -29,6 +33,8 @@
 		"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
 		"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 --color -c tests/phpunit.xml"
+		"rector:check": "rector --dry-run",
+		"rector:fix": "rector",
+		"test:unit": "phpunit --color -c tests/phpunit.xml"
 	}
 }