Merge pull request #483 from magento-obsessive-owls/PB-494

dhaecker · web-flow · commit e6fb49296726 · 2020-05-08T13:46:16.000-05:00
[PB-494] Update code to be compatible with PHP 7.4
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php
@@ -163,7 +163,7 @@ private function createOptionMocks(array $optionMocksConfiguration): array
      */
     private function createOptionMock(string $label): MockObject
     {
-        $mock = $this->createMock(OptionInterface::class);
+        $mock = $this->getMockForAbstractClass(OptionInterface::class);
         $mock->method('getLabel')
             ->willReturn(__($label));
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php
@@ -64,7 +64,7 @@ public function testDescription(): void
         $this->block = $this->layout->createBlock(View::class);
         $this->block->setTemplate('Magento_PageBuilder::catalog/category/view/description.phtml');
 
-        $this->assertContains('data-appearance="contained"', $this->block->toHtml());
+        $this->assertStringContainsString('data-appearance="contained"', $this->block->toHtml());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php
@@ -26,13 +26,13 @@ public function testFormLoadsEmptyFormUsingParams()
         $this->dispatch('backend/pagebuilder/form/element_productconditions_child');
         $responseBody = $this->getResponse()->getBody();
         // Assert form is associated correctly
-        $this->assertContains('data-form-part="test_namespace"', $responseBody);
+        $this->assertStringContainsString('data-form-part="test_namespace"', $responseBody);
         // Assert the form object is propagated
-        $this->assertContains('form/myobject', $responseBody);
+        $this->assertStringContainsString('form/myobject', $responseBody);
         // Assert id is used
-        $this->assertContains('name="parameters[conditions][1--3][type]"', $responseBody);
+        $this->assertStringContainsString('name="parameters[conditions][1--3][type]"', $responseBody);
         // Assert type is used
-        $this->assertContains('value="Magento\CatalogWidget\Model\Rule\Condition\Product"', $responseBody);
+        $this->assertStringContainsString('value="Magento\CatalogWidget\Model\Rule\Condition\Product"', $responseBody);
     }
 
     public function testFormLoadsCustomPrefix()
@@ -53,8 +53,8 @@ public function testFormLoadsCustomPrefix()
         $responseBody = $this->getResponse()->getBody();
 
         // Assert the form object is propagated
-        $this->assertContains('form/myobject', $responseBody);
+        $this->assertStringContainsString('form/myobject', $responseBody);
         // Assert id is used
-        $this->assertContains('name="parameters[myprefix][1--3][type]"', $responseBody);
+        $this->assertStringContainsString('name="parameters[myprefix][1--3][type]"', $responseBody);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php
@@ -23,9 +23,9 @@ public function testFormLoadsEmptyFormUsingParams()
         $this->dispatch('backend/pagebuilder/form/element_productconditions');
         $responseBody = $this->getResponse()->getBody();
         // Assert form is associated correctly
-        $this->assertContains('data-form-part="test_namespace"', $responseBody);
+        $this->assertStringContainsString('data-form-part="test_namespace"', $responseBody);
         // Assert correct conditions are loaded
-        $this->assertContains(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class, $responseBody);
+        $this->assertStringContainsString(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class, $responseBody);
     }
 
     public function testFormLoadsConditionsFromPost()
@@ -63,19 +63,19 @@ public function testFormLoadsConditionsFromPost()
         $responseBody = $this->getResponse()->getBody();
 
         // Assert the description rule is loaded correctly
-        $this->assertContains('<option value="{}" selected="selected">contains</option>', $responseBody);
+        $this->assertStringContainsString('<option value="{}" selected="selected">contains</option>', $responseBody);
         $expected = 'data-ui-id="editable-0-text-parameters-conditions-1-1-value"' .
             '  value="foo" data-form-part="test_namespace"';
-        $this->assertContains($expected, $responseBody);
+        $this->assertStringContainsString($expected, $responseBody);
 
         // Assert the combine form has form-part
         $expected = 'name="parameters[conditions][1--2][value]" data-form-part="test_namespace"';
-        $this->assertContains($expected, $responseBody);
+        $this->assertStringContainsString($expected, $responseBody);
 
         // Assert the combine condition has the correct child value and form-part
         $expected = 'data-ui-id="editable-0-text-parameters-conditions-1-2-1-value"' .
             '  value="123" data-form-part="test_namespace"';
