package_manager/tests/fixtures/build_test_projects/updated_module/1.1.0/updated_module.services.yml

@@ -2,6 +2,6 @@ services:
   updated_module.post_apply_subscriber:
     class: Drupal\updated_module\PostApplySubscriber
     arguments:
-      - '@package_manager.path_locator'
+      - '@Drupal\package_manager\PathLocator'
     tags:
       - { name: event_subscriber }

package_manager/tests/fixtures/fake_site/composer.json

@@ -20,42 +20,19 @@
         "bar": 134,
         "foo-bar": null
     },
-    "baz": null
+    "baz": null,
+    "installer-paths": {
+      "modules/contrib/{$name}": ["type:drupal-module"],
+      "profiles/contrib/{$name}": ["type:drupal-profile"],
+      "themes/contrib/{$name}": ["type:drupal-theme"]
+    }
   },
   "repositories": {
-    "packagist.org": false,
-    "drupal/core-recommended": {
-      "type": "path",
-      "version": "9.8.0",
-      "url": "../path_repos/drupal--core-recommended",
-      "options": {
-        "symlink": false
-      }
-    },
-    "drupal/core-dev": {
-      "type": "path",
-      "version": "9.8.0",
-      "url": "../path_repos/drupal--core-dev",
-      "options": {
-        "symlink": false
-      }
+    "fake-packages": {
+      "type": "composer",
+      "url": "./"
     },
-    "drupal/core": {
-      "type": "path",
-      "version": "9.8.0",
-      "url": "../path_repos/drupal--core",
-      "options": {
-        "symlink": false
-      }
-    },
-    "cweagans/composer-patches": {
-      "type": "path",
-      "version": "1.7.333",
-      "url": "../path_repos/cweagans--composer-patches",
-      "options": {
-        "symlink": false
-      }
-    }
+    "packagist.org": false
   },
   "minimum-stability": "stable",
   "config": {

package_manager/tests/fixtures/fake_site/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "672a2db4be3ba5e4f025ddea6b7dacd7",
+    "content-hash": "17cd7e695939dc97e22d10fa4efbe10b",
     "packages": [
         {
             "name": "drupal/core",
@@ -50,11 +50,7 @@
                     }
                 }
             },
-            "description": "A fake version of drupal/core",
-            "transport-options": {
-                "symlink": false,
-                "relative": true
-            }
+            "description": "A fake version of drupal/core"
         },
         {
             "name": "drupal/core-recommended",
@@ -65,11 +61,7 @@
                 "reference": "112e4f7cfe8312457cd0eb58dcbffebc148850d8"
             },
             "type": "project",
-            "description": "A fake version of drupal/core-recommended",
-            "transport-options": {
-                "symlink": false,
-                "relative": true
-            }
+            "description": "A fake version of drupal/core-recommended"
         }
     ],
     "packages-dev": [
@@ -82,11 +74,7 @@
                 "reference": "b99a99a11ff2779b5e4c5787dc43575382a3548c"
             },
             "type": "package",
-            "description": "A fake version of drupal/core-dev",
-            "transport-options": {
-                "symlink": false,
-                "relative": true
-            }
+            "description": "A fake version of drupal/core-dev"
         }
     ],
     "aliases": [],
@@ -96,5 +84,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

package_manager/tests/fixtures/fake_site/packages.json

