Issue #2715145 by andypost, phenaproxima, longwave, alexpott, RenatoG,...

Issue #2715145 by andypost, phenaproxima, longwave, alexpott, RenatoG, quietone, catch: Remove system.authorize config

core/modules/system/config/install/system.authorize.yml

-filetransfer_default:

core/modules/system/config/schema/system.schema.yml

@@ -53,14 +53,6 @@ system.maintenance:
       type: text
       label: 'Message to display when in maintenance mode'
 
-system.authorize:
-  type: config_object
-  label: 'Authorize settings'
-  mapping:
-    filetransfer_default:
-      type: string
-      label: 'Default file transfer protocol'
-
 system.cron:
   type: config_object
   label: 'Cron settings'

core/modules/system/migrations/d7_system_authorize.yml

@@ -9,7 +9,11 @@ source:
     - authorize_filetransfer_default
   source_module: system
 process:
-   filetransfer_default: authorize_filetransfer_default
+  filetransfer_default:
+    plugin: skip_on_empty
+    method: row
+    source: empty
 destination:
   plugin: config
-  config_name: system.authorize
+  config_name: null
+  destination_module: system

core/modules/system/system.post_update.php

@@ -197,3 +197,10 @@ function system_post_update_service_advisory_settings() {
   $config = \Drupal::configFactory()->getEditable('system.advisories');
   $config->set('interval_hours', 6)->set('enabled', TRUE)->save();
 }
+
+/**
+ * Remove obsolete system.authorize configuration.
+ */
+function system_post_update_delete_authorize_settings() {
+  \Drupal::configFactory()->getEditable('system.authorize')->delete();
+}

core/modules/system/tests/src/Functional/Update/DeleteAuthorizeSettingsUpdateTest.php

+<?php
+
+namespace Drupal\Tests\system\Functional\Update;
+
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
+
+/**
+ * Tests the upgrade path for removal the system.authorize configuration.
+ *
+ * @see https://www.drupal.org/node/3206320
+ * @see system_post_update_delete_authorize_settings()
+ *
+ * @group Update
+ */
+class DeleteAuthorizeSettingsUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../fixtures/update/drupal-8.8.0.bare.standard.php.gz',
+    ];
+  }
+
+  /**
+   * Tests system_post_update_delete_authorize_settings().
+   */
+  public function testSystemAuthorizeRemoval() {
+    $this->assertArrayHasKey('filetransfer_default', $this->config('system.authorize')->getRawData());
+
+    $this->runUpdates();
+
+    $config = $this->config('system.authorize');
+    $this->assertTrue($config->isNew());
+  }
+
+}

core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php

@@ -14,9 +14,7 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
   protected static $modules = ['action', 'file', 'system'];
 
   protected $expectedConfig = [
-    'system.authorize' => [
-      'filetransfer_default' => 'ftp',
-    ],
+    'system.authorize' => [],
     'system.cron' => [
       'threshold' => [
         // autorun is not handled by the migration.
@@ -166,6 +164,9 @@ public function testConfigurationMigration() {
       unset($actual['_core']);
       $this->assertSame($actual, $values, $config_id . ' matches expected values.');
     }
+    // The d7_system_authorize migration should not create the system.authorize
+    // config.
+    $this->assertTrue($this->config('system.authorize')->isNew());
   }
 
 }