Move composer files into webapp to simplify all overrides

Author: vmcj

.github/jobs/baseinstall.sh

@@ -41,7 +41,9 @@ export PHPVERSION
 
 section_start "Run composer"
 export APP_ENV="dev"
+cd webapp
 composer install --no-scripts
+cd ..
 section_end
 
 section_start "Set simple admin password"

.github/workflows/codeql-analysis.yml

@@ -53,6 +53,7 @@ jobs:
     - name: Install composer files
       if: ${{ contains(env.COMPILED, matrix.language) }}
       run: |
+        cd webapp
         composer install --no-scripts
 
     - name: Configure Makefile

gitlab/base.sh

@@ -55,14 +55,17 @@ parameters:
     domjudge.baseurl: http://localhost/domjudge
 EOF
 
-# install check if the cache might be dirty
-set +e
-composer install --no-scripts || rm -rf webapp/vendor
-set -e
-
-# install all php dependencies
-composer install --no-scripts
-echo -e "\033[0m"
+# Composer steps
+cd webapp
+    # install check if the cache might be dirty
+    set +e
+    composer install --no-scripts || rm -rf webapp/vendor
+    set -e
+
+    # install all php dependencies
+    composer install --no-scripts
+    echo -e "\033[0m"
+cd $DIR
 
 # configure, make and install (but skip documentation)
 make configure

composer.json renamed to webapp/composer.json

@@ -125,15 +125,15 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"App\\": "webapp/src/"
+			"App\\": "src/"
 		},
 		"files": [
-			"webapp/resources/functions.php"
+			"resources/functions.php"
 		]
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"App\\Tests\\": "webapp/tests/"
+			"App\\Tests\\": "tests/"
 		}
 	},
 	"config": {
@@ -144,8 +144,6 @@
 		"platform": {
 			"php": "8.1.0"
 		},
-		"vendor-dir": "webapp/vendor",
-		"component-dir": "webapp/vendor/components",
 		"allow-plugins": {
 			"composer/package-versions-deprecated": true,
 			"symfony/flex": true,
@@ -178,12 +176,8 @@
 	},
 	"extra": {
 		"symfony": {
-			"root-dir": "webapp/",
 			"allow-contrib": true,
 			"require": "6.4.*"
-		},
-		"runtime": {
-			"dotenv_path": "webapp/.env"
 		}
 	}
 }