Update dependencies.

.github/PULL_REQUEST_TEMPLATE.md

@@ -40,4 +40,4 @@ Any additional information that you think would be helpful when reviewing this
  PR.
 
 # Interested parties
-Tag (@ mention) interested parties or, if unsure, @Islandora/8-x-committers
+Tag (@ mention) interested parties or, if unsure, @Islandora/committers

.github/workflows/build-2.x.yml

@@ -19,96 +19,19 @@ jobs:
   build:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.allowed_failure }}
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ["7.3", "7.4"]
+        # PHP 8.1 fails - see https://github.com/Islandora/islandora/issues/887
+        php-versions: ["7.4", "8.0"]
+        # test-suite functional-javascript will appear to pass but will skip tests; missing chromedriver.
         test-suite: ["kernel", "functional", "functional-javascript"]
-        drupal-version: ["9.3.x", "9.4.x-dev"]
+        # Not yet Drupal 10 ready - see https://github.com/Islandora/islandora/issues/888
+        drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev"]
+        mysql: ["8.0"]
         allowed_failure: [false]
-        mysql: ["5.7"]
-        # include experimental parts
-        include:
-          # 9.3.x on PHP 8.0
-          - drupal-version: '9.3.x'
-            php-versions: '8.0'
-            mysql: "8.0"
-            test-suite: "kernel"
-            allowed_failure: true
-          - drupal-version: '9.3.x'
-            php-versions: '8.0'
-            mysql: "8.0"
-            test-suite: "functional"
-            allowed_failure: true
-          - drupal-version: '9.3.x'
-            php-versions: '8.0'
-            mysql: "8.0"
-            test-suite: "functional-javascript"
-            allowed_failure: true
-          # 9.3.x on PHP 8.1
-          - drupal-version: '9.3.x'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "kernel"
-            allowed_failure: true
-          - drupal-version: '9.3.x'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "functional"
-            allowed_failure: true
-          - drupal-version: '9.3.x'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "functional-javascript"
-            allowed_failure: true
-          # 9.4.x-dev on PHP "8.0"
-          - drupal-version: '9.4.x-dev'
-            php-versions: '8.0'
-            mysql: "8.0"
-            test-suite: "kernel"
-            allowed_failure: true
-          - drupal-version: '9.4.x-dev'
-            php-versions: '8.0'
-            mysql: "8.0"
-            test-suite: "functional"
-            allowed_failure: true
-          - drupal-version: '9.4.x-dev'
-            php-versions: '8.0'
-            mysql: "8.0"
-            test-suite: "functional-javascript"
-            allowed_failure: true
-          # 9.4.x-dev on PHP 8.1
-          - drupal-version: '9.4.x-dev'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "kernel"
-            allowed_failure: true
-          - drupal-version: '9.4.x-dev'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "functional"
-            allowed_failure: true
-          - drupal-version: '9.4.x-dev'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "functional-javascript"
-            allowed_failure: true
-          # 10.0.x-dev on PHP 8.1
-          - drupal-version: '10.0.x-dev'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "kernel"
-            allowed_failure: true
-          - drupal-version: '10.0.x-dev'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "functional"
-            allowed_failure: true
-          - drupal-version: '10.0.x-dev'
-            php-versions: '8.1'
-            mysql: "8.0"
-            test-suite: "functional-javascript"
-            allowed_failure: true
+
 
     name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }}
 
@@ -175,7 +98,6 @@ jobs:
           cd $DRUPAL_DIR
           chmod -R u+w web/sites/default
           mkdir -p web/sites/simpletest/browser_output
-        continue-on-error: ${{ matrix.allowed_failure }}
 
       - name: Setup composer paths
         run: |
@@ -190,18 +112,15 @@ jobs:
           cd $DRUPAL_DIR/web
           drush --uri=127.0.0.1:8282 en -y islandora_audio islandora_breadcrumbs islandora_iiif islandora_image islandora_video islandora_text_extraction_defaults
           drush --uri=127.0.0.1:8282 fim -y islandora_core_feature,islandora_text_extraction_defaults
-        continue-on-error: ${{ matrix.allowed_failure }}
 
       - name: Copy PHPunit file
         run: cp $PHPUNIT_FILE $DRUPAL_DIR/web/core/phpunit.xml
 
       - name: Test scripts
         run: $SCRIPT_DIR/travis_scripts.sh
-        continue-on-error: ${{ matrix.allowed_failure }}
 
       - name: PHPUNIT tests
         run: |
           cd $DRUPAL_DIR/web/core
           $DRUPAL_DIR/vendor/bin/phpunit --verbose --testsuite "${{ matrix.test-suite }}"
-        continue-on-error: ${{ matrix.allowed_failure }}
 

README.md

@@ -1,6 +1,6 @@
 # ![Islandora](https://cloud.githubusercontent.com/assets/2371345/25624809/f95b0972-2f30-11e7-8992-a8f135402cdc.png) Islandora
 
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg?style=flat-square)](https://php.net/)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg?style=flat-square)](https://php.net/)
 [![Build Status](https://github.com/islandora/islandora/actions/workflows/build-2.x.yml/badge.svg)](https://github.com/Islandora/islandora/actions)
 [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
 [![LICENSE](https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square)](./LICENSE)

composer.json

@@ -14,30 +14,31 @@
     }
   ],
   "require": {
-    "drupal/context": "^4.0@beta",
-    "drupal/search_api": "~1.8",
-    "islandora/jsonld": "^2",
-    "stomp-php/stomp-php": "4.*",
-    "drupal/jwt": "^1.0.0-beta5",
-    "drupal/filehash": "^1.1 || ^2",
-    "drupal/prepopulate" : "^2.2",
-    "drupal/eva" : "^2.0",
+    "drupal/context": "^4.1",
+    "drupal/ctools": "^3.8 || ^4",
+    "drupal/eva" : "^3.0",
     "drupal/features" : "^3.7",
-    "drupal/migrate_plus" : "^5.1",
+    "drupal/file_replace": "^1.1",
+    "drupal/filehash": "^2",
+    "drupal/flysystem" : "^2.0@beta",
+    "drupal/jwt": "^1.0",
+    "drupal/migrate_plus" : "^5.1 || ^6",
     "drupal/migrate_source_csv" : "^3.4",
+    "drupal/prepopulate" : "^2.2",
+    "drupal/search_api": "^1.24",
     "drupal/token" : "^1.3",
-    "drupal/flysystem" : "^2.0@alpha",
     "islandora/crayfish-commons": "^2",
-    "drupal/file_replace": "^1.1"
+    "islandora/jsonld": "^2",
+    "stomp-php/stomp-php": "4.*"
   },
   "require-dev": {
     "phpunit/phpunit": "^6",
-    "squizlabs/php_codesniffer": "2.7.1",
+    "squizlabs/php_codesniffer": "3.7.1",
     "drupal/coder": "*",
     "sebastian/phpcpd": "*"
   },
   "suggest": {
-    "drupal/transliterate_filenames": "Sanitizes filenames when they are uploaded so they don't break your repository." 
+    "drupal/transliterate_filenames": "Sanitizes filenames when they are uploaded so they don't break your repository."
   },
   "license": "GPL-2.0-or-later",
   "authors": [

config/install/islandora.settings.yml

@@ -1,4 +1,5 @@
 broker_url: 'tcp://localhost:61613'
 jwt_expiry: '+2 hour'
 gemini_url: ''
+delete_media_and_files: TRUE
 gemini_pseudo_bundles: []

config/schema/islandora.schema.yml

@@ -14,6 +14,9 @@ islandora.settings:
     jwt_expiry:
       type: string
       label: 'How long JWTs should last before expiring.'
+    delete_media_and_files:
+      type: boolean
+      label: 'Node Delete with Media and Files'
     upload_form_location:
       type: string
       label: 'Upload Form Location'
@@ -87,6 +90,14 @@ condition.plugin.node_has_term:
     logic:
       type: string
       label: 'Logic (AND or OR)'
+    tids:
+      type: sequence
+      sequence:
+        type: mapping
+        mapping:
+          target_id:
+            type: integer
+            label: The target taxonomy term IDs
 
 condition.plugin.node_has_parent:
   type: condition.plugin
@@ -158,6 +169,76 @@ condition.plugin.node_had_namespace:
     pid_field:
       type: ignore
       label: 'PID field'
+
 field.formatter.settings.islandora_image:
   type: field.formatter.settings.image
   label: 'Islandora image field display format settings'
+
+condition.plugin.islandora_entity_bundle:
+  type: condition.plugin
+  mapping:
+    bundles:
+      type: sequence
+      sequence:
+        type: string
+
+condition.plugin.media_source_mimetype:
+  type: condition.plugin
+  mapping:
+    mimetype:
+      type: string
+
+reaction.plugin.alter_jsonld_type:
+  type: islandora.reaction_plugin_with_saved
+  mapping:
+    source_field:
+      type: string
+
+islandora.reaction_plugin_with_saved:
+  type: reaction.plugin
+  mapping:
+    saved:
+      type: boolean
+      label: Default config upstream; however, left undefined in the schema.
+
+reaction.plugin.islandora_map_uri_predicate:
+  type: islandora.reaction_plugin_with_saved
+  mapping:
+    drupal_uri_predicate:
+      type: string
+
+reaction.plugin.view_mode_alter:
+  type: islandora.reaction_plugin_with_saved
+  mapping:
+    mode:
+      type: string
+      label: The view mode to which to switch
+
+islandora.reaction.actions:
+  type: islandora.reaction_plugin_with_saved
+  mapping:
+    actions:
+      type: sequence
+      sequence:
+        type: string
+
+reaction.plugin.index:
+  type: islandora.reaction.actions
+
+reaction.plugin.delete:
+  type: islandora.reaction.actions
+
+reaction.plugin.derivative:
+  type: islandora.reaction.actions
+
+field.widget.settings.media_track:
+  type: field.widget.settings.file_generic
+
+field.field_settings.media_track:
+  type: field.field_settings.file
+  mapping:
+    languages:
+      type: string
+
+field.storage_settings.media_track:
+  type: field.storage_settings.file

css/islandora.css

@@ -0,0 +1,3 @@
+.container .islandora-media-items {
+  margin: 0;
+}

islandora.info.yml

@@ -4,31 +4,31 @@ name: 'islandora'
 description: "Islandora Core"
 type: module
 package: Islandora
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9
 dependencies:
   - drupal:block
   - drupal:node
   - drupal:path
   - drupal:text
   - drupal:options
   - drupal:link
-  - drupal:jsonld
-  - drupal:search_api
-  - drupal:jwt
+  - jsonld:jsonld
+  - search_api:search_api
+  - jwt:jwt
   - drupal:rest
-  - drupal:filehash
+  - filehash:filehash
   - drupal:basic_auth
-  - drupal:context_ui
+  - context:context_ui
   - drupal:action
-  - drupal:eva
+  - eva:eva
   - drupal:taxonomy
   - drupal:views_ui
   - drupal:media
-  - drupal:prepopulate
-  - drupal:features_ui
-  - drupal:migrate_source_csv
+  - prepopulate:prepopulate
+  - features:features_ui
+  - migrate_source_csv:migrate_source_csv
   - drupal:content_translation
-  - drupal:flysystem
-  - drupal:token
-  - drupal:file_replace
+  - flysystem:flysystem
+  - token:token
+  - file_replace:file_replace
+  - ctools:ctools

islandora.install

@@ -5,6 +5,10 @@
  * Install/update hook implementations.
  */
 
+use Drupal\Core\Extension\ExtensionNameLengthException;
+use Drupal\Core\Extension\MissingDependencyException;
+use Drupal\Core\Utility\UpdateException;
+
 /**
  * Adds common namespaces to jsonld.settings.
  */
@@ -174,3 +178,37 @@ function update_jsonld_included_namespaces() {
       ->warning("Could not find required jsonld.settings to add default RDF namespaces.");
   }
 }
+
+/**
+ * Ensure that ctools is enabled.
+ */
+function islandora_update_8007() {
+  $module_handler = \Drupal::moduleHandler();
+  if ($module_handler->moduleExists('ctools')) {
+    return t('The "@module_name" module is already enabled, no action necessary.', [
+      '@module_name' => 'ctools',
+    ]);
+  }
+
+  /** @var \Drupal\Core\Extension\ModuleInstallerInterface $installer */
+  $installer = \Drupal::service('module_installer');
+
+  try {
+    if ($installer->install(['ctools'], TRUE)) {
+      return t('The "@module_name" module was enabled successfully.', [
+        '@module_name' => 'ctools',
+      ]);
+    }
+  }
+  catch (ExtensionNameLengthException | MissingDependencyException $e) {
+    throw new UpdateException('Failed; ensure that the ctools module is available in the Drupal installation.', 0, $e);
+  }
+  catch (\Exception $e) {
+    throw new UpdateException('Failed; encountered an exception while trying to enable ctools.', 0, $e);
+  }
+
+  // Theoretically impossible to hit, as ModuleInstaller::install() only returns
+  // TRUE (or throws/propagates an exception), but... probably a good idea to
+  // have the here, just in case?
+  throw new UpdateException('Failed; hit the end of the update hook implementation, which is not expected.');
+}