diff --git a/config/optional/search_api_solr.solr_field_type.text_cy_6_0_0.yml b/config/optional/search_api_solr.solr_field_type.text_cy_6_0_0.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c5f4b2bf2a040002308e68e9f1741fd79eb713f1
--- /dev/null
+++ b/config/optional/search_api_solr.solr_field_type.text_cy_6_0_0.yml
@@ -0,0 +1,461 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - search_api_solr
+ - language
+ config:
+ - language.entity.cy
+id: text_cy_6_0_0
+label: 'Welsh Text Field'
+minimum_solr_version: 6.0.0
+custom_code: ''
+field_type_language_code: cy
+domains: {}
+field_type:
+ name: text_cy
+ class: solr.TextField
+ positionIncrementGap: 100
+ storeOffsetsWithPositions: true
+ analyzers:
+ -
+ type: index
+ charFilters:
+ -
+ class: solr.MappingCharFilterFactory
+ mapping: accents_cy.txt
+ tokenizer:
+ class: solr.StandardTokenizerFactory
+ filters:
+ -
+ class: solr.WordDelimiterFilterFactory
+ catenateNumbers: 1
+ generateNumberParts: 1
+ protected: protwords_cy.txt
+ splitOnCaseChange: 1
+ generateWordParts: 1
+ preserveOriginal: 1
+ catenateAll: 0
+ catenateWords: 1
+ -
+ class: solr.LowerCaseFilterFactory
+ -
+ class: solr.StopFilterFactory
+ ignoreCase: true
+ words: stopwords_cy.txt
+ -
+ class: solr.SnowballPorterFilterFactory
+ language: Spanish
+ protected: protwords_cy.txt
+ -
+ class: solr.RemoveDuplicatesTokenFilterFactory
+ -
+ type: query
+ charFilters:
+ -
+ class: solr.MappingCharFilterFactory
+ mapping: accents_cy.txt
+ tokenizer:
+ class: solr.StandardTokenizerFactory
+ filters:
+ -
+ class: solr.WordDelimiterFilterFactory
+ catenateNumbers: 0
+ generateNumberParts: 0
+ protected: protwords_cy.txt
+ splitOnCaseChange: 1
+ generateWordParts: 1
+ preserveOriginal: 1
+ catenateAll: 0
+ catenateWords: 0
+ -
+ class: solr.LowerCaseFilterFactory
+ -
+ class: solr.SynonymFilterFactory
+ synonyms: synonyms_cy.txt
+ expand: true
+ ignoreCase: true
+ -
+ class: solr.StopFilterFactory
+ ignoreCase: true
+ words: stopwords_cy.txt
+ -
+ class: solr.SnowballPorterFilterFactory
+ language: Spanish
+ protected: protwords_cy.txt
+ -
+ class: solr.RemoveDuplicatesTokenFilterFactory
+unstemmed_field_type:
+ name: text_unstemmed_cy
+ class: solr.TextField
+ positionIncrementGap: 100
+ storeOffsetsWithPositions: true
+ analyzers:
+ -
+ type: index
+ charFilters:
+ -
+ class: solr.MappingCharFilterFactory
+ mapping: accents_cy.txt
+ tokenizer:
+ class: solr.StandardTokenizerFactory
+ filters:
+ -
+ class: solr.WordDelimiterFilterFactory
+ catenateNumbers: 1
+ generateNumberParts: 1
+ protected: protwords_cy.txt
+ splitOnCaseChange: 1
+ generateWordParts: 1
+ preserveOriginal: 1
+ catenateAll: 0
+ catenateWords: 1
+ -
+ class: solr.LowerCaseFilterFactory
+ -
+ class: solr.StopFilterFactory
+ ignoreCase: true
+ words: stopwords_cy.txt
+ -
+ class: solr.RemoveDuplicatesTokenFilterFactory
+ -
+ type: query
+ charFilters:
+ -
+ class: solr.MappingCharFilterFactory
+ mapping: accents_cy.txt
+ tokenizer:
+ class: solr.StandardTokenizerFactory
+ filters:
+ -
+ class: solr.WordDelimiterFilterFactory
+ catenateNumbers: 0
+ generateNumberParts: 0
+ protected: protwords_cy.txt
+ splitOnCaseChange: 1
+ generateWordParts: 1
+ preserveOriginal: 1
+ catenateAll: 0
+ catenateWords: 0
+ -
+ class: solr.LowerCaseFilterFactory
+ -
+ class: solr.SynonymFilterFactory
+ synonyms: synonyms_cy.txt
+ expand: true
+ ignoreCase: true
+ -
+ class: solr.StopFilterFactory
+ ignoreCase: true
+ words: stopwords_cy.txt
+ -
+ class: solr.RemoveDuplicatesTokenFilterFactory
+collated_field_type:
+ name: collated_cy
+ class: solr.ICUCollationField
+ locale: cy
+ strength: primary
+ caseLevel: false
+solr_configs:
+ searchComponents:
+ -
+ name: spellcheck
+ class: solr.SpellCheckComponent
+ lst:
+ -
+ name: spellchecker
+ str:
+ -
+ name: name
+ VALUE: cy
+ -
+ name: field
+ VALUE: spellcheck_cy
+ -
+ name: classname
+ VALUE: solr.DirectSolrSpellChecker
+ -
+ name: distanceMeasure
+ VALUE: internal
+ -
+ name: accuracy
+ VALUE: '0.5'
+ -
+ name: maxEdits
+ VALUE: '2'
+ -
+ name: minPrefix
+ VALUE: '1'
+ -
+ name: maxInspections
+ VALUE: '5'
+ -
+ name: minQueryLength
+ VALUE: '4'
+ -
+ name: maxQueryFrequency
+ VALUE: '0.01'
+ -
+ name: thresholdTokenFrequency
+ VALUE: '.01'
+ -
+ name: onlyMorePopular
+ VALUE: 'true'
+ -
+ name: suggest
+ class: solr.SuggestComponent
+ lst:
+ -
+ name: suggester
+ str:
+ -
+ name: name
+ VALUE: cy
+ -
+ name: lookupImpl
+ VALUE: AnalyzingInfixLookupFactory
+ -
+ name: dictionaryImpl
+ VALUE: DocumentDictionaryFactory
+ -
+ name: field
+ VALUE: twm_suggest
+ -
+ name: suggestAnalyzerFieldType
+ VALUE: text_cy
+ -
+ name: contextField
+ VALUE: sm_context_tags
+ -
+ name: buildOnCommit
+ VALUE: 'false'
+ -
+ name: buildOnStartup
+ VALUE: 'false'
+text_files:
+ stopwords: |
+ a
+ ac
+ ag
+ am
+ an
+ ar
+ at
+ canys
+ cyfryw
+ ddim
+ eu
+ fel
+ fod
+ gan
+ hyn
+ hynny
+ hwn
+ i
+ mae
+ mewn
+ na
+ nac
+ neu
+ nhw
+ o
+ oedd
+ ond
+ os
+ ym
+ ymlaen
+ yn
+ yna
+ yno
+ yng
+ yr
+ synonyms: |
+ drupal, durpal
+ nouns: |
+ protwords: |
+ accents: |
+ # À => A
+ "\u00C0" => "A"
+ # Ã => A
+ "\u00C1" => "A"
+ # Â => A
+ "\u00C2" => "A"
+ # Ã => A
+ "\u00C3" => "A"
+ # Ä => A
+ "\u00C4" => "A"
+ # Ã… => A
+ "\u00C5" => "A"
+ # Ä„ => A
+ "\u0104" => "A"
+ # Æ => AE
+ "\u00C6" => "AE"
+ # Ç => C
+ "\u00C7" => "C"
+ # Ć => C
+ "\U0106" => "C"
+ # È => E
+ "\u00C8" => "E"
+ # É => E
+ "\u00C9" => "E"
+ # Ê => E
+ "\u00CA" => "E"
+ # Ë => E
+ "\u00CB" => "E"
+ # Ę => E
+ "\u0118" => "E"
+ # Ì => I
+ "\u00CC" => "I"
+ # Ã => I
+ "\u00CD" => "I"
+ # ÃŽ => I
+ "\u00CE" => "I"
+ # Ã => I
+ "\u00CF" => "I"
+ # IJ => IJ
+ "\u0132" => "IJ"
+ # Ã => D
+ "\u00D0" => "D"
+ # Å => L
+ "\u0141" => "L"
+ # Ñ => N
+ "\u00D1" => "N"
+ # Ń => N
+ "\u0143" => "N"
+ # Ã’ => O
+ "\u00D2" => "O"
+ # Ó => O
+ "\u00D3" => "O"
+ # Ô => O
+ "\u00D4" => "O"
+ # Õ => O
+ "\u00D5" => "O"
+ # Ö => O
+ "\u00D6" => "O"
+ # Ø => O
+ "\u00D8" => "O"
+ # Å’ => OE
+ "\u0152" => "OE"
+ # Þ
+ "\u00DE" => "TH"
+ # Ù => U
+ "\u00D9" => "U"
+ # Ú => U
+ "\u00DA" => "U"
+ # Û => U
+ "\u00DB" => "U"
+ # Ü => U
+ "\u00DC" => "U"
+ # Ã => Y
+ "\u00DD" => "Y"
+ # Ÿ => Y
+ "\u0178" => "Y"
+ # Ã => a
+ "\u00E0" => "a"
+ # á => a
+ "\u00E1" => "a"
+ # â => a
+ "\u00E2" => "a"
+ # ã => a
+ "\u00E3" => "a"
+ # ä => a
+ "\u00E4" => "a"
+ # å => a
+ "\u00E5" => "a"
+ # æ => ae
+ "\u00E6" => "ae"
+ # ç => c
+ "\u00E7" => "c"
+ # è => e
+ "\u00E8" => "e"
+ # é => e
+ "\u00E9" => "e"
+ # ê => e
+ "\u00EA" => "e"
+ # ë => e
+ "\u00EB" => "e"
+ # ì => i
+ "\u00EC" => "i"
+ # Ã => i
+ "\u00ED" => "i"
+ # î => i
+ "\u00EE" => "i"
+ # ï => i
+ "\u00EF" => "i"
+ # ij => ij
+ "\u0133" => "ij"
+ # ð => d
+ "\u00F0" => "d"
+ # ñ => n
+ "\u00F1" => "n"
+ # ò => o
+ "\u00F2" => "o"
+ # ó => o
+ "\u00F3" => "o"
+ # ô => o
+ "\u00F4" => "o"
+ # õ => o
+ "\u00F5" => "o"
+ # ö => o
+ "\u00F6" => "o"
+ # ø => o
+ "\u00F8" => "o"
+ # Å“ => oe
+ "\u0153" => "oe"
+ # ß => ss
+ "\u00DF" => "ss"
+ # Åš => S
+ "\u015a" => "S"
+ # þ => th
+ "\u00FE" => "th"
+ # ù => u
+ "\u00F9" => "u"
+ # ú => u
+ "\u00FA" => "u"
+ # û => u
+ "\u00FB" => "u"
+ # ü => u
+ "\u00FC" => "u"
+ # ý => y
+ "\u00FD" => "y"
+ # ÿ => y
+ "\u00FF" => "y"
+ # Ź => Z
+ "\u0179" => "Z"
+ # Å» => Z
+ "\u017b" => "Z"
+ # ff => ff
+ "\uFB00" => "ff"
+ # ï¬ => fi
+ "\uFB01" => "fi"
+ # fl => fl
+ "\uFB02" => "fl"
+ # ffi => ffi
+ "\uFB03" => "ffi"
+ # ffl => ffl
+ "\uFB04" => "ffl"
+ # ſt => st
+ "\uFB05" => "st"
+ # st => st
+ "\uFB06" => "st"
+ # MÄori macrons.
+ # Ā => A
+ "\u0100" => "A"
+ # Ä’ => E
+ "\u0112" => "E"
+ # Ī => I
+ "\u012A" => "I"
+ # Ō => O
+ "\u014C" => "O"
+ # Ū => U
+ "\u016A" => "U"
+ # Ä => a
+ "\u0101" => "a"
+ # Ä“ => e
+ "\u0113" => "e"
+ # Ä« => i
+ "\u012B" => "i"
+ # Å => o
+ "\u014D" => "o"
+ # Å« => u
+ "\u016B" => "u"
diff --git a/config/optional/search_api_solr.solr_field_type.text_cy_7_0_0.yml b/config/optional/search_api_solr.solr_field_type.text_cy_7_0_0.yml
new file mode 100644
index 0000000000000000000000000000000000000000..787727123acd443bf53cfdb2535ce9118014eb84
--- /dev/null
+++ b/config/optional/search_api_solr.solr_field_type.text_cy_7_0_0.yml
@@ -0,0 +1,465 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - search_api_solr
+ - language
+ config:
+ - language.entity.cy
+id: text_cy_7_0_0
+label: 'Welsh Text Field'
+minimum_solr_version: 7.0.0
+custom_code: ''
+field_type_language_code: cy
+domains: {}
+field_type:
+ name: text_cy
+ class: solr.TextField
+ positionIncrementGap: 100
+ storeOffsetsWithPositions: true
+ analyzers:
+ -
+ type: index
+ charFilters:
+ -
+ class: solr.MappingCharFilterFactory
+ mapping: accents_cy.txt
+ tokenizer:
+ class: solr.StandardTokenizerFactory
+ filters:
+ -
+ class: solr.WordDelimiterGraphFilterFactory
+ catenateNumbers: 1
+ generateNumberParts: 1
+ protected: protwords_cy.txt
+ splitOnCaseChange: 1
+ generateWordParts: 1
+ preserveOriginal: 1
+ catenateAll: 0
+ catenateWords: 1
+ -
+ class: solr.FlattenGraphFilterFactory
+ -
+ class: solr.LowerCaseFilterFactory
+ -
+ class: solr.StopFilterFactory
+ ignoreCase: true
+ words: stopwords_cy.txt
+ -
+ class: solr.SnowballPorterFilterFactory
+ language: Spanish
+ protected: protwords_cy.txt
+ -
+ class: solr.RemoveDuplicatesTokenFilterFactory
+ -
+ type: query
+ charFilters:
+ -
+ class: solr.MappingCharFilterFactory
+ mapping: accents_cy.txt
+ tokenizer:
+ class: solr.StandardTokenizerFactory
+ filters:
+ -
+ class: solr.WordDelimiterGraphFilterFactory
+ catenateNumbers: 0
+ generateNumberParts: 0
+ protected: protwords_cy.txt
+ splitOnCaseChange: 1
+ generateWordParts: 1
+ preserveOriginal: 1
+ catenateAll: 0
+ catenateWords: 0
+ -
+ class: solr.LowerCaseFilterFactory
+ -
+ class: solr.SynonymGraphFilterFactory
+ synonyms: synonyms_cy.txt
+ expand: true
+ ignoreCase: true
+ -
+ class: solr.StopFilterFactory
+ ignoreCase: true
+ words: stopwords_cy.txt
+ -
+ class: solr.SnowballPorterFilterFactory
+ language: Spanish
+ protected: protwords_cy.txt
+ -
+ class: solr.RemoveDuplicatesTokenFilterFactory
+unstemmed_field_type:
+ name: text_unstemmed_cy
+ class: solr.TextField
+ positionIncrementGap: 100
+ storeOffsetsWithPositions: true
+ analyzers:
+ -
+ type: index
+ charFilters:
+ -
+ class: solr.MappingCharFilterFactory
+ mapping: accents_cy.txt
+ tokenizer:
+ class: solr.StandardTokenizerFactory
+ filters:
+ -
+ class: solr.WordDelimiterGraphFilterFactory
+ catenateNumbers: 1
+ generateNumberParts: 1
+ protected: protwords_cy.txt
+ splitOnCaseChange: 1
+ generateWordParts: 1
+ preserveOriginal: 1
+ catenateAll: 0
+ catenateWords: 1
+ -
+ class: solr.FlattenGraphFilterFactory
+ -
+ class: solr.LowerCaseFilterFactory
+ -
+ class: solr.StopFilterFactory
+ ignoreCase: true
+ words: stopwords_cy.txt
+ -
+ class: solr.RemoveDuplicatesTokenFilterFactory
+ -
+ type: query
+ charFilters:
+ -
+ class: solr.MappingCharFilterFactory
+ mapping: accents_cy.txt
+ tokenizer:
+ class: solr.StandardTokenizerFactory
+ filters:
+ -
+ class: solr.WordDelimiterGraphFilterFactory
+ catenateNumbers: 0
+ generateNumberParts: 0
+ protected: protwords_cy.txt
+ splitOnCaseChange: 1
+ generateWordParts: 1
+ preserveOriginal: 1
+ catenateAll: 0
+ catenateWords: 0
+ -
+ class: solr.LowerCaseFilterFactory
+ -
+ class: solr.SynonymGraphFilterFactory
+ synonyms: synonyms_cy.txt
+ expand: true
+ ignoreCase: true
+ -
+ class: solr.StopFilterFactory
+ ignoreCase: true
+ words: stopwords_cy.txt
+ -
+ class: solr.RemoveDuplicatesTokenFilterFactory
+collated_field_type:
+ name: collated_cy
+ class: solr.ICUCollationField
+ locale: cy
+ strength: primary
+ caseLevel: false
+solr_configs:
+ searchComponents:
+ -
+ name: spellcheck
+ class: solr.SpellCheckComponent
+ lst:
+ -
+ name: spellchecker
+ str:
+ -
+ name: name
+ VALUE: cy
+ -
+ name: field
+ VALUE: spellcheck_cy
+ -
+ name: classname
+ VALUE: solr.DirectSolrSpellChecker
+ -
+ name: distanceMeasure
+ VALUE: internal
+ -
+ name: accuracy
+ VALUE: '0.5'
+ -
+ name: maxEdits
+ VALUE: '2'
+ -
+ name: minPrefix
+ VALUE: '1'
+ -
+ name: maxInspections
+ VALUE: '5'
+ -
+ name: minQueryLength
+ VALUE: '4'
+ -
+ name: maxQueryFrequency
+ VALUE: '0.01'
+ -
+ name: thresholdTokenFrequency
+ VALUE: '.01'
+ -
+ name: onlyMorePopular
+ VALUE: 'true'
+ -
+ name: suggest
+ class: solr.SuggestComponent
+ lst:
+ -
+ name: suggester
+ str:
+ -
+ name: name
+ VALUE: cy
+ -
+ name: lookupImpl
+ VALUE: AnalyzingInfixLookupFactory
+ -
+ name: dictionaryImpl
+ VALUE: DocumentDictionaryFactory
+ -
+ name: field
+ VALUE: twm_suggest
+ -
+ name: suggestAnalyzerFieldType
+ VALUE: text_cy
+ -
+ name: contextField
+ VALUE: sm_context_tags
+ -
+ name: buildOnCommit
+ VALUE: 'false'
+ -
+ name: buildOnStartup
+ VALUE: 'false'
+text_files:
+ stopwords: |
+ a
+ ac
+ ag
+ am
+ an
+ ar
+ at
+ canys
+ cyfryw
+ ddim
+ eu
+ fel
+ fod
+ gan
+ hyn
+ hynny
+ hwn
+ i
+ mae
+ mewn
+ na
+ nac
+ neu
+ nhw
+ o
+ oedd
+ ond
+ os
+ ym
+ ymlaen
+ yn
+ yna
+ yno
+ yng
+ yr
+ synonyms: |
+ drupal, durpal
+ nouns: |
+ protwords: |
+ accents: |
+ # À => A
+ "\u00C0" => "A"
+ # Ã => A
+ "\u00C1" => "A"
+ # Â => A
+ "\u00C2" => "A"
+ # Ã => A
+ "\u00C3" => "A"
+ # Ä => A
+ "\u00C4" => "A"
+ # Ã… => A
+ "\u00C5" => "A"
+ # Ä„ => A
+ "\u0104" => "A"
+ # Æ => AE
+ "\u00C6" => "AE"
+ # Ç => C
+ "\u00C7" => "C"
+ # Ć => C
+ "\U0106" => "C"
+ # È => E
+ "\u00C8" => "E"
+ # É => E
+ "\u00C9" => "E"
+ # Ê => E
+ "\u00CA" => "E"
+ # Ë => E
+ "\u00CB" => "E"
+ # Ę => E
+ "\u0118" => "E"
+ # Ì => I
+ "\u00CC" => "I"
+ # Ã => I
+ "\u00CD" => "I"
+ # ÃŽ => I
+ "\u00CE" => "I"
+ # Ã => I
+ "\u00CF" => "I"
+ # IJ => IJ
+ "\u0132" => "IJ"
+ # Ã => D
+ "\u00D0" => "D"
+ # Å => L
+ "\u0141" => "L"
+ # Ñ => N
+ "\u00D1" => "N"
+ # Ń => N
+ "\u0143" => "N"
+ # Ã’ => O
+ "\u00D2" => "O"
+ # Ó => O
+ "\u00D3" => "O"
+ # Ô => O
+ "\u00D4" => "O"
+ # Õ => O
+ "\u00D5" => "O"
+ # Ö => O
+ "\u00D6" => "O"
+ # Ø => O
+ "\u00D8" => "O"
+ # Å’ => OE
+ "\u0152" => "OE"
+ # Þ
+ "\u00DE" => "TH"
+ # Ù => U
+ "\u00D9" => "U"
+ # Ú => U
+ "\u00DA" => "U"
+ # Û => U
+ "\u00DB" => "U"
+ # Ü => U
+ "\u00DC" => "U"
+ # Ã => Y
+ "\u00DD" => "Y"
+ # Ÿ => Y
+ "\u0178" => "Y"
+ # Ã => a
+ "\u00E0" => "a"
+ # á => a
+ "\u00E1" => "a"
+ # â => a
+ "\u00E2" => "a"
+ # ã => a
+ "\u00E3" => "a"
+ # ä => a
+ "\u00E4" => "a"
+ # å => a
+ "\u00E5" => "a"
+ # æ => ae
+ "\u00E6" => "ae"
+ # ç => c
+ "\u00E7" => "c"
+ # è => e
+ "\u00E8" => "e"
+ # é => e
+ "\u00E9" => "e"
+ # ê => e
+ "\u00EA" => "e"
+ # ë => e
+ "\u00EB" => "e"
+ # ì => i
+ "\u00EC" => "i"
+ # Ã => i
+ "\u00ED" => "i"
+ # î => i
+ "\u00EE" => "i"
+ # ï => i
+ "\u00EF" => "i"
+ # ij => ij
+ "\u0133" => "ij"
+ # ð => d
+ "\u00F0" => "d"
+ # ñ => n
+ "\u00F1" => "n"
+ # ò => o
+ "\u00F2" => "o"
+ # ó => o
+ "\u00F3" => "o"
+ # ô => o
+ "\u00F4" => "o"
+ # õ => o
+ "\u00F5" => "o"
+ # ö => o
+ "\u00F6" => "o"
+ # ø => o
+ "\u00F8" => "o"
+ # Å“ => oe
+ "\u0153" => "oe"
+ # ß => ss
+ "\u00DF" => "ss"
+ # Åš => S
+ "\u015a" => "S"
+ # þ => th
+ "\u00FE" => "th"
+ # ù => u
+ "\u00F9" => "u"
+ # ú => u
+ "\u00FA" => "u"
+ # û => u
+ "\u00FB" => "u"
+ # ü => u
+ "\u00FC" => "u"
+ # ý => y
+ "\u00FD" => "y"
+ # ÿ => y
+ "\u00FF" => "y"
+ # Ź => Z
+ "\u0179" => "Z"
+ # Å» => Z
+ "\u017b" => "Z"
+ # ff => ff
+ "\uFB00" => "ff"
+ # ï¬ => fi
+ "\uFB01" => "fi"
+ # fl => fl
+ "\uFB02" => "fl"
+ # ffi => ffi
+ "\uFB03" => "ffi"
+ # ffl => ffl
+ "\uFB04" => "ffl"
+ # ſt => st
+ "\uFB05" => "st"
+ # st => st
+ "\uFB06" => "st"
+ # MÄori macrons.
+ # Ā => A
+ "\u0100" => "A"
+ # Ä’ => E
+ "\u0112" => "E"
+ # Ī => I
+ "\u012A" => "I"
+ # Ō => O
+ "\u014C" => "O"
+ # Ū => U
+ "\u016A" => "U"
+ # Ä => a
+ "\u0101" => "a"
+ # Ä“ => e
+ "\u0113" => "e"
+ # Ä« => i
+ "\u012B" => "i"
+ # Å => o
+ "\u014D" => "o"
+ # Å« => u
+ "\u016B" => "u"
diff --git a/tests/src/Kernel/SearchApiSolrTest.php b/tests/src/Kernel/SearchApiSolrTest.php
index fd2e29db445db0660448bf1a8a408cc9bfe8e708..800d731e45d710ff5332bf6fc6d0478b32b9f214 100644
--- a/tests/src/Kernel/SearchApiSolrTest.php
+++ b/tests/src/Kernel/SearchApiSolrTest.php
@@ -55,6 +55,7 @@ class SearchApiSolrTest extends SolrBackendTestBase {
'bg' => 'bg',
'ca' => 'ca',
'cs' => 'cs',
+ 'cy' => 'cy',
'da' => 'da',
'el' => 'el',
'es' => 'es',
@@ -336,6 +337,7 @@ class SearchApiSolrTest extends SolrBackendTestBase {
$language_ids['zh-hant'] = FALSE;
if (version_compare($targeted_solr_major_version, '6', '<')) {
$language_ids['ar'] = FALSE;
+ $language_ids['cy'] = FALSE;
$language_ids['ja'] = FALSE;
$language_ids['hu'] = FALSE;
$language_ids['sk'] = FALSE;