Merge pull request #56 from magento-commerce/1.3-develop-phpunit9

MC-38769: PHPUnit 9 support for PHP 2.3.x

Author: eug123

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup.xml

@@ -52,7 +52,7 @@
         <conditionalClick stepKey="expandAdvancedContentTools" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true"/>
         <waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="waitForGoogleMapsAPIKeyInputField"/>
         <fillField selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" userInput="{{apiKey}}" stepKey="inputAPIKey"/>
-        <pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\WebDriverKeys::ENTER]" stepKey="pressKey"/>
+        <pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKey"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
     </actionGroup>
@@ -63,7 +63,7 @@
         <comment userInput="inputGoogleMapsAPIKey" stepKey="comment"/>
         <waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="waitForGoogleMapsAPIKeyInputField"/>
         <fillField selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" userInput="{{apiKey}}" stepKey="inputAPIKey"/>
-        <pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\WebDriverKeys::ENTER]" stepKey="pressKey"/>
+        <pressKey selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKey"/>
     </actionGroup>
     <actionGroup name="clickAndValidateGoogleMapsAPIKeyTestKeyButton">
         <arguments>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest.xml

@@ -219,7 +219,7 @@
         <see userInput="Row" selector="{{PageBuilderPanel.searchResults}}" stepKey="validateRowAppears"/>
         <dontSee userInput="Column" selector="{{PageBuilderPanel.searchResults}}" stepKey="validateColumnDoesNotAppear"/>
         <comment userInput="Clear input field using backspace to show all content types on Pagebuilder panel" stepKey="commentDeleteSearch"/>
-        <pressKey selector="{{PageBuilderPanel.searchPanel}}" parameterArray="[\WebDriverKeys::BACKSPACE]" stepKey="enterSearchInput"/>
+        <pressKey selector="{{PageBuilderPanel.searchPanel}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="enterSearchInput"/>
         <dontSee userInput="r" selector="{{PageBuilderPanel.searchPanel}}" stepKey="validateInputClearedAfterRemoveCharacters"/>
         <scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
         <actionGroup ref="validateMenuSectionsAndContentTypes" stepKey="validateMenuSectionsAndContentTypesAfterClearField"/>

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

@@ -33,7 +33,7 @@ class SortingTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->sortingFactoryMock = $this->createMock(Factory::class);

app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php

@@ -35,7 +35,7 @@ class TemplateTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->logger = $this->createMock(LoggerInterface::class);

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

@@ -40,7 +40,7 @@ class ViewTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
@@ -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());
     }
 
     /**

dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php

@@ -48,7 +48,7 @@ class UploadTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = ObjectManager::getInstance();
 
@@ -77,7 +77,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $_FILES = [];
     }

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);
     }
 }

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);
     }
 }

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

@@ -44,7 +44,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->objectManager = Bootstrap::getObjectManager();

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

@@ -74,7 +74,7 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->objectManager = Bootstrap::getObjectManager();
@@ -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());
     }
 }

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

@@ -22,7 +22,7 @@ class AllowedParentTest extends \PHPUnit\Framework\TestCase
      */
     private $fileResolverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
 

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

@@ -22,7 +22,7 @@ class AppearanceTest extends \PHPUnit\Framework\TestCase
      */
     private $contentTypesReader;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

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

@@ -22,7 +22,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
      */
     private $fileResolverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
 
@@ -36,11 +36,9 @@ protected function setUp()
         );
     }
 
-    /**
-     * @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')

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

@@ -22,7 +22,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
      */
     private $fileResolverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
 
@@ -36,11 +36,9 @@ protected function setUp()
         );
     }
 
-    /**
-     * @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')

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

@@ -30,7 +30,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
      */
     private $contentTypesFileResolverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
 

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php

@@ -23,7 +23,7 @@ class ElementTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
     }

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

@@ -16,7 +16,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
      */
     private $templateFilter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->templateFilter = ObjectManager::getInstance()->create(Template::class);
     }
@@ -30,8 +30,8 @@ protected function setUp()
     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));
     }
 
     /**

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

@@ -27,7 +27,7 @@ class UiComponentConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
 

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php

@@ -24,7 +24,7 @@ class ConfigTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->model = $objectManager->get(Config::class);

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);
     }
 }

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/RendererPoolTest.php

@@ -22,7 +22,7 @@ class RendererPoolTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
 

dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php

@@ -27,7 +27,7 @@ class TemplatePluginTest extends \PHPUnit\Framework\TestCase
      */
     private $templateFilter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->templateFilter = $this->objectManager->get(TemplateFilter::class);

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

@@ -20,7 +20,7 @@ class MenuSectionsTest extends \PHPUnit\Framework\TestCase
      */
     private $componentDirSearch;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $componentRegistrar = new ComponentRegistrar();
         $this->componentDirSearch = new DirSearch($componentRegistrar, new ReadFactory(new DriverPool()));