Skip to content

Commit

Permalink
Update drupal to 10.3 and add patches. (#160)
Browse files Browse the repository at this point in the history
  • Loading branch information
rosiel committed Jul 17, 2024
1 parent e490adf commit 3e07da8
Show file tree
Hide file tree
Showing 88 changed files with 471 additions and 426 deletions.
6 changes: 6 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@
"patches": {
"twistor/flysystem-stream-wrapper": {
"PHP 8.2 deprecation warning": "assets/patches/flysystem-stream-wrapper.patch"
},
"drupal/flysystem": {
"required_derivative_scheme https://www.drupal.org/project/flysystem/issues/3457193": "https://www.drupal.org/files/issues/2024-07-01/3378738-1.patch"
},
"drupal/advanced_search": {
"set session": "https://patch-diff.githubusercontent.com/raw/Islandora/advanced_search/pull/52.patch"
}
}
},
Expand Down
694 changes: 336 additions & 358 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/sync/block_content.type.basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ _core:
default_config_hash: zglzjmYxi0G0ag9MZ02y0LSJOdpWRwJxyP_OvFojFyo
id: basic
label: 'Basic block'
revision: 0
revision: false
description: 'A basic block contains a title and a body.'
1 change: 1 addition & 0 deletions config/sync/coi.settings.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
_core:
default_config_hash: bO--lQ6KgJ0tb7_TBJybomU61yvfcSyI5qRzOxpLFvE
langcode: en
override_behavior: disable
message:
enabled: true
Expand Down
6 changes: 3 additions & 3 deletions config/sync/editor.editor.basic_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ image_upload:
status: true
scheme: public
directory: inline-images
max_size: ''
max_size: null
max_dimensions:
width: 0
height: 0
width: null
height: null
6 changes: 3 additions & 3 deletions config/sync/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ image_upload:
status: true
scheme: public
directory: inline-images
max_size: ''
max_size: null
max_dimensions:
width: 0
height: 0
width: null
height: null
2 changes: 1 addition & 1 deletion config/sync/node.type.article.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ _core:
name: Article
type: article
description: 'Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.'
help: ''
help: null
new_revision: true
preview_mode: 1
display_submitted: true
2 changes: 1 addition & 1 deletion config/sync/node.type.islandora_object.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ _core:
name: 'Repository Item'
type: islandora_object
description: 'An item in your Islandora repository.'
help: ''
help: null
new_revision: true
preview_mode: 1
display_submitted: false
2 changes: 1 addition & 1 deletion config/sync/node.type.page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ _core:
name: 'Basic page'
type: page
description: "Use <em>basic pages</em> for your static content, such as an 'About us' page."
help: ''
help: null
new_revision: true
preview_mode: 1
display_submitted: false
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ cache:
size: 512
initialSize: 512
autowarmCount: 0
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ cache:
size: 512
initialSize: 512
autowarmCount: 0
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ cache:
initialSize: 0
autowarmCount: 10
regenerator: solr.NoOpRegenerator
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ cache:
initialSize: 0
autowarmCount: 10
regenerator: solr.NoOpRegenerator
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ unstemmed_field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
spellcheck_field_type: { }
spellcheck_field_type: { }
collated_field_type:
name: collated_en
class: solr.ICUCollationField
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ unstemmed_field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
spellcheck_field_type: { }
spellcheck_field_type: { }
collated_field_type:
name: collated_en
class: solr.ICUCollationField
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ field_type:
concat: true
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ field_type:
concat: true
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ field_type:
class: solr.PatternTokenizerFactory
pattern: '[\t\r\n]'
filters: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type: { }
collated_field_type: { }
solr_configs: { }
text_files: { }
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type:
name: text_spell_und
class: solr.TextField
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ field_type:
class: solr.LowerCaseFilterFactory
-
class: solr.RemoveDuplicatesTokenFilterFactory
unstemmed_field_type: { }
unstemmed_field_type: { }
spellcheck_field_type:
name: text_spell_und
class: solr.TextField
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ request_handler:
VALUE: spellcheck
-
VALUE: suggest
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ request_handler:
-
name: fmap.div
VALUE: ignored_
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ request_handler:
-
name: timeAllowed
VALUE: '${solr.mlt.timeAllowed:2000}'
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ request_handler:
-
name: df
VALUE: id
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ request_handler:
-
name: confFiles
VALUE: '${solr.replication.confFiles:schema.xml,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml}'
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ request_handler:
-
name: pollInterval
VALUE: '${solr.replication.pollInterval:00:00:60}'
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ request_handler:
VALUE: spellcheck
-
VALUE: elevator
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ request_handler:
str:
-
VALUE: spellcheck
solr_configs: { }
solr_configs: { }
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ request_handler:
str:
-
VALUE: suggest
solr_configs: { }
solr_configs: { }
2 changes: 1 addition & 1 deletion config/sync/system.cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ _core:
threshold:
requirements_warning: 172800
requirements_error: 1209600
logging: 1
logging: true
2 changes: 1 addition & 1 deletion config/sync/system.date.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ _core:
default_config_hash: t7clj3mzmOGrXX0HuCH5usf0vEqRtnMTBFVBIEmZ5pc
first_day: 0
country:
default: ''
default: null
timezone:
default: America/Chicago
user:
Expand Down
1 change: 1 addition & 0 deletions config/sync/system.site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ page:
admin_compact_mode: false
weight_select_max: 100
default_langcode: en
mail_notification: null
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.corporate_body.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: 'Corporate Body'
vid: corporate_body
description: 'An organization or group of persons that is identified by a particular name and that acts, or may act, as an entity. Also includes an individual acting in a corporate capacity.'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.country.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: Country
vid: country
description: 'The MARC Code List for Countries contains a list of places and their associated two- or three-character lowercase alphabetic cod'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.family.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: Family
vid: family
description: 'Two or more people related through marriage, birth, adoption, or other legal manner, or who present themselves as a family.'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.frequencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: Frequency
vid: frequencies
description: 'Terms to express publication frequency'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.genre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: Genre
vid: genre
description: 'A term or terms that designate a category characterizing a particular style, form, or content, such as artistic, musical, literary composition, etc.'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.geo_location.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: 'Geographic Location'
vid: geo_location
description: 'Geographic area(s) and places to which the records pertain.'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.islandora_display.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: 'Islandora Display'
vid: islandora_display
description: 'Terms used to alter how a repository item is viewed. ie. basic image vs large image'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.islandora_media_use.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: 'Islandora Media Use'
vid: islandora_media_use
description: 'Terms to define how a media object is to be used.'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.islandora_models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: 'Islandora Models'
vid: islandora_models
description: 'Types of repository objects'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.issuance_modes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: 'Issuance Mode'
vid: issuance_modes
description: "Terms from Library of Congress' MARC Issuance List vocabulary"
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.language.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: Language
vid: language
description: 'Codes to describe language of resource content. Intended for use with ISO639-2'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.person.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: Person
vid: person
description: 'An individual of the human species. '
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.physical_form.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: 'Physical Form'
vid: physical_form
description: 'A designation of a particular physical presentation of a resource, including the physical form or medium of material for a resou'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.resource_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: 'Resource Types (LC)'
vid: resource_types
description: 'The LC Resource Types vocabulary. '
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.resource_types_dcmi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ name: 'Resource Types (DCMI)'
vid: resource_types_dcmi
description: 'The DCMI Type Vocabulary'
weight: 0
new_revision: false
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.subject.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: Subject
vid: subject
description: 'Subject matter to which the records pertain, such as topics, events, people, and organizations.'
weight: 0
new_revision: false
Loading

0 comments on commit 3e07da8

Please sign in to comment.