Skip to content

Commit 55c4d4b

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #484 from magento/develop-php74
PB-492: Upgrade Page Builder to make compatible with PHP 7.4
2 parents 96c714f + e6fb492 commit 55c4d4b

File tree

50 files changed

+202
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+202
-185
lines changed

‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-catalog": "*",
1010
"magento/framework": "*",
11-
"php": "~7.1.3||~7.2.0||~7.3.0"
11+
"php": "~7.3.0||~7.4.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/CmsPageBuilderAnalytics/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-cms": "*",
1010
"magento/framework": "*",
11-
"php": "~7.1.3||~7.2.0||~7.3.0"
11+
"php": "~7.3.0||~7.4.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<actualResult type="variable">$fallbackImageSource</actualResult>
2727
</assertRegExp>
2828
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="style" stepKey="fallbackImageStyle"/>
29-
<assertContains stepKey="assertCover">
29+
<assertStringContainsString stepKey="assertCover">
3030
<expectedResult type="string">display: block;</expectedResult>
3131
<actualResult type="variable">$fallbackImageStyle</actualResult>
32-
</assertContains>
32+
</assertStringContainsString>
3333
</actionGroup>
3434
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageInVideoBackgroundWithInvalidVideoActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<actualResult type="variable">$fallbackImageSource</actualResult>
2727
</assertRegExp>
2828
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImageSource(index, fallbackImage.fileName)}}" userInput="style" stepKey="fallbackImageStyle"/>
29-
<assertContains stepKey="assertCover">
29+
<assertStringContainsString stepKey="assertCover">
3030
<expectedResult type="string">object-fit: cover;</expectedResult>
3131
<actualResult type="variable">$fallbackImageStyle</actualResult>
32-
</assertContains>
32+
</assertStringContainsString>
3333
</actionGroup>
3434
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateParallaxVideoBackgroundWithAllAttributesActionGroup.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<annotations>
1212
<description>Validates all video background attributes when all attributes are configured and parallax is enabled. Extends: validateVideoBackgroundWithAllAttributes</description>
1313
</annotations>
14-
<assertContains stepKey="assertVideoPosition">
14+
<assertStringContainsString stepKey="assertVideoPosition">
1515
<expectedResult type="string">position: fixed;</expectedResult>
1616
<actualResult type="variable">$videoStyle</actualResult>
17-
</assertContains>
18-
<assertContains stepKey="assertImagePosition">
17+
</assertStringContainsString>
18+
<assertStringContainsString stepKey="assertImagePosition">
1919
<expectedResult type="string">position: fixed;</expectedResult>
2020
<actualResult type="variable">$fallbackImageStyle</actualResult>
21-
</assertContains>
21+
</assertStringContainsString>
2222
</actionGroup>
2323
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<annotations>
1212
<description>Validates that the video in the video background is finished playing.</description>
1313
</annotations>
14-
<assertContains stepKey="assertFallbackImageNotDisplayed">
14+
<assertStringContainsString stepKey="assertFallbackImageNotDisplayed">
1515
<expectedResult type="string">display: block;</expectedResult>
1616
<actualResult type="variable">$fallbackImageStyle</actualResult>
17-
</assertContains>
17+
</assertStringContainsString>
1818
</actionGroup>
1919
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingBeforeViewingActionGroup.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<annotations>
1212
<description>Validates that the video in the video background is finished playing before it's in the viewport.</description>
1313
</annotations>
14-
<assertNotContains stepKey="assertVideoPlaying">
14+
<assertStringNotContainsString stepKey="assertVideoPlaying">
1515
<expectedResult type="string">transform: translate3d(</expectedResult>
1616
<actualResult type="variable">$videoStyle</actualResult>
17-
</assertNotContains>
18-
<assertContains stepKey="assertFallbackImageNotDisplayed">
17+
</assertStringNotContainsString>
18+
<assertStringContainsString stepKey="assertFallbackImageNotDisplayed">
1919
<expectedResult type="string">display: block;</expectedResult>
2020
<actualResult type="variable">$fallbackImageStyle</actualResult>
21-
</assertContains>
21+
</assertStringContainsString>
2222
</actionGroup>
2323
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<annotations>
1212
<description>Validates that the video in the video background is loaded but not playing.</description>
1313
</annotations>
14-
<assertNotContains stepKey="assertVideoPlaying">
14+
<assertStringNotContainsString stepKey="assertVideoPlaying">
1515
<expectedResult type="string">transform: translate3d(</expectedResult>
1616
<actualResult type="variable">$videoStyle</actualResult>
17-
</assertNotContains>
17+
</assertStringNotContainsString>
1818
</actionGroup>
1919
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingForNotVisibleElementActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<description>Validates that the video in the video background is loaded but not playing for an element that is not visible.</description>
1313
</annotations>
1414
<waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
15-
<assertNotContains stepKey="assertVideoPlaying">
15+
<assertStringNotContainsString stepKey="assertVideoPlaying">
1616
<expectedResult type="string">transform: translate3d(</expectedResult>
1717
<actualResult type="variable">$videoStyle</actualResult>
18-
</assertNotContains>
18+
</assertStringNotContainsString>
1919
</actionGroup>
2020
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
2121
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
2222
<grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>
23-
<assertContains stepKey="assertVideoPlaying">
23+
<assertStringContainsString stepKey="assertVideoPlaying">
2424
<expectedResult type="string">transform: translate3d(</expectedResult>
2525
<actualResult type="variable">$videoStyle</actualResult>
26-
</assertContains>
26+
</assertStringContainsString>
2727
<waitForElement selector="{{section.videoBackgroundFallbackImage(index)}}|{{section.videoBackgroundNoFallbackImage(index)}}" stepKey="waitForFallbackImage"/>
2828
<grabAttributeFrom selector="{{section.videoBackgroundFallbackImage(index)}}|{{section.videoBackgroundNoFallbackImage(index)}}" userInput="style" stepKey="fallbackImageStyle"/>
29-
<assertContains stepKey="assertFallbackImageNotDisplayed">
29+
<assertStringContainsString stepKey="assertFallbackImageNotDisplayed">
3030
<expectedResult type="string">display: none;</expectedResult>
3131
<actualResult type="variable">$fallbackImageStyle</actualResult>
32-
</assertContains>
32+
</assertStringContainsString>
3333
</actionGroup>
3434
</actionGroups>

0 commit comments

Comments
 (0)