automatic_updates.services.yml

@@ -133,6 +133,10 @@ services:
     class: Drupal\automatic_updates\Validator\XdebugValidator
     tags:
       - { name: event_subscriber }
+  automatic_updates.validator.installed_version:
+    class: Drupal\automatic_updates\Validator\InstalledVersionValidator
+    tags:
+      - { name: event_subscriber }
   automatic_updates.validator.target_release:
     class: Drupal\automatic_updates\Validator\UpdateReleaseValidator
     tags:

automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php

@@ -64,7 +64,12 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
   protected function setUp(): void {
     parent::setUp();
     $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
-    $this->drupalLogin($this->rootUser);
+    $user = $this->createUser([
+      'administer site configuration',
+      'administer software updates',
+      'access site in maintenance mode',
+    ]);
+    $this->drupalLogin($user);
     $this->drupalPlaceBlock('local_tasks_block', ['primary' => TRUE]);
   }
 

automatic_updates_extensions/tests/src/Kernel/AutomaticUpdatesExtensionsKernelTestBase.php

@@ -3,10 +3,9 @@
 namespace Drupal\Tests\automatic_updates_extensions\Kernel;
 
 use Drupal\automatic_updates_extensions\ExtensionUpdater;
-use Drupal\package_manager\Event\StageEvent;
-use Drupal\package_manager\Exception\StageException;
 use Drupal\package_manager\Exception\StageValidationException;
 use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
