Simplify relative paths to webapp/vendor

.github/jobs/syntax-check

@@ -48,7 +48,7 @@ while read -r i ; do
 	fi
 	if grep -qE "^#\\!.*/bin/(ba)?sh" "$i" && \
 		[ "${i##*.}" != "zip" ] && \
-		echo "$i" | grep -qvE '(^\./(config|autom4te|install-sh|sql/files/defaultdata/hs/run|lib/vendor/|output|judge/judgedaemon))'; then
+		echo "$i" | grep -qvE '(^\./(config|autom4te|install-sh|sql/files/defaultdata/hs/run|webapp/vendor/|output|judge/judgedaemon))'; then
 		# We ignore the following shellcheck warnings, for more details see:
 		# https://github.com/koalaman/shellcheck/wiki/<code>
 		#

webapp/Makefile

@@ -26,7 +26,7 @@ copy-bundle-assets:
 # the include paths are broken. We just copy in the data we need
 	-rm -rf public/bundles/nelmioapidoc
 	mkdir -p public/bundles/nelmioapidoc
-	cp -R ../webapp/vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
+	cp -R vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
 
 clean-l:
 	-rm -rf public/bundles/nelmioapidoc
@@ -44,11 +44,11 @@ install-domserver:
 # Now change all relative symlinks in webapp/public to their correct paths
 	for link in $$(find $(DESTDIR)$(domserver_webappdir)/public/$$dir -maxdepth 2 -type l); do \
 		target=$$(readlink $$link) ; \
-		if echo $${target} | grep -q '\.\./\.\./webapp/vendor' ; then \
+		case $${target} in *../vendor*) \
 			rm $$link ; \
