package_manager/package_manager.install

@@ -9,6 +9,7 @@ declare(strict_types = 1);
 
 use Drupal\package_manager\ComposerInspector;
 use Drupal\package_manager\Exception\StageFailureMarkerException;
+use Drupal\package_manager\FailureMarker;
 use PhpTuf\ComposerStager\API\Core\BeginnerInterface;
 use PhpTuf\ComposerStager\API\Exception\ExceptionInterface;
 use PhpTuf\ComposerStager\API\Finder\Service\ExecutableFinderInterface;
@@ -30,7 +31,7 @@ function package_manager_requirements(string $phase) {
   // If we're able to check for the presence of the failure marker at all, do it
   // irrespective of the current run phase. If the failure marker is there, the
   // site is in an indeterminate state and should be restored from backup ASAP.
-  $service_id = 'package_manager.failure_marker';
+  $service_id = FailureMarker::class;
   if (\Drupal::hasService($service_id)) {
     try {
       \Drupal::service($service_id)->assertNotExists(NULL);

package_manager/package_manager.services.yml

@@ -10,22 +10,23 @@ services:
 
   # Basic infrastructure services for Composer Stager, overridden by us to
   # provide additional functionality.
-  Drupal\package_manager\ProcessFactory:
-    public: false
   Drupal\package_manager\ExecutableFinder:
     public: false
+    decorates: 'PhpTuf\ComposerStager\API\Finder\Service\ExecutableFinderInterface'
   Drupal\package_manager\FileSyncerFactory:
     public: false
+    decorates: 'PhpTuf\ComposerStager\API\FileSyncer\Factory\FileSyncerFactoryInterface'
+  Drupal\package_manager\ProcessFactory:
+    public: false
+    decorates: 'PhpTuf\ComposerStager\API\Process\Factory\ProcessFactoryInterface'
   Drupal\package_manager\TranslatableStringFactory:
     public: false
-  PhpTuf\ComposerStager\API\Finder\Service\ExecutableFinderInterface:
-    alias: 'Drupal\package_manager\ExecutableFinder'
-  PhpTuf\ComposerStager\API\Process\Factory\ProcessFactoryInterface:
-    alias: 'Drupal\package_manager\ProcessFactory'
+    decorates: 'PhpTuf\ComposerStager\API\Translation\Factory\TranslatableFactoryInterface'
+  Drupal\package_manager\NoSymlinksPointToADirectory:
+    public: false
+    decorates: 'PhpTuf\ComposerStager\API\Precondition\Service\NoSymlinksPointToADirectoryInterface'
   PhpTuf\ComposerStager\API\FileSyncer\Service\FileSyncerInterface:
-    factory: ['@Drupal\package_manager\FileSyncerFactory', 'create']
-  PhpTuf\ComposerStager\API\Translation\Factory\TranslatableFactoryInterface:
-    alias: 'Drupal\package_manager\TranslatableStringFactory'
+    factory: ['@PhpTuf\ComposerStager\API\FileSyncer\Factory\FileSyncerFactoryInterface', 'create']
   logger.channel.package_manager:
     parent: logger.channel_base
     arguments:
@@ -36,28 +37,16 @@ services:
       - 'package_manager_change_log'
 
   # Services provided to Drupal by Package Manager.
-  package_manager.beginner:
-    class: PhpTuf\ComposerStager\Internal\Core\Beginner
-  PhpTuf\ComposerStager\API\Core\BeginnerInterface: '@package_manager.beginner'
-  package_manager.stager:
-    class: PhpTuf\ComposerStager\Internal\Core\Stager
-  PhpTuf\ComposerStager\API\Core\StagerInterface: '@package_manager.stager'
-  package_manager.committer:
-    class: PhpTuf\ComposerStager\Internal\Core\Committer
-  PhpTuf\ComposerStager\API\Core\CommitterInterface: '@package_manager.committer'
-  package_manager.path_locator:
-    class: Drupal\package_manager\PathLocator
+  Drupal\package_manager\PathLocator:
     arguments:
       $appRoot: '%app.root%'
-  Drupal\package_manager\PathLocator: '@package_manager.path_locator'
-  package_manager.failure_marker:
-    class: Drupal\package_manager\FailureMarker
-  Drupal\package_manager\FailureMarker: '@package_manager.failure_marker'
-  package_manager.update_data_subscriber:
-    class: Drupal\package_manager\EventSubscriber\UpdateDataSubscriber
+  Drupal\package_manager\FailureMarker:
+    tags:
+      - { name: event_subscriber }
+  Drupal\package_manager\EventSubscriber\UpdateDataSubscriber:
+    # @todo Autowire this service when https://drupal.org/i/3325557 lands.
     arguments:
       - '@update.manager'
-    # @todo Autowire this service when https://drupal.org/i/3325557 lands.
     autowire: false
     tags:
       - { name: event_subscriber }
@@ -66,29 +55,21 @@ services:
       - [setLogger, ['@logger.channel.package_manager_change_log']]
     tags:
       - { name: event_subscriber }
-  package_manager.composer_inspector:
-    class: Drupal\package_manager\ComposerInspector
+  Drupal\package_manager\ComposerInspector:
     calls:
       - [setLogger, ['@logger.channel.package_manager']]
-  Drupal\package_manager\ComposerInspector: '@package_manager.composer_inspector'
 
   # Validators.
-  package_manager.validator.environment_support:
-    class: Drupal\package_manager\Validator\EnvironmentSupportValidator
+  Drupal\package_manager\Validator\EnvironmentSupportValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\package_manager\Validator\EnvironmentSupportValidator: '@package_manager.validator.environment_support'
-  package_manager.validator.composer:
-    class: Drupal\package_manager\Validator\ComposerValidator
+  Drupal\package_manager\Validator\ComposerValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.disk_space:
-    class: Drupal\package_manager\Validator\DiskSpaceValidator
+  Drupal\package_manager\Validator\DiskSpaceValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\package_manager\Validator\DiskSpaceValidator: '@package_manager.validator.disk_space'
-  package_manager.validator.pending_updates:
-    class: Drupal\package_manager\Validator\PendingUpdatesValidator
+  Drupal\package_manager\Validator\PendingUpdatesValidator:
     arguments:
       - '%app.root%'
       - '@update.post_update_registry'
@@ -96,129 +77,100 @@ services:
     autowire: false
     tags:
       - { name: event_subscriber }
-  package_manager.validator.lock_file:
-    class: Drupal\package_manager\Validator\LockFileValidator
+  Drupal\package_manager\Validator\LockFileValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.file_system:
-    class: Drupal\package_manager\Validator\WritableFileSystemValidator
+  Drupal\package_manager\Validator\WritableFileSystemValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\package_manager\Validator\WritableFileSystemValidator: '@package_manager.validator.file_system'
-  package_manger.validator.composer_minimum_stability:
-    class: Drupal\package_manager\Validator\ComposerMinimumStabilityValidator
+  Drupal\package_manager\Validator\ComposerMinimumStabilityValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.multisite:
-    class: Drupal\package_manager\Validator\MultisiteValidator
+  Drupal\package_manager\Validator\MultisiteValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.symlink:
-    class: Drupal\package_manager\Validator\SymlinkValidator
+  Drupal\package_manager\Validator\SymlinkValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.duplicate_info_file:
-    class: Drupal\package_manager\Validator\DuplicateInfoFileValidator
+  Drupal\package_manager\Validator\DuplicateInfoFileValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.enabled_extensions:
-    class: Drupal\package_manager\Validator\EnabledExtensionsValidator
+  Drupal\package_manager\Validator\EnabledExtensionsValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.overwrite_existing_packages:
-    class: Drupal\package_manager\Validator\OverwriteExistingPackagesValidator
+  Drupal\package_manager\Validator\OverwriteExistingPackagesValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.allowed_scaffold_packages:
-    class: Drupal\package_manager\Validator\AllowedScaffoldPackagesValidator
+  Drupal\package_manager\Validator\AllowedScaffoldPackagesValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.staged_database_updates:
-    class: Drupal\package_manager\Validator\StagedDBUpdateValidator
+  Drupal\package_manager\Validator\StagedDBUpdateValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\package_manager\Validator\StagedDBUpdateValidator: '@package_manager.validator.staged_database_updates'
-  package_manager.test_site_excluder:
-    class: Drupal\package_manager\PathExcluder\TestSiteExcluder
+  Drupal\package_manager\PathExcluder\TestSiteExcluder:
     tags:
       - { name: event_subscriber }
-  package_manager.vendor_hardening_excluder:
-    class: Drupal\package_manager\PathExcluder\VendorHardeningExcluder
+  Drupal\package_manager\PathExcluder\VendorHardeningExcluder:
     tags:
       - { name: event_subscriber }
-  package_manager.site_files_excluder:
-    class: Drupal\package_manager\PathExcluder\SiteFilesExcluder
+  Drupal\package_manager\PathExcluder\SiteFilesExcluder:
     tags:
       - { name: event_subscriber }
-  package_manager.sqlite_excluder:
-    class: Drupal\package_manager\PathExcluder\SqliteDatabaseExcluder
+  Drupal\package_manager\PathExcluder\SqliteDatabaseExcluder:
     tags:
       - { name: event_subscriber }
-  Drupal\package_manager\PathExcluder\SqliteDatabaseExcluder: '@package_manager.sqlite_excluder'
-  package_manager.git_excluder:
-    class: Drupal\package_manager\PathExcluder\GitExcluder
+  Drupal\package_manager\PathExcluder\GitExcluder:
     tags:
       - { name: event_subscriber }
-  package_manager.unknown_path_excluder:
-    class: Drupal\package_manager\PathExcluder\UnknownPathExcluder
+  Drupal\package_manager\PathExcluder\UnknownPathExcluder:
     tags:
       - { name: event_subscriber }
-  package_manager.site_configuration_excluder:
-    class: Drupal\package_manager\PathExcluder\SiteConfigurationExcluder
+    calls:
+      - [setLogger, ['@logger.channel.package_manager']]
+  Drupal\package_manager\PathExcluder\SiteConfigurationExcluder:
     arguments:
       $sitePath: '%site.path%'
     tags:
       - { name: event_subscriber }
-  Drupal\package_manager\PathExcluder\SiteConfigurationExcluder: '@package_manager.site_configuration_excluder'
-  package_manager.node_modules_excluder:
-    class: Drupal\package_manager\PathExcluder\NodeModulesExcluder
+  Drupal\package_manager\PathExcluder\NodeModulesExcluder:
     tags:
       - { name: event_subscriber }
-  package_manager.uninstall_validator:
-    class: Drupal\package_manager\PackageManagerUninstallValidator
+  Drupal\package_manager\PackageManagerUninstallValidator:
     tags:
       - { name: module_install.uninstall_validator }
-    parent: container.trait
-    calls:
-      - ['setContainer', ['@service_container']]
+    arguments:
+      $eventDispatcher: '@event_dispatcher'
     lazy: true
-  package_manager.validator.settings:
-    class: Drupal\package_manager\Validator\SettingsValidator
+  Drupal\package_manager\Validator\SettingsValidator:
     tags:
       - { name: event_subscriber }
   Drupal\package_manager\Validator\RsyncValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.composer_plugins:
-    class: Drupal\package_manager\Validator\ComposerPluginsValidator
+  Drupal\package_manager\Validator\ComposerPluginsValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.patches:
-    class: Drupal\package_manager\Validator\ComposerPatchesValidator
+  Drupal\package_manager\Validator\ComposerPatchesValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.base_requirements_fulfilled:
-    class: Drupal\package_manager\Validator\BaseRequirementsFulfilledValidator
+  Drupal\package_manager\Validator\BaseRequirementsFulfilledValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\package_manager\Validator\BaseRequirementsFulfilledValidator: '@package_manager.validator.base_requirements_fulfilled'
-  package_manager.validator.supported_releases:
-    class: Drupal\package_manager\Validator\SupportedReleaseValidator
+  Drupal\package_manager\Validator\SupportedReleaseValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.stage_not_in_active:
-    class: Drupal\package_manager\Validator\StageNotInActiveValidator
+  Drupal\package_manager\Validator\StageNotInActiveValidator:
     tags:
       - { name: event_subscriber }
-  package_manager.validator.php_extensions:
-    class: Drupal\package_manager\Validator\PhpExtensionsValidator
+  Drupal\package_manager\Validator\PhpExtensionsValidator:
     tags:
       - { name: event_subscriber }
   # @todo Tag this service as an event subscriber in https://drupal.org/i/3358504,
   #   once packages.drupal.org supports TUF.
-  Drupal\package_manager\Validator\PhpTufValidator: {}
-  package_manager.update_processor:
-    class: Drupal\package_manager\PackageManagerUpdateProcessor
+  Drupal\package_manager\Validator\PhpTufValidator:
+    arguments:
+      $baseUrl: 'https://packages.drupal.org'
+  Drupal\package_manager\PackageManagerUpdateProcessor:
     arguments:
       # @todo Autowire $update_fetcher when https://drupal.org/i/3325557 lands.
       $update_fetcher: '@update.fetcher'

package_manager/src/ComposerInspector.php

@@ -50,15 +50,11 @@ class ComposerInspector implements LoggerAwareInterface {
   /**
    * A semantic version constraint for the supported version(s) of Composer.
    *
-   * Only versions supported by Composer are supported: the LTS and the latest
-   * minor version. Those are currently (May 2023) 2.2 and 2.5, but will be 2.5
-   * and 2.6 later this year (December 2023): the 2.2 LTS ends in December 2023.
-   *
    * @see https://endoflife.date/composer
    *
    * @var string
    */
-  final public const SUPPORTED_VERSION = '~2.5.5 || ^2.6';
+  final public const SUPPORTED_VERSION = '^2.6';
 
   /**
    * Constructs a ComposerInspector object.
@@ -171,7 +167,7 @@ class ComposerInspector implements LoggerAwareInterface {
         // The "Composer is available" precondition requires active and stage
         // directories, but they don't actually matter to it, nor do path
         // exclusions, so dummies can be passed for simplicity.
-        $active_dir = $this->pathFactory::create(__DIR__);
+        $active_dir = $this->pathFactory->create(__DIR__);
         $stage_dir = $active_dir;
 
         $this->composerIsAvailable->assertIsFulfilled($active_dir, $stage_dir);
@@ -319,26 +315,24 @@ class ComposerInspector implements LoggerAwareInterface {
     foreach ($packages_data as $name => $package) {
       $path = $package['path'];
 
+      // For packages installed as dev snapshots from certain version control
+      // systems, `composer show` displays the version like `1.0.x-dev 0a1b2c`,
+      // which will cause an exception if we try to parse it as a legitimate
+      // semantic version. Since we don't need the abbreviated commit hash, just
+      // remove it.
+      if (str_contains($package['version'], '-dev ')) {
+        $packages_data[$name]['version'] = explode(' ', $package['version'], 2)[0];
+      }
+
       // We expect Composer to report that metapackages' install paths are the
       // same as the working directory, in which case InstalledPackage::$path
       // should be NULL. For all other package types, we consider it invalid
       // if the install path is the same as the working directory.
-      // @todo Remove this handling of metapackage paths when Composer 2.5.7 or
-      //   later is required, in https://drupal.org/i/3365133.
       if (isset($package['type']) && $package['type'] === 'metapackage') {
-        // TRICKY: until Composer 2.5.6, metapackages returned the current
-        // working directory instead of NULL.
-        // @see https://github.com/composer/composer/commit/3a48e393756e8b0387925aa327f45a30128b4556
-        $packages_data[$name]['path'] = NULL;
-        // @todo Remove the if-branch when the minimum Composer version is raised to >=2.5.6.
-        if (Semver::satisfies($this->getVersion(), '<2.5.6')) {
-          if ($path !== $working_dir) {
-            throw new \UnexpectedValueException("Metapackage '$name' is installed at unexpected path: '$path', expected '$working_dir'");
-          }
-        }
-        elseif ($path !== NULL) {
+        if ($path !== NULL) {
           throw new \UnexpectedValueException("Metapackage '$name' is installed at unexpected path: '$path', expected NULL");
         }
+        $packages_data[$name]['path'] = $path;
       }
       elseif ($path === $working_dir) {
         throw new \UnexpectedValueException("Package '$name' cannot be installed at path: '$path'");

package_manager/src/Event/CollectPathsToExcludeEvent.php

@@ -7,7 +7,7 @@ namespace Drupal\package_manager\Event;
 use Drupal\package_manager\StageBase;
 use Drupal\package_manager\PathLocator;
 use PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface;
-use PhpTuf\ComposerStager\API\Path\Value\PathList;
+use PhpTuf\ComposerStager\API\Path\Factory\PathListFactoryInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
 
 /**
@@ -18,13 +18,6 @@ use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
  */
 final class CollectPathsToExcludeEvent extends StageEvent implements PathListInterface {
 
-  /**
-   * The list of paths to exclude.
-   *
-   * @var \PhpTuf\ComposerStager\API\Path\Value\PathListInterface
-   */
-  protected PathListInterface $pathList;
-
   /**
    * Constructs a CollectPathsToExcludeEvent object.
    *
@@ -34,14 +27,19 @@ final class CollectPathsToExcludeEvent extends StageEvent implements PathListInt
    *   The path locator service.
    * @param \PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface $pathFactory
    *   The path factory service.
+   * @param \PhpTuf\ComposerStager\API\Path\Value\PathListInterface|null $pathList
+   *   (optional) The list of paths to exclude.
    */
   public function __construct(
     StageBase $stage,
     private readonly PathLocator $pathLocator,
-    private readonly PathFactoryInterface $pathFactory
+    private readonly PathFactoryInterface $pathFactory,
+    private ?PathListInterface $pathList = NULL,
   ) {
     parent::__construct($stage);
-    $this->pathList = new PathList();
+
+    $this->pathList ??= \Drupal::service(PathListFactoryInterface::class)
+      ->create();
   }
 
   /**
@@ -55,7 +53,7 @@ final class CollectPathsToExcludeEvent extends StageEvent implements PathListInt
    * {@inheritdoc}
    */
   public function getAll(): array {
-    return $this->pathList->getAll();
+    return array_unique($this->pathList->getAll());
   }
 
   /**
@@ -87,6 +85,9 @@ final class CollectPathsToExcludeEvent extends StageEvent implements PathListInt
    *   The paths to ignore. Absolute paths will be made relative to the project
    *   root; relative paths will be assumed to already be relative to the
    *   project root, and ignored as given.
+   *
+   * @throws \LogicException
+   *   If any of the given paths are absolute, but not inside the project root.
    */
   public function addPathsRelativeToProjectRoot(array $paths): void {
     $project_root = $this->pathLocator->getProjectRoot();

package_manager/src/Event/PostDestroyEvent.php

-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\package_manager\Event;
-
-/**
- * Event fired after the stage directory is destroyed.
- *
- * If the stage is being force destroyed, $this->stage may be an object of a
- * different class than the one that originally created the stage directory.
- *
- * @see \Drupal\package_manager\StageBase::destroy()
- */
-final class PostDestroyEvent extends StageEvent {
-}

package_manager/src/Event/PreApplyEvent.php

@@ -4,7 +4,9 @@ declare(strict_types = 1);
 
 namespace Drupal\package_manager\Event;
 
+use Drupal\package_manager\ImmutablePathList;
 use Drupal\package_manager\StageBase;
+use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
 
 /**
  * Event fired before staged changes are synced to the active directory.
@@ -12,36 +14,26 @@ use Drupal\package_manager\StageBase;
 final class PreApplyEvent extends PreOperationStageEvent {
 
   /**
-   * Paths to exclude from the update.
+   * The list of paths to ignore in the active and stage directories.
    *
-   * @var string[]
+   * @var \Drupal\package_manager\ImmutablePathList
    */
-  private array $excludedPaths = [];
-
-  /**
-   * Returns the paths to exclude from the current operation.
-   *
-   * @return string[]
-   *   The paths to exclude.
-   */
-  public function getExcludedPaths(): array {
-    return array_unique($this->excludedPaths);
-  }
+  public readonly ImmutablePathList $excludedPaths;
 
   /**
    * Constructs a PreApplyEvent object.
    *
    * @param \Drupal\package_manager\StageBase $stage
    *   The stage which fired this event.
-   * @param string[] $paths_to_exclude
+   * @param \PhpTuf\ComposerStager\API\Path\Value\PathListInterface $excluded_paths
    *   The list of paths to exclude. These will not be copied from the stage
    *   directory to the active directory, nor be deleted from the active
    *   directory if they exist, when the stage directory is copied back into
    *   the active directory.
    */
-  public function __construct(StageBase $stage, array $paths_to_exclude) {
+  public function __construct(StageBase $stage, PathListInterface $excluded_paths) {
     parent::__construct($stage);
-    $this->excludedPaths = $paths_to_exclude;
+    $this->excludedPaths = new ImmutablePathList($excluded_paths);
   }
 
 }

package_manager/src/Event/PreCreateEvent.php

@@ -4,7 +4,9 @@ declare(strict_types = 1);
 
 namespace Drupal\package_manager\Event;
 
+use Drupal\package_manager\ImmutablePathList;
 use Drupal\package_manager\StageBase;
+use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
 
 /**
  * Event fired before a stage directory is created.
@@ -12,34 +14,24 @@ use Drupal\package_manager\StageBase;
 final class PreCreateEvent extends PreOperationStageEvent {
 
   /**
-   * Paths to exclude from the update.
+   * The list of paths to exclude from the stage directory.
    *
-   * @var string[]
+   * @var \Drupal\package_manager\ImmutablePathList
    */
-  private array $excludedPaths = [];
-
-  /**
-   * Returns the paths to exclude from the current operation.
-   *
-   * @return string[]
-   *   The paths to exclude.
-   */
-  public function getExcludedPaths(): array {
-    return array_unique($this->excludedPaths);
-  }
+  public readonly ImmutablePathList $excludedPaths;
 
   /**
    * Constructs a PreCreateEvent object.
    *
    * @param \Drupal\package_manager\StageBase $stage
    *   The stage which fired this event.
-   * @param string[] $paths_to_exclude
+   * @param \PhpTuf\ComposerStager\API\Path\Value\PathListInterface $excluded_paths
    *   The list of paths to exclude. These will not be copied into the stage
    *   directory when it is created.
    */
-  public function __construct(StageBase $stage, array $paths_to_exclude) {
+  public function __construct(StageBase $stage, PathListInterface $excluded_paths) {
     parent::__construct($stage);
-    $this->excludedPaths = $paths_to_exclude;
+    $this->excludedPaths = new ImmutablePathList($excluded_paths);
   }
 
 }

package_manager/src/Event/PreDestroyEvent.php

-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\package_manager\Event;
-
-/**
- * Event fired before the stage directory is destroyed.
- *
- * If the stage is being force destroyed, $this->stage may be an object of a
- * different class than the one that originally created the stage directory.
- *
- * @see \Drupal\package_manager\StageBase::destroy()
- */
-final class PreDestroyEvent extends PreOperationStageEvent {
-}

package_manager/src/Event/StatusCheckEvent.php

@@ -5,9 +5,10 @@ declare(strict_types = 1);
 namespace Drupal\package_manager\Event;
 
 use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\package_manager\ImmutablePathList;
 use Drupal\package_manager\StageBase;
 use Drupal\package_manager\ValidationResult;
-use Drupal\system\SystemManager;
+use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
 
 /**
  * Event fired to check the status of the system to use Package Manager.
@@ -18,36 +19,38 @@ use Drupal\system\SystemManager;
 final class StatusCheckEvent extends PreOperationStageEvent {
 
   /**
-   * Returns paths to exclude or NULL if a base requirement is not fulfilled.
+   * The paths to exclude, or NULL if there was an error collecting them.
    *
-   * @return string[]|null
-   *   The paths to exclude, or NULL if a base requirement is not fulfilled.
+   * @var \Drupal\package_manager\ImmutablePathList|null
    *
-   * @throws \LogicException
-   *   Thrown if the excluded paths are NULL and no errors have been added to
-   *   this event.
+   * @see ::__construct()
    */
-  public function getExcludedPaths(): ?array {
-    if (isset($this->pathsToExclude)) {
-      return array_unique($this->pathsToExclude);
-    }
-
-    if (empty($this->getResults(SystemManager::REQUIREMENT_ERROR))) {
-      throw new \LogicException('$paths_to_exclude should only be NULL if the error that caused the paths to not be collected was added to the status check event.');
-    }
-    return NULL;
-  }
+  public readonly ?ImmutablePathList $excludedPaths;
 
   /**
    * Constructs a StatusCheckEvent object.
    *
    * @param \Drupal\package_manager\StageBase $stage
    *   The stage which fired this event.
-   * @param string[]|null $pathsToExclude
-   *   The list of paths to exclude, or NULL if they could not be collected.
+   * @param \PhpTuf\ComposerStager\API\Path\Value\PathListInterface|\Throwable $excluded_paths
+   *   The list of paths to exclude or, if an error occurred while they were
+   *   being collected, the throwable from that error. If this is a throwable,
+   *   it will be converted to a validation error.
    */
-  public function __construct(StageBase $stage, private ?array $pathsToExclude) {
+  public function __construct(StageBase $stage, PathListInterface|\Throwable $excluded_paths) {
     parent::__construct($stage);
+
+    // If there was an error collecting the excluded paths, convert it to a
+    // validation error so we can still run status checks that don't need to
+    // examine the list of excluded paths.
+    if ($excluded_paths instanceof \Throwable) {
+      $this->addErrorFromThrowable($excluded_paths);
+      $excluded_paths = NULL;
+    }
+    else {
+      $excluded_paths = new ImmutablePathList($excluded_paths);
+    }
+    $this->excludedPaths = $excluded_paths;
   }
 
   /**

package_manager/src/ExecutableFinder.php

@@ -6,7 +6,6 @@ namespace Drupal\package_manager;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use PhpTuf\ComposerStager\API\Finder\Service\ExecutableFinderInterface;
-use PhpTuf\ComposerStager\Internal\Finder\Service\ExecutableFinder as StagerExecutableFinder;
 
 /**
  * An executable finder which looks for executable paths in configuration.
@@ -21,13 +20,13 @@ final class ExecutableFinder implements ExecutableFinderInterface {
   /**
    * Constructs an ExecutableFinder object.
    *
-   * @param \PhpTuf\ComposerStager\Internal\Finder\Service\ExecutableFinder $decorated
+   * @param \PhpTuf\ComposerStager\API\Finder\Service\ExecutableFinderInterface $decorated
    *   The decorated executable finder.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
    *   The config factory service.
    */
   public function __construct(
-    private readonly StagerExecutableFinder $decorated,
+    private readonly ExecutableFinderInterface $decorated,
     private readonly ConfigFactoryInterface $configFactory
   ) {}
 

package_manager/src/FailureMarker.php

@@ -4,6 +4,8 @@ declare(strict_types = 1);
 
 namespace Drupal\package_manager;
 
+use Drupal\package_manager\Event\CollectPathsToExcludeEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
@@ -23,7 +25,7 @@ use Drupal\package_manager\Exception\StageFailureMarkerException;
  *   at any time without warning. External code should not interact with this
  *   class.
  */
-final class FailureMarker {
+final class FailureMarker implements EventSubscriberInterface {
 
   /**
    * Constructs a FailureMarker object.
@@ -64,6 +66,7 @@ final class FailureMarker {
   public function write(StageBase $stage, TranslatableMarkup $message, \Throwable $throwable = NULL): void {
     $data = [
       'stage_class' => get_class($stage),
+      'stage_type' => $stage->getType(),
       'stage_file' => (new \ReflectionObject($stage))->getFileName(),
       'message' => (string) $message,
       'throwable_class' => $throwable ? get_class($throwable) : FALSE,
@@ -103,7 +106,7 @@ final class FailureMarker {
    * @param bool $include_backtrace
    *   Whether to include the backtrace in the message. Defaults to TRUE. May be
    *   set to FALSE in a context where it does not make sense to include, such
-   *   as e-mails.
+   *   as emails.
    *
    * @return string|null
    *   The message from the file if it exists, otherwise NULL.
@@ -142,4 +145,25 @@ final class FailureMarker {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents(): array {
+    return [
+      CollectPathsToExcludeEvent::class => 'excludeMarkerFile',
+    ];
+  }
+
+  /**
+   * Excludes the failure marker file from stage operations.
+   *
+   * @param \Drupal\package_manager\Event\CollectPathsToExcludeEvent $event
+   *   The event being handled.
+   */
+  public function excludeMarkerFile(CollectPathsToExcludeEvent $event): void {
+    $event->addPathsRelativeToProjectRoot([
+      $this->getPath(),
+    ]);
+  }
+
 }

package_manager/src/FileSyncerFactory.php

@@ -5,11 +5,10 @@ declare(strict_types = 1);
 namespace Drupal\package_manager;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use PhpTuf\ComposerStager\API\FileSyncer\Factory\FileSyncerFactoryInterface;
 use PhpTuf\ComposerStager\API\FileSyncer\Service\FileSyncerInterface;
-use PhpTuf\ComposerStager\Internal\FileSyncer\Factory\FileSyncerFactory as StagerFileSyncerFactory;
-use PhpTuf\ComposerStager\Internal\FileSyncer\Service\PhpFileSyncer;
-use PhpTuf\ComposerStager\Internal\FileSyncer\Service\RsyncFileSyncer;
-use Symfony\Component\Process\ExecutableFinder;
+use PhpTuf\ComposerStager\API\FileSyncer\Service\PhpFileSyncerInterface;
+use PhpTuf\ComposerStager\API\FileSyncer\Service\RsyncFileSyncerInterface;
 
 /**
  * A file syncer factory which creates a file syncer according to configuration.
@@ -19,35 +18,26 @@ use Symfony\Component\Process\ExecutableFinder;
  *   at any time without warning. External code should not interact with this
  *   class.
  */
-final class FileSyncerFactory {
+final class FileSyncerFactory implements FileSyncerFactoryInterface {
 
   /**
-   * The decorated file syncer factory.
+   * Constructs a FileSyncerFactory object.
    *
-   * @var \PhpTuf\ComposerStager\Internal\FileSyncer\Factory\FileSyncerFactory
-   */
-  private $decorated;
-
-  /**
-   * Constructs a FileCopierFactory object.
-   *
-   * @param \Symfony\Component\Process\ExecutableFinder $executable_finder
-   *   The Symfony executable finder.
-   * @param \PhpTuf\ComposerStager\Internal\FileSyncer\Service\PhpFileSyncer $phpFileSyncer
+   * @param \PhpTuf\ComposerStager\API\FileSyncer\Factory\FileSyncerFactoryInterface $decorated
+   *   The decorated file syncer factory.
+   * @param \PhpTuf\ComposerStager\API\FileSyncer\Service\PhpFileSyncerInterface $phpFileSyncer
    *   The PHP file syncer service.
-   * @param \PhpTuf\ComposerStager\Internal\FileSyncer\Service\RsyncFileSyncer $rsyncFileSyncer
+   * @param \PhpTuf\ComposerStager\API\FileSyncer\Service\RsyncFileSyncerInterface $rsyncFileSyncer
    *   The rsync file syncer service.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
    *   The config factory service.
    */
   public function __construct(
-    ExecutableFinder $executable_finder,
-    private readonly PhpFileSyncer $phpFileSyncer,
-    private readonly RsyncFileSyncer $rsyncFileSyncer,
+    private readonly FileSyncerFactoryInterface $decorated,
+    private readonly PhpFileSyncerInterface $phpFileSyncer,
+    private readonly RsyncFileSyncerInterface $rsyncFileSyncer,
     private readonly ConfigFactoryInterface $configFactory,
-  ) {
-    $this->decorated = new StagerFileSyncerFactory($executable_finder, $phpFileSyncer, $rsyncFileSyncer);
-  }
+  ) {}
 
   /**
    * {@inheritdoc}

package_manager/src/ImmutablePathList.php

+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\package_manager;
+
+use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
+
+/**
+ * Defines a path list that cannot be changed.
+ *
+ * @internal
+ *   This is an internal part of Package Manager and may be changed or removed
+ *   at any time without warning. External code should not interact with this
+ *   class.
+ */
+final class ImmutablePathList implements PathListInterface {
+
+  /**
+   * Constructs an ImmutablePathList object.
+   *
+   * @param \PhpTuf\ComposerStager\API\Path\Value\PathListInterface $decorated
+   *   The decorated path list.
+   */
+  public function __construct(private readonly PathListInterface $decorated) {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function add(string ...$paths): never {
+    throw new \LogicException('Immutable path lists cannot be changed.');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getAll(): array {
+    return $this->decorated->getAll();
+  }
+
+}

package_manager/src/NoSymlinksPointToADirectory.php

@@ -9,6 +9,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait;
 use PhpTuf\ComposerStager\API\Path\Value\PathInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
 use PhpTuf\ComposerStager\API\Precondition\Service\NoSymlinksPointToADirectoryInterface;
+use PhpTuf\ComposerStager\API\Process\Service\ProcessInterface;
 use PhpTuf\ComposerStager\API\Translation\Value\TranslatableInterface;
 
 /**
@@ -57,7 +58,7 @@ final class NoSymlinksPointToADirectory implements NoSymlinksPointToADirectoryIn
   /**
    * {@inheritdoc}
    */
-  public function getStatusMessage(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL,): TranslatableInterface {
+  public function getStatusMessage(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL, int $timeout = ProcessInterface::DEFAULT_TIMEOUT,): TranslatableInterface {
     if ($this->isUsingRsync()) {
       return $this->t('Symlinks to directories are supported by the rsync file syncer.');
     }
@@ -67,14 +68,14 @@ final class NoSymlinksPointToADirectory implements NoSymlinksPointToADirectoryIn
   /**
    * {@inheritdoc}
    */
-  public function isFulfilled(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL,): bool {
+  public function isFulfilled(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL, int $timeout = ProcessInterface::DEFAULT_TIMEOUT,): bool {
     return $this->isUsingRsync() || $this->decorated->isFulfilled($activeDir, $stagingDir, $exclusions);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function assertIsFulfilled(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL,): void {
+  public function assertIsFulfilled(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL, int $timeout = ProcessInterface::DEFAULT_TIMEOUT,): void {
     if ($this->isUsingRsync()) {
       return;
     }

package_manager/src/PackageManagerServiceProvider.php

@@ -7,7 +7,6 @@ namespace Drupal\package_manager;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\ServiceProviderBase;
 use PhpTuf\ComposerStager\API\Core\BeginnerInterface;
-use PhpTuf\ComposerStager\API\Precondition\Service\NoSymlinksPointToADirectoryInterface;
 
 /**
  * Defines dynamic container services for Package Manager.
@@ -39,6 +38,7 @@ final class PackageManagerServiceProvider extends ServiceProviderBase {
     // services.
     $ignore_directories = [
       $path . '/API/Exception',
+      $path . '/Internal/Helper',
       $path . '/Internal/Path/Value',
       $path . '/Internal/Translation/Value',
     ];
@@ -119,11 +119,6 @@ final class PackageManagerServiceProvider extends ServiceProviderBase {
       }
     }
     // END: DELETE FROM CORE MERGE REQUEST
-    // Decorate certain Composer Stager preconditions.
-    $container->register(NoSymlinksPointToADirectory::class)
-      ->setPublic(FALSE)
-      ->setAutowired(TRUE)
-      ->setDecoratedService(NoSymlinksPointToADirectoryInterface::class);
   }
 
 }

package_manager/src/PackageManagerUninstallValidator.php

@@ -4,11 +4,16 @@ declare(strict_types = 1);
 
 namespace Drupal\package_manager;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Extension\ModuleUninstallValidatorInterface;
+use Drupal\Core\Queue\QueueFactory;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\TempStore\SharedTempStoreFactory;
+use PhpTuf\ComposerStager\API\Core\BeginnerInterface;
+use PhpTuf\ComposerStager\API\Core\CommitterInterface;
+use PhpTuf\ComposerStager\API\Core\StagerInterface;
 use PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Prevents any module from being uninstalled if update is in process.
@@ -18,26 +23,62 @@ use Symfony\Component\DependencyInjection\ContainerAwareTrait;
  *   at any time without warning. External code should not interact with this
  *   class.
  */
-final class PackageManagerUninstallValidator implements ModuleUninstallValidatorInterface, ContainerAwareInterface {
+final class PackageManagerUninstallValidator implements ModuleUninstallValidatorInterface {
 
-  use ContainerAwareTrait;
   use StringTranslationTrait;
 
+  /**
+   * Constructs a new PackageManagerUninstallValidator object.
+   *
+   * @param \Drupal\package_manager\PathLocator $pathLocator
+   *   The path locator service.
+   * @param \PhpTuf\ComposerStager\API\Core\BeginnerInterface $beginner
+   *   The beginner service.
+   * @param \PhpTuf\ComposerStager\API\Core\StagerInterface $stager
+   *   The stager service.
+   * @param \PhpTuf\ComposerStager\API\Core\CommitterInterface $committer
+   *   The committer service.
+   * @param \Drupal\Core\Queue\QueueFactory $queueFactory
+   *   The queue factory service.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
+   *   The event dispatcher service.
+   * @param \Drupal\Core\TempStore\SharedTempStoreFactory $sharedTempStoreFactory
+   *   The shared temp store factory service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
+   * @param \PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface $pathFactory
+   *   The path factory service.
+   * @param \Drupal\package_manager\FailureMarker $failureMarker
+   *   The failure marker service.
+   */
+  public function __construct(
+    private readonly PathLocator $pathLocator,
+    private readonly BeginnerInterface $beginner,
+    private readonly StagerInterface $stager,
+    private readonly CommitterInterface $committer,
+    private readonly QueueFactory $queueFactory,
+    private readonly EventDispatcherInterface $eventDispatcher,
+    private readonly SharedTempStoreFactory $sharedTempStoreFactory,
+    private readonly TimeInterface $time,
+    private readonly PathFactoryInterface $pathFactory,
+    private readonly FailureMarker $failureMarker
+  ) {}
+
   /**
    * {@inheritdoc}
    */
   public function validate($module) {
     $stage = new class(
-      $this->container->get('package_manager.path_locator'),
-      $this->container->get('package_manager.beginner'),
-      $this->container->get('package_manager.stager'),
-      $this->container->get('package_manager.committer'),
-      $this->container->get('file_system'),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('tempstore.shared'),
-      $this->container->get('datetime.time'),
-      $this->container->get(PathFactoryInterface::class),
-      $this->container->get('package_manager.failure_marker')) extends StageBase {};
+      $this->pathLocator,
+      $this->beginner,
+      $this->stager,
+      $this->committer,
+      $this->queueFactory,
+      $this->eventDispatcher,
+      $this->sharedTempStoreFactory,
+      $this->time,
+      $this->pathFactory,
+      $this->failureMarker) extends StageBase {};
     if ($stage->isAvailable() || !$stage->isApplying()) {
       return [];
     }

package_manager/src/PackageManagerUpdateProcessor.php

@@ -4,6 +4,7 @@ declare(strict_types = 1);
 
 namespace Drupal\package_manager;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface;
 use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
@@ -48,18 +49,24 @@ final class PackageManagerUpdateProcessor extends UpdateProcessor {
    *   The key/value factory.
    * @param \Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface $key_value_expirable_factory
    *   The expirable key/value factory.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, QueueFactory $queue_factory, UpdateFetcherInterface $update_fetcher, StateInterface $state_store, PrivateKey $private_key, KeyValueFactoryInterface $key_value_factory, KeyValueExpirableFactoryInterface $key_value_expirable_factory) {
-    $this->updateFetcher = $update_fetcher;
-    $this->updateSettings = $config_factory->get('update.settings');
+  public function __construct(
+    ConfigFactoryInterface $config_factory,
+    QueueFactory $queue_factory,
+    UpdateFetcherInterface $update_fetcher,
+    StateInterface $state_store,
+    PrivateKey $private_key,
+    KeyValueFactoryInterface $key_value_factory,
+    KeyValueExpirableFactoryInterface $key_value_expirable_factory,
+    TimeInterface $time,
+  ) {
+    parent::__construct(...func_get_args());
     $this->fetchQueue = $queue_factory->get('package_manager.update_fetch_tasks');
     $this->tempStore = $key_value_expirable_factory->get('package_manager.update');
     $this->fetchTaskStore = $key_value_factory->get('package_manager.update_fetch_task');
     $this->availableReleasesTempStore = $key_value_expirable_factory->get('package_manager.update_available_releases');
-    $this->stateStore = $state_store;
-    $this->privateKey = $private_key;
-    $this->fetchTasks = [];
-    $this->failed = [];
   }
 
   /**

package_manager/src/PathExcluder/SiteConfigurationExcluder.php

@@ -67,7 +67,7 @@ class SiteConfigurationExcluder implements EventSubscriberInterface {
   }
 
   /**
-   * Makes the staged `sites/default` directory world-writable.
+   * Makes the staged `sites/default` directory owner-writable.
    *
    * This is done to allow the core scaffold plugin to make changes in
    * `sites/default`, if necessary, without breaking if `sites/default` is not
@@ -89,7 +89,7 @@ class SiteConfigurationExcluder implements EventSubscriberInterface {
     if (!is_dir($dir)) {
       return;
     }
-    if (!$this->fileSystem->chmod($dir, 0777)) {
+    if (!$this->fileSystem->chmod($dir, 0700)) {
       throw new FileException("Could not change permissions on '$dir'.");
     }
   }

package_manager/src/PathExcluder/SiteFilesExcluder.php

@@ -59,7 +59,9 @@ final class SiteFilesExcluder implements EventSubscriberInterface {
         $path = $wrapper->getDirectoryPath();
 
         if ($this->fileSystem->isAbsolutePath($path)) {
-          $event->addPathsRelativeToProjectRoot([realpath($path)]);
+          if ($path = realpath($path)) {
+            $event->addPathsRelativeToProjectRoot([$path]);
+          }
         }
         else {
           $event->addPathsRelativeToWebRoot([$path]);

package_manager/src/PathExcluder/SqliteDatabaseExcluder.php

@@ -6,7 +6,7 @@ namespace Drupal\package_manager\PathExcluder;
 
 use Drupal\Core\Database\Connection;
 use Drupal\package_manager\Event\CollectPathsToExcludeEvent;
-use Drupal\package_manager\PathLocator;
+use PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -22,16 +22,14 @@ class SqliteDatabaseExcluder implements EventSubscriberInterface {
   /**
    * Constructs a SqliteDatabaseExcluder object.
    *
-   * @param \Drupal\package_manager\PathLocator $pathLocator
-   *   The path locator service.
+   * @param \PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface $pathFactory
+   *   The path factory service.
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection.
    */
   public function __construct(
-    private readonly PathLocator $pathLocator,
-    // TRICKY: this cannot be private nor readonly for testing purposes.
-    // @see \Drupal\Tests\package_manager\Kernel\PathExcluder\SqliteDatabaseExcluderTest::mockDatabase()
-    protected Connection $database
+    private readonly PathFactoryInterface $pathFactory,
+    private readonly Connection $database,
   ) {}
 
   /**
@@ -50,19 +48,27 @@ class SqliteDatabaseExcluder implements EventSubscriberInterface {
    *   The event object.
    */
   public function excludeDatabaseFiles(CollectPathsToExcludeEvent $event): void {
-    // If the database is SQLite, it might be located in the active directory
-    // and we should exclude it. Always treat it as relative to the project root.
+    // If the database is SQLite, it might be located in the project directory
+    // and we should exclude it.
     if ($this->database->driver() === 'sqlite') {
-      $options = $this->database->getConnectionOptions();
-      // Nothing to exclude if the database lives outside the project root.
-      if (str_starts_with($options['database'], '/') && !str_starts_with($options['database'], $this->pathLocator->getProjectRoot())) {
-        return;
+      $db_path = $this->database->getConnectionOptions()['database'];
+      // Exclude the database file and auxiliary files created by SQLite.
+      $paths = [$db_path, "$db_path-shm", "$db_path-wal"];
+
+      // If the database path is absolute, it might be outside the project root,
+      // in which case we don't need to do anything.
+      if ($this->pathFactory->create($db_path)->isAbsolute()) {
+        try {
+          $event->addPathsRelativeToProjectRoot($paths);
+        }
+        catch (\LogicException) {
+          // The database is outside of the project root, so we're done.
+        }
+      }
+      else {
+        // The database is in the web root, and must be excluded relative to it.
+        $event->addPathsRelativeToWebRoot($paths);
       }
-      $event->addPathsRelativeToProjectRoot([
-        $options['database'],
-        $options['database'] . '-shm',
-        $options['database'] . '-wal',
-      ]);
     }
   }