+use Drupal\Tests\package_manager\Kernel\TestStageTrait;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
@@ -122,33 +121,6 @@ abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdates
  */
 class TestExtensionUpdater extends ExtensionUpdater {
 
-  /**
-   * The directory where staging areas will be created.
-   *
-   * @var string
-   */
-  public static $stagingRoot;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getStagingRoot(): string {
-    return static::$stagingRoot ?: parent::getStagingRoot();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function dispatch(StageEvent $event, callable $on_error = NULL): void {
-    try {
-      parent::dispatch($event, $on_error);
-    }
-    catch (StageException $e) {
-      // Attach the event object to the exception so that test code can verify
-      // that the exception was thrown when a specific event was dispatched.
-      $e->event = $event;
-      throw $e;
-    }
-  }
+  use TestStageTrait;
 
 }

package_manager/package_manager.install

@@ -8,7 +8,7 @@
 /**
  * Implements hook_requirements().
  */
-function package_manager_requirements() {
+function package_manager_requirements(string $phase) {
   $requirements = [];
 
   if (!class_exists('PhpTuf\ComposerStager\Domain\Beginner')) {
@@ -18,7 +18,7 @@ function package_manager_requirements() {
       'severity' => REQUIREMENT_ERROR,
     ];
   }
-  if (extension_loaded('xdebug')) {
+  if ($phase === 'runtime' && extension_loaded('xdebug')) {
     $requirements['package_manager_xdebug'] = [
       'title' => 'Xdebug enabled',
       'description' => t('Xdebug is enabled, which may have a negative performance impact on Package Manager and any modules that use it.'),

package_manager/package_manager.module

@@ -18,7 +18,12 @@ function package_manager_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<p>' . t('Package Manager is a framework for updating Drupal core and installing contributed modules and themes via Composer. It has no user interface, but it provides an API for creating a temporary copy of the current site, making changes to the copy, and then syncing those changes back into the live site.') . '</p>';
       $output .= '<p>' . t('Package Manager dispatches events before and after various operations, and external code can integrate with it by subscribing to those events. For more information, see <code>package_manager.api.php</code>.') . '</p>';
       $output .= '<h3 id="package-manager-requirements">' . t('Requirements') . '</h3>';
-      $output .= '<p>' . t('Package Manager requires Composer @version or later available as an executable, and PHP must have permission to run it. The path to the executable may be set in the <code>package_manager.settings:executables.composer</code> config setting, or it will be automatically detected.', ['@version' => ComposerExecutableValidator::MINIMUM_COMPOSER_VERSION]) . '</p>';
+      $output .= '<p>' . t('Package Manager requires Composer @version or later available as an executable, and PHP must have permission to run it. The path to the executable may be stored in config, or it will be automatically detected. To set the path to Composer, you can add the following line to settings.php:', ['@version' => ComposerExecutableValidator::MINIMUM_COMPOSER_VERSION]) . '</p>';
+      $output .= "<p><code>\$config['package_manager.settings']['executables']['composer'] = '/full/path/to/composer';</code></p>";
+      // BEGIN: DELETE FROM CORE MERGE REQUEST
+      $output .= '<p>' . t('Or, if using Drush, you can run the following command:') . '</p>';
+      $output .= '<p><code>drush config:set package_manager.settings executables.composer /full/path/to/composer</code></p>';
+      // END: DELETE FROM CORE MERGE REQUEST
       $output .= '<h3>' . t('Limitations') . '</h3>';
       $output .= '<p>' . t("Because Package Manager modifies the current site's code base, it is intentionally limited in certain ways to prevent unexpected changes from being made to the live site:") . '</p>';
       $output .= '<ul>';

package_manager/package_manager.services.yml

 services:
-  # Underlying Symfony utilities.
-  package_manager.symfony_file_system:
-    class: Symfony\Component\Filesystem\Filesystem
-  package_manager.symfony_executable_finder:
-    class: Symfony\Component\Process\ExecutableFinder
+  # Underlying Symfony utilities for Composer Stager.
+  Symfony\Component\Filesystem\Filesystem:
+    public: false
+  Symfony\Component\Process\ExecutableFinder:
+    public: false
 
-  # Basic infrastructure services.
-  package_manager.process_factory:
-    class: Drupal\package_manager\ProcessFactory
+  # Basic infrastructure services for Composer Stager.
+  Drupal\package_manager\ProcessFactory:
     arguments:
       - '@file_system'
       - '@config.factory'
-  package_manager.file_system:
-    class: PhpTuf\ComposerStager\Infrastructure\Filesystem\Filesystem
-    arguments:
-      - '@package_manager.symfony_file_system'
-  package_manager.executable_finder:
-    class: Drupal\package_manager\ExecutableFinder
-    arguments:
-      - '@package_manager.symfony_executable_finder'
-      - '@config.factory'
+    public: false
+  PhpTuf\ComposerStager\Infrastructure\Filesystem\Filesystem:
+    autowire: true
+    public: false
+  Drupal\package_manager\ExecutableFinder:
+    arguments:
+      $config_factory: '@config.factory'
+    autowire: true
+    public: false
+  PhpTuf\ComposerStager\Infrastructure\Process\ProcessFactoryInterface:
+    alias: 'Drupal\package_manager\ProcessFactory'
+  PhpTuf\ComposerStager\Domain\Filesystem\FilesystemInterface:
+    alias: 'PhpTuf\ComposerStager\Infrastructure\Filesystem\Filesystem'
+  PhpTuf\ComposerStager\Infrastructure\Process\ExecutableFinderInterface:
+    alias: 'Drupal\package_manager\ExecutableFinder'
 
-  # Executable runners.
-  package_manager.rsync_runner:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\Runner\RsyncRunner
-    arguments:
-      - '@package_manager.executable_finder'
-      - '@package_manager.process_factory'
-  package_manager.composer_runner:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\Runner\ComposerRunner
-    arguments:
-      - '@package_manager.executable_finder'
-      - '@package_manager.process_factory'
+  # Executable runners for Composer Stager.
+  PhpTuf\ComposerStager\Infrastructure\Process\Runner\RsyncRunner:
+    autowire: true
+    public: false
+  PhpTuf\ComposerStager\Infrastructure\Process\Runner\ComposerRunner:
+    autowire: true
+    public: false
+  PhpTuf\ComposerStager\Domain\Process\Runner\RsyncRunnerInterface:
+    alias: 'PhpTuf\ComposerStager\Infrastructure\Process\Runner\RsyncRunner'
+  PhpTuf\ComposerStager\Domain\Process\Runner\ComposerRunnerInterface:
+    alias: 'PhpTuf\ComposerStager\Infrastructure\Process\Runner\ComposerRunner'
 
-  # File syncers.
-  package_manager.file_syncer.rsync:
-    class: PhpTuf\ComposerStager\Infrastructure\FileSyncer\RsyncFileSyncer
-    arguments:
-      - '@package_manager.file_system'
-      - '@package_manager.rsync_runner'
-  package_manager.file_syncer.php:
-    class: PhpTuf\ComposerStager\Infrastructure\FileSyncer\PhpFileSyncer
-    arguments:
-      - '@package_manager.file_system'
-  package_manager.file_syncer.factory:
-    class: Drupal\package_manager\FileSyncerFactory
-    arguments:
-      - '@package_manager.symfony_executable_finder'
-      - '@package_manager.file_syncer.php'
-      - '@package_manager.file_syncer.rsync'
-      - '@config.factory'
-  package_manager.file_syncer:
-    class: PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerInterface
-    factory: ['@package_manager.file_syncer.factory', 'create']
+  # File syncers for Composer Stager.
+  PhpTuf\ComposerStager\Infrastructure\FileSyncer\RsyncFileSyncer:
+    autowire: true
+  PhpTuf\ComposerStager\Infrastructure\FileSyncer\PhpFileSyncer:
+    autowire: true
+  Drupal\package_manager\FileSyncerFactory:
+    arguments:
+      $config_factory: '@config.factory'
+    autowire: true
+    public: false
+  PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerInterface:
+    factory: ['@Drupal\package_manager\FileSyncerFactory', 'create']
 
-  # Domain services.
+  # Services provided to Drupal by Package Manager.
   package_manager.beginner:
     class: PhpTuf\ComposerStager\Domain\Beginner
-    arguments:
-      - '@package_manager.file_syncer'
-      - '@package_manager.file_system'
+    autowire: true
   package_manager.stager:
     class: PhpTuf\ComposerStager\Domain\Stager
-    arguments:
-      - '@package_manager.composer_runner'
-      - '@package_manager.file_system'
+    autowire: true
   package_manager.committer:
     class: PhpTuf\ComposerStager\Domain\Committer
-    arguments:
-      - '@package_manager.file_syncer'
-      - '@package_manager.file_system'
+    autowire: true
   package_manager.path_locator:
     class: Drupal\package_manager\PathLocator
     arguments:
@@ -79,7 +70,7 @@ services:
   package_manager.validator.composer_executable:
     class: Drupal\package_manager\Validator\ComposerExecutableValidator
     arguments:
-      - '@package_manager.composer_runner'
+      - '@PhpTuf\ComposerStager\Domain\Process\Runner\ComposerRunnerInterface'
       - '@module_handler'
       - '@string_translation'
     tags:
@@ -143,11 +134,11 @@ services:
   package_manager.site_files_excluder:
     class: Drupal\package_manager\PathExcluder\SiteFilesExcluder
     arguments:
-      - '@package_manager.path_locator'
-      - '@stream_wrapper_manager'
-      - '@package_manager.symfony_file_system'
+      $path_locator: '@package_manager.path_locator'
+      $stream_wrapper_manager: '@stream_wrapper_manager'
     tags:
       - { name: event_subscriber }
+    autowire: true
   package_manager.sqlite_excluder:
     class: Drupal\package_manager\PathExcluder\SqliteDatabaseExcluder
     arguments:

package_manager/src/FileSyncerFactory.php

@@ -6,6 +6,8 @@ use Drupal\Core\Config\ConfigFactoryInterface;
 use PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerFactoryInterface;
 use PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerInterface;
 use PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerFactory as StagerFileSyncerFactory;
+use PhpTuf\ComposerStager\Infrastructure\FileSyncer\PhpFileSyncer;
+use PhpTuf\ComposerStager\Infrastructure\FileSyncer\RsyncFileSyncer;
 use Symfony\Component\Process\ExecutableFinder;
 
 /**
@@ -23,14 +25,14 @@ class FileSyncerFactory implements FileSyncerFactoryInterface {
   /**
    * The PHP file syncer service.
    *
-   * @var \PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerInterface
+   * @var \PhpTuf\ComposerStager\Infrastructure\FileSyncer\PhpFileSyncer
    */
   protected $phpFileSyncer;
 
   /**
    * The rsync file syncer service.
    *
-   * @var \PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerInterface
+   * @var \PhpTuf\ComposerStager\Infrastructure\FileSyncer\RsyncFileSyncer
    */
   protected $rsyncFileSyncer;
 
@@ -46,14 +48,14 @@ class FileSyncerFactory implements FileSyncerFactoryInterface {
    *
    * @param \Symfony\Component\Process\ExecutableFinder $executable_finder
    *   The Symfony executable finder.
-   * @param \PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerInterface $php_file_syncer
+   * @param \PhpTuf\ComposerStager\Infrastructure\FileSyncer\PhpFileSyncer $php_file_syncer
    *   The PHP file syncer service.
-   * @param \PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerInterface $rsync_file_syncer
+   * @param \PhpTuf\ComposerStager\Infrastructure\FileSyncer\RsyncFileSyncer $rsync_file_syncer
    *   The rsync file syncer service.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory service.
    */
-  public function __construct(ExecutableFinder $executable_finder, FileSyncerInterface $php_file_syncer, FileSyncerInterface $rsync_file_syncer, ConfigFactoryInterface $config_factory) {
+  public function __construct(ExecutableFinder $executable_finder, PhpFileSyncer $php_file_syncer, RsyncFileSyncer $rsync_file_syncer, ConfigFactoryInterface $config_factory) {
     $this->decorated = new StagerFileSyncerFactory($executable_finder, $php_file_syncer, $rsync_file_syncer);
     $this->phpFileSyncer = $php_file_syncer;
     $this->rsyncFileSyncer = $rsync_file_syncer;

package_manager/src/Stage.php

@@ -3,7 +3,6 @@
 namespace Drupal\package_manager;
 
 use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Component\FileSystem\FileSystem;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\File\Exception\FileException;
@@ -67,6 +66,15 @@ class Stage {
    */
   protected const TEMPSTORE_METADATA_KEY = 'metadata';
 
+  /**
+   * The tempstore key under which to store the path of the staging root.
+   *
+   * @var string
+   *
+   * @see ::getStagingRoot()
+   */
+  private const TEMPSTORE_STAGING_ROOT_KEY = 'staging_root';
+
   /**
    * The tempstore key under which to store the time that ::apply() was called.
    *
@@ -238,6 +246,11 @@ class Stage {
    * call ::claim(). However, if it was created during another request, the
    * stage must be claimed before operations can be performed on it.
    *
+   * @param int|null $timeout
+   *   (optional) How long to allow the file copying operation to run before
+   *   timing out, in seconds, or NULL to never time out. Defaults to 300
+   *   seconds.
+   *
    * @return string
    *   Unique ID for the stage, which can be used to claim the stage before
    *   performing other operations on it. Calling code should store this ID for
@@ -248,7 +261,7 @@ class Stage {
    *
    * @see ::claim()
    */
-  public function create(): string {
+  public function create(?int $timeout = 300): string {
     if (!$this->isAvailable()) {
       throw new StageException('Cannot create a new stage because one already exists.');
     }
@@ -270,7 +283,7 @@ class Stage {
     // available.
     $this->dispatch($event, [$this, 'markAsAvailable']);
 
-    $this->beginner->begin($active_dir, $stage_dir, $event->getExcludedPaths());
+    $this->beginner->begin($active_dir, $stage_dir, $event->getExcludedPaths(), NULL, $timeout);
     $this->dispatch(new PostCreateEvent($this));
     return $id;
   }
@@ -313,8 +326,13 @@ class Stage {
 
   /**
    * Applies staged changes to the active directory.
+   *
+   * @param int|null $timeout
+   *   (optional) How long to allow the file copying operation to run before
+   *   timing out, in seconds, or NULL to never time out. Defaults to 600
+   *   seconds.
    */
-  public function apply(): void {
+  public function apply(?int $timeout = 600): void {
     $this->checkOwnership();
 
     $active_dir = $this->pathLocator->getProjectRoot();
@@ -331,7 +349,7 @@ class Stage {
     $this->tempStore->set(self::TEMPSTORE_APPLY_TIME_KEY, $this->time->getRequestTime());
     $this->dispatch($event, $release_apply);
 
-    $this->committer->commit($stage_dir, $active_dir, $event->getExcludedPaths());
+    $this->committer->commit($stage_dir, $active_dir, $event->getExcludedPaths(), NULL, $timeout);
 
     // Rebuild the container and clear all caches, to ensure that new services
     // are picked up.
@@ -390,6 +408,7 @@ class Stage {
   protected function markAsAvailable(): void {
     $this->tempStore->delete(static::TEMPSTORE_METADATA_KEY);
     $this->tempStore->delete(static::TEMPSTORE_LOCK_KEY);
+    $this->tempStore->delete(self::TEMPSTORE_STAGING_ROOT_KEY);
     $this->lock = NULL;
   }
 
@@ -541,9 +560,17 @@ class Stage {
    *   The absolute path of the directory containing the staging areas managed
    *   by this class.
    */
-  protected function getStagingRoot(): string {
-    $site_id = $this->configFactory->get('system.site')->get('uuid');
-    return FileSystem::getOsTemporaryDirectory() . DIRECTORY_SEPARATOR . '.package_manager' . $site_id;
+  private function getStagingRoot(): string {
+    // Since the staging root can depend on site settings, store it so that
+    // things won't break if the settings change during this stage's life
+    // cycle.
+    $dir = $this->tempStore->get(self::TEMPSTORE_STAGING_ROOT_KEY);
+    if (empty($dir)) {
+      $site_id = $this->configFactory->get('system.site')->get('uuid');
+      $dir = $this->fileSystem->getTempDirectory() . DIRECTORY_SEPARATOR . '.package_manager' . $site_id;
+      $this->tempStore->set(self::TEMPSTORE_STAGING_ROOT_KEY, $dir);
+    }
+    return $dir;
   }
 
   /**

package_manager/tests/fixtures/fake_site/vendor/composer/installed.json

+{
+  "packages": [
+    {
+      "name": "drupal/core",
+      "version": "9.8.0"
+    }
+  ]
+}

package_manager/tests/modules/package_manager_bypass/src/Beginner.php

@@ -14,7 +14,7 @@ class Beginner extends InvocationRecorderBase implements BeginnerInterface {
    * {@inheritdoc}
    */
   public function begin(string $activeDir, string $stagingDir, ?array $exclusions = [], ?OutputCallbackInterface $callback = NULL, ?int $timeout = 120): void {
-    $this->saveInvocationArguments($activeDir, $stagingDir, $exclusions);
+    $this->saveInvocationArguments($activeDir, $stagingDir, $exclusions, $timeout);
   }
 
 }

package_manager/tests/modules/package_manager_bypass/src/Committer.php

@@ -31,7 +31,7 @@ class Committer extends InvocationRecorderBase implements CommitterInterface {
    * {@inheritdoc}
    */
   public function commit(string $stagingDir, string $activeDir, ?array $exclusions = [], ?OutputCallbackInterface $callback = NULL, ?int $timeout = 120): void {
-    $this->saveInvocationArguments($activeDir, $stagingDir, $exclusions);
+    $this->saveInvocationArguments($stagingDir, $activeDir, $exclusions, $timeout);
   }
 
   /**

package_manager/tests/modules/package_manager_bypass/src/PackageManagerBypassServiceProvider.php

@@ -18,9 +18,11 @@ class PackageManagerBypassServiceProvider extends ServiceProviderBase {
     parent::alter($container);
 
     $container->getDefinition('package_manager.beginner')
-      ->setClass(Beginner::class);
+      ->setClass(Beginner::class)
+      ->setArguments([]);
     $container->getDefinition('package_manager.stager')
-      ->setClass(Stager::class);
+      ->setClass(Stager::class)
+      ->setArguments([]);
 
     $container->register('package_manager_bypass.committer')
       ->setClass(Committer::class)

package_manager/tests/modules/package_manager_test_fixture/package_manager_test_fixture.services.yml

@@ -3,6 +3,6 @@ services:
     class: Drupal\package_manager_test_fixture\EventSubscriber\FixtureStager
     arguments:
       - '@state'
-      - '@package_manager.symfony_file_system'
+      - '@Symfony\Component\Filesystem\Filesystem'
     tags:
       - { name: event_subscriber }

package_manager/tests/modules/package_manager_test_fixture/src/EventSubscriber/FixtureStager.php

@@ -57,12 +57,27 @@ class FixtureStager implements EventSubscriberInterface {
    * @see \Drupal\Tests\automatic_updates\Functional\AutomaticUpdatesFunctionalTestBase::tearDown()
    */
   public function copyFilesFromFixture(PostRequireEvent $event): void {
-    $fixturePath = $this->state->get(static::class);
+    [$fixturePath, $changeLock] = $this->state->get(static::class);
+
     if ($fixturePath && is_dir($fixturePath)) {
-      $this->fileSystem->mirror($fixturePath, $event->getStage()->getStageDirectory(), NULL, [
+      $destination = $event->getStage()->getStageDirectory();
+
+      $this->fileSystem->mirror($fixturePath, $destination, NULL, [
         'override' => TRUE,
         'delete' => TRUE,
       ]);
+
+      // Modify the lock file in the staging area, to simulate that a package
+      // was added, updated, or removed. Otherwise, tests must remember to
+      // disable the lock file validator.
+      // @see \Drupal\package_manager\Validator\LockFileValidator
+      $lock = $destination . '/composer.lock';
+      if ($changeLock && file_exists($lock)) {
+        $data = file_get_contents($lock);
+        $data = json_decode($data);
+        $data->_time = microtime();
+        file_put_contents($lock, json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+      }
     }
   }
 
@@ -80,9 +95,12 @@ class FixtureStager implements EventSubscriberInterface {
    *
    * @param string $path
    *   The path of the fixture to copy into the staging area.
+   * @param bool $change_lock
+   *   (optional) Whether to change the lock file, in order to simulate the
+   *   addition, updating, or removal of a package. Defaults to TRUE.
    */
-  public static function setFixturePath(string $path): void {
-    \Drupal::state()->set(static::class, $path);
+  public static function setFixturePath(string $path, bool $change_lock = TRUE): void {
+    \Drupal::state()->set(static::class, [$path, $change_lock]);
   }
 
 }

package_manager/tests/src/Kernel/ComposerExecutableValidatorTest.php

@@ -2,12 +2,13 @@
 
 namespace Drupal\Tests\package_manager\Kernel;
 
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Url;
 use Drupal\package_manager\Event\PreCreateEvent;
 use Drupal\package_manager\Validator\ComposerExecutableValidator;
 use Drupal\package_manager\ValidationResult;
+use PhpTuf\ComposerStager\Domain\Process\Runner\ComposerRunnerInterface;
 use PhpTuf\ComposerStager\Exception\IOException;
-use PhpTuf\ComposerStager\Infrastructure\Process\ExecutableFinderInterface;
 use Prophecy\Argument;
 
 /**
@@ -17,19 +18,42 @@ use Prophecy\Argument;
  */
 class ComposerExecutableValidatorTest extends PackageManagerKernelTestBase {
 
+  /**
+   * The mocked Composer runner.
+   *
+   * @var \Prophecy\Prophecy\ObjectProphecy|\PhpTuf\ComposerStager\Domain\Process\Runner\ComposerRunnerInterface
+   */
+  private $composerRunner;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    $this->composerRunner = $this->prophesize(ComposerRunnerInterface::class);
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    parent::register($container);
+
+    $container->getDefinition('package_manager.validator.composer_executable')
+      ->setArgument('$composer', $this->composerRunner->reveal());
+  }
+
   /**
    * Tests that an error is raised if the Composer executable isn't found.
    */
   public function testErrorIfComposerNotFound(): void {
     $exception = new IOException("This is your regularly scheduled error.");
 
-    // The executable finder throws an exception if it can't find the requested
-    // executable.
-    $exec_finder = $this->prophesize(ExecutableFinderInterface::class);
-    $exec_finder->find('composer')
+    // If the Composer executable isn't found, the executable finder will throw
+    // an exception, which will not be caught by the Composer runner.
+    $this->composerRunner->run(Argument::cetera())
       ->willThrow($exception)
       ->shouldBeCalled();
-    $this->container->set('package_manager.executable_finder', $exec_finder->reveal());
 
     // The validator should translate that exception into an error.
     $error = ValidationResult::createError([
@@ -38,7 +62,6 @@ class ComposerExecutableValidatorTest extends PackageManagerKernelTestBase {
     $this->assertResults([$error], PreCreateEvent::class);
 
     $this->enableModules(['help']);
-    $this->container->set('package_manager.executable_finder', $exec_finder->reveal());
     $this->assertResultsWithHelp([$error], PreCreateEvent::class);
   }
 
@@ -122,10 +145,7 @@ class ComposerExecutableValidatorTest extends PackageManagerKernelTestBase {
     // Mock the output of `composer --version`, will be passed to the validator,
     // which is itself a callback function that gets called repeatedly as
     // Composer produces output.
-    /** @var \PhpTuf\ComposerStager\Domain\Process\Runner\ComposerRunnerInterface|\Prophecy\Prophecy\ObjectProphecy $runner */
-    $runner = $this->prophesize('\PhpTuf\ComposerStager\Domain\Process\Runner\ComposerRunnerInterface');
-
-    $runner->run(['--version'], Argument::type(ComposerExecutableValidator::class))
+    $this->composerRunner->run(['--version'], Argument::type(ComposerExecutableValidator::class))
       // Whatever is passed to ::run() will be passed to this mock callback in
       // $arguments, and we know exactly what that will contain: an array of
       // command arguments for Composer, and the validator object.
@@ -137,14 +157,12 @@ class ComposerExecutableValidatorTest extends PackageManagerKernelTestBase {
         // recognized, supported version number out of this output.
         $validator($validator::OUT, "Composer version $reported_version");
       });
-    $this->container->set('package_manager.composer_runner', $runner->reveal());
 
     // If the validator can't find a recognized, supported version of Composer,
     // it should produce errors.
     $this->assertResults($expected_results, PreCreateEvent::class);
 
     $this->enableModules(['help']);
-    $this->container->set('package_manager.composer_runner', $runner->reveal());
     $this->assertResultsWithHelp($expected_results, PreCreateEvent::class);
   }
 

package_manager/tests/src/Kernel/ExecutableFinderTest.php

@@ -2,6 +2,9 @@
 
 namespace Drupal\Tests\package_manager\Kernel;
 
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\package_manager\ExecutableFinder;
+use PhpTuf\ComposerStager\Infrastructure\Process\ExecutableFinderInterface;
 use Symfony\Component\Process\ExecutableFinder as SymfonyExecutableFinder;
 
 /**
@@ -12,10 +15,11 @@ use Symfony\Component\Process\ExecutableFinder as SymfonyExecutableFinder;
 class ExecutableFinderTest extends PackageManagerKernelTestBase {
 
   /**
-   * Tests that the executable finder looks for paths in configuration.
+   * {@inheritdoc}
    */
-  public function testCheckConfigurationForExecutablePath(): void {
-    $symfony_executable_finder = new class () extends SymfonyExecutableFinder {
+  public function register(ContainerBuilder $container) {
+    // Mock a Symfony executable finder that always returns /dev/null.
+    $symfony_executable_finder = new class extends SymfonyExecutableFinder {
 
       /**
        * {@inheritdoc}
@@ -25,13 +29,19 @@ class ExecutableFinderTest extends PackageManagerKernelTestBase {
       }
 
     };
-    $this->container->set('package_manager.symfony_executable_finder', $symfony_executable_finder);
+    $container->getDefinition(ExecutableFinder::class)
+      ->setArgument('$symfony_executable_finder', $symfony_executable_finder);
+  }
 
+  /**
+   * Tests that the executable finder looks for paths in configuration.
+   */
+  public function testCheckConfigurationForExecutablePath(): void {
     $this->config('package_manager.settings')
       ->set('executables.composer', '/path/to/composer')
       ->save();
 
-    $executable_finder = $this->container->get('package_manager.executable_finder');
+    $executable_finder = $this->container->get(ExecutableFinderInterface::class);
     $this->assertSame('/path/to/composer', $executable_finder->find('composer'));
     $this->assertSame('/dev/null', $executable_finder->find('rsync'));
   }

package_manager/tests/src/Kernel/FileSyncerFactoryTest.php

@@ -3,6 +3,9 @@
 namespace Drupal\Tests\package_manager\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
+use PhpTuf\ComposerStager\Domain\FileSyncer\FileSyncerInterface;
+use PhpTuf\ComposerStager\Infrastructure\FileSyncer\PhpFileSyncer;
+use PhpTuf\ComposerStager\Infrastructure\FileSyncer\RsyncFileSyncer;
 
 /**
  * @covers \Drupal\package_manager\FileSyncerFactory
@@ -40,19 +43,17 @@ class FileSyncerFactoryTest extends KernelTestBase {
    * @dataProvider providerFactory
    */
   public function testFactory(?string $configured_syncer): void {
-    $factory = $this->container->get('package_manager.file_syncer.factory');
-
     switch ($configured_syncer) {
       case 'rsync':
-        $expected_syncer = $this->container->get('package_manager.file_syncer.rsync');
+        $expected_syncer = RsyncFileSyncer::class;
         break;
 
       case 'php':
-        $expected_syncer = $this->container->get('package_manager.file_syncer.php');
+        $expected_syncer = PhpFileSyncer::class;
         break;
 
       default:
-        $expected_syncer = $factory->create();
+        $expected_syncer = FileSyncerInterface::class;
         break;
     }
 
@@ -60,7 +61,7 @@ class FileSyncerFactoryTest extends KernelTestBase {
       ->set('file_syncer', $configured_syncer)
       ->save();
 
-    $this->assertSame($expected_syncer, $factory->create());
+    $this->assertInstanceOf($expected_syncer, $this->container->get(FileSyncerInterface::class));
   }
 
 }

package_manager/tests/src/Kernel/LockFileValidatorTest.php

@@ -2,12 +2,12 @@
 
 namespace Drupal\Tests\package_manager\Kernel;
 
-use Drupal\package_manager\Event\PostRequireEvent;
 use Drupal\package_manager\Event\PreApplyEvent;
 use Drupal\package_manager\Event\PreCreateEvent;
 use Drupal\package_manager\Event\PreRequireEvent;
 use Drupal\package_manager\Validator\LockFileValidator;
 use Drupal\package_manager\ValidationResult;
+use Drupal\package_manager_test_fixture\EventSubscriber\FixtureStager;
 
 /**
  * @coversDefaultClass \Drupal\package_manager\Validator\LockFileValidator
@@ -56,7 +56,7 @@ class LockFileValidatorTest extends PackageManagerKernelTestBase {
 
     // Change the lock file to ensure the stored hash of the previous version
     // has been deleted.
-    file_put_contents($this->activeDir . '/composer.lock', 'changed');
+    file_put_contents($this->activeDir . '/composer.lock', '{"changed": true}');
     $this->assertResults([]);
   }
 
@@ -124,11 +124,11 @@ class LockFileValidatorTest extends PackageManagerKernelTestBase {
    * Tests validation when the staged and active lock files are identical.
    */
   public function testApplyWithNoChange(): void {
-    $this->addListener(PostRequireEvent::class, function (PostRequireEvent $event) {
-      $stage_dir = $event->getStage()->getStageDirectory();
-      mkdir($stage_dir);
-      copy("$this->activeDir/composer.lock", "$stage_dir/composer.lock");
-    });
+    // Ensure the lock file is not changed when the active directory is copied
+    // into the virtual staging area.
+    // @see \Drupal\package_manager_test_fixture\EventSubscriber\FixtureStager
+    FixtureStager::setFixturePath($this->activeDir, FALSE);
+
     $result = ValidationResult::createError([
       'There are no pending Composer operations.',
     ]);

package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php

@@ -10,6 +10,7 @@ use Drupal\package_manager\Exception\StageException;
 use Drupal\package_manager\Exception\StageValidationException;
 use Drupal\package_manager\PathLocator;
 use Drupal\package_manager\Stage;
+use Drupal\package_manager_test_fixture\EventSubscriber\FixtureStager;
 use Drupal\Tests\package_manager\Traits\ValidationTestTrait;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
@@ -29,8 +30,20 @@ abstract class PackageManagerKernelTestBase extends KernelTestBase {
   protected static $modules = [
     'package_manager',
     'package_manager_bypass',
+    'package_manager_test_fixture',
   ];
 
+  /**
+   * The test staging root.
+   *
+   * This value must be set before creating a test stage instance.
+   *
+   * @var string
+   *
+   * @see \Drupal\Tests\package_manager\Kernel\TestStageTrait::__construct()
+   */
+  public static $testStagingRoot;
+
   /**
    * The service IDs of any validators to disable.
    *
@@ -175,9 +188,14 @@ abstract class PackageManagerKernelTestBase extends KernelTestBase {
     // Create a staging root directory alongside the active directory.
     $stage_dir = vfsStream::newDirectory('stage');
     $this->vfsRoot->addChild($stage_dir);
-    TestStage::$stagingRoot = $stage_dir->url();
+    static::$testStagingRoot = $stage_dir->url();
 
-    $path_locator = $this->mockPathLocator($active_dir->url());
+    $active_dir = $active_dir->url();
+    $path_locator = $this->mockPathLocator($active_dir);
+
+    // Ensure that the active directory is copied into the virtual staging area,
+    // even if Package Manager's operations are bypassed.
+    FixtureStager::setFixturePath($active_dir);
 
     // Since the path locator now points to a virtual file system, we need to
     // replace the disk space validator with a test-only version that bypasses
@@ -230,9 +248,9 @@ abstract class PackageManagerKernelTestBase extends KernelTestBase {
 }
 
 /**
- * Defines a stage specifically for testing purposes.
+ * Common functions for test stages.
  */
-class TestStage extends Stage {
+trait TestStageTrait {
 
   /**
    * The directory where staging areas will be created.
@@ -244,8 +262,10 @@ class TestStage extends Stage {
   /**
    * {@inheritdoc}
    */
-  public function getStagingRoot(): string {
-    return static::$stagingRoot ?: parent::getStagingRoot();
+  public function __construct(...$arguments) {
+    parent::__construct(...$arguments);
+    $mirror = new \ReflectionClass(Stage::class);
+    $this->tempStore->set($mirror->getConstant('TEMPSTORE_STAGING_ROOT_KEY'), PackageManagerKernelTestBase::$testStagingRoot);
   }
 
   /**
@@ -263,6 +283,14 @@ class TestStage extends Stage {
     }
   }
 
+}
+/**
+ * Defines a stage specifically for testing purposes.
+ */
+class TestStage extends Stage {
+
+  use TestStageTrait;
+
 }
 
 /**

package_manager/tests/src/Kernel/StageTest.php

@@ -3,8 +3,10 @@
 namespace Drupal\Tests\package_manager\Kernel;
 
 use Drupal\Component\Datetime\Time;
+use Drupal\Component\FileSystem\FileSystem;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Extension\ModuleUninstallValidatorException;
+use Drupal\Core\Site\Settings;
 use Drupal\package_manager\Event\PostApplyEvent;
 use Drupal\package_manager\Event\PreApplyEvent;
 use Drupal\package_manager\Event\StageEvent;
@@ -63,15 +65,21 @@ class StageTest extends PackageManagerKernelTestBase {
 
     $stage = $this->createStage();
     $id = $stage->create();
-    $this->assertStringEndsWith("/.package_manager$site_id/$id", $stage->getStageDirectory());
+    // If the file_temp_path setting is empty, the stage directory should be
+    // created in the OS's temporary directory.
+    $this->assertEmpty(Settings::get('file_temp_path'));
+    $expected_dir = FileSystem::getOsTemporaryDirectory() . "/.package_manager$site_id/$id";
+    $this->assertSame($expected_dir, $stage->getStageDirectory());
+    // If the file_temp_path setting is changed, the existing stage shouldn't be
+    // affected...
+    $this->setSetting('file_temp_path', '/junk/drawer');
+    $this->assertSame($expected_dir, $stage->getStageDirectory());
     $stage->destroy();
-
+    // ...but a new stage should be.
     $stage = $this->createStage();
     $another_id = $stage->create();
-    // The new stage ID should be unique, but the parent directory should be
-    // unchanged.
     $this->assertNotSame($id, $another_id);
-    $this->assertStringEndsWith("/.package_manager$site_id/$another_id", $stage->getStageDirectory());
+    $this->assertSame("/junk/drawer/.package_manager$site_id/$another_id", $stage->getStageDirectory());
   }
 
   /**
@@ -208,6 +216,30 @@ class StageTest extends PackageManagerKernelTestBase {
     $stage->apply();
   }
 
+  /**
+   * Tests that Composer Stager is invoked with a long timeout.
+   */
+  public function testTimeouts(): void {
+    $stage = $this->createStage();
+    $stage->create(420);
+    $stage->apply();
+
+    $timeouts = [
+      // The beginner was given an explicit timeout.
+      'package_manager.beginner' => 420,
+      // The committer should have been called with a longer timeout than
+      // Composer Stager's default of 120 seconds.
+      'package_manager.committer' => 600,
+    ];
+    foreach ($timeouts as $service_id => $expected_timeout) {
+      $invocations = $this->container->get($service_id)->getInvocationArguments();
+
+      // The service should have been called with the expected timeout.
+      $this->assertCount(1, $invocations);
+      $this->assertSame($expected_timeout, end($invocations[0]));
+    }
+  }
+
 }
 
 /**