-        $this->assertContains($expected, $responseBody);
+        $this->assertStringContainsString($expected, $responseBody);
     }
 
     public function testFormLoadsProperPrefix()
@@ -115,6 +115,6 @@ public function testFormLoadsProperPrefix()
 
         // Assert the combine form has form-part
         $expected = 'name="parameters[myprefix][1--2][value]"';
-        $this->assertContains($expected, $responseBody);
+        $this->assertStringContainsString($expected, $responseBody);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php
@@ -37,17 +37,17 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
     private $objectManager;
 
     /**
-     * @var Write|\PHPUnit_Framework_MockObject_MockObject
+     * @var Write|\PHPUnit\Framework\MockObject\MockObject
      */
     private $directoryWrite;
 
     /**
-     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     * @var Filesystem|\PHPUnit\Framework\MockObject\MockObject
      */
     private $filesystem;
 
     /**
-     * @var Database|\PHPUnit_Framework_MockObject_MockObject
+     * @var Database|\PHPUnit\Framework\MockObject\MockObject
      */
     private $mediaStorage;
 
@@ -62,12 +62,12 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
     private $serializer;
 
     /**
-     * @var Gd2|\PHPUnit_Framework_MockObject_MockObject
+     * @var Gd2|\PHPUnit\Framework\MockObject\MockObject
      */
     private $imageAdapter;
 
     /**
-     * @var AdapterFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var AdapterFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $imageAdapterFactory;
 
@@ -173,6 +173,6 @@ public function testSaveAction()
         $this->assertEquals('Automated Template', $template->getName());
         $this->assertEquals('<div data-content-type="row"></div>', $template->getTemplate());
         $this->assertEquals('any', $template->getCreatedFor());
-        $this->assertContains('.template-manager/automatedtemplate', $template->getPreviewImage());
+        $this->assertStringContainsString('.template-manager/automatedtemplate', $template->getPreviewImage());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php
@@ -18,7 +18,7 @@ class AllowedParentTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
      */
     private $fileResolverMock;
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php
@@ -18,7 +18,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
      */
     private $fileResolverMock;
 
