Skip to content

D11-11: Bump core version, and address some issues flagged by upgrade_status #169

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.

Sign up for GitHub

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

Open
adam-vessey wants to merge 10 commits into
base: main
Choose a base branch
from
Open

D11-11: Bump core version, and address some issues flagged by upgrade_status #169

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aaa8ec2
Use the empty `drush.services` with an open-sided range.
adam-vessey Oct 22, 2025
4ab774d
Bump core version.
adam-vessey Oct 23, 2025
c040819
Avoid use of deprecated/removed method.
adam-vessey Oct 23, 2025
34c7a31
Adjust tests as per `upgrade_status` recommendations.
adam-vessey Oct 23, 2025
003ffc7
Widen `drupal/imagemagick` spec.
adam-vessey Oct 23, 2025
b31f9fe
Bump allowed/required `symfony/mime` for D11.
adam-vessey Oct 27, 2025
57db7ac
Add a some missing typehints.
adam-vessey Oct 28, 2025
f8def20
Adding version check for `checkStatus()` parent function.
nchiasson-dgi Mar 11, 2026
440499a
Merge pull request #180 from nchiasson-dgi/update/d11
nchiasson-dgi Mar 11, 2026
2dc7490
Merge branch 'main' into update/d11
nchiasson-dgi Apr 28, 2026
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: 6 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,30 @@
"discoverygarden/islandora_drush_utils": "^1 || ^2",
"discoverygarden/update-helper": "^1",
"drupal/controlled_access_terms": "^2",
"drupal/imagemagick": "^3.2",
"drupal/imagemagick": "^3.2 || ^4",
"drupal/islandora": "^2",
"drupal/migrate_directory": "^1 || ^2",
"drupal/migrate_plus": "^5.1 || ^6",
"drupal/migrate_tools": "^6.1.0",
"drupal/paragraphs": "^1",
"drupal/pathauto": "^1.8",
"iqb/substream": "dev-master",
"symfony/mime": "^5 || ^6"
"symfony/mime": "^5 || ^6 || ^7"
},
"require-dev": {
"drupal/devel": "^4"
},
"conflict": {
"drupal/core": "<10.1"
},
"suggest": {
"discoverygarden/entity_reference_integrity_extra": "Deal with addtional 'entity_reference' fields.",
"drupal/entity_reference_integrity": "Used to check things when a migration elects to 'manage_orphans'."
},
"extra": {
"drush": {
"services": {
"drush.11-12.services.yml": "^11.6 || ^12",
"drush.11-12.services.yml": ">=11.6",
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🌐 Web query:

Drush 13 release Drupal 11 compatibility

💡 Result:

  • Drush 13.0.0 release date: August 2, 2024. [1]
  • Drupal 11 compatibility: Yes — Drush 13 is marked as supported/recommended for Drupal 11 (and compatible with Drupal 10.2+). [2]
  • Key requirement: Drush 13 requires PHP 8.3+. [2]

Sources:
[1] endoflife.date (Drush release timeline)
[2] Drush docs (Drupal compatibility table)

Revisit the open-ended Drush services constraint now that Drush 13 is released.

Drush 13 was released in August 2024 and is compatible with Drupal 11. The constraint >=11.6 does match Drush 13 as intended, but given the commit message indicated this was a "temporary/compatibility change," the constraint approach should be formally reassessed. Determine whether this open-ended constraint will remain appropriate for Drush 14+ or if it requires tightening to a specific upper bound (e.g., >=11.6,<14.0).

🤖 Prompt for AI Agents 
In `@composer.json` at line 34, The current Composer platform config entry for
"drush.11-12.services.yml" uses an open-ended constraint ">=11.6"; update this
to a bounded version to avoid accidentally allowing incompatible Drush major
releases (e.g., change the constraint to ">=11.6,<14.0" or another agreed upper
bound) and document the chosen bound in a brief comment or commit message;
locate the key "drush.11-12.services.yml" in composer.json and replace the
version string accordingly, ensuring composer validate passes and running a
quick compatibility test (e.g., install or update) to confirm no regressions.

"drush.10-11.services.yml": "^10 || >=11.0.0 <11.6"
}
}
Expand Down
2 changes: 1 addition & 1 deletion dgi_migrate.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'DGI Migrate'
description: "DGI Migration Support."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- drupal:media
- drupal:migrate
Expand Down
2 changes: 1 addition & 1 deletion modules/devel/dgi_migrate_devel.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: DGI Migrate Devel Plugin(s)
description: "Devel plugins."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- drupal:migrate
- dgi_migrate:dgi_migrate
Expand Down
2 changes: 1 addition & 1 deletion modules/dgi_migrate_alter/dgi_migrate_alter.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: 'DGI Migrate Alter'
description: "Allows easy alterations of migrations through plugins."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
2 changes: 1 addition & 1 deletion modules/dgi_migrate_big_set_overrides/dgi_migrate_big_set_overrides.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: 'DGI Migrate, big set overrides'
description: "Toggle off some things that take cause issues with resource constraints, while running a migration/batch."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
2 changes: 1 addition & 1 deletion modules/dgi_migrate_dspace/dgi_migrate_dspace.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: DGI Migrate DSpace
description: DSpace Migrations to import AIP ZIP exports.
package: DGI Helpers
type: module
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- drupal:migrate
- dgi_migrate:dgi_migrate
2 changes: 1 addition & 1 deletion modules/dgi_migrate_edtf_validator/dgi_migrate_edtf_validator.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'DGI Migrate EDTF Validator'
description: "DGI Migration EDTF Support."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- drupal:migrate
- controlled_access_terms:controlled_access_terms
2 changes: 1 addition & 1 deletion modules/dgi_migrate_foxml_standard_mods/dgi_migrate_foxml_standard_mods.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: DGI Migrate FOXML (Standard MODS)
description: "FOXML migration for MODS into the DGI standard content type"
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- drupal:migrate
- dgi_migrate:dgi_migrate
Expand Down
2 changes: 1 addition & 1 deletion ...gi_migrate_foxml_standard_mods/modules/xslt/dgi_migrate_foxml_standard_mods_xslt.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: DGI Migrate FOXML (Standard MODS) XSLT
description: "XSLT preprocessing for FOXML migration for MODS into the DGI standard content type"
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- dgi_migrate:dgi_migrate
- dgi_migrate:dgi_migrate_foxml_standard_mods
Expand Down
2 changes: 1 addition & 1 deletion modules/dgi_migrate_foxml_standard_mods/tests/src/Kernel/RoleMapperMigrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class RoleMapperMigrationTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
public static $modules = [
protected static $modules = [
'migrate',
'dgi_migrate',
'dgi_migrate_foxml_standard_mods',
Expand Down
2 changes: 1 addition & 1 deletion modules/dgi_migrate_foxml_standard_mods/tests/src/Unit/RoleMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function testRoleMapper($path, $expected_roles) {
$roles = $this->plugin->mapRoles($element, $this->xpath);

$this->assertSame($expected_roles, array_intersect($expected_roles, $roles), 'Received found the expected role(s).');
$this->assertSame(count($expected_roles), count($roles), 'Had same number of roles.');
$this->assertCount(count($expected_roles), $roles, 'Had same number of roles.');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion modules/dgi_migrate_imagemagick_cleanup/dgi_migrate_imagemagick_cleanup.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'DGI Migrate Imagemagick Cleanup'
description: "Imagemagick helper."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- drupal:migrate
- imagemagick:imagemagick
2 changes: 1 addition & 1 deletion modules/dgi_migrate_paragraphs/dgi_migrate_paragraphs.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'DGI Migrate Paragraphs'
description: "DGI Paragraph Migration Support."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- drupal:migrate
- paragraphs:paragraphs
2 changes: 1 addition & 1 deletion .../dgi_migrate_regenerate_pathauto_aliases/dgi_migrate_regenerate_pathauto_aliases.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'DGI Migrate, regenerate Pathauto aliases'
description: "Provides a way to regenerate Pathauto aliases that were initially disabled."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- pathauto:pathauto
- islandora_drush_utils:islandora_drush_utils
7 changes: 5 additions & 2 deletions src/MigrateBatchExecutable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ protected function getQueue() : QueueInterface {
/**
* {@inheritdoc}
*/
public function __sleep() {
public function __sleep() : array {
$vars = $this->traitSleep();
$to_suppress = [
// XXX: Avoid serializing some things can't be natively serialized.
Expand Down Expand Up @@ -478,7 +478,10 @@ public function processBatch(&$context) {
* {@inheritdoc}
*/
protected function checkStatus() {
$status = parent::checkStatus();
$status = version_compare(\Drupal::VERSION, '11.3.0', '>=') ?
MigrationInterface::RESULT_COMPLETED :
parent::checkStatus();


Comment on lines +481 to 485
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Fix linting error: Remove extra empty line.

The pipeline is failing due to multiple consecutive empty lines (lines 484-485).

Proposed fix 
   protected function checkStatus() {
     $status = version_compare(\Drupal::VERSION, '11.3.0', '>=') ?
       MigrationInterface::RESULT_COMPLETED :
       parent::checkStatus();
-
 
     if ($status === MigrationInterface::RESULT_COMPLETED) {
🧰 Tools
🪛 GitHub Actions: Code Linting

[error] 484-484: Functions must not contain multiple empty lines in a row; found 2 empty lines (Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines).

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@src/MigrateBatchExecutable.php` around lines 481 - 485, There's an extra
blank line after the ternary assignment to $status causing lint failures; edit
the method in MigrateBatchExecutable.php where $status is set using
version_compare(... ) ? MigrationInterface::RESULT_COMPLETED :
parent::checkStatus() and remove the consecutive empty line(s) so the assignment
and the following code are contiguous (no extra blank lines).

if ($status === MigrationInterface::RESULT_COMPLETED) {
if (!static::isCli() && !static::hasTime()) {
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/migrate/id_map/SmartSql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition

// Default generated table names, limited to 63 characters.
$machine_name = mb_strtolower(str_replace(PluginBase::DERIVATIVE_SEPARATOR, '__', $this->migration->id()));
$prefix_length = strlen($this->database->tablePrefix());
$prefix_length = strlen($this->database->getPrefix());
$max_length = self::TABLE_NAME_CHARACTER_LIMIT - $prefix_length;

$map_table_name = self::MAP_TABLE_PREFIX . $machine_name;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/migrate/source/Migration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function __toString() {
/**
* {@inheritdoc}
*/
public function __sleep() {
public function __sleep() : array {
$vars = parent::__sleep();

$to_suppress = [
Expand Down
2 changes: 1 addition & 1 deletion src/StompQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function deleteQueue() {
/**
* {@inheritDoc}
*/
public function __sleep() {
public function __sleep() : array {
$vars = $this->dstSleep();

$to_suppress = [
Expand Down
Loading