Change the location in various files

Author: Michael Vasseur

README.md

@@ -72,7 +72,7 @@ The M4 autoconf macros are licensed under all-permissive and GPL3+
 licences; see the respective files under m4/ for details.
 
 The DOMjudge tarball ships external library dependencies in the
-lib/vendor directory. These are covered by their individual licenses
+webapp/vendor directory. These are covered by their individual licenses
 as specified in the file composer.lock.
 
 Contact

etc/domserver-static.php.in

@@ -12,6 +12,7 @@ define('ETCDIR',    '@domserver_etcdir@');
 define('WEBAPPDIR', '@domserver_webappdir@');
 define('LIBDIR',    '@domserver_libdir@');
 define('SQLDIR',    '@domserver_sqldir@');
+define('VENDORDIR', '@domserver_webappdir@/vendor');
 define('LOGDIR',    '@domserver_logdir@');
 define('RUNDIR',    '@domserver_rundir@');
 define('TMPDIR',    '@domserver_tmpdir@');

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/console

@@ -4,11 +4,11 @@
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
-if (!is_file(dirname(__DIR__, 2) . '/lib/vendor/autoload_runtime.php')) {
+if (!is_file(dirname(__DIR__, 2) . '/webapp/vendor/autoload_runtime.php')) {
     throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
 }
 
-require_once dirname(__DIR__, 2) . '/lib/vendor/autoload_runtime.php';
+require_once dirname(__DIR__, 2) . '/webapp/vendor/autoload_runtime.php';
 require_once dirname(__DIR__) . '/config/load_db_secrets.php';
 
 set_time_limit(0);

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/config/autoload.php.in

@@ -12,8 +12,8 @@ use Doctrine\Common\Annotations\AnnotationRegistry;
 use Composer\Autoload\ClassLoader;
 
 // Load the static domserver file if we don't have the constants from it yet
-if (!defined('LIBVENDORDIR')) {
+if (!defined('VENDORDIR')) {
     require('@domserver_etcdir@/domserver-static.php');
 }
 
-return require LIBVENDORDIR.'/autoload.php';
+return require VENDORDIR.'/autoload.php';

webapp/config/static.yaml.in

@@ -7,7 +7,7 @@ parameters:
     domjudge.webappdir: @domserver_webappdir@
     domjudge.libdir: @domserver_libdir@
     domjudge.sqldir: @domserver_sqldir@
-    domjudge.libvendordir: @domserver_libvendordir@
+    domjudge.vendordir: @domserver_webappdir@/vendor
     domjudge.logdir: @domserver_logdir@
     domjudge.rundir: @domserver_rundir@
     domjudge.tmpdir: @domserver_tmpdir@

webapp/public/index.php

@@ -2,7 +2,7 @@
 
 use App\Kernel;
 
-require_once dirname(__DIR__, 2) . '/lib/vendor/autoload_runtime.php';
+require_once dirname(__DIR__, 2) . '/webapp/vendor/autoload_runtime.php';
 require_once dirname(__DIR__) . '/config/load_db_secrets.php';
 
 return function (array $context) {

webapp/src/Service/DOMJudgeService.php

@@ -96,7 +96,7 @@ public function __construct(
         protected readonly Environment $twig,
         #[Autowire('%kernel.project_dir%')]
         protected string $projectDir,
-        #[Autowire('%domjudge.libvendordir%')]
+        #[Autowire('%domjudge.vendordir%')]
         protected string $vendorDir,
     ) {}
 

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')) {