Fix merge issues

Author: iMattPro

composer.json

@@ -20,7 +20,7 @@
 	],
 	"require": {
 		"php": ">=8.1",
-		"composer/installers": "~1.0"
+		"composer/installers": "~1.0",
 		"ext-zip": "*"
 	},
 	"require-dev": {

tests/helper/packager_test.php

@@ -209,15 +209,15 @@ public function test_get_template_engine_returns_twig_instance()
 		$callCount = 0;
 		$expectedArgs = [
 			['path_helper'],
-			['assets.bag'],
 			['filesystem'],
+			['assets.bag'],
 			['ext.manager'],
 			['user']
 		];
 		$returnValues = [
 			$path_helper,
-			$assets_bag,
 			$filesystem,
+			$assets_bag,
 			$ext_manager,
 			$user
 		];