Merge pull request #13701 from nextcloud/revert-13665-bugfix/noid/mig…

…rate-to-php-scoper

Revert "fix(dependencies): Migrate to PHP scoper"

.github/dependabot.yml

@@ -66,8 +66,8 @@ updates:
   directories:
     - "/tests/integration"
     - "/vendor-bin/csfixer"
+    - "/vendor-bin/mozart"
     - "/vendor-bin/openapi-extractor"
-    - "/vendor-bin/php-scoper"
     - "/vendor-bin/phpunit"
     - "/vendor-bin/psalm"
     - "/vendor-bin/rector"

Makefile

@@ -88,7 +88,6 @@ appstore:
 	--exclude=jest.config.js \
 	--exclude=jest.global.setup.js \
 	--exclude=.l10nignore \
-	--exclude=lib-vendor-organizer.php \
 	--exclude=mkdocs.yml \
 	--exclude=Makefile \
 	--exclude=node_modules \
@@ -101,7 +100,6 @@ appstore:
 	--exclude=.readthedocs.yaml \
 	--exclude=/recording \
 	--exclude=/redocly.yaml \
-	--exclude=/scoper.inc.php \
 	--exclude=/site \
 	--exclude=/src \
 	--exclude=.stylelintignore \

composer.json

@@ -29,17 +29,13 @@
 		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
 		"post-install-cmd": [
 			"@composer bin all install --ansi",
-			"vendor/bin/php-scoper add-prefix --force # Scope our dependencies",
-			"@php lib-vendor-organizer.php lib/Vendor/ OCA\\\\Talk\\\\Vendor",
-			"composer dump-autoload -o"
+			"\"vendor/bin/mozart\" compose",
+			"composer dump-autoload"
 		],
 		"post-update-cmd": [
 			"@composer bin all update --ansi",
-			"vendor/bin/php-scoper add-prefix --force # Scope our dependencies",
-			"rm -Rf lib/Vendor && mv build lib/Vendor",
-			"find lib/Vendor/ -maxdepth 1 -mindepth 1 -type d | cut -d '/' -f3 | xargs -I {} rm -Rf vendor/{} # Remove origins",
-			"@php lib-vendor-organizer.php lib/Vendor/ OCA\\\\Talk\\\\Vendor",
-			"composer dump-autoload -o"
+			"\"vendor/bin/mozart\" compose",
+			"composer dump-autoload"
 		],
 		"test:unit": "vendor/bin/phpunit -c tests/php/phpunit.xml --colors=always --fail-on-warning --fail-on-risky"
 	},
@@ -51,5 +47,17 @@
 		"bamarni/composer-bin-plugin": "^1.8",
 		"cuyz/valinor": "^1.14",
 		"firebase/php-jwt": "^6.10"
+	},
+	"extra": {
+		"mozart": {
+			"dep_namespace": "OCA\\Talk\\Vendor\\",
+			"dep_directory": "/lib/Vendor/",
+			"classmap_directory": "/lib/autoload/",
+			"classmap_prefix": "NEXTCLOUDTALK_",
+			"packages": [
+				"firebase/php-jwt",
+				"cuyz/valinor"
+			]
+		}
 	}
 }

vendor-bin/php-scoper/composer.json → vendor-bin/mozart/composer.json

@@ -6,6 +6,6 @@
 		"sort-packages": true
 	},
 	"require": {
-		"humbug/php-scoper": "^0.18.7"
+		"coenjacobs/mozart": "^0.7.1"
 	}
 }