Skip to content

Commit e6fb492

Browse files
dhaeckerdhaecker
authored
Merge pull request #483 from magento-obsessive-owls/PB-494
[PB-494] Update code to be compatible with PHP 7.4
2 parents 9c0a7bb + 94a1c27 commit e6fb492

File tree

13 files changed

+47
-51
lines changed

13 files changed

+47
-51
lines changed

‎app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private function createOptionMocks(array $optionMocksConfiguration): array
163163
*/
164164
private function createOptionMock(string $label): MockObject
165165
{
166-
$mock = $this->createMock(OptionInterface::class);
166+
$mock = $this->getMockForAbstractClass(OptionInterface::class);
167167
$mock->method('getLabel')
168168
->willReturn(__($label));
169169

‎dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testDescription(): void
6464
$this->block = $this->layout->createBlock(View::class);
6565
$this->block->setTemplate('Magento_PageBuilder::catalog/category/view/description.phtml');
6666

67-
$this->assertContains('data-appearance="contained"', $this->block->toHtml());
67+
$this->assertStringContainsString('data-appearance="contained"', $this->block->toHtml());
6868
}
6969

7070
/**

‎dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ public function testFormLoadsEmptyFormUsingParams()
2626
$this->dispatch('backend/pagebuilder/form/element_productconditions_child');
2727
$responseBody = $this->getResponse()->getBody();
2828
// Assert form is associated correctly
29-
$this->assertContains('data-form-part="test_namespace"', $responseBody);
29+
$this->assertStringContainsString('data-form-part="test_namespace"', $responseBody);
3030
// Assert the form object is propagated
31-
$this->assertContains('form/myobject', $responseBody);
31+
$this->assertStringContainsString('form/myobject', $responseBody);
3232
// Assert id is used
33-
$this->assertContains('name="parameters[conditions][1--3][type]"', $responseBody);
33+
$this->assertStringContainsString('name="parameters[conditions][1--3][type]"', $responseBody);
3434
// Assert type is used
35-
$this->assertContains('value="Magento\CatalogWidget\Model\Rule\Condition\Product"', $responseBody);
35+
$this->assertStringContainsString('value="Magento\CatalogWidget\Model\Rule\Condition\Product"', $responseBody);
3636
}
3737

3838
public function testFormLoadsCustomPrefix()
@@ -53,8 +53,8 @@ public function testFormLoadsCustomPrefix()
5353
$responseBody = $this->getResponse()->getBody();
5454

5555
// Assert the form object is propagated
56-
$this->assertContains('form/myobject', $responseBody);
56+
$this->assertStringContainsString('form/myobject', $responseBody);
5757
// Assert id is used
58-
$this->assertContains('name="parameters[myprefix][1--3][type]"', $responseBody);
58+
$this->assertStringContainsString('name="parameters[myprefix][1--3][type]"', $responseBody);
5959
}
6060
}

‎dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public function testFormLoadsEmptyFormUsingParams()
2323
$this->dispatch('backend/pagebuilder/form/element_productconditions');
2424
$responseBody = $this->getResponse()->getBody();
2525
// Assert form is associated correctly
26-
$this->assertContains('data-form-part="test_namespace"', $responseBody);
26+
$this->assertStringContainsString('data-form-part="test_namespace"', $responseBody);
2727
// Assert correct conditions are loaded
28-
$this->assertContains(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class, $responseBody);
28+
$this->assertStringContainsString(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class, $responseBody);
2929
}
3030

3131
public function testFormLoadsConditionsFromPost()
@@ -63,19 +63,19 @@ public function testFormLoadsConditionsFromPost()
6363
$responseBody = $this->getResponse()->getBody();
6464

6565
// Assert the description rule is loaded correctly
66-
$this->assertContains('<option value="{}" selected="selected">contains</option>', $responseBody);
66+
$this->assertStringContainsString('<option value="{}" selected="selected">contains</option>', $responseBody);
6767
$expected = 'data-ui-id="editable-0-text-parameters-conditions-1-1-value"' .
6868
' value="foo" data-form-part="test_namespace"';
69-
$this->assertContains($expected, $responseBody);
69+
$this->assertStringContainsString($expected, $responseBody);
7070

7171
// Assert the combine form has form-part
7272
$expected = 'name="parameters[conditions][1--2][value]" data-form-part="test_namespace"';
73-
$this->assertContains($expected, $responseBody);
73+
$this->assertStringContainsString($expected, $responseBody);
7474

7575
// Assert the combine condition has the correct child value and form-part
7676
$expected = 'data-ui-id="editable-0-text-parameters-conditions-1-2-1-value"' .
7777
' value="123" data-form-part="test_namespace"';
78-
$this->assertContains($expected, $responseBody);
78+
$this->assertStringContainsString($expected, $responseBody);
7979
}
8080

8181
public function testFormLoadsProperPrefix()
@@ -115,6 +115,6 @@ public function testFormLoadsProperPrefix()
115115

116116
// Assert the combine form has form-part
117117
$expected = 'name="parameters[myprefix][1--2][value]"';
118-
$this->assertContains($expected, $responseBody);
118+
$this->assertStringContainsString($expected, $responseBody);
119119
}
120120
}

‎dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
3737
private $objectManager;
3838

3939
/**
40-
* @var Write|\PHPUnit_Framework_MockObject_MockObject
40+
* @var Write|\PHPUnit\Framework\MockObject\MockObject
4141
*/
4242
private $directoryWrite;
4343

