Skip to content

Commit 8d2f2eb

Browse files
committed
MC-5824: Remove data migration from main Page Builder module
- Fix static failures
1 parent b9f487e commit 8d2f2eb

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

app/code/Magento/PageBuilder/composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"description": "Page Builder module",
44
"require": {
55
"magento/framework": "*",
6+
"magento/module-eav": "*",
7+
"magento/module-search": "*",
68
"magento/module-store": "*",
79
"magento/module-backend": "*",
810
"magento/module-cms": "*",

app/code/Magento/PageBuilderDataMigration/Setup/DataConverter/BlueFootToPageBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
use Magento\Framework\DB\DataConverter\DataConverterInterface;
1111

1212
/**
13+
* Class BlueFootToPageBuilder
14+
*
1315
* Convert existing BlueFoot 1.0.* structures into Magento PageBuilder compatible HTML structures. This is ran on first
1416
* install of the new Page Builder module. It will leave any unsupported content in the tree allowing the
1517
* MixedToPageBuilder process this later on.
@@ -46,7 +48,7 @@ public function __construct(
4648
* @param string $value
4749
* @return string
4850
*/
49-
public function convert($value)
51+
public function convert(string $value)
5052
{
5153
if (preg_match('/<!--' . Format::BLUEFOOT_KEY . '="(.*)"-->/', $value, $matches)) {
5254
if ($this->validator->validate($matches[1])) {

app/code/Magento/PageBuilderDataMigration/Setup/DataConverter/MixedToPageBuilder.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
use Magento\Framework\DB\DataConverter\DataConverterInterface;
1111

1212
/**
13+
* Class MixedToPageBuilder
14+
*
1315
* Convert mixed PageBuilder & PageBuilder content to Magento PageBuilder compatible HTML structures, this should be
1416
* utilised for 3rd party extensions outside of core that previously extended PageBuilder's functionality.
1517
*/
@@ -45,7 +47,7 @@ public function __construct(
4547
* @param string $value
4648
* @return string
4749
*/
48-
public function convert($value)
50+
public function convert(string $value)
4951
{
5052
if (strstr($value, Format::UNMIGRATED_KEY) !== false) {
5153
return $this->convertMixed($value);
@@ -57,10 +59,10 @@ public function convert($value)
5759
/**
5860
* Convert any instances of un-migrated content to the new format
5961
*
60-
* @param $value
62+
* @param string $value
6163
* @return string
6264
*/
63-
private function convertMixed($value)
65+
private function convertMixed(string $value)
6466
{
6567
/**
6668
* Match all instances of any un-migrated content within the value argument. This will automatically retrieve
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
magento/module-page-builder
2-
magento/module-page-builder-analytics
2+
magento/module-page-builder-analytics
3+
magento/module-page-builder-data-migration

0 commit comments

Comments
 (0)