+{
+    "packages": {
+        "drupal/core-recommended": {
+            "9.8.0": {
+                "name": "drupal/core-recommended",
+                "description": "A fake version of drupal/core-recommended",
+                "type": "project",
+                "version": "9.8.0",
+                "dist": {
+                    "type": "path",
+                    "url": "../path_repos/drupal--core-recommended",
+                    "reference": "112e4f7cfe8312457cd0eb58dcbffebc148850d8"
+                }
+            }
+        },
+        "drupal/core-dev": {
+            "9.8.0": {
+                "name": "drupal/core-dev",
+                "description": "A fake version of drupal/core-dev",
+                "type": "package",
+                "version": "9.8.0",
+                "dist": {
+                    "type": "path",
+                    "url": "../path_repos/drupal--core-dev",
+                    "reference": "b99a99a11ff2779b5e4c5787dc43575382a3548c"
+                }
+            }
+        },
+        "drupal/core": {
+            "9.8.0": {
+                "name": "drupal/core",
+                "type": "drupal-core",
+                "description": "A fake version of drupal/core",
+                "version": "9.8.0",
+                "extra": {
+                    "_readme": [
+                        "The 'drupal-scaffold' section below is needed because 'Drupal\\automatic_updates\\Validator\\ScaffoldFilePermissionsValidator'",
+                        "uses this section to determine which files to check. The actual composer.json file for drupal/core will have more files listed",
+                        "but this limited list is used in '\\Drupal\\Tests\\automatic_updates\\Kernel\\StatusCheck\\ScaffoldFilePermissionsValidatorTest'",
+                        "to ensure this section determines the file list."
+                    ],
+                    "drupal-scaffold": {
+                        "file-mapping": {
+                            "[project-root]/.editorconfig": "assets/scaffold/files/editorconfig",
+                            "[project-root]/.gitattributes": "assets/scaffold/files/gitattributes",
+                            "[web-root]/.csslintrc": "assets/scaffold/files/csslintrc",
+                            "[web-root]/.eslintignore": "assets/scaffold/files/eslintignore",
+                            "[web-root]/.eslintrc.json": "assets/scaffold/files/eslintrc.json",
+                            "[web-root]/.ht.router.php": "assets/scaffold/files/ht.router.php",
+                            "[web-root]/.htaccess": "assets/scaffold/files/htaccess",
+                            "[web-root]/example.gitignore": "assets/scaffold/files/example.gitignore",
+                            "[web-root]/index.php": "assets/scaffold/files/index.php",
+                            "[web-root]/INSTALL.txt": "assets/scaffold/files/drupal.INSTALL.txt",
+                            "[web-root]/README.md": "assets/scaffold/files/drupal.README.md",
+                            "[web-root]/robots.txt": "assets/scaffold/files/robots.txt",
+                            "[web-root]/update.php": "assets/scaffold/files/update.php",
+                            "[web-root]/web.config": "assets/scaffold/files/web.config",
+                            "[web-root]/sites/README.txt": "assets/scaffold/files/sites.README.txt",
+                            "[web-root]/sites/development.services.yml": "assets/scaffold/files/development.services.yml",
+                            "[web-root]/sites/example.settings.local.php": "assets/scaffold/files/example.settings.local.php",
+                            "[web-root]/sites/example.sites.php": "assets/scaffold/files/example.sites.php",
+                            "[web-root]/sites/default/default.services.yml": "assets/scaffold/files/default.services.yml",
+                            "[web-root]/sites/default/default.settings.php": "assets/scaffold/files/default.settings.php",
+                            "[web-root]/modules/README.txt": "assets/scaffold/files/modules.README.txt",
+                            "[web-root]/profiles/README.txt": "assets/scaffold/files/profiles.README.txt",
+                            "[web-root]/themes/README.txt": "assets/scaffold/files/themes.README.txt"
+                        }
+                    }
+                },
+                "dist": {
+                    "type": "path",
+                    "url": "../path_repos/drupal--core",
+                    "reference": "31fd2270701526555acae45a3601c777e35508d5"
+                }
+            }
+        },
+        "cweagans/composer-patches": {
+            "1.7.333": {
+                "name": "cweagans/composer-patches",
+                "description": "A fake version of cweagans/composer-patches",
+                "type": "composer-plugin",
+                "version": "1.7.333",
+                "extra": {
+                    "class": "\\cweagans\\Fake\\ComposerPatches"
+                },
+                "dist": {
+                    "type": "path",
+                    "url": "../path_repos/cweagans--composer-patches"
+                },
+                "require": {
+                    "composer-plugin-api": "^1.0 || ^2.0"
+                },
+                "autoload": {
+                    "psr-4": {
+                        "cweagans\\Fake\\": "src"
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -47,10 +47,6 @@
             },
             "installation-source": "dist",
             "description": "A fake version of drupal/core",
-            "transport-options": {
-                "symlink": false,
-                "relative": true
-            },
             "install-path": "../drupal/core"
         },
         {
@@ -65,10 +61,6 @@
             "type": "package",
             "installation-source": "dist",
             "description": "A fake version of drupal/core-dev",
-            "transport-options": {
-                "symlink": false,
-                "relative": true
-            },
             "install-path": "../drupal/core-dev"
         },
         {
@@ -83,10 +75,6 @@
             "type": "project",
             "installation-source": "dist",
             "description": "A fake version of drupal/core-recommended",
-            "transport-options": {
-                "symlink": false,
-                "relative": true
-            },
             "install-path": "../drupal/core-recommended"
         }
     ],

package_manager/tests/fixtures/path_repos/main_module_submodule/composer.json

+{
+  "name": "drupal/main_module_submodule",
+  "type": "metapackage",
+  "version": "1.0.0",
+  "require": {
+    "drupal/main_module": "*"
+  }
+}

package_manager/tests/fixtures/release-history/drupal.9.8.0-rc1.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This fixture is used by \Drupal\Tests\automatic_updates\Functional\UpdaterFormTest.
+
+Contains metadata about the following (fake) releases of Drupal core, in order:
+- 9.8.0-rc1
+- 9.7.0
+- 9.8.x-dev
+-->
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <title>Drupal</title>
+    <short_name>drupal</short_name>
+    <dc:creator>Drupal</dc:creator>
+    <supported_branches>9.8.,9.7.</supported_branches>
+    <project_status>published</project_status>
+    <link>http://example.com/project/drupal</link>
+    <terms>
+        <term>
+            <name>Projects</name>
+            <value>Drupal project</value>
+        </term>
+    </terms>
+    <releases>
+        <release>
+          <name>Drupal 9.8.0-rc1</name>
+          <version>9.8.0-rc1</version>
+          <status>published</status>
+          <release_link>http://example.com/drupal-9-8-0-rc1-release</release_link>
+          <download_link>http://example.com/drupal-9-8-0-rc1-.tar.gz</download_link>
+          <date>1250424521</date>
+          <terms>
+            <term>
+              <name>Release type</name>
+              <value>New features</value>
+            </term>
+            <term>
+              <name>Release type</name>
+              <value>Bug fixes</value>
+            </term>
+          </terms>
+        </release>
+        <release>
+            <name>Drupal 9.7.0</name>
+            <version>9.7.0</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-7-0-release</release_link>
+            <download_link>http://example.com/drupal-9-7-0.tar.gz</download_link>
+            <date>1250424521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+        <release>
+            <name>Drupal 9.8.x-dev</name>
+            <version>9.8.x-dev</version>
+            <status>published</status>
+            <release_link>http://example.com/drupal-9-8-x-dex-release</release_link>
+            <download_link>http://example.com/drupal-9-8-x-dex.tar.gz</download_link>
+            <date>1250424521</date>
+            <terms>
+                <term>
+                    <name>Release type</name>
+                    <value>New features</value>
+                </term>
+                <term>
+                    <name>Release type</name>
+                    <value>Bug fixes</value>
+                </term>
+            </terms>
+        </release>
+    </releases>
+</project>

package_manager/tests/fixtures/release-history/main_module.1.0.0.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This fixture is used by \Drupal\Tests\package_manager\Build\PackageInstallTest.
+
+Contains metadata about the following (fake) releases of main_module, all of which are secure, in order:
+- 1.0.0
+-->
+<project xmlns:dc="http://purl.org/dc/elements/1.1/">
+<title>Main Module</title>
+<short_name>main_module</short_name>
+<dc:creator>Drupal</dc:creator>
+<supported_branches>1.0.</supported_branches>
+<project_status>published</project_status>
+<link>http://example.com/project/main_module</link>
+  <terms>
+   <term><name>Projects</name><value>Main Module project</value></term>
+  </terms>
+<releases>
+  <release>
+    <name>Main Module 1.0.0</name>
+    <version>1.0.0</version>
+    <tag>1.0.0</tag>
+    <status>published</status>
+    <release_link>http://example.com/main_module-1-0-0-release</release_link>
+    <download_link>http://example.com/main_module-1-0-0.tar.gz</download_link>
+    <date>1584195300</date>
+    <terms>
+      <term><name>Release type</name><value>New features</value></term>
+      <term><name>Release type</name><value>Bug fixes</value></term>
+    </terms>
+  </release>
+</releases>
+</project>

package_manager/tests/modules/fixture_manipulator/fixture_manipulator.services.yml

 services:
-  fixture_manipulator.stage_manipulator:
-    class: Drupal\fixture_manipulator\StageFixtureManipulator
-    arguments: ['@state', '@fixture_manipulator.stage_manipulator.inner']
-    decorates: 'package_manager.beginner'
+  _defaults:
+    autowire: true
+  Drupal\fixture_manipulator\StageFixtureManipulator:
+    decorates: 'PhpTuf\ComposerStager\API\Core\BeginnerInterface'
+  Drupal\fixture_manipulator\ProcessFactory:
+    decorates: 'PhpTuf\ComposerStager\API\Process\Factory\ProcessFactoryInterface'

package_manager/tests/modules/fixture_manipulator/src/ActiveFixtureManipulator.php

@@ -4,6 +4,8 @@ declare(strict_types = 1);
 
 namespace Drupal\fixture_manipulator;
 
+use Drupal\package_manager\PathLocator;
+
 /**
  * A fixture manipulator for the active directory.
  */
@@ -16,7 +18,7 @@ final class ActiveFixtureManipulator extends FixtureManipulator {
     if ($dir) {
       throw new \UnexpectedValueException("$dir cannot be specific for a ActiveFixtureManipulator instance");
     }
-    $dir = \Drupal::service('package_manager.path_locator')->getProjectRoot();
+    $dir = \Drupal::service(PathLocator::class)->getProjectRoot();
     parent::doCommitChanges($dir);
   }
 

package_manager/tests/modules/fixture_manipulator/src/FixtureManipulator.php

@@ -4,8 +4,9 @@ namespace Drupal\fixture_manipulator;
 
 use Drupal\Component\FileSystem\FileSystem;
 use Drupal\Component\Utility\NestedArray;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessOutputCallbackInterface;
+use PhpTuf\ComposerStager\API\Process\Service\OutputCallbackInterface;
 use PhpTuf\ComposerStager\API\Process\Service\ComposerProcessRunnerInterface;
+use PhpTuf\ComposerStager\API\Process\Value\OutputTypeEnum;
 use Symfony\Component\Filesystem\Filesystem as SymfonyFileSystem;
 use Drupal\Component\Serialization\Yaml;
 
@@ -137,7 +138,7 @@ class FixtureManipulator {
             $fs->mkdir($file_dir);
           }
         }
-        file_put_contents("$repo_path/$file_name", $file_contents);
+        assert(file_put_contents("$repo_path/$file_name", $file_contents) !== FALSE);
       }
     }
     return $this->requirePackage($package['name'], $package['version'], $is_dev_requirement, $allow_plugins);
