Use vendor-bin to separate dev from production dependencies

Signed-off-by: Joas Schilling <coding@schilljs.com>

13 files changed, 6190 insertions, 4568 deletions

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a9d1f0440..413caa369 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,6 +8,30 @@ updates:
     time: "03:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
+- package-ecosystem: composer
+  directory: "/vendor-bin/csfixer"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+- package-ecosystem: composer
+  directory: "/vendor-bin/phpunit"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+- package-ecosystem: composer
+  directory: "/vendor-bin/psalm"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
 - package-ecosystem: npm
   directory: "/"
   schedule:
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index b63a7e1c2..e5e1e5d7a 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -75,8 +75,8 @@ jobs:
 #          php -S localhost:8080 &
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests/php
-        run: ../../vendor/phpunit/phpunit/phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer run test
 
 #      - name: PHPUnit integration
 #        working-directory: apps/${{ env.APP_NAME }}
@@ -150,8 +150,8 @@ jobs:
 #          php -S localhost:8080 &
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests/php
-        run: ../../vendor/phpunit/phpunit/phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer run test
 
 #      - name: PHPUnit integration
 #        working-directory: apps/${{ env.APP_NAME }}
@@ -222,8 +222,8 @@ jobs:
 #          php -S localhost:8080 &
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests/php
-        run: ../../vendor/phpunit/phpunit/phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer run test
 
 #      - name: PHPUnit integration
 #        working-directory: apps/${{ env.APP_NAME }}
@@ -287,8 +287,8 @@ jobs:
 #          php -S localhost:8080 &
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests/php
-        run: ../../vendor/phpunit/phpunit/phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer run test
 
 #      - name: PHPUnit integration
 #        working-directory: apps/${{ env.APP_NAME }}
diff --git a/.gitignore b/.gitignore
index 8a2e72a2c..e3b9ff9e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@
 
 # PHP Code Sniffer
 /vendor
+/vendor-bin/csfixer/vendor
+/vendor-bin/phpunit/vendor
+/vendor-bin/psalm/vendor
 /.php-cs-fixer.cache
 
 # Local docs
diff --git a/Makefile b/Makefile
index 151049d2b..df5cbdaac 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ version+=master
 
 all: dev-setup build-production
 
-dev-setup: clean-dev composer-install-production npm-init
+dev-setup: clean-dev composer-install-dev npm-init
 
 release: appstore create-tag
 
@@ -99,6 +99,9 @@ appstore:
 	--exclude=.tx \
 	--exclude=tests \
 	--exclude=tsconfig.json \
+	--exclude=vendor \
+	--exclude=vendor-bin/production/composer.json \
+	--exclude=vendor-bin/production/composer.lock \
 	--exclude=webpack.js \
 	$(project_dir)/  $(sign_dir)/$(app_name)
 	@if [ -f $(cert_dir)/$(app_name).key ]; then \
diff --git a/composer.json b/composer.json
index f3e29d618..d43186f18 100644
--- a/composer.json
+++ b/composer.json
@@ -10,13 +10,16 @@
 		}
 	},
 	"config": {
+		"allow-plugins": {
+			"bamarni/composer-bin-plugin": true
+		},
 		"autoloader-suffix": "Talk",
-		"optimize-autoloader": true,
 		"classmap-authoritative": true,
-		"sort-packages": true,
+		"optimize-autoloader": true,
 		"platform": {
 			"php": "7.4"
-		}
+		},
+		"sort-packages": true
 	},
 	"scripts": {
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
@@ -25,16 +28,23 @@
 		"psalm": "psalm --threads=1",
 		"psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
 		"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
-		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType"
+		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
+		"post-install-cmd": [
+			"@composer bin all install --ansi",
+			"composer dump-autoload"
+		],
+		"post-update-cmd": [
+			"@composer bin all update --ansi",
+			"composer dump-autoload"
+		],
+		"test": "cd tests/php/ && phpunit -c phpunit.xml"
 	},
 	"require-dev": {
+		"bamarni/composer-bin-plugin": "^1.8",
 		"christophwurst/nextcloud": "dev-master",
-		"nextcloud/coding-standard": "^1.0",
-		"phpunit/phpunit": "^9.5",
-		"roave/security-advisories": "dev-latest",
-		"vimeo/psalm": "^4.22"
+		"roave/security-advisories": "dev-latest"
 	},
 	"require": {
-		"firebase/php-jwt": "^6.2"
+		"firebase/php-jwt": "^6.3"
 	}
 }
