Merge pull request #323 from magento-gl/phpunit10

[Arrows] Delivery of PHPUnit 10 Upgrade

Author: sidolov

app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php

@@ -68,9 +68,9 @@ public function render(array $params): array
         ];
 
         $contentTypes = $this->config->getContentTypes();
-        $backendBlockClassName = isset($contentTypes[$params['role']]['backend_block'])
+        $backendBlockClassName = isset($params['role']) && isset($contentTypes[$params['role']]['backend_block'])
             ? $contentTypes[$params['role']]['backend_block'] : false;
-        $backendBlockTemplate = isset($contentTypes[$params['role']]['backend_template'])
+        $backendBlockTemplate = isset($params['role']) && isset($contentTypes[$params['role']]['backend_template'])
             ? $contentTypes[$params['role']]['backend_template'] : false;
 
         if ($backendBlockTemplate) {

dev/tests/integration/testsuite/Magento/PageBuilder/CatalogWidget/Block/Product/ProductListTest.php

@@ -113,6 +113,7 @@ public function testProductWithDifferentPriceOnEachWebsite(): void
     /**
      * Test that filtering by category works correctly together with sorting
      *
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
      * @magentoDataFixture Magento/Catalog/_files/products_list.php
      * @magentoDataFixture Magento/Catalog/_files/categories_no_products.php

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

@@ -85,22 +85,22 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->filesystem = $this->getMockBuilder(Filesystem::class)
-            ->setMethods(['getDirectoryWrite'])
+            ->onlyMethods(['getDirectoryWrite'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->mediaStorage = $this->getMockBuilder(Database::class)
-            ->setMethods(['checkDbUsage', 'saveFile'])
+            ->onlyMethods(['checkDbUsage', 'saveFile'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->imageAdapter = $this->getMockBuilder(Gd2::class)
-            ->setMethods(['open', 'resize', 'save'])
+            ->onlyMethods(['open', 'resize', 'save'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->imageAdapterFactory = $this->getMockBuilder(AdapterFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
 

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

@@ -47,7 +47,7 @@ public function testRemoveStyle(string $elementData, string $styleProperty, stri
         $this->assertEquals($expectedResult, $element->removeStyle($styleProperty));
     }
 
-    public function removeStylesDataProvider()
+    public static function removeStylesDataProvider()
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
         return [
@@ -90,7 +90,7 @@ public function testAddStyle(string $elementData, string $styleProperty, string
         $this->assertEquals($expectedResult, $element->addStyle($styleProperty, $styleValue));
     }
 
-    public function addStyleDataProvider()
+    public static function addStyleDataProvider()
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
         return [

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

@@ -37,7 +37,7 @@ public function testFilterFor(string $results, bool $contains, string $value)
     /**
      * @return array
      */
-    public function getFilterForDataProvider() : array
+    public static function getFilterForDataProvider() : array
     {
         $template = <<<TEMPLATE
 <div data-content-type="row" data-appearance="contained" data-element="main">

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

@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
 
         $this->dataInterfaceFactoryMock = $this->getMockBuilder(\Magento\Framework\Config\DataInterfaceFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -70,7 +70,7 @@ public function testGetFields(array $uiConfig, array $expectedFields)
      *
      * @return array
      */
-    public function uiConfigDataProvider() : array
+    public static function uiConfigDataProvider() : array
     {
         return [
             [

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

@@ -83,7 +83,7 @@ public function testMediaUrlShouldBeTheSameAsBackendMediaURL(string $store, stri
     /**
      * @return array
      */
-    public function storeDataProvider(): array
+    public static function storeDataProvider(): array
     {
         return [
             [

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

@@ -56,7 +56,7 @@ public function testFiltering(string $preFiltered, string $postFiltered, string
     /**
      * @return array
      */
-    public function filterDataProvider(): array
+    public static function filterDataProvider(): array
     {
         $preFilteredFiles = glob(__DIR__ . '/../../_files/template_plugin/*pre_filter*');
 

dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php

@@ -15,6 +15,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @magentoDbIsolation enabled
+ */
 class PageBuilderStripStylesTest extends TestCase
 {
     private const XPATH_SELECTOR = '//*[@data-content-type][@style]|//*[@data-content-type]/*[@style]';
@@ -63,7 +66,9 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
             $styleAttr = $node->getAttribute('style');
 
             if ($styleAttr) {
-                $getInternalStyles = $xpathAfter->query('//body/style[last()]')->item(0)->textContent;
+                if ($xpathAfter->query('//body/style[last()]')->item(0)) {
+                    $getInternalStyles = $xpathAfter->query('//body/style[last()]')->item(0)->textContent;
+                }
                 $styleRules[] = $styleAttr;
             }
         }
@@ -85,7 +90,7 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
     /**
      * @return array
      */
-    public function conversionData(): array
+    public static function conversionData(): array
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
         return [
@@ -176,7 +181,7 @@ public function conversionData(): array
     /**
      * @return array
      */
-    public function conversionDataRaw(): array
+    public static function conversionDataRaw(): array
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
         return [

dev/tests/integration/testsuite/Magento/PageBuilder/_files/custom_variable_xss.php

@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 /** @var \Magento\Variable\Model\ResourceModel\Variable $variableResource */
-$variableResource = $this->objectManager->get(\Magento\Variable\Model\ResourceModel\Variable::class);
+$variableResource = $objectManager->get(\Magento\Variable\Model\ResourceModel\Variable::class);
 
 /** @var \Magento\Variable\Model\Variable $variable */
-$variable = $this->objectManager->get(\Magento\Variable\Model\Variable::class);
+$variable = $objectManager->get(\Magento\Variable\Model\Variable::class);
 
 $variable->setData([
     'code' => 'xssVariable',