-			realtarget=$(domserver_webappdir)/vendor$$(echo $${target} | sed 's!^.*\.\./\.\./webapp/vendor!!') ; \
+			realtarget=$(domserver_webappdir)/vendor$${target#*../vendor} ; \
 			ln -s $$realtarget $$link ; \
-		fi \
+		esac \
 	done
 	$(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env
 

webapp/bin/console

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

webapp/bin/phpunit

@@ -5,20 +5,19 @@ if (!ini_get('date.timezone')) {
     ini_set('date.timezone', 'UTC');
 }
 
-if (is_file(dirname(__DIR__, 2) . '/webapp/vendor/phpunit/phpunit/phpunit')) {
+if (is_file(dirname(__DIR__) . '/vendor/phpunit/phpunit/phpunit')) {
     if (PHP_VERSION_ID >= 80000) {
-        require dirname(__DIR__, 2) . '/webapp/vendor/phpunit/phpunit/phpunit';
+        require dirname(__DIR__) . '/vendor/phpunit/phpunit/phpunit';
     } else {
-        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__, 2) . '/webapp/vendor/autoload.php');
+        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php');
         require PHPUNIT_COMPOSER_INSTALL;
         PHPUnit\TextUI\Command::main();
     }
 } else {
-    if (!is_file(dirname(__DIR__,
-            2) . '/webapp/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+    if (!is_file(dirname(__DIR__) . '/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) . '/webapp/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
+    require dirname(__DIR__) . '/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
 }

webapp/public/css/bootstrap.min.css

@@ -1 +1 @@
-../../../webapp/vendor/twbs/bootstrap/dist/css/bootstrap.min.css
+../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css

webapp/public/css/dataTables.bootstrap5.min.css

@@ -1 +1 @@
-../../../webapp/vendor/datatables.net/datatables.net-bs5/css/dataTables.bootstrap5.min.css
+../../vendor/datatables.net/datatables.net-bs5/css/dataTables.bootstrap5.min.css

webapp/public/css/fontawesome-all.min.css

@@ -1 +1 @@
-../../../webapp/vendor/fortawesome/font-awesome/css/all.min.css
+../../vendor/fortawesome/font-awesome/css/all.min.css

webapp/public/css/nv.d3.min.css

@@ -1 +1 @@
-../../../webapp/vendor/novus/nvd3/build/nv.d3.min.css
+../../vendor/novus/nvd3/build/nv.d3.min.css

webapp/public/css/select2-bootstrap-5-theme.min.css

@@ -1 +1 @@
-../../../webapp/vendor/apalfrey/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css
+../../vendor/apalfrey/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css

webapp/public/css/select2.min.css

@@ -1 +1 @@
-../../../webapp/vendor/select2/select2/dist/css/select2.min.css
+../../vendor/select2/select2/dist/css/select2.min.css

webapp/public/flags

@@ -1 +1 @@
-../../webapp/vendor/components/flag-icon-css/flags
+../vendor/components/flag-icon-css/flags

webapp/public/index.php

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

webapp/public/js/FileSaver.min.js

@@ -1 +1 @@
-../../../webapp/vendor/eligrey/filesaver/dist/FileSaver.min.js
+../../vendor/eligrey/filesaver/dist/FileSaver.min.js

webapp/public/js/bootstrap.bundle.min.js

@@ -1 +1 @@
-../../../webapp/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js
+../../vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js

webapp/public/js/d3.min.js

@@ -1 +1 @@
-../../../webapp/vendor/mbostock/d3/d3.min.js
+../../vendor/mbostock/d3/d3.min.js

webapp/public/js/dataTables.bootstrap5.min.js

@@ -1 +1 @@
-../../../webapp/vendor/datatables.net/datatables.net-bs5/js/dataTables.bootstrap5.min.js
+../../vendor/datatables.net/datatables.net-bs5/js/dataTables.bootstrap5.min.js

webapp/public/js/dataTables.min.js

@@ -1 +1 @@
-../../../webapp/vendor/datatables.net/datatables.net/js/dataTables.min.js
+../../vendor/datatables.net/datatables.net/js/dataTables.min.js

webapp/public/js/jquery.min.js

@@ -1 +1 @@
-../../../webapp/vendor/components/jquery/jquery.min.js
+../../vendor/components/jquery/jquery.min.js

webapp/public/js/nv.d3.min.js

@@ -1 +1 @@
-../../../webapp/vendor/novus/nvd3/build/nv.d3.min.js
+../../vendor/novus/nvd3/build/nv.d3.min.js

webapp/public/js/select2.min.js

@@ -1 +1 @@
-../../../webapp/vendor/select2/select2/dist/js/select2.min.js
+../../vendor/select2/select2/dist/js/select2.min.js

webapp/public/webfonts

@@ -1 +1 @@
-../../webapp/vendor/fortawesome/font-awesome/webfonts
+../vendor/fortawesome/font-awesome/webfonts

webapp/tests/Unit/Controller/API/ContestControllerAdminTest.php

@@ -175,7 +175,7 @@ public function testProblemsetManagement(): void
         self::assertArrayNotHasKey('problemset', $object);
 
         // Now upload a problemset
-        $problemsetFile = __DIR__ . '/../../../../../webapp/public/doc/logos/DOMjudgelogo.pdf';
+        $problemsetFile = __DIR__ . '/../../../../public/doc/logos/DOMjudgelogo.pdf';
         $problemset = new UploadedFile($problemsetFile, 'DOMjudgelogo.pdf');
         $this->verifyApiJsonResponse('POST', $url . '/problemset', 204, $this->apiUser, null, ['problemset' => $problemset]);
 
@@ -199,7 +199,7 @@ public function testProblemsetManagement(): void
         self::assertEquals(file_get_contents($problemsetFile), $callbackData);
 
         // Upload the problemset again, this time using PUT to also test that
-        $problemsetFile = __DIR__ . '/../../../../../webapp/public/doc/logos/DOMjudgelogo.pdf';
+        $problemsetFile = __DIR__ . '/../../../../public/doc/logos/DOMjudgelogo.pdf';
         $problemset = new UploadedFile($problemsetFile, 'DOMjudgelogo.pdf');
         $this->verifyApiJsonResponse('PUT', $url . '/problemset', 204, $this->apiUser, null, ['problemset' => $problemset]);
 

webapp/tests/bootstrap.php

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