Merging develop into main

src/Handler.php

@@ -343,7 +343,7 @@ class Handler extends BaseHandler {
       }
       $corePath = $installationManager->getInstallPath($drupalCorePackage);
       // Directory where Drupal's index.php is located.
-      $webRoot = dirname($corePath);
+      $webRoot = basename(dirname($corePath));
     }
     $this->config->setValue('webRoot', $webRoot, FALSE);
 
@@ -426,7 +426,7 @@ class Handler extends BaseHandler {
       if (isset($def['link']) && ($def['link'] !== $settingsPath)) {
         $link = $def['link'] . '/' . $filename;
         if (!$fs->exists($link)) {
-          $rel = substr($fs->makePathRelative($file, $projectRoot . '/' . $def['link']), 3, -1);
+          $rel = substr($fs->makePathRelative($file, $projectRoot . '/' . $link), 3, -1);
           $fs->symlink($rel, $link);
         }
       }