@@ -36,11 +36,9 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     */
     public function testPartial()
     {
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $file = file_get_contents(__DIR__ . '/../../../_files/content_type/type3_content_type2.xml');
         $this->fileResolverMock->expects($this->once())
             ->method('get')
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php
@@ -18,7 +18,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
      */
     private $fileResolverMock;
 
@@ -36,11 +36,9 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     */
     public function testPartial()
     {
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $file = file_get_contents(__DIR__ . '/../../../_files/content_type/menu_section3.xml');
         $this->fileResolverMock->expects($this->once())
             ->method('get')
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php
@@ -21,12 +21,12 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
      */
     private $menuSectionsFileResolverMock;
 
     /**
-     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\PageBuilder\Model\Config\FileResolver|\PHPUnit\Framework\MockObject\MockObject
      */
     private $contentTypesFileResolverMock;
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php
@@ -30,8 +30,8 @@ protected function setUp(): void
     public function testFilterFor(string $results, bool $contains, string $value)
     {
         $contains ?
-            self::assertContains($results, $this->templateFilter->filter($value)) :
-            self::assertNotContains($results, $this->templateFilter->filter($value));
+            self::assertStringContainsString($results, $this->templateFilter->filter($value)) :
+            self::assertStringNotContainsString($results, $this->templateFilter->filter($value));
     }
 
     /**
@@ -41,30 +41,30 @@ public function getFilterForDataProvider() : array
     {
         $template = <<<TEMPLATE
 <div data-content-type="row" data-appearance="contained" data-element="main">
-	<div data-enable-parallax="0" data-parallax-speed="0.5" 
-	data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=jb-decorating.jpg}}\&quot;}" 
-	data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; 
-	background-position: center center; background-size: cover; background-repeat: repeat; 
+	<div data-enable-parallax="0" data-parallax-speed="0.5"
+	data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=jb-decorating.jpg}}\&quot;}"
+	data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column;
+	background-position: center center; background-size: cover; background-repeat: repeat;
 	background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; min-height: 350px;
 	margin: 0px 0px 10px; padding: 10px;"></div>
 </div>
 TEMPLATE;
 
         $template2 = <<<TEMPLATE
 <div data-content-type="row" data-element="main" data-appearance="contained">
-	<div style="background-position: center; border-width: 1px; border-style: none; margin: 0px 0px 10px; 
-	padding: 10px; border-radius: 0px; background-repeat: repeat; background-attachment: scroll; display: flex; 
-	min-height: 350px; background-size: cover; flex-direction: column; justify-content: flex-start;" 
-	data-element="inner" data-background-images='{\"desktop_image\":\"{{media url=jb-decorating.jpg}}\"}' 
+	<div style="background-position: center; border-width: 1px; border-style: none; margin: 0px 0px 10px;
+	padding: 10px; border-radius: 0px; background-repeat: repeat; background-attachment: scroll; display: flex;
+	min-height: 350px; background-size: cover; flex-direction: column; justify-content: flex-start;"
+	data-element="inner" data-background-images='{\"desktop_image\":\"{{media url=jb-decorating.jpg}}\"}'
 	data-parallax-speed="0.5" data-enable-parallax="0"></div>
 </div>
 TEMPLATE;
 
         $template3 = <<<TEMPLATE
 <div data-content-type="row" data-element="main" data-appearance="contained">
-	<div style="background-position: center; border-width: 1px; border-style: none; margin: 0px 0px 10px; 
-	padding: 10px; border-radius: 0px; background-repeat: repeat; background-attachment: scroll; display: flex; 
-	min-height: 350px; background-size: cover; flex-direction: column; justify-content: flex-start;" 
+	<div style="background-position: center; border-width: 1px; border-style: none; margin: 0px 0px 10px;
+	padding: 10px; border-radius: 0px; background-repeat: repeat; background-attachment: scroll; display: flex;
+	min-height: 350px; background-size: cover; flex-direction: column; justify-content: flex-start;"
 	data-element="inner" data-background-images='{}' data-parallax-speed="0.5" data-enable-parallax="0"></div>
 </div>
 TEMPLATE;
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php
@@ -18,7 +18,7 @@ class UiComponentConfigTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\Config\DataInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Config\DataInterfaceFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $dataInterfaceFactoryMock;
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php
@@ -31,9 +31,9 @@ public function testRender()
         ]);
         $this->assertArrayHasKey('content', $result);
         $content = $result['content'];
-        $this->assertNotContains('<script>', $content);
-        $this->assertContains('<p>Custom variable: "HTML Value".</p>', $content);
-        $this->assertNotContains('<html>', $content);
-        $this->assertNotContains('<!DOCTYPE', $content);
+        $this->assertStringNotContainsString('<script>', $content);
+        $this->assertStringContainsString('<p>Custom variable: "HTML Value".</p>', $content);
+        $this->assertStringNotContainsString('<html>', $content);
+        $this->assertStringNotContainsString('<!DOCTYPE', $content);
     }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php
@@ -36,7 +36,7 @@ function ($filename, $menuSections) {
 
                 $contentTypeMenuSection = $dom->getElementsByTagName('menu_section')->item(0);
                 if ($contentTypeMenuSection) {
-                    $this->assertContains(
+                    $this->assertStringContainsString(
                         $contentTypeMenuSection->nodeValue,
                         $menuSections,
                         'Invalid menu section "' . $contentTypeMenuSection->nodeValue . '" in XML File ' . $filename

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ private function createOptionMocks(array $optionMocksConfiguration): array`
`163`	`163`	`*/`
`164`	`164`	`private function createOptionMock(string $label): MockObject`
`165`	`165`	`{`
`166`		`- $mock = $this->createMock(OptionInterface::class);`
	`166`	`+ $mock = $this->getMockForAbstractClass(OptionInterface::class);`
`167`	`167`	`$mock->method('getLabel')`
`168`	`168`	`->willReturn(__($label));`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function testDescription(): void`
`64`	`64`	`$this->block = $this->layout->createBlock(View::class);`
`65`	`65`	`$this->block->setTemplate('Magento_PageBuilder::catalog/category/view/description.phtml');`
`66`	`66`
`67`		`- $this->assertContains('data-appearance="contained"', $this->block->toHtml());`
	`67`	`+ $this->assertStringContainsString('data-appearance="contained"', $this->block->toHtml());`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`