4444
/**
45-
* @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
45+
* @var Filesystem|\PHPUnit\Framework\MockObject\MockObject
4646
*/
4747
private $filesystem;
4848

4949
/**
50-
* @var Database|\PHPUnit_Framework_MockObject_MockObject
50+
* @var Database|\PHPUnit\Framework\MockObject\MockObject
5151
*/
5252
private $mediaStorage;
5353

@@ -62,12 +62,12 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
6262
private $serializer;
6363

6464
/**
65-
* @var Gd2|\PHPUnit_Framework_MockObject_MockObject
65+
* @var Gd2|\PHPUnit\Framework\MockObject\MockObject
6666
*/
6767
private $imageAdapter;
6868

6969
/**
70-
* @var AdapterFactory|\PHPUnit_Framework_MockObject_MockObject
70+
* @var AdapterFactory|\PHPUnit\Framework\MockObject\MockObject
7171
*/
7272
private $imageAdapterFactory;
7373

@@ -173,6 +173,6 @@ public function testSaveAction()
173173
$this->assertEquals('Automated Template', $template->getName());
174174
$this->assertEquals('<div data-content-type="row"></div>', $template->getTemplate());
175175
$this->assertEquals('any', $template->getCreatedFor());
176-
$this->assertContains('.template-manager/automatedtemplate', $template->getPreviewImage());
176+
$this->assertStringContainsString('.template-manager/automatedtemplate', $template->getPreviewImage());
177177
}
178178
}

‎dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class AllowedParentTest extends \PHPUnit\Framework\TestCase
1818
private $model;
1919

2020
/**
21-
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
21+
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
2222
*/
2323
private $fileResolverMock;
2424

‎dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
1818
private $model;
1919

2020
/**
21-
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
21+
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
2222
*/
2323
private $fileResolverMock;
2424

@@ -36,11 +36,9 @@ protected function setUp(): void
3636
);
3737
}
3838

39-
/**
40-
* @expectedException \Magento\Framework\Exception\LocalizedException
41-
*/
4239
public function testPartial()
4340
{
41+
$this->expectException(\Magento\Framework\Exception\LocalizedException::class);
4442
$file = file_get_contents(__DIR__ . '/../../../_files/content_type/type3_content_type2.xml');
4543
$this->fileResolverMock->expects($this->once())
4644
->method('get')

‎dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
1818
private $model;
1919

2020
/**
21-
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
21+
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
2222
*/
2323
private $fileResolverMock;
2424

@@ -36,11 +36,9 @@ protected function setUp(): void
3636
);
3737
}
3838

