Issue #3425875 by Wim Leers, phenaproxima, smustgrave: Add validation...

Issue #3425875 by Wim Leers, phenaproxima, smustgrave: Add validation constraints to search.settings

core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php

@@ -59,6 +59,13 @@ trait SchemaCheckTrait {
         '^The file storage you selected is not a visible, readable and writable stream wrapper\. Possible choices: <em class="placeholder"><\/em>\.$',
       ],
     ],
+    'search.settings' => [
+      // @todo Simple config cannot have dependencies on any other config.
+      //   Remove this in https://www.drupal.org/project/drupal/issues/3425992.
+      'default_page' => [
+        "The 'search.page.node_search' config does not exist.",
+      ],
+    ],
   ];
 
   /**

core/modules/search/config/schema/search.schema.yml

@@ -3,13 +3,24 @@
 search.settings:
   type: config_object
   label: 'Search settings'
+  constraints:
+    FullyValidatable: ~
   mapping:
     and_or_limit:
       type: integer
       label: 'AND/OR combination limit'
+      constraints:
+        Range:
+          min: 0
     default_page:
       type: string
       label: 'Default search page'
+      constraints:
+        ConfigExists:
+          prefix: search.page.
+      # @see \Drupal\search\SearchPageRepository::getDefaultSearchPage()
+      # @see \Drupal\search\SearchPageRepository::clearDefaultSearchPage()
+      requiredKey: false
     index:
       type: mapping
       label: 'Indexing settings'
@@ -17,51 +28,57 @@ search.settings:
         cron_limit:
           type: integer
           label: 'Number of items to index per cron run'
+          constraints:
+            Range:
+              min: 1
         overlap_cjk:
           type: boolean
           label: 'Simple CJK handling'
         minimum_word_size:
           type: integer
           label: 'Minimum word length to index'
+          constraints:
+            Range:
+              min: 1
         tag_weights:
           type: mapping
           label: 'HTML tags weight'
           mapping:
             h1:
-              type: integer
+              type: weight
               label: 'Tag h1 weight'
             h2:
-              type: integer
+              type: weight
               label: 'Tag h2 weight'
             h3:
-              type: integer
+              type: weight
               label: 'Tag h3 weight'
             h4:
-              type: integer
+              type: weight
               label: 'Tag h4 weight'
             h5:
-              type: integer
+              type: weight
               label: 'Tag h5 weight'
             h6:
-              type: integer
+              type: weight
               label: 'Tag h6 weight'
             u:
-              type: integer
+              type: weight
               label: 'Tag u weight'
             b:
-              type: integer
+              type: weight
               label: 'Tag b weight'
             i:
-              type: integer
+              type: weight
               label: 'Tag i weight'
             strong:
-              type: integer
+              type: weight
               label: 'Tag strong weight'
             em:
-              type: integer
+              type: weight
               label: 'Tag em weight'
             a:
-              type: integer
+              type: weight
               label: 'Tag a weight'
     logging:
       type: boolean

core/modules/search/src/Form/SearchPageAddForm.php

@@ -35,12 +35,17 @@ protected function actions(array $form, FormStateInterface $form_state) {
    */
   public function save(array $form, FormStateInterface $form_state) {
     // If there is no default search page, make the added search the default.
-    if (!$this->searchPageRepository->getDefaultSearchPage()) {
-      $this->searchPageRepository->setDefaultSearchPage($this->entity);
-    }
+    // TRICKY: ::getDefaultSearchPage() will return the first active search page
+    // as the default if no explicit default is configured in `search.settings`.
+    // That's why this must be checked *before* saving the form.
+    $make_default = !$this->searchPageRepository->getDefaultSearchPage();
 
     parent::save($form, $form_state);
 
+    if ($make_default) {
+      $this->searchPageRepository->setDefaultSearchPage($this->entity);
+    }
+
     $this->messenger()->addStatus($this->t('The %label search page has been added.', ['%label' => $this->entity->label()]));
   }
 

core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php

@@ -24,6 +24,7 @@ class MigrateSearchSettingsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp(): void {
     parent::setUp();
+    $this->installConfig(['search']);
     $this->executeMigration('d6_search_settings');
   }
 

core/modules/search/tests/src/Kernel/SearchTokenizerTest.php

@@ -19,6 +19,14 @@ class SearchTokenizerTest extends KernelTestBase {
    */
   protected static $modules = ['search'];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+    $this->installConfig(['search']);
+  }
+
   /**
    * Verifies that strings of CJK characters are tokenized.
    *