diff --git a/composer.lock b/composer.lock
index 7493d5394..187ae1206 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8d44df009b16f278d27bfdc7eea1f621",
+    "content-hash": "2448109074c40d85c149ef7be6482860",
     "packages": [
         {
             "name": "firebase/php-jwt",
@@ -71,170 +71,61 @@
     ],
     "packages-dev": [
         {
-            "name": "amphp/amp",
-            "version": "v2.6.2",
+            "name": "bamarni/composer-bin-plugin",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/amphp/amp.git",
-                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
+                "url": "https://github.com/bamarni/composer-bin-plugin.git",
+                "reference": "e12e9769c8ee97d036f7f98abf66b96cf3862346"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
-                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/e12e9769c8ee97d036f7f98abf66b96cf3862346",
+                "reference": "e12e9769c8ee97d036f7f98abf66b96cf3862346",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "composer-plugin-api": "^2.0",
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1",
+                "composer/composer": "^2.0",
                 "ext-json": "*",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "psalm/phar": "^3.11@dev",
-                "react/promise": "^2"
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9.5",
+                "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+                "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+                "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "lib/functions.php",
-                    "lib/Internal/functions.php"
-                ],
-                "psr-4": {
-                    "Amp\\": "lib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Daniel Lowrey",
-                    "email": "rdlowrey@php.net"
-                },
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Bob Weinand",
-                    "email": "bobwei9@hotmail.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
-                }
-            ],
-            "description": "A non-blocking concurrency framework for PHP applications.",
-            "homepage": "https://amphp.org/amp",
-            "keywords": [
-                "async",
-                "asynchronous",
-                "awaitable",
-                "concurrency",
-                "event",
-                "event-loop",
-                "future",
-                "non-blocking",
-                "promise"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v2.6.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
-                }
-            ],
-            "time": "2022-02-20T17:52:18+00:00"
-        },
-        {
-            "name": "amphp/byte-stream",
-            "version": "v1.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd",
-                "shasum": ""
-            },
-            "require": {
-                "amphp/amp": "^2",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1.4",
-                "friendsofphp/php-cs-fixer": "^2.3",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^6 || ^7 || ^8",
-                "psalm/phar": "^3.11.4"
-            },
-            "type": "library",
+            "type": "composer-plugin",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
+                "class": "Bamarni\\Composer\\Bin\\BamarniBinPlugin"
             },
             "autoload": {
-                "files": [
-                    "lib/functions.php"
-                ],
                 "psr-4": {
-                    "Amp\\ByteStream\\": "lib"
+                    "Bamarni\\Composer\\Bin\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
-                }
-            ],
-            "description": "A stream abstraction to make working with non-blocking I/O simple.",
-            "homepage": "http://amphp.org/byte-stream",
+            "description": "No conflicts for your bin dependencies",
             "keywords": [
-                "amp",
-                "amphp",
-                "async",
-                "io",
-                "non-blocking",
-                "stream"
+                "composer",
+                "conflict",
+                "dependency",
+                "executable",
+                "isolation",
+                "tool"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/byte-stream/issues",
-                "source": "https://github.com/amphp/byte-stream/tree/v1.8.1"
+                "issues": "https://github.com/bamarni/composer-bin-plugin/issues",
+                "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-03-30T17:13:30+00:00"
+            "time": "2022-08-03T19:58:11+00:00"
         },
         {
             "name": "christophwurst/nextcloud",
@@ -242,12 +133,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
-                "reference": "b7bcba48272375f8b55e1a69769337902a95d952"
+                "reference": "9a171fc34f71e7ba615228b5b3f9fea09d557b17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/b7bcba48272375f8b55e1a69769337902a95d952",
-                "reference": "b7bcba48272375f8b55e1a69769337902a95d952",
+                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/9a171fc34f71e7ba615228b5b3f9fea09d557b17",
+                "reference": "9a171fc34f71e7ba615228b5b3f9fea09d557b17",
                 "shasum": ""
             },
             "require": {
@@ -278,1791 +169,7 @@
                 "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
                 "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master"
             },
-            "time": "2022-08-25T02:31:45+00:00"
-        },
-        {
-            "name": "composer/package-versions-deprecated",
-            "version": "1.11.99.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/package-versions-deprecated.git",
-                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d",
-                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.1.0 || ^2.0",
-                "php": "^7 || ^8"
-            },
-            "replace": {
-                "ocramius/package-versions": "1.11.99"
-            },
-            "require-dev": {
-                "composer/composer": "^1.9.3 || ^2.0@dev",
-                "ext-zip": "^1.13",
-                "phpunit/phpunit": "^6.5 || ^7"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "PackageVersions\\Installer",
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PackageVersions\\": "src/PackageVersions"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be"
-                }
-            ],
-            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
-            "support": {
-                "issues": "https://github.com/composer/package-versions-deprecated/issues",
-                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-01-17T14:14:24+00:00"
-        },
-        {
-            "name": "composer/pcre",