39-
/**
40-
* @expectedException \Magento\Framework\Exception\LocalizedException
41-
*/
4239
public function testPartial()
4340
{
41+
$this->expectException(\Magento\Framework\Exception\LocalizedException::class);
4442
$file = file_get_contents(__DIR__ . '/../../../_files/content_type/menu_section3.xml');
4543
$this->fileResolverMock->expects($this->once())
4644
->method('get')

‎dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
2121
private $model;
2222

2323
/**
24-
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
24+
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
2525
*/
2626
private $menuSectionsFileResolverMock;
2727

2828
/**
29-
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
29+
* @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
3030
*/
3131
private $contentTypesFileResolverMock;
3232

‎dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php

+13-13
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ protected function setUp(): void
3030
public function testFilterFor(string $results, bool $contains, string $value)
3131
{
3232
$contains ?
33-
self::assertContains($results, $this->templateFilter->filter($value)) :
34-
self::assertNotContains($results, $this->templateFilter->filter($value));
33+
self::assertStringContainsString($results, $this->templateFilter->filter($value)) :
34+
self::assertStringNotContainsString($results, $this->templateFilter->filter($value));
3535
}
3636

3737
/**
@@ -41,30 +41,30 @@ public function getFilterForDataProvider() : array
4141
{
4242
$template = <<<TEMPLATE
4343
<div data-content-type="row" data-appearance="contained" data-element="main">
44-
<div data-enable-parallax="0" data-parallax-speed="0.5"
45-
data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=jb-decorating.jpg}}\&quot;}"
46-
data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column;
47-
background-position: center center; background-size: cover; background-repeat: repeat;
44+
<div data-enable-parallax="0" data-parallax-speed="0.5"
45+
data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=jb-decorating.jpg}}\&quot;}"
46+
data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column;
47+
background-position: center center; background-size: cover; background-repeat: repeat;
4848
background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; min-height: 350px;
4949
margin: 0px 0px 10px; padding: 10px;"></div>
5050
</div>
5151
TEMPLATE;
5252

5353
$template2 = <<<TEMPLATE
5454
<div data-content-type="row" data-element="main" data-appearance="contained">
55-
<div style="background-position: center; border-width: 1px; border-style: none; margin: 0px 0px 10px;
56-
padding: 10px; border-radius: 0px; background-repeat: repeat; background-attachment: scroll; display: flex;
57-
min-height: 350px; background-size: cover; flex-direction: column; justify-content: flex-start;"
58-
data-element="inner" data-background-images='{\"desktop_image\":\"{{media url=jb-decorating.jpg}}\"}'
55+
<div style="background-position: center; border-width: 1px; border-style: none; margin: 0px 0px 10px;
56+
padding: 10px; border-radius: 0px; background-repeat: repeat; background-attachment: scroll; display: flex;
57+
min-height: 350px; background-size: cover; flex-direction: column; justify-content: flex-start;"
58+
data-element="inner" data-background-images='{\"desktop_image\":\"{{media url=jb-decorating.jpg}}\"}'
5959
data-parallax-speed="0.5" data-enable-parallax="0"></div>
6060
</div>
6161
TEMPLATE;
6262

6363
$template3 = <<<TEMPLATE
6464
<div data-content-type="row" data-element="main" data-appearance="contained">
65-
<div style="background-position: center; border-width: 1px; border-style: none; margin: 0px 0px 10px;
66-
padding: 10px; border-radius: 0px; background-repeat: repeat; background-attachment: scroll; display: flex;
67-
min-height: 350px; background-size: cover; flex-direction: column; justify-content: flex-start;"
65+
<div style="background-position: center; border-width: 1px; border-style: none; margin: 0px 0px 10px;
66+
padding: 10px; border-radius: 0px; background-repeat: repeat; background-attachment: scroll; display: flex;
67+
min-height: 350px; background-size: cover; flex-direction: column; justify-content: flex-start;"
6868
data-element="inner" data-background-images='{}' data-parallax-speed="0.5" data-enable-parallax="0"></div>
6969
</div>
7070
TEMPLATE;

‎dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class UiComponentConfigTest extends \PHPUnit\Framework\TestCase
1818
private $objectManager;
1919

2020
/**
21-
* @var \Magento\Framework\Config\DataInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
21+
* @var \Magento\Framework\Config\DataInterfaceFactory|\PHPUnit\Framework\MockObject\MockObject
2222
*/
2323
private $dataInterfaceFactoryMock;
2424

‎dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public function testRender()
3131
]);
3232
$this->assertArrayHasKey('content', $result);
3333
$content = $result['content'];
34-
$this->assertNotContains('<script>', $content);
35-
$this->assertContains('<p>Custom variable: "HTML Value".</p>', $content);
36-
$this->assertNotContains('<html>', $content);
37-
$this->assertNotContains('<!DOCTYPE', $content);
34+
$this->assertStringNotContainsString('<script>', $content);
35+
$this->assertStringContainsString('<p>Custom variable: "HTML Value".</p>', $content);
36+
$this->assertStringNotContainsString('<html>', $content);
37+
$this->assertStringNotContainsString('<!DOCTYPE', $content);
3838
}
3939
}

‎dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function ($filename, $menuSections) {
3636

3737
$contentTypeMenuSection = $dom->getElementsByTagName('menu_section')->item(0);
3838
if ($contentTypeMenuSection) {
39-
$this->assertContains(
39+
$this->assertStringContainsString(
4040
$contentTypeMenuSection->nodeValue,
4141
$menuSections,
4242
'Invalid menu section "' . $contentTypeMenuSection->nodeValue . '" in XML File ' . $filename

0 commit comments

Comments
 (0)