Fix tests

Also create a new cache as the old one should be quite out
of date and as we now move the vendor somewhere else this
is the right time to update the naming.

Author: vmcj

.github/jobs/configure-checks/all.bats

@@ -231,7 +231,6 @@ compile_assertions_finished () {
    assert_line "    - bin..............: /opt/domjudge/domserver/bin"
    assert_line "    - etc..............: /opt/domjudge/domserver/etc"
    assert_line "    - lib..............: /opt/domjudge/domserver/lib"
-   assert_line "    - libvendor........: /opt/domjudge/domserver/lib/vendor"
    assert_line "    - log..............: /opt/domjudge/domserver/log"
    assert_line "    - run..............: /opt/domjudge/domserver/run"
    assert_line "    - sql..............: /opt/domjudge/domserver/sql"
@@ -257,7 +256,6 @@ compile_assertions_finished () {
    refute_line " * documentation.......: /opt/domjudge/doc"
    refute_line " * domserver...........: /opt/domjudge/domserver"
    refute_line "    - bin..............: /opt/domjudge/domserver/bin"
-   refute_line "    - libvendor........: /opt/domjudge/domserver/lib/vendor"
    refute_line "    - tmp..............: /opt/domjudge/domserver/tmp"
    refute_line "    - example_problems.: /opt/domjudge/domserver/example_problems"
    refute_line " * judgehost...........: /opt/domjudge/judgehost"
@@ -269,7 +267,6 @@ compile_assertions_finished () {
    assert_line " * prefix..............: /tmp"
    assert_line " * documentation.......: /tmp/doc"
    assert_line " * domserver...........: /tmp/domserver"
-   assert_line "    - libvendor........: /tmp/domserver/lib/vendor"
    assert_line " * judgehost...........: /tmp/judgehost"
    assert_line "    - judge............: /tmp/judgehost/judgings"
 }
@@ -291,7 +288,6 @@ compile_assertions_finished () {
    assert_line "    - bin..............: /usr/local/bin"
    assert_line "    - etc..............: /usr/local/etc/domjudge"
    assert_line "    - lib..............: /usr/local/lib/domjudge"
-   assert_line "    - libvendor........: /usr/local/lib/domjudge/vendor"
    assert_line "    - log..............: /usr/local/var/log/domjudge"
    assert_line "    - run..............: /usr/local/var/run/domjudge"
    assert_line "    - sql..............: /usr/local/share/domjudge/sql"
@@ -319,7 +315,6 @@ compile_assertions_finished () {
    assert_line "    - bin..............: /usr/local/bin"
    assert_line "    - etc..............: /usr/local/etc/domjudge"
    assert_line "    - lib..............: /usr/local/lib/domjudge"
-   assert_line "    - libvendor........: /usr/local/lib/domjudge/vendor"
    assert_line "    - log..............: /usr/local/var/log/domjudge"
    assert_line "    - run..............: /usr/local/var/run/domjudge"
    assert_line "    - sql..............: /usr/local/share/domjudge/sql"

gitlab/base.sh

@@ -48,7 +48,7 @@ parameters:
     domjudge.webappdir: /webapp
     domjudge.libdir: /lib
     domjudge.sqldir: /sql
-    domjudge.libvendordir: /lib/vendor
+    domjudge.libvendordir: /webapp/vendor
     domjudge.logdir: /output/log
     domjudge.rundir: /output/run
     domjudge.tmpdir: /output/tmp
@@ -57,7 +57,7 @@ EOF
 
 # install check if the cache might be dirty
 set +e
-composer install --no-scripts || rm -rf lib/vendor
+composer install --no-scripts || rm -rf webapp/vendor
 set -e
 
 # install all php dependencies

gitlab/ci/template.yml

@@ -27,9 +27,9 @@
 .cached_vendor:
   extends: [.clean_ordering]
   cache:
-    key: libvendor-260522
+    key: webappvendor-240427
     paths:
-      - lib/vendor/
+      - webapp/vendor/
 
 .mysql_job:
   script:

phpstan.dist.neon

@@ -22,4 +22,4 @@ parameters:
             message: "#Method .* return type has no value type specified in iterable type array#"
             path: webapp/src/DataFixtures/Test
 includes:
-    - lib/vendor/phpstan/phpstan-doctrine/extension.neon
+    - webapp/vendor/phpstan/phpstan-doctrine/extension.neon

webapp/bin/phpunit

@@ -5,20 +5,20 @@ if (!ini_get('date.timezone')) {
     ini_set('date.timezone', 'UTC');
 }
 
-if (is_file(dirname(__DIR__, 2) . '/lib/vendor/phpunit/phpunit/phpunit')) {
+if (is_file(dirname(__DIR__, 2) . '/webapp/vendor/phpunit/phpunit/phpunit')) {
     if (PHP_VERSION_ID >= 80000) {
-        require dirname(__DIR__, 2) . '/lib/vendor/phpunit/phpunit/phpunit';
+        require dirname(__DIR__, 2) . '/webapp/vendor/phpunit/phpunit/phpunit';
     } else {
-        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__, 2) . '/lib/vendor/autoload.php');
+        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__, 2) . '/webapp/vendor/autoload.php');
         require PHPUNIT_COMPOSER_INSTALL;
         PHPUnit\TextUI\Command::main();
     }
 } else {
     if (!is_file(dirname(__DIR__,
-            2) . '/lib/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+            2) . '/webapp/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
         echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
         exit(1);
     }
 
-    require dirname(__DIR__, 2) . '/lib/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
+    require dirname(__DIR__, 2) . '/webapp/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
 }

webapp/tests/bootstrap.php

@@ -2,7 +2,7 @@
 
 use Symfony\Component\Dotenv\Dotenv;
 
-require dirname(__DIR__, 2) . '/lib/vendor/autoload.php';
+require dirname(__DIR__, 2) . '/webapp/vendor/autoload.php';
 require dirname(__DIR__) . '/config/load_db_secrets.php';
 
 if (file_exists(dirname(__DIR__) . '/config/bootstrap.php')) {