diff --git a/.gitattributes b/.gitattributes index e7b792f8..76ea8fee 100644 --- a/.gitattributes +++ b/.gitattributes @@ -42,9 +42,6 @@ *.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -# PHPStan's baseline uses tabs instead of spaces. -core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php - # Define binary file attributes. # - Do not treat them as text. # - Include binary diff in patches instead of "binary files differ." diff --git a/composer.json b/composer.json index 7b284322..9cc6d659 100755 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "drupal/flysystem": "^2.2@alpha", "drupal/fpa": "^4.0", "drupal/hal": "^1.0||^2.0", - "drupal/islandora": "^2", + "drupal/islandora": "^2.12.3", "drupal/islandora_mirador": "^2", "drupal/matomo": "^1.19", "drupal/openseadragon": "^2", diff --git a/composer.lock b/composer.lock index 11e6315d..37f83d80 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6a63947955a4e1b16a2acccbe3929467", + "content-hash": "2be12b4bd79e6045fd74b549465a0097", "packages": [ { "name": "adci/full-name-parser", @@ -3409,31 +3409,32 @@ }, { "name": "drupal/hal", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/hal.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/hal-2.0.2.zip", - "reference": "2.0.2", - "shasum": "9ec3ad376678941bae2e0eae0c980c42cddfc8b2" + "url": "https://ftp.drupal.org/files/projects/hal-2.0.3.zip", + "reference": "2.0.3", + "shasum": "81bc4b0bfdc6c3b7c2ec50f5eb4739451ff5c2ae" }, "require": { - "drupal/core": "^10" + "drupal/core": "^10 || ^11" }, "require-dev": { "drupal/aggregator": "2.x-dev", "drupal/entity_reference_revisions": "1.x-dev", - "drupal/rdf": "2.x-dev" + "drupal/rdf": "^2.1 || 3.0.x-dev", + "drupal/tour": "^1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1700523711", + "version": "2.0.3", + "datestamp": "1721252595", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4430,17 +4431,17 @@ }, { "name": "drupal/migrate_plus", - "version": "6.0.2", + "version": "6.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/migrate_plus.git", - "reference": "6.0.2" + "reference": "6.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/migrate_plus-6.0.2.zip", - "reference": "6.0.2", - "shasum": "4315bc293aa75ea9247582d5d1925b075865e467" + "url": "https://ftp.drupal.org/files/projects/migrate_plus-6.0.3.zip", + "reference": "6.0.3", + "shasum": "08feb88178a45d8354862b03fd7fcf9b47ae14e1" }, "require": { "drupal/core": ">=9.1", @@ -4457,8 +4458,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.2", - "datestamp": "1705424638", + "version": "6.0.3", + "datestamp": "1721333111", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5136,17 +5137,17 @@ }, { "name": "drupal/taxonomy_manager", - "version": "2.0.11", + "version": "2.0.12", "source": { "type": "git", "url": "https://git.drupalcode.org/project/taxonomy_manager.git", - "reference": "2.0.11" + "reference": "2.0.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/taxonomy_manager-2.0.11.zip", - "reference": "2.0.11", - "shasum": "03d50c2702dcf1c2f744ad735ab2037adc422fb1" + "url": "https://ftp.drupal.org/files/projects/taxonomy_manager-2.0.12.zip", + "reference": "2.0.12", + "shasum": "70677d9fb730cbf40640d6e28393f74458ecf717" }, "require": { "drupal/core": "^9.3 || ^10", @@ -5158,8 +5159,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.11", - "datestamp": "1715239473", + "version": "2.0.12", + "datestamp": "1721222244", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6062,22 +6063,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.8.1", + "version": "7.8.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" + "reference": "f4152d9eb85c445fe1f992001d1748e8bec070d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4152d9eb85c445fe1f992001d1748e8bec070d2", + "reference": "f4152d9eb85c445fe1f992001d1748e8bec070d2", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.1", - "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "guzzlehttp/promises": "^1.5.3 || ^2.0.3", + "guzzlehttp/psr7": "^1.9.1 || ^2.6.3", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -6088,9 +6089,9 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "guzzle/client-integration-tests": "3.0.2", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "phpunit/phpunit": "^8.5.39 || ^9.6.20", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -6168,7 +6169,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.1" + "source": "https://github.com/guzzle/guzzle/tree/7.8.2" }, "funding": [ { @@ -6184,20 +6185,20 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:35:24+00:00" + "time": "2024-07-18T11:12:18+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" + "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", + "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", "shasum": "" }, "require": { @@ -6205,7 +6206,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "type": "library", "extra": { @@ -6251,7 +6252,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.2" + "source": "https://github.com/guzzle/promises/tree/2.0.3" }, "funding": [ { @@ -6267,20 +6268,20 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:19:20+00:00" + "time": "2024-07-18T10:29:17+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.6.2", + "version": "2.6.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" + "reference": "6de29867b18790c0d2c846af4c13a24cc3ad56f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/6de29867b18790c0d2c846af4c13a24cc3ad56f3", + "reference": "6de29867b18790c0d2c846af4c13a24cc3ad56f3", "shasum": "" }, "require": { @@ -6295,8 +6296,8 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "http-interop/http-factory-tests": "0.9.0", + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -6367,7 +6368,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.2" + "source": "https://github.com/guzzle/psr7/tree/2.6.3" }, "funding": [ { @@ -6383,7 +6384,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:05:35+00:00" + "time": "2024-07-18T09:59:12+00:00" }, { "name": "halaxa/json-machine", diff --git a/config/sync/islandora.settings.yml b/config/sync/islandora.settings.yml index c2131fbe..4b617521 100644 --- a/config/sync/islandora.settings.yml +++ b/config/sync/islandora.settings.yml @@ -1,11 +1,11 @@ _core: default_config_hash: XgeYJpPmZIOwE_nA73tYvFw-Rcj-HtlbNwfktqSVsaQ -broker_url: 'tcp://activemq:61613' +broker_url: 'tcp://127.0.0.1:61613' jwt_expiry: '+2 hour' delete_media_and_files: true -redirect_after_media_save: false upload_form_location: '' upload_form_allowed_mimetypes: '' +gemini_url: '' gemini_pseudo_bundles: 'islandora_object:node': 'islandora_object:node' 'audio:media': 'audio:media' diff --git a/config/sync/key.key.islandora_rsa_key.yml b/config/sync/key.key.islandora_rsa_key.yml index 9e75e6f0..883398e4 100644 --- a/config/sync/key.key.islandora_rsa_key.yml +++ b/config/sync/key.key.islandora_rsa_key.yml @@ -12,6 +12,6 @@ key_type_settings: algorithm: RS256 key_provider: file key_provider_settings: - file_location: /opt/keys/jwt/private.key + file_location: /opt/islandora/auth/private.key key_input: none key_input_settings: { } diff --git a/config/sync/media.settings.yml b/config/sync/media.settings.yml index d672e9d0..32d79b30 100644 --- a/config/sync/media.settings.yml +++ b/config/sync/media.settings.yml @@ -3,4 +3,4 @@ _core: icon_base_uri: 'public://media-icons/generic' iframe_domain: null oembed_providers_url: 'https://oembed.com/providers.json' -standalone_url: true +standalone_url: false diff --git a/config/sync/views.view.iiif_manifest.yml b/config/sync/views.view.iiif_manifest.yml index dde9bee8..82a76941 100644 --- a/config/sync/views.view.iiif_manifest.yml +++ b/config/sync/views.view.iiif_manifest.yml @@ -166,6 +166,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -180,7 +181,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/config/sync/views.view.search_in_hocr.yml b/config/sync/views.view.search_in_hocr.yml index 08b97e3d..d42e3b8c 100644 --- a/config/sync/views.view.search_in_hocr.yml +++ b/config/sync/views.view.search_in_hocr.yml @@ -116,6 +116,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0