README.md

@@ -11,7 +11,7 @@ Follow and read more on the [Automatic Updates Initiative overview and roadmap](
 
 Automatic Updates includes a sub-module, Automatic Updates Extensions, which supports updating contributed modules and themes.
 
-⚠️ ☢️️ **Automatic Updates Extensions is still experimental and under heavy development.** We encourage you to test it in your local development environment, or another low-stakes testing situation, but it is emphatically NOT ready for use in a production environment. ☢️ ⚠️
+⚠️ ☢️️ Depending on the contributed module or theme, updates to these projects could make the site inoperable. If possible, it is highly recommended that you test these updates in a development environment first.☢️ ⚠️
 
 ### More info
 

automatic_updates_extensions/automatic_updates_extensions.info.yml

@@ -2,6 +2,5 @@ name: 'Automatic Updates Extensions'
 type: module
 description: 'Allows updates to themes and modules'
 core_version_requirement: ^10.1
-lifecycle: experimental
 dependencies:
   - drupal:automatic_updates

automatic_updates_extensions/src/ExtensionUpdateStage.php

@@ -26,7 +26,7 @@ use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
  *   This class is an internal part of the module's update handling and
  *   should not be used by external code.
  */
-class ExtensionUpdateStage extends StageBase {
+final class ExtensionUpdateStage extends StageBase {
 
   /**
    * {@inheritdoc}

automatic_updates_extensions/src/Form/UpdateReady.php

@@ -31,7 +31,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  * Defines a form to commit staged updates.
  *
  * @internal
- *   Form classes are internal.
+ *   Form classes are internal and should not be used by external code.
  */
 final class UpdateReady extends UpdateFormBase {
 
@@ -134,7 +134,11 @@ final class UpdateReady extends UpdateFormBase {
     $form['package_updates'] = $this->showUpdates();
     $form['backup'] = [
       '#prefix' => '<strong>',
-      '#markup' => $this->t('Back up your database and site before you continue. <a href=":backup_url">Learn how</a>.', [':backup_url' => 'https://www.drupal.org/node/22281']),
+      '#type' => 'checkbox',
+      '#title' => $this->t('Warning: Updating contributed modules or themes may leave your site inoperable or looking wrong.'),
+      '#description' => $this->t('Back up your database and site before you continue. <a href=":backup_url">Learn how</a>. Each contributed module or theme may follow different standards for backwards compatibility, may or may not have tests, and may add or remove features in any release. For these reasons, it is highly recommended that you test this update in a development environment first.', [':backup_url' => 'https://www.drupal.org/node/22281']),
+      '#required' => TRUE,
+      '#default_value' => FALSE,
       '#suffix' => '</strong>',
     ];
     $form['maintenance_mode'] = [

automatic_updates_extensions/src/Form/UpdaterForm.php

@@ -29,7 +29,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  * A form for selecting extension updates.
  *
  * @internal
- *   Form classes are internal.
+ *   Form classes are internal and should not be used by external code.
  */
 final class UpdaterForm extends UpdateFormBase {
 

automatic_updates_extensions/tests/src/Build/ModuleUpdateTest.php

@@ -14,7 +14,7 @@ use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
  * @group automatic_updates_extensions
  * @internal
  */
-class ModuleUpdateTest extends UpdateTestBase {
+final class ModuleUpdateTest extends UpdateTestBase {
 
   use FormTestTrait;
 
@@ -132,6 +132,7 @@ END;
     $page->pressButton('Update');
     $this->waitForBatchJob();
     $assert_session->pageTextContains('Ready to update');
+    $page->checkField('backup');
     $page->pressButton('Continue');
     $this->waitForBatchJob();
     $assert_session->pageTextContains('Update complete!');

automatic_updates_extensions/tests/src/Functional/ComposerStagerOperationFailureTest.php

@@ -56,8 +56,7 @@ class ComposerStagerOperationFailureTest extends UpdaterFormTestBase {
     $this->checkForMetaRefresh();
     // We can't continue the update after an error in the committer.
     if ($service_class === LoggingCommitter::class) {
-      $page->pressButton('Continue');
-      $this->checkForMetaRefresh();
+      $this->acceptWarningAndUpdate();
       $this->clickLink('the error page');
       $assert_session->statusCodeEquals(200);
       $assert_session->statusMessageContains('Automatic updates failed to apply, and the site is in an indeterminate state. Consider restoring the code and database from a backup.');
@@ -77,8 +76,7 @@ class ComposerStagerOperationFailureTest extends UpdaterFormTestBase {
     $this->getStageFixtureManipulator()->setVersion('drupal/semver_test_package_name', '8.1.1');
     $page->pressButton('Update');
     $this->checkForMetaRefresh();
-    $page->pressButton('Continue');
-    $this->checkForMetaRefresh();
+    $this->acceptWarningAndUpdate();
     $assert_session->statusMessageContains('Update complete!');
   }
 

automatic_updates_extensions/tests/src/Functional/DisplayUpdatesTest.php

@@ -9,7 +9,7 @@ namespace Drupal\Tests\automatic_updates_extensions\Functional;
  * @group automatic_updates_extensions
  * @internal
  */
-class DisplayUpdatesTest extends UpdaterFormTestBase {
+final class DisplayUpdatesTest extends UpdaterFormTestBase {
 
   /**
    * Data provider for testDisplayUpdates().

automatic_updates_extensions/tests/src/Functional/PreUpdateTest.php

@@ -11,7 +11,7 @@ use Drupal\fixture_manipulator\ActiveFixtureManipulator;
  * @group automatic_updates_extensions
  * @internal
  */
-class PreUpdateTest extends UpdaterFormTestBase {
+final class PreUpdateTest extends UpdaterFormTestBase {
 
   /**
    * Tests the form when modules requiring an update not installed via composer.

automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php

@@ -13,7 +13,7 @@ use Drupal\package_manager\ValidationResult;
  * @group automatic_updates_extensions
  * @internal
  */
-class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
+final class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
 
   /**
    * Data provider for testStatusCheckerRunAfterUpdate().
@@ -63,8 +63,7 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
       // We must do this after the update has started, because the pending
       // updates validator will prevent an update from starting.
       $this->container->get('state')->set('automatic_updates_test.new_update', TRUE);
-      $page->pressButton('Continue');
-      $this->checkForMetaRefresh();
+      $this->acceptWarningAndUpdate();
       $assert_session->pageTextContainsOnce('An error has occurred.');
       $assert_session->pageTextContainsOnce('Continue to the error page');
       $page->clickLink('the error page');
@@ -82,8 +81,7 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
       $assert_session->pageTextContains('Updates were attempted.');
     }
     else {
-      $page->pressButton('Continue');
-      $this->checkForMetaRefresh();
+      $this->acceptWarningAndUpdate();
       $assert_session->addressEquals('/admin/reports/updates');
       $assert_session->pageTextContainsOnce('Update complete!');
     }

automatic_updates_extensions/tests/src/Functional/SuccessfulUpdateTest.php

@@ -13,7 +13,7 @@ use Drupal\package_manager_test_validation\StagedDatabaseUpdateValidator;
  * @group automatic_updates_extensions
  * @internal
  */
-class SuccessfulUpdateTest extends UpdaterFormTestBase {
+final class SuccessfulUpdateTest extends UpdaterFormTestBase {
 
   /**
    * Data provider for testSuccessfulUpdate().
@@ -102,8 +102,7 @@ class SuccessfulUpdateTest extends UpdaterFormTestBase {
     $warning_messages = $assert_session->elementExists('xpath', '//div[@data-drupal-messages]//div[@aria-label="Warning message"]');
     $this->assertStringContainsString('Database updates have been detected in the following extensions.<ul><li>System</li><li>Automatic Updates Theme With Updates</li></ul>', $warning_messages->getHtml());
 
-    $page->pressButton('Continue');
-    $this->checkForMetaRefresh();
+    $this->acceptWarningAndUpdate();
     $assert_session->addressEquals('/admin/reports/updates');
     // Confirm that the site was in maintenance before the update was applied.
     // @see \Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber::handleEvent()

automatic_updates_extensions/tests/src/Functional/UnsuccessfulUpdateTest.php

@@ -14,7 +14,7 @@ use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
  * @group automatic_updates_extensions
  * @internal
  */
-class UnsuccessfulUpdateTest extends UpdaterFormTestBase {
+final class UnsuccessfulUpdateTest extends UpdaterFormTestBase {
 
   /**
    * Test the form for warning messages.

automatic_updates_extensions/tests/src/Functional/UpdateErrorTest.php

@@ -15,7 +15,7 @@ use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
  * @group automatic_updates_extensions
  * @internal
  */
-class UpdateErrorTest extends UpdaterFormTestBase {
+final class UpdateErrorTest extends UpdaterFormTestBase {
 
   /**
    * Tests that an exception is thrown if a previous apply failed.
@@ -40,8 +40,7 @@ class UpdateErrorTest extends UpdaterFormTestBase {
     $this->assertUpdateStagedTimes(1);
     $assert_session->pageTextNotContains('The following dependencies will also be updated:');
     LoggingCommitter::setException(new \Exception('failed at committer'));
-    $page->pressButton('Continue');
-    $this->checkForMetaRefresh();
+    $this->acceptWarningAndUpdate();
     $failure_message = 'Automatic updates failed to apply, and the site is in an indeterminate state. Consider restoring the code and database from a backup.';
     $assert_session->pageTextContainsOnce('An error has occurred.');
     $assert_session->pageTextContains($failure_message);

automatic_updates_extensions/tests/src/Functional/UpdaterFormTestBase.php

@@ -13,6 +13,8 @@ use Drupal\Tests\automatic_updates\Functional\UpdaterFormTestBase as UpdaterForm
  * Base class for functional tests of updater form.
  *
  * @internal
+ *   This class is an internal part of the module's testing infrastructure and
+ *   should not be used by external code.
  */
 abstract class UpdaterFormTestBase extends UpdaterFormFunctionalTestBase {
 
@@ -137,4 +139,16 @@ abstract class UpdaterFormTestBase extends UpdaterFormFunctionalTestBase {
     $this->checkForMetaRefresh();
   }
 
+  /**
+   * Continue the update after checking the backup warning checkbox.
+   */
+  protected function acceptWarningAndUpdate(): void {
+    $page = $this->getSession()->getPage();
+    $page->pressButton('Continue');
+    $this->assertSession()->statusMessageContains('Warning: Updating contributed modules or themes may leave your site inoperable or looking wrong. field is required.', 'error');
+    $page->checkField('backup');
+    $page->pressButton('Continue');
+    $this->checkForMetaRefresh();
+  }
+
 }

automatic_updates_extensions/tests/src/Kernel/AutomaticUpdatesExtensionsKernelTestBase.php

@@ -15,6 +15,8 @@ use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
  * Base class for kernel tests of the Automatic Updates Extensions module.
  *
  * @internal
+ *   This class is an internal part of the module's testing infrastructure and
+ *   should not be used by external code.
  */
 abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdatesKernelTestBase {
 

automatic_updates_extensions/tests/src/Kernel/ExtensionUpdateStageTest.php

@@ -14,7 +14,7 @@ use PhpTuf\ComposerStager\API\Core\StagerInterface;
  * @group automatic_updates_extensions
  * @internal
  */
-class ExtensionUpdateStageTest extends AutomaticUpdatesExtensionsKernelTestBase {
+final class ExtensionUpdateStageTest extends AutomaticUpdatesExtensionsKernelTestBase {
 
   use UserCreationTrait;
 

automatic_updates_extensions/tests/src/Kernel/Validator/UpdateReleaseValidatorTest.php

@@ -14,7 +14,7 @@ use Drupal\Tests\automatic_updates_extensions\Kernel\AutomaticUpdatesExtensionsK
  * @group automatic_updates_extensions
  * @internal
  */
-class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBase {
+final class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBase {
 
   /**
    * {@inheritdoc}

automatic_updates_extensions/tests/src/Traits/FormTestTrait.php

@@ -11,6 +11,8 @@ use Drupal\Tests\BrowserTestBase;
  * Common methods for testing the update form.
  *
  * @internal
+ *   This class is an internal part of the module's testing infrastructure and
+ *   should not be used by external code.
  */
 trait FormTestTrait {
 

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/Plugin/QueueWorker/Cleaner.php

@@ -54,7 +54,7 @@ final class Cleaner extends QueueWorkerBase implements ContainerFactoryPluginInt
 
     if (file_exists($dir)) {
       $this->fileSystem->deleteRecursive($dir, function (string $path): void {
-        $this->fileSystem->chmod($path, 0777);
+        $this->fileSystem->chmod($path, is_dir($path) ? 0700 : 0600);
       });
     }
   }