@@ -276,7 +277,7 @@ class FixtureManipulator {
     if ($file_name === NULL) {
       $file_name = "$project_name.info.yml";
     }
-    file_put_contents("$path/$file_name", Yaml::encode(['project' => $project_name]));
+    assert(file_put_contents("$path/$file_name", Yaml::encode(['project' => $project_name])) !== FALSE);
     return $this;
   }
 
@@ -376,18 +377,6 @@ class FixtureManipulator {
     }
   }
 
-  /**
-   * Ensures a path is writable.
-   *
-   * @param string $path
-   *   The path.
-   */
-  private static function ensureFilePathIsWritable(string $path): void {
-    if (!is_writable($path)) {
-      throw new \LogicException("'$path' is not writable.");
-    }
-  }
-
   /**
    * Creates an empty .git folder after being provided a path.
    */
@@ -437,28 +426,23 @@ class FixtureManipulator {
     return $this->manipulatorArguments;
   }
 
-  protected function runComposerCommand(array $command_options): ProcessOutputCallbackInterface {
-    $plain_output = new class() implements ProcessOutputCallbackInterface {
+  protected function runComposerCommand(array $command_options): OutputCallbackInterface {
+    $plain_output = new class() implements OutputCallbackInterface {
       public string $stdout = '';
       public string $stderr = '';
 
       /**
        * {@inheritdoc}
        */
-      public function __invoke(string $type, string $buffer): void {
-        // \Symfony\Component\Process\Process defines the output types in
-        // lowercase, but Composer Stager uses uppercase.
-        $type = strtoupper($type);
-
-        if ($type === self::OUT) {
+      public function __invoke(OutputTypeEnum $type, string $buffer): void {
+        if ($type === OutputTypeEnum::OUT) {
           $this->stdout .= $buffer;
           return;
         }
-        elseif ($type === self::ERR) {
+        elseif ($type === OutputTypeEnum::ERR) {
           $this->stderr .= $buffer;
           return;
         }
-        throw new \InvalidArgumentException("Unsupported output type: '$type'");
       }
 
     };
@@ -591,31 +575,18 @@ class FixtureManipulator {
       $this->createPathRepo($package, $repo_path, NULL);
     }
 
-    // Register the repository, keyed by package name and version. This ensures
-    // each package is registered only once and its version can be updated (but
-    // must have unique versions).
-    $repo_key = "repo.$name";
-    if ($is_new_or_fork === 'fork') {
-      $repositories = json_decode(file_get_contents($this->dir . '/composer.json'), TRUE, flags: JSON_THROW_ON_ERROR)['repositories'];
-      // @todo consistently use 'version' or 'options.versions.PACKAGE_NAME', by fixing ComposerFixtureCreator in https://drupal.org/i/3347055
-      $original_version = isset($repositories[$name]['version']) ? $repositories[$name]['version'] : $repositories[$name]['options']['versions'][$name];
-      if ($package['version'] !== $original_version) {
-        $repo_key .= "--" . $package['version'];
-      }
-    }
-    $repository = json_encode([
+    // Add the package to the Composer repository defined for the site.
+    $packages_json = $this->dir . '/packages.json';
+    $packages_data = file_get_contents($packages_json);
+    $packages_data = json_decode($packages_data, TRUE, flags: JSON_THROW_ON_ERROR);
+
+    $version = $package['version'];
+    $package['dist'] = [
       'type' => 'path',
       'url' => $repo_path,
-      'options' => [
-        'symlink' => FALSE,
-        'versions' => [
-          $name => $package['version'],
-        ],
-        // @see https://getcomposer.org/repoprio
-        'canonical' => FALSE,
-      ],
-    ], JSON_UNESCAPED_SLASHES);
-    $this->runComposerCommand(['config', $repo_key, $repository]);
+    ];
+    $packages_data['packages'][$name][$version] = $package;
+    assert(file_put_contents($packages_json, json_encode($packages_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) !== FALSE);
 
     return $repo_path;
   }
@@ -635,8 +606,8 @@ class FixtureManipulator {
     }
     // Update all the repos in the composer.json file to point to the new
     // repos at the absolute path.
-    $composer_json = file_get_contents($this->dir . '/composer.json');
-    file_put_contents($this->dir . '/composer.json', str_replace('../path_repos/', "$path_repo_base/", $composer_json));
+    $composer_json = file_get_contents($this->dir . '/packages.json');
+    assert(file_put_contents($this->dir . '/packages.json', str_replace('../path_repos/', "$path_repo_base/", $composer_json)) !== FALSE);
     $this->runComposerCommand(['update', '--lock']);
     $this->runComposerCommand(['install']);
   }

package_manager/tests/modules/fixture_manipulator/src/ProcessFactory.php

+<?php
+
+namespace Drupal\fixture_manipulator;
+
+use PhpTuf\ComposerStager\API\Process\Factory\ProcessFactoryInterface;
+use PhpTuf\ComposerStager\API\Process\Service\ProcessInterface;
+
+/**
+ * Process factory that always sets the COMPOSER_MIRROR_PATH_REPOS env variable.
+ *
+ * This is necessary because the fake_site fixture is built from a Composer-type
+ * repository, which will normally try to symlink packages which are installed
+ * from local directories, which in turn will break Package Manager because it
+ * does not support symlinks pointing outside the main code base. The
+ * COMPOSER_MIRROR_PATH_REPOS environment variable forces Composer to mirror,
+ * rather than symlink, local directories when installing packages.
+ *
+ * @see \Drupal\fixture_manipulator\FixtureManipulator::setUpRepos()
+ */
+final class ProcessFactory implements ProcessFactoryInterface {
+
+  /**
+   * Constructs a ProcessFactory object.
+   *
+   * @param \PhpTuf\ComposerStager\API\Process\Factory\ProcessFactoryInterface $decorated
+   *   The decorated process factory service.
+   */
+  public function __construct(private readonly ProcessFactoryInterface $decorated) {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function create(array $command): ProcessInterface {
+    $process = $this->decorated->create($command);
+
+    $env = $process->getEnv();
+    $env['COMPOSER_MIRROR_PATH_REPOS'] = '1';
+    return $process->setEnv($env);
+  }
+
+}

package_manager/tests/modules/fixture_manipulator/src/StageFixtureManipulator.php

@@ -8,8 +8,8 @@ use Drupal\Core\State\StateInterface;
 use PhpTuf\ComposerStager\API\Core\BeginnerInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessOutputCallbackInterface;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessRunnerInterface;
+use PhpTuf\ComposerStager\API\Process\Service\OutputCallbackInterface;
+use PhpTuf\ComposerStager\API\Process\Service\ProcessInterface;
 
 /**
  * A fixture manipulator service that commits changes after begin.
@@ -51,10 +51,10 @@ final class StageFixtureManipulator extends FixtureManipulator implements Beginn
   /**
    * {@inheritdoc}
    */
-  public function begin(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL, ?ProcessOutputCallbackInterface $callback = NULL, ?int $timeout = ProcessRunnerInterface::DEFAULT_TIMEOUT): void {
+  public function begin(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL, ?OutputCallbackInterface $callback = NULL, ?int $timeout = ProcessInterface::DEFAULT_TIMEOUT): void {
     $this->inner->begin($activeDir, $stagingDir, $exclusions, $callback, $timeout);
     if ($this->getQueuedManipulationItems()) {
-      $this->doCommitChanges($stagingDir->resolved());
+      $this->doCommitChanges($stagingDir->absolute());
     }
   }
 

package_manager/tests/modules/package_manager_bypass/package_manager_bypass.services.yml

 services:
-  package_manager_bypass.beginner:
-    class: Drupal\package_manager_bypass\LoggingBeginner
-    arguments: ['@state', '@package_manager_bypass.beginner.inner' ]
-    decorates: 'package_manager.beginner'
-  package_manager_bypass.committer:
-    class: Drupal\package_manager_bypass\LoggingCommitter
-    arguments: [ '@state', '@package_manager_bypass.committer.inner' ]
-    decorates: 'package_manager.committer'
+  _defaults:
+    autowire: true
+  Drupal\package_manager_bypass\LoggingBeginner:
+    decorates: 'PhpTuf\ComposerStager\API\Core\BeginnerInterface'
+  Drupal\package_manager_bypass\LoggingCommitter:
+    decorates: 'PhpTuf\ComposerStager\API\Core\CommitterInterface'

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

@@ -8,8 +8,8 @@ use Drupal\Core\State\StateInterface;
 use PhpTuf\ComposerStager\API\Core\BeginnerInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessOutputCallbackInterface;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessRunnerInterface;
+use PhpTuf\ComposerStager\API\Process\Service\OutputCallbackInterface;
+use PhpTuf\ComposerStager\API\Process\Service\ProcessInterface;
 
 /**
  * A composer-stager Beginner decorator that adds logging.
@@ -44,8 +44,8 @@ final class LoggingBeginner implements BeginnerInterface {
   /**
    * {@inheritdoc}
    */
-  public function begin(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL, ?ProcessOutputCallbackInterface $callback = NULL, ?int $timeout = ProcessRunnerInterface::DEFAULT_TIMEOUT): void {
-    $this->saveInvocationArguments($activeDir, $stagingDir, $exclusions, $timeout);
+  public function begin(PathInterface $activeDir, PathInterface $stagingDir, ?PathListInterface $exclusions = NULL, ?OutputCallbackInterface $callback = NULL, ?int $timeout = ProcessInterface::DEFAULT_TIMEOUT): void {
+    $this->saveInvocationArguments($activeDir, $stagingDir, $exclusions?->getAll(), $timeout);
     $this->throwExceptionIfSet();
     $this->inner->begin($activeDir, $stagingDir, $exclusions, $callback, $timeout);
   }

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

@@ -8,8 +8,8 @@ use Drupal\Core\State\StateInterface;
 use PhpTuf\ComposerStager\API\Core\CommitterInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathListInterface;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessOutputCallbackInterface;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessRunnerInterface;
+use PhpTuf\ComposerStager\API\Process\Service\OutputCallbackInterface;
+use PhpTuf\ComposerStager\API\Process\Service\ProcessInterface;
 
 /**
  * A composer-stager Committer decorator that adds logging.
@@ -44,8 +44,8 @@ final class LoggingCommitter implements CommitterInterface {
   /**
    * {@inheritdoc}
    */
-  public function commit(PathInterface $stagingDir, PathInterface $activeDir, ?PathListInterface $exclusions = NULL, ?ProcessOutputCallbackInterface $callback = NULL, ?int $timeout = ProcessRunnerInterface::DEFAULT_TIMEOUT): void {
-    $this->saveInvocationArguments($stagingDir, $activeDir, $exclusions, $timeout);
+  public function commit(PathInterface $stagingDir, PathInterface $activeDir, ?PathListInterface $exclusions = NULL, ?OutputCallbackInterface $callback = NULL, ?int $timeout = ProcessInterface::DEFAULT_TIMEOUT): void {
+    $this->saveInvocationArguments($stagingDir, $activeDir, $exclusions?->getAll(), $timeout);
     $this->throwExceptionIfSet();
     $this->inner->commit($stagingDir, $activeDir, $exclusions, $callback, $timeout);
   }

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

@@ -8,8 +8,8 @@ use Composer\Json\JsonFile;
 use Drupal\Core\State\StateInterface;
 use PhpTuf\ComposerStager\API\Core\StagerInterface;
 use PhpTuf\ComposerStager\API\Path\Value\PathInterface;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessOutputCallbackInterface;
-use PhpTuf\ComposerStager\API\Process\Service\ProcessRunnerInterface;
+use PhpTuf\ComposerStager\API\Process\Service\OutputCallbackInterface;
+use PhpTuf\ComposerStager\API\Process\Service\ProcessInterface;
 
 /**
  * A composer-stager Stager implementation that does nothing, except logging.
@@ -43,13 +43,13 @@ final class NoOpStager implements StagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function stage(array $composerCommand, PathInterface $activeDir, PathInterface $stagingDir, ?ProcessOutputCallbackInterface $callback = NULL, ?int $timeout = ProcessRunnerInterface::DEFAULT_TIMEOUT): void {
+  public function stage(array $composerCommand, PathInterface $activeDir, PathInterface $stagingDir, ?OutputCallbackInterface $callback = NULL, ?int $timeout = ProcessInterface::DEFAULT_TIMEOUT): void {
     $this->saveInvocationArguments($composerCommand, $stagingDir, $timeout);
     $this->throwExceptionIfSet();
 
     // If desired, simulate a change to the lock file (e.g., as a result of
     // running `composer update`).
-    $lockFile = new JsonFile($stagingDir->resolved() . '/composer.lock');
+    $lockFile = new JsonFile($stagingDir->absolute() . '/composer.lock');
     $changeLockFile = $this->state->get(static::class . ' lock', TRUE);
 
     if ($changeLockFile && $lockFile->exists()) {

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

@@ -7,6 +7,8 @@ namespace Drupal\package_manager_bypass;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\ServiceProviderBase;
 use Drupal\Core\Site\Settings;
+use Drupal\package_manager\PathLocator;
+use PhpTuf\ComposerStager\API\Core\StagerInterface;
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -23,19 +25,22 @@ final class PackageManagerBypassServiceProvider extends ServiceProviderBase {
   public function alter(ContainerBuilder $container) {
     parent::alter($container);
 
-    $state = new Reference('state');
     // By default, \Drupal\package_manager_bypass\NoOpStager is applied, except
     // when a test opts out by setting this setting to FALSE.
     // @see \Drupal\package_manager_bypass\NoOpStager::setLockFileShouldChange()
     if (Settings::get('package_manager_bypass_composer_stager', TRUE)) {
-      $container->getDefinition('package_manager.stager')->setClass(NoOpStager::class)->setArguments([$state]);
+      $container->register(NoOpStager::class)
+        ->setClass(NoOpStager::class)
+        ->setPublic(FALSE)
+        ->setAutowired(TRUE)
+        ->setDecoratedService(StagerInterface::class);
     }
 
-    $container->getDefinition('package_manager.path_locator')
+    $container->getDefinition(PathLocator::class)
       ->setClass(MockPathLocator::class)
       ->setAutowired(FALSE)
       ->setArguments([
-        $state,
+        new Reference('state'),
         new Parameter('app.root'),
         new Reference('config.factory'),
         new Reference('file_system'),

package_manager/tests/modules/package_manager_test_api/package_manager_test_api.routing.yml

@@ -10,3 +10,12 @@ package_manager_test_api.finish:
     _controller: 'Drupal\package_manager_test_api\ApiController::finish'
   requirements:
     _access: 'TRUE'
+package_manager_test_api.check_setup:
+  path: '/package-manager-test-api/check-setup'
+  defaults:
+    _controller: 'Drupal\package_manager_test_api\ApiController::checkSetup'
+  requirements:
+    _access: 'TRUE'
+  options:
+    _maintenance_access: TRUE
+    no_cache: TRUE

package_manager/tests/modules/package_manager_test_api/src/ApiController.php

@@ -5,14 +5,19 @@ declare(strict_types = 1);
 namespace Drupal\package_manager_test_api;
 
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Queue\QueueFactory;
 use Drupal\Core\Url;
+use Drupal\package_manager\FailureMarker;
 use Drupal\package_manager\PathLocator;
 use Drupal\package_manager\StageBase;
+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\ContainerInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Provides API endpoints to interact with a stage directory in functional test.
@@ -58,19 +63,20 @@ class ApiController extends ControllerBase {
    */
   public static function create(ContainerInterface $container) {
     $stage = new ControllerStage(
-      $container->get('package_manager.path_locator'),
-      $container->get('package_manager.beginner'),
-      $container->get('package_manager.stager'),
-      $container->get('package_manager.committer'),
-      $container->get('file_system'),
+      $container->get(PathLocator::class),
+      $container->get(BeginnerInterface::class),
+      $container->get(StagerInterface::class),
+      $container->get(CommitterInterface::class),
+      $container->get(QueueFactory::class),
       $container->get('event_dispatcher'),
       $container->get('tempstore.shared'),
       $container->get('datetime.time'),
       $container->get(PathFactoryInterface::class),
-      $container->get('package_manager.failure_marker'));
+      $container->get(FailureMarker::class),
+    );
     return new static(
       $stage,
-      $container->get('package_manager.path_locator')
+      $container->get(PathLocator::class),
     );
   }
 
@@ -83,9 +89,7 @@ class ApiController extends ControllerBase {
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request. The runtime and dev dependencies are expected to be in
    *   either the query string or request body, under the 'runtime' and 'dev'
-   *   keys, respectively. There may also be a 'files_to_return' key, which
-   *   contains an array of file paths, relative to the project root, whose
-   *   contents should be returned in the response.
+   *   keys, respectively.
    *
    * @return \Symfony\Component\HttpFoundation\RedirectResponse
    *   A response that directs to the ::finish() method.
@@ -96,9 +100,6 @@ class ApiController extends ControllerBase {
     $id = $this->createAndApplyStage($request);
     $redirect_url = Url::fromRoute($this->finishedRoute)
       ->setRouteParameter('id', $id)
-      ->setOption('query', [
-        'files_to_return' => $request->get('files_to_return', []),
-      ])
       ->setAbsolute()
       ->toString();
 
@@ -110,26 +111,14 @@ class ApiController extends ControllerBase {
    *
    * @param string $id
    *   The stage ID.
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request. There may be a 'files_to_return' key in either the query
-   *   string or request body which contains an array of file paths, relative to
-   *   the project root, whose contents should be returned in the response.
    *
-   * @return \Symfony\Component\HttpFoundation\JsonResponse
-   *   A JSON response containing an associative array of the contents of the
-   *   files listed in the 'files_to_return' request key. The array will be
-   *   keyed by path, relative to the project root.
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   The response.
    */
-  public function finish(string $id, Request $request): JsonResponse {
+  public function finish(string $id): Response {
     $this->stage->claim($id)->postApply();
     $this->stage->destroy();
-
-    $dir = $this->pathLocator->getProjectRoot();
-    $file_contents = [];
-    foreach ($request->get('files_to_return', []) as $path) {
-      $file_contents[$path] = file_get_contents($dir . '/' . $path);
-    }
-    return new JsonResponse($file_contents);
+    return new Response();
   }
 
   /**
@@ -138,9 +127,7 @@ class ApiController extends ControllerBase {
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request. The runtime and dev dependencies are expected to be in
    *   either the query string or request body, under the 'runtime' and 'dev'
-   *   keys, respectively. There may also be a 'files_to_return' key, which
-   *   contains an array of file paths, relative to the project root, whose
-   *   contents should be returned in the response.
+   *   keys, respectively.
    *
    * @return string
    *   Unique ID for the stage, which can be used to claim the stage before
@@ -157,6 +144,19 @@ class ApiController extends ControllerBase {
     return $id;
   }
 
+  /**
+   * Returns the information about current PHP server used for build tests.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   The response.
+   */
+  public function checkSetup(): Response {
+    return new Response(
+      'max_execution_time=' . ini_get('max_execution_time') .
+      ':set_time_limit-exists=' . (function_exists('set_time_limit') ? 'yes' : 'no')
+    );
+  }
+
 }
 
 /**
@@ -169,4 +169,11 @@ class ApiController extends ControllerBase {
  *
  * @see \Drupal\package_manager\StageBase::claim()
  */
-final class ControllerStage extends StageBase {}
+final class ControllerStage extends StageBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected string $type = 'package_manager_test_api:controller';
+
+}