Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Drupal 11 support #1063

Draft
wants to merge 3 commits into
base: 2.x
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/build-2.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ jobs:
matrix:
php-versions: ["8.1", "8.2", "8.3"]
test-suite: ["kernel", "functional", "functional-javascript"]
drupal-version: ["10.2.x", "10.3.x", "10.4.x-dev"]
drupal-version: ["10.2.x", "10.3.x", "10.4.x-dev", "11.0.x"]
mysql: ["8.0"]
allowed_failure: [false]
exclude:
- drupal-version: "11.0.x"
php-versions: "8.1"
- drupal-version: "11.0.x"
php-versions: "8.2"

name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }}

Expand Down Expand Up @@ -114,7 +119,7 @@ jobs:
- name: PHPUNIT tests
run: |
cd $DRUPAL_DIR/web/core
$DRUPAL_DIR/vendor/bin/phpunit --verbose --testsuite "${{ matrix.test-suite }}"
$DRUPAL_DIR/vendor/bin/phpunit --testsuite "${{ matrix.test-suite }}"

- name: Print chromedriver logs
if: matrix.test-suite == 'functional-javascript'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ You can set the following configuration at `admin/config/islandora/core`:

## Documentation

Further documentation for this module is available on the [Islandora 8 documentation site](https://islandora.github.io/documentation/).
Further documentation for this module is available on the [Islandora documentation site](https://islandora.github.io/documentation/).

## Troubleshooting/Issues

Expand Down
2 changes: 1 addition & 1 deletion islandora.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: 'islandora'
description: "Islandora Core"
type: module
package: Islandora
core_version_requirement: ^10.2
core_version_requirement: ^10.2 || ^11
dependencies:
- context:context_ui
- ctools:ctools
Expand Down
2 changes: 1 addition & 1 deletion modules/islandora_advanced_search/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ checkbox.
## Documentation

Further documentation for this module is available on the
[Islandora 8 documentation site](https://islandora.github.io/documentation/).
[Islandora documentation site](https://islandora.github.io/documentation/).

## Troubleshooting/Issues

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: 'Islandora Advanced Search'
description: "Creates an Advanced Search block and other enhancements to search."
type: module
package: Islandora
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
dependencies:
- drupal:facets
- drupal:facets_summary
Expand Down
2 changes: 1 addition & 1 deletion modules/islandora_audio/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $ drush en islandora_audio

## Documentation

Official documentation is available on the [Islandora 8 documentation site](https://islandora.github.io/documentation/).
Official documentation is available on the [Islandora documentation site](https://islandora.github.io/documentation/).

## Development

Expand Down
2 changes: 1 addition & 1 deletion modules/islandora_audio/islandora_audio.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ name: 'Islandora Audio'
description: 'Islandora audio derivative actions'
type: module
package: Islandora
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
dependencies:
- drupal:islandora
2 changes: 1 addition & 1 deletion modules/islandora_breadcrumbs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ $ drush en islandora_breadcrumbs

## Documentation

Official documentation is available on the [Islandora 8 documentation site](https://islandora.github.io/documentation/).
Official documentation is available on the [Islandora documentation site](https://islandora.github.io/documentation/).

## Development

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Islandora Breadcrumbs'
type: module
description: 'Builds breadcrumbs based on field_member_of relationships.'
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
package: Islandora
dependencies:
- islandora:islandora
2 changes: 1 addition & 1 deletion modules/islandora_core_feature/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $ drush mim islandora_tags

## Documentation

Official documentation is available on the [Islandora 8 documentation site](https://islandora.github.io/documentation/).
Official documentation is available on the [Islandora documentation site](https://islandora.github.io/documentation/).

## Development

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Islandora Core Feature'
description: 'Minimum configuration required for Islandora.'
type: module
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
dependencies:
- drupal:basic_auth
- drupal:content_translation
Expand Down
2 changes: 1 addition & 1 deletion modules/islandora_iiif/islandora_iiif.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Islandora IIIF'
type: module
description: 'IIIF support for Islandora'
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
package: Islandora
dependencies:
- drupal:islandora
2 changes: 1 addition & 1 deletion modules/islandora_image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $ drush en islandora_image

## Documentation

Further documentation for this module is available on the [Islandora 8 documentation site](https://islandora.github.io/documentation/).
Further documentation for this module is available on the [Islandora documentation site](https://islandora.github.io/documentation/).

## Troubleshooting/Issues

Expand Down
2 changes: 1 addition & 1 deletion modules/islandora_image/islandora_image.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Islandora Image'
type: module
description: 'Islandora Image derivative actions'
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
package: Islandora
dependencies:
- drupal:islandora
2 changes: 1 addition & 1 deletion modules/islandora_text_extraction/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $ drush en islandora_text_extraction

## Documentation

Official documentation is available on the [Islandora 8 documentation site](https://islandora.github.io/documentation/).
Official documentation is available on the [Islandora documentation site](https://islandora.github.io/documentation/).

## Sponsors

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Islandora Text Extraction'
type: module
description: 'Islandora 8 module to connect to Hypercube microservice, and to get text from PDF ingest'
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
package: 'Islandora'
dependencies:
- drupal:islandora
2 changes: 1 addition & 1 deletion modules/islandora_text_extraction_defaults/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ $ drush en islandora_text_extraction

## Documentation

Official documentation is available on the [Islandora 8 documentation site](https://islandora.github.io/documentation/).
Official documentation is available on the [Islandora documentation site](https://islandora.github.io/documentation/).

## Development

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Islandora Text Extraction Defaults'
type: module
description: 'Default config for the Islandora Text Extraction module.'
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
package: Islandora
dependencies:
- drupal:field
Expand Down
2 changes: 1 addition & 1 deletion modules/islandora_video/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $ drush en islandora_video

## Documentation

Official documentation is available on the [Islandora 8 documentation site](https://islandora.github.io/documentation/).
Official documentation is available on the [Islandora documentation site](https://islandora.github.io/documentation/).

## Development

Expand Down
2 changes: 1 addition & 1 deletion modules/islandora_video/islandora_video.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ name: 'Islandora Video'
description: 'Islandora video derivative actions'
type: module
package: Islandora
core_version_requirement: ^9 || ^10
core_version_requirement: ^9 || ^10 || ^11
dependencies:
- drupal:islandora
2 changes: 1 addition & 1 deletion src/EventSubscriber/JwtEventSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static function create(
/**
* {@inheritdoc}
*/
public static function getSubscribedEvents() {
public static function getSubscribedEvents(): array {
$events[JwtAuthEvents::VALIDATE][] = ['validate'];
$events[JwtAuthEvents::VALID][] = ['loadUser'];
$events[JwtAuthEvents::GENERATE][] = ['setIslandoraClaims'];
Expand Down
2 changes: 1 addition & 1 deletion src/EventSubscriber/LinkHeaderSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function __construct(
/**
* {@inheritdoc}
*/
public static function getSubscribedEvents() {
public static function getSubscribedEvents(): array {
// Run this early so the headers get cached.
$events[KernelEvents::RESPONSE][] = ['onResponse', 129];

Expand Down
2 changes: 1 addition & 1 deletion src/EventSubscriber/StompHeaderEventSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function __construct(
/**
* {@inheritdoc}
*/
public static function getSubscribedEvents() {
public static function getSubscribedEvents(): array {
return [
StompHeaderEventInterface::EVENT_NAME => ['baseHeaders', -100],
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ dependencies:
- drupal:node
- drupal:views
- drupal:language

# Information added by Drupal.org packaging script on 2024-10-28
version: '2.13.1'
project: 'islandora'
datestamp: 1730125691
Loading