Skip to content

Commit

Permalink
8.6.9
Browse files Browse the repository at this point in the history
  • Loading branch information
pookmish authored Jan 9, 2025
1 parent 162809a commit ce92118
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Stanford Migrate

8.6.9
--------------------------------------------------------------------------------
_Release Date: 2025-01-09_

- Allow install with migrate_file > 3.0 for D11 support.

8.6.8
--------------------------------------------------------------------------------
_Release Date: 2024-12-13_
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"php": ">=8.0",
"drupal/core": "^10.3 || ^11",
"drupal/empty_fields": "^1.0@beta",
"drupal/migrate_file": "^2.0",
"drupal/migrate_file": "^2.0 || ^3.0",
"drupal/migrate_plus": "^6.0",
"drupal/migrate_source_csv": "^3.4",
"drupal/migrate_tools": "^6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Config/MigrationConfigOverrides.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function loadOverrides($names) {
foreach ($names as $name) {

// Only override migration entities.
if (substr($name, 0, 23) == 'migrate_plus.migration.') {
if (str_starts_with($name, 'migrate_plus.migration.')) {
$migration_id = pathinfo($name, PATHINFO_EXTENSION);

// If the state value is not set, don't do any overriding.
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/migrate/source/StanfordUrl.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function getAllIds() {
* Modify the parent method by adding the current feed url into the source
* data. This can then be used by process plugins.
*/
public function next() {
public function next(): void {
$this->currentSourceIds = NULL;
$this->currentRow = NULL;

Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/migrate_plus/data_parser/LocalistJson.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected function getSourceData(string $url, string|int $item_selector = ''): a
* Paged url results.
*/
protected static function getPagedUrls(string $url): array {
$query = parse_url($url, PHP_URL_QUERY);
$query = parse_url($url, PHP_URL_QUERY) ?: '';
$base_url = trim(str_replace($query, '', $url), '?');
parse_str($query, $query_parts);

Expand Down
2 changes: 1 addition & 1 deletion stanford_migrate.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: 'Adds more functionality to migrate and migrate plus modules'
type: module
core_version_requirement: ^10.3 || ^11
package: 'Stanford'
version: 8.6.8
version: 8.6.9
dependencies:
- drupal:migrate
- empty_fields:empty_fields
Expand Down
3 changes: 3 additions & 0 deletions tests/src/Kernel/Form/StanfordMigrateCsvImportFormTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Drupal\migrate_plus\Entity\MigrationInterface;
use Drupal\Tests\stanford_migrate\Kernel\StanfordMigrateKernelTestBase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\SessionInterface;

/**
* Class StanfordMigrateCsvImportFormTest.
Expand Down Expand Up @@ -130,6 +131,8 @@ protected function setMigrationRequest(MigrationInterface $migration) {
'migration' => $migration,
];
$request = new Request([], [], $attributes);
$session = $this->createMock(SessionInterface::class);
$request->setSession($session);
\Drupal::requestStack()->push($request);
}

Expand Down

0 comments on commit ce92118

Please sign in to comment.