From 1e9845607a6005d199bd16e5646b50f4eee8f4a3 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 17 May 2022 00:12:52 +0100
Subject: [PATCH] Issue #3250582 by huzooka, Matroskeen, danflanagan8,
ravi.shankar, quietone, erik.erskine: ResponsiveImageStyles source plugin
must extend DrupalSqlBase
---
.../src/Plugin/migrate/source/d7/ResponsiveImageStyles.php | 4 ++--
.../Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php | 5 +++++
.../Plugin/migrate/source/d7/ResponsiveImageStylesTest.php | 5 ++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/core/modules/responsive_image/src/Plugin/migrate/source/d7/ResponsiveImageStyles.php b/core/modules/responsive_image/src/Plugin/migrate/source/d7/ResponsiveImageStyles.php
index a5da895dd838..c4a72db0ad9d 100644
--- a/core/modules/responsive_image/src/Plugin/migrate/source/d7/ResponsiveImageStyles.php
+++ b/core/modules/responsive_image/src/Plugin/migrate/source/d7/ResponsiveImageStyles.php
@@ -2,8 +2,8 @@
namespace Drupal\responsive_image\Plugin\migrate\source\d7;
-use Drupal\migrate\Plugin\migrate\source\SqlBase;
use Drupal\migrate\Row;
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
/**
* Gets Drupal responsive image styles source from database.
@@ -20,7 +20,7 @@
* source_module = "picture"
* )
*/
-class ResponsiveImageStyles extends SqlBase {
+class ResponsiveImageStyles extends DrupalSqlBase {
/**
* {@inheritdoc}
diff --git a/core/modules/responsive_image/tests/src/Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php b/core/modules/responsive_image/tests/src/Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php
index f9c877684640..1064d22b82a9 100644
--- a/core/modules/responsive_image/tests/src/Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php
+++ b/core/modules/responsive_image/tests/src/Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php
@@ -22,6 +22,11 @@ class MigrateResponsiveImageStylesTest extends MigrateDrupal7TestBase {
*/
protected function setUp(): void {
parent::setUp();
+ // Ensure the 'picture' module is enabled in the source.
+ $this->sourceDatabase->update('system')
+ ->condition('name', 'picture')
+ ->fields(['status' => 1])
+ ->execute();
$this->executeMigrations(['d7_image_styles', 'd7_responsive_image_styles']);
}
diff --git a/core/modules/responsive_image/tests/src/Kernel/Plugin/migrate/source/d7/ResponsiveImageStylesTest.php b/core/modules/responsive_image/tests/src/Kernel/Plugin/migrate/source/d7/ResponsiveImageStylesTest.php
index b942a0e9a38e..b89b4b435ad0 100644
--- a/core/modules/responsive_image/tests/src/Kernel/Plugin/migrate/source/d7/ResponsiveImageStylesTest.php
+++ b/core/modules/responsive_image/tests/src/Kernel/Plugin/migrate/source/d7/ResponsiveImageStylesTest.php
@@ -15,7 +15,10 @@ class ResponsiveImageStylesTest extends MigrateSqlSourceTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['responsive_image'];
+ protected static $modules = [
+ 'migrate_drupal',
+ 'responsive_image',
+ ];
/**
* {@inheritdoc}
--
GitLab