Skip to content

D11-11: Bump core version #35

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 5 commits into
base: main
Choose a base branch
from
Open

D11-11: Bump core version #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a1f02d
Avoid setting `$this->logger` directly.
adam-vessey Oct 22, 2025
69ee8ad
Add conflict statement.
adam-vessey Oct 22, 2025
bfda356
Bump core version.
adam-vessey Oct 23, 2025
898af14
Add missing access checks and batch context.
adam-vessey Oct 23, 2025
5e96ba6
Merge remote-tracking branch 'origin/main' into update/d11
adam-vessey Oct 28, 2025
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
3 changes: 3 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
"discoverygarden/update-helper": "^1",
"discoverygarden/dgi_standard_derivative_examiner": "^1.2 || ^2"
},
"conflict": {
"drush/drush": "<13"
},
"extra": {
"drush": {
"services": {
Expand Down
2 changes: 1 addition & 1 deletion islandora_drush_utils.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ name: 'Islandora Drush Utils'
description: "Drush utility functions for Islandora."
type: module
package: DGI
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- islandora:islandora
8 changes: 6 additions & 2 deletions src/Drush/Commands/PublishUnpublishCollectionsDrushCommands.php
View file
Open in desktop
Copy link
Contributor Author

@adam-vessey adam-vessey Oct 23, 2025

Choose a reason for hiding this comment

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

This command never seems to have been used? The missing $context should've made rather a mess, and the missing accessCheck() invocations seem to suggest that this was never called in D10?

Could just drop this command/file?

Copy link
Contributor

@chrismacdonaldw chrismacdonaldw Nov 4, 2025

Choose a reason for hiding this comment

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

Looks like it was written back in 2023 and was a one time use command that the team deemed as potentially useful for the future. I'm indifferent on leaving it in

Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class PublishUnpublishCollectionsDrushCommands extends DrushCommands {
public function __construct(EntityTypeManagerInterface $entity_type_manager, IslandoraUtils $islandora_utils, LoggerInterface $logger) {
$this->storage = $entity_type_manager;
$this->utils = $islandora_utils;
$this->logger = $logger;
$this->logger()?->add('islandora_drush_utils', $logger);
}

/**
Expand Down Expand Up @@ -97,9 +97,12 @@ public function updateStatus(
* The publish status of the nodes and media.
* @param array $ancestor_nids
* The array of NIDs to search for as an ancestor.
* @param array $context
* The batch context.
*/
public function updateStatusBatch(int $batch_size, bool $publish, array $ancestor_nids) {
public function updateStatusBatch(int $batch_size, bool $publish, array $ancestor_nids, array &$context) {
$query = $this->storage->getStorage('node')->getQuery()
->accessCheck(FALSE)
->condition('type', 'islandora_object')
->exists('field_member_of');

Expand Down Expand Up @@ -151,6 +154,7 @@ public function updateStatusBatch(int $batch_size, bool $publish, array $ancesto

$mids = $this->storage->getStorage('media')
->getQuery()
->accessCheck(FALSE)
->exists('field_media_of')
->condition('field_media_of', $node->id())
->execute();
Expand Down
2 changes: 1 addition & 1 deletion src/Drush/Commands/Sec873DrushCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function __construct(
protected QueueFactory $queueFactory,
) {
parent::__construct();
$this->setLogger($logger);
$this->logger()?->add('islandora_drush_utils.sec_873', $logger);
}

/**
Expand Down