Issue #2409413 by cafuego, longwave, lokapujya, alexpott, alvar0hurtad0, SivaprasadC, snehi, vipul.patil7888, ayushmishra206, dawehner, xjm, mradcliffe: Remove fields that do nothing from the "RSS publishing" settings form

core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php

@@ -161,14 +161,13 @@ abstract class AggregatorTestBase extends BrowserTestBase {
   public function getDefaultFeedItemCount() {
     // Our tests are based off of rss.xml, so let's find out how many elements
     // should be related.
-    $feed_count = \Drupal::entityQuery('node')
+    return \Drupal::entityQuery('node')
       ->condition('promote', NodeInterface::PROMOTED)
       ->condition('status', NodeInterface::PUBLISHED)
       ->accessCheck(FALSE)
-      ->range(0, $this->config('system.rss')->get('items.limit'))
+      ->range(0, 10)
       ->count()
       ->execute();
-    return min($feed_count, 10);
   }
 
   /**

core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php

@@ -502,8 +502,6 @@ class ConfigTranslationListUiTest extends BrowserTestBase {
     $this->doSettingsPageTest('admin/config/system/site-information');
     // Test the account settings page.
     $this->doSettingsPageTest('admin/config/people/accounts');
-    // Test the RSS settings page.
-    $this->doSettingsPageTest('admin/config/services/rss-publishing');
   }
 
 }

core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php

@@ -888,11 +888,6 @@ class ConfigTranslationUiTest extends BrowserTestBase {
     $this->container->get('state')->set('config_translation_test_config_translation_info_alter', TRUE);
     $this->container->get('plugin.manager.config_translation.mapper')->clearCachedDefinitions();
 
-    // Check out if the translation page has the altered in settings.
-    $this->drupalGet('admin/config/system/site-information/translate/fr/add');
-    $this->assertText('Feed channel');
-    $this->assertText('Feed description');
-
     // Check if the translation page does not have the altered out settings.
     $this->drupalGet('admin/config/people/accounts/translate/fr/add');
     $this->assertText('Name');

core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php

@@ -469,7 +469,6 @@ class ConfigNamesMapperTest extends UnitTestCase {
       ],
       'system.rss' => [
         'items' => [
-          'limit' => 10,
           'view_mode' => 'rss',
         ],
       ],

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

@@ -1,6 +1,2 @@
-channel:
-  description: ''
 items:
-  limit: 10
   view_mode: rss
-langcode: en

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

@@ -196,20 +196,10 @@ system.rss:
   type: config_object
   label: 'Feed settings'
   mapping:
-    channel:
-      type: mapping
-      label: 'Feed channel'
-      mapping:
-        description:
-          type: text
-          label: 'Feed description'
     items:
       type: mapping
       label: 'Feed items'
       mapping:
-        limit:
-          type: integer
-          label: 'Feed item limit'
         view_mode:
           type: string
           label: 'Feed content'

core/modules/system/migrations/system_rss.yml

@@ -7,11 +7,9 @@ migration_tags:
 source:
   plugin: variable
   variables:
-    - feed_default_items
     - feed_item_length
   source_module: system
 process:
-  'items/limit': feed_default_items
   'items/view_mode': feed_item_length
 destination:
   plugin: config

core/modules/system/src/Form/RssFeedsForm.php

@@ -30,25 +30,10 @@ class RssFeedsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $rss_config = $this->config('system.rss');
-    $form['feed_description'] = [
-      '#type' => 'textarea',
-      '#title' => t('Feed description'),
-      '#default_value' => $rss_config->get('channel.description'),
-      '#description' => t('Description of your site, included in each feed.'),
-    ];
-    $options = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30];
-    $form['feed_default_items'] = [
-      '#type' => 'select',
-      '#title' => t('Number of items in each feed'),
-      '#default_value' => $rss_config->get('items.limit'),
-      '#options' => array_combine($options, $options),
-      '#description' => t('Default number of items to include in each feed.'),
-    ];
     $form['feed_view_mode'] = [
       '#type' => 'select',
       '#title' => t('Feed content'),
-      '#default_value' => $rss_config->get('items.view_mode'),
+      '#default_value' => $this->config('system.rss')->get('items.view_mode'),
       '#options' => [
         'title' => t('Titles only'),
         'teaser' => t('Titles plus teaser'),
@@ -65,8 +50,6 @@ class RssFeedsForm extends ConfigFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->config('system.rss')
-      ->set('channel.description', $form_state->getValue('feed_description'))
-      ->set('items.limit', $form_state->getValue('feed_default_items'))
       ->set('items.view_mode', $form_state->getValue('feed_view_mode'))
       ->save();
 

core/modules/system/system.post_update.php

@@ -168,3 +168,14 @@ function system_post_update_schema_version_int() {
     }
   }
 }
+
+/**
+ * Remove obsolete system.rss configuration.
+ */
+function system_post_update_delete_rss_settings() {
+  \Drupal::configFactory()->getEditable('system.rss')
+    ->clear('channel')
+    ->clear('items.limit')
+    ->clear('langcode')
+    ->save();
+}

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

@@ -91,16 +91,9 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase {
       'stale_file_threshold' => 2592000,
     ],
     'system.rss' => [
-      // channel is not handled by the migration.
-      'channel' => [
-        'description' => '',
-      ],
       'items' => [
-        'limit' => 10,
         'view_mode' => 'title',
       ],
-      // langcode is not handled by the migration.
-      'langcode' => 'en',
     ],
     'system.site' => [
       // uuid is not handled by the migration.

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

@@ -94,14 +94,9 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
       'stale_file_threshold' => 2592000,
     ],
     'system.rss' => [
-      'channel' => [
-        'description' => '',
-      ],
       'items' => [
-        'limit' => 27,
         'view_mode' => 'fulltext',
       ],
-      'langcode' => 'en',
     ],
     'system.site' => [
       // uuid is not handled by the migration.