diff --git a/automatic_updates.info.yml b/automatic_updates.info.yml index dea79b731bf359e06fd40f136ea329038eb5616e..8240f6e933578fb8ad05813dfdddedcf70754105 100644 --- a/automatic_updates.info.yml +++ b/automatic_updates.info.yml @@ -1,7 +1,7 @@ name: 'Automatic Updates' type: module description: 'Automatically updates Drupal core.' -core_version_requirement: ^9.7 || ^10.1 +core_version_requirement: ^9.7 || ^10 dependencies: - drupal:package_manager - drupal:update diff --git a/automatic_updates_extensions/automatic_updates_extensions.info.yml b/automatic_updates_extensions/automatic_updates_extensions.info.yml index edf3f07d7dd05544935b033957d4a71cdd2d2b1c..6cfd52e6c419595b0e60c90b60413cbf50e12ddf 100644 --- a/automatic_updates_extensions/automatic_updates_extensions.info.yml +++ b/automatic_updates_extensions/automatic_updates_extensions.info.yml @@ -1,7 +1,7 @@ name: 'Automatic Updates Extensions' type: module description: 'Allows updates to themes and modules' -core_version_requirement: ^9.7 || ^10.1 +core_version_requirement: ^9.7 || ^10 lifecycle: experimental dependencies: - drupal:automatic_updates diff --git a/composer.json b/composer.json index 6d8213f317d6122bffdcf357c4e1bfe2bee1e008..51f3afb4875633257396dd688307f3533f55b557 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,9 @@ "php-tuf/composer-stager": "2.0-alpha1", "composer-runtime-api": "^2.1" }, + "require-dev": { + "colinodell/psr-testlogger": "^1.2" + }, "scripts": { "phpcbf": "scripts/phpcbf.sh", "phpcs": "scripts/phpcs.sh", diff --git a/package_manager/package_manager.info.yml b/package_manager/package_manager.info.yml index 522d714ba24e552a877284850360e8b1e67fa191..5aad751530d572130725b733a23eef8b3482ef3a 100644 --- a/package_manager/package_manager.info.yml +++ b/package_manager/package_manager.info.yml @@ -1,6 +1,6 @@ name: 'Package Manager' type: module description: 'API module providing functionality to stage package installs and updates with Composer.' -core_version_requirement: ^9.7 || ^10.1 +core_version_requirement: ^9.7 || ^10 dependencies: - drupal:update diff --git a/package_manager/src/PackageManagerServiceProvider.php b/package_manager/src/PackageManagerServiceProvider.php index 6b368ad0619cfd85e0bebe42e7514258ad141899..27ca8d13a0863683758e4cc3ed235d7e52af3904 100644 --- a/package_manager/src/PackageManagerServiceProvider.php +++ b/package_manager/src/PackageManagerServiceProvider.php @@ -86,6 +86,35 @@ final class PackageManagerServiceProvider extends ServiceProviderBase { } } + // BEGIN: DELETE FROM CORE MERGE REQUEST + // Remove all of this when Drupal 10.1 is the minimum required version of + // Drupal core. + $aliases = [ + 'config.factory' => 'Drupal\Core\Config\ConfigFactoryInterface', + 'module_handler' => 'Drupal\Core\Extension\ModuleHandlerInterface', + 'state' => 'Drupal\Core\State\StateInterface', + 'extension.list.module' => 'Drupal\Core\Extension\ModuleExtensionList', + 'extension.list.theme' => 'Drupal\Core\Extension\ThemeExtensionList', + 'stream_wrapper_manager' => 'Drupal\Core\StreamWrapper\StreamWrapperManagerInterface', + 'database' => 'Drupal\Core\Database\Connection', + 'queue' => 'Drupal\Core\Queue\QueueFactory', + 'private_key' => 'Drupal\Core\PrivateKey', + 'datetime.time' => 'Drupal\Component\Datetime\TimeInterface', + 'event_dispatcher' => 'Symfony\Contracts\EventDispatcher\EventDispatcherInterface', + 'plugin.manager.mail' => 'Drupal\Core\Mail\MailManagerInterface', + 'language_manager' => 'Drupal\Core\Language\LanguageManagerInterface', + 'file_system' => 'Drupal\Core\File\FileSystemInterface', + 'tempstore.shared' => 'Drupal\Core\TempStore\SharedTempStoreFactory', + 'class_resolver' => 'Drupal\Core\DependencyInjection\ClassResolverInterface', + 'request_stack' => 'Symfony\Component\HttpFoundation\RequestStack', + ]; + foreach ($aliases as $service_id => $alias) { + if (!$container->hasAlias($alias)) { + $container->setAlias($alias, $service_id); + } + } + // END: DELETE FROM CORE MERGE REQUEST + // Decorate certain Composer Stager preconditions. $container->register(NoSymlinksPointToADirectory::class) ->setPublic(FALSE)