.gitlab-ci.yml

@@ -39,7 +39,7 @@ include:
     # - Minor or Major latests - `ref: 1.x-latest` or `ref: 1.0.x-latest` - Get the latest additions within a minor (mostly bugfixes) or major (bugs and new features).
     # - Fixed tag - `ref: 1.0.1` - Set the value to a known tag. This will not get any updates.
     # If you change the default value of ref, you should set the _CURL_TEMPLATES_REF variable in the variables section to be the same as set here.
-    ref: main
+    ref: $_GITLAB_TEMPLATES_REF
     file:
       - '/includes/include.drupalci.main.yml'
       # EXPERIMENTAL: For Drupal 7, remove the above line and uncomment the below.
@@ -66,6 +66,8 @@ variables:
   CI_DEBUG_SERVICES: "true"
   _TARGET_DB_TYPE: "mariadb"
   _TARGET_DB_VERSION: "10.6"
+  # Always show environment variables, to help in debugging CI problems.
+  _SHOW_ENVIRONMENT_VARIABLES: '1'
 
 
 ###################################################################################
@@ -232,6 +234,11 @@ phpunit (next major):
     - when: on_success
   variables:
     _PHPUNIT_EXTRA: '--types PHPUnit-$TEST_TYPE --module $MODULE'
+    # This variable prevents a deprecation error; see https://www.drupal.org/node/3422624.
+    MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless"]}}, "http://localhost:9515"]'
+    # Ensure deprecations will cause tests to fail, except for deprecations that core
+    # specifically ignores.
+    SYMFONY_DEPRECATIONS_HELPER: 'ignoreFile=$CI_PROJECT_DIR/$_WEB_ROOT/core/.deprecation-ignore.txt'
   # This is a really dirty hack to work around a possible bug in Drush when it runs against
   # Drupal core 11.x-dev:
   # https://git.drupalcode.org/project/automatic_updates/-/jobs/723857#L209

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,9 +49,20 @@ 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) {
-    parent::__construct($config_factory, $queue_factory, $update_fetcher, $state_store, $private_key, $key_value_factory, $key_value_expirable_factory);
+  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');

package_manager/src/Validator/RsyncValidator.php

@@ -72,7 +72,7 @@ final class RsyncValidator implements EventSubscriberInterface {
     if ($configured_syncer === 'php') {
       // Only status checks support warnings.
       if ($event instanceof StatusCheckEvent) {
-        $message = $this->t('You are currently using the PHP file syncer, which has known problems and is not stable. It is strongly recommended to switch back to the default <em>rsync</em> file syncer instead.');
+        $message = $this->t('You are currently using the PHP file syncer, which has known problems and is not stable. <strong>The PHP file syncer will be removed in Package Manager 3.1.0.</strong> Switch back to the default <em>rsync</em> file syncer to continue using Package Manager.');
 
         if (!$rsync_found) {
           $message = $this->t('@message <code>rsync</code> was not found on your system.', ['@message' => $message]);

package_manager/src/Validator/SupportedReleaseValidator.php

@@ -121,12 +121,16 @@ final class SupportedReleaseValidator implements EventSubscriberInterface {
       $event->addError($unsupported_packages, $summary);
     }
     if ($unknown_packages) {
-      $summary = $this->formatPlural(
-        count($unknown_packages),
-        'Cannot update because the following new or updated Drupal package does not have project information.',
-        'Cannot update because the following new or updated Drupal packages do not have project information.',
-      );
-      $event->addError($unknown_packages, $summary);
+      $event->addError([
+        $this->formatPlural(
+          count($unknown_packages),
+          'Cannot update because the following new or updated Drupal package does not have project information: @unknown_packages',
+          'Cannot update because the following new or updated Drupal packages do not have project information: @unknown_packages',
+          [
+            '@unknown_packages' => implode(', ', $unknown_packages),
+          ],
+        ),
+      ]);
     }
   }
 

package_manager/tests/src/Kernel/RsyncValidatorTest.php

@@ -65,7 +65,7 @@ class RsyncValidatorTest extends PackageManagerKernelTestBase {
         'php',
         [
           ValidationResult::createWarning([
-            t('You are currently using the PHP file syncer, which has known problems and is not stable. It is strongly recommended to switch back to the default <em>rsync</em> file syncer instead.'),
+            t('You are currently using the PHP file syncer, which has known problems and is not stable. <strong>The PHP file syncer will be removed in Package Manager 3.1.0.</strong> Switch back to the default <em>rsync</em> file syncer to continue using Package Manager.'),
           ]),
         ],
         [],
@@ -74,7 +74,7 @@ class RsyncValidatorTest extends PackageManagerKernelTestBase {
         'php',
         [
           ValidationResult::createWarning([
-            t('You are currently using the PHP file syncer, which has known problems and is not stable. It is strongly recommended to switch back to the default <em>rsync</em> file syncer instead. See the <a href="/admin/help/package_manager#package-manager-faq-rsync">Package Manager help</a> for more information on how to resolve this.'),
+            t('You are currently using the PHP file syncer, which has known problems and is not stable. <strong>The PHP file syncer will be removed in Package Manager 3.1.0.</strong> Switch back to the default <em>rsync</em> file syncer to continue using Package Manager. See the <a href="/admin/help/package_manager#package-manager-faq-rsync">Package Manager help</a> for more information on how to resolve this.'),
           ]),
         ],
         ['help'],

package_manager/tests/src/Kernel/SupportedReleaseValidatorTest.php

@@ -49,6 +49,18 @@ class SupportedReleaseValidatorTest extends PackageManagerKernelTestBase {
         'version' => '8.1.0',
         'type' => 'drupal-module',
       ])
+      ->addPackage(
+          [
+            'name' => "drupal/module_no_project",
+            'version' => '1.0.0',
+            'type' => 'drupal-module',
+          ],
+          FALSE,
+          FALSE,
+          [
+            'module_no_project.info.yml' => '{name: "Module No Project", type: "module"}',
+          ],
+      )
       ->commitChanges();
   }
 
@@ -179,6 +191,18 @@ class SupportedReleaseValidatorTest extends PackageManagerKernelTestBase {
         ],
         [],
       ],
+      'updating a module that does not have project info' => [
+        [],
+        TRUE,
+        [
+          'name' => "drupal/module_no_project",
+          'version' => '1.1.0',
+          'type' => 'drupal-module',
+        ],
+        [
+          ValidationResult::createError([t('Cannot update because the following new or updated Drupal package does not have project information: drupal/module_no_project')]),
+        ],
+      ],
     ];
   }
 

scripts/src/ConverterCommand.php

@@ -311,6 +311,8 @@ class ConverterCommand extends Command {
       //   https://drupal.org/i/3347937.
       'scripts',
       'dictionary.txt',
+      // @todo Remove in https://www.drupal.org/i/3432496.
+      'src/Validator/ConsoleUserValidator.php',
     ];
     $removals = array_map(function ($path) use ($core_module_path) {
       return "$core_module_path/$path";

src/Validator/ConsoleUserValidator.php

+<?php
+
+namespace Drupal\automatic_updates\Validator;
+
+use Drupal\automatic_updates\ConsoleUpdateStage;
+use Drupal\package_manager\Event\PreCreateEvent;
+use Drupal\package_manager\Event\StatusCheckEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Validates that the `auto-update` script is not run as the root user.
+ *
+ * We add this warning to the StatusCheckEvent and PreCreateEvent events
+ * instead of directly in the `auto-update` script to ensure that the warning
+ * is surfaced to the status report page along with other warnings and errors.
+ *
+ * @todo Remove this validator in favor of exiting the `auto-update` script as
+ *   early as possible if run as root in https://www.drupal.org/i/3432496.
+ */
+class ConsoleUserValidator implements EventSubscriberInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents(): array {
+    return [
+      StatusCheckEvent::class => ['validateConsoleUser'],
+      PreCreateEvent::class => ['validateConsoleUser'],
+    ];
+  }
+
+  /**
+   * Adds a warning if the `auto-update` script is run as the root user.
+   *
+   * @param \Drupal\package_manager\Event\StatusCheckEvent|\Drupal\package_manager\Event\PreCreateEvent $event
+   *   The stage event.
+   */
+  public function validateConsoleUser(StatusCheckEvent|PreCreateEvent $event) {
+    if (PHP_SAPI === 'cli' && $event->stage instanceof ConsoleUpdateStage && function_exists('posix_getuid') && posix_getuid() === 0) {
+      $event->addWarning([t('The `auto-update` script should not be run as the root user. Please run it as a less privileged user. In 3.1.0 if this script is run as the root user updates will not be preformed.')]);
+    }
+  }
+
+}