#23173: Static and integration tests fix.

Author: engcom-Foxtrot

app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php

@@ -57,7 +57,8 @@ public function __construct(
 
     /**
      * Prepare layout.
-     * Add files to use dialog windows
+     *
+     * Add files to use dialog windows.
      *
      * @return $this
      */

dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php

@@ -52,21 +52,23 @@ protected function mockModel($filesystem = null)
 
         $this->model = $this->getMockBuilder(\Magento\Email\Model\Template::class)
             ->setMethods(['_getMail'])
-            ->setConstructorArgs([
-                $this->objectManager->get(\Magento\Framework\Model\Context::class),
-                $this->objectManager->get(\Magento\Framework\View\DesignInterface::class),
-                $this->objectManager->get(\Magento\Framework\Registry::class),
-                $this->objectManager->get(\Magento\Store\Model\App\Emulation::class),
-                $this->objectManager->get(\Magento\Store\Model\StoreManager::class),
-                $this->objectManager->create(\Magento\Framework\View\Asset\Repository::class),
-                $filesystem,
-                $this->objectManager->create(\Magento\Framework\App\Config\ScopeConfigInterface::class),
-                $this->objectManager->get(\Magento\Email\Model\Template\Config::class),
-                $this->objectManager->get(\Magento\Email\Model\TemplateFactory::class),
-                $this->objectManager->get(\Magento\Framework\Filter\FilterManager::class),
-                $this->objectManager->get(\Magento\Framework\UrlInterface::class),
-                $this->objectManager->get(\Magento\Email\Model\Template\FilterFactory::class),
-            ])
+            ->setConstructorArgs(
+                [
+                    $this->objectManager->get(\Magento\Framework\Model\Context::class),
+                    $this->objectManager->get(\Magento\Framework\View\DesignInterface::class),
+                    $this->objectManager->get(\Magento\Framework\Registry::class),
+                    $this->objectManager->get(\Magento\Store\Model\App\Emulation::class),
+                    $this->objectManager->get(\Magento\Store\Model\StoreManager::class),
+                    $this->objectManager->create(\Magento\Framework\View\Asset\Repository::class),
+                    $filesystem,
+                    $this->objectManager->create(\Magento\Framework\App\Config\ScopeConfigInterface::class),
+                    $this->objectManager->get(\Magento\Email\Model\Template\Config::class),
+                    $this->objectManager->get(\Magento\Email\Model\TemplateFactory::class),
+                    $this->objectManager->get(\Magento\Framework\Filter\FilterManager::class),
+                    $this->objectManager->get(\Magento\Framework\UrlInterface::class),
+                    $this->objectManager->get(\Magento\Email\Model\Template\FilterFactory::class),
+                ]
+            )
             ->getMock();
 
         $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
@@ -122,12 +124,14 @@ public function testGetProcessedTemplate()
             ->load();
 
         $expectedViewUrl = '/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico';
-        $this->model->setDesignConfig([
-            'area' => 'frontend',
-            'store' => $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-                ->getStore('fixturestore')
-                ->getId(),
-        ]);
+        $this->model->setDesignConfig(
+            [
+                'area' => 'frontend',
+                'store' => $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
+                    ->getStore('fixturestore')
+                    ->getId(),
+            ]
+        );
         $this->model->setTemplateText('{{view url="Magento_Theme::favicon.ico"}}');
 
         $this->setNotDefaultThemeForFixtureStore();
@@ -373,9 +377,11 @@ public function testTemplateStylesVariable($area, $expectedOutput, $unexpectedOu
             // @styles comments by default, it is necessary to mock an object to return testable contents
             $themeDirectory = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadInterface::class)
                 ->disableOriginalConstructor()
-                ->setMethods([
-                    'readFile',
-                ])
+                ->setMethods(
+                    [
+                        'readFile',
+                    ]
+                )
                 ->getMockForAbstractClass();
 
             $themeDirectory->expects($this->once())
@@ -478,10 +484,12 @@ protected function setUpAdminThemeFallback()
         $adminStore = $this->objectManager->create(\Magento\Store\Model\Store::class)
             ->load(Store::ADMIN_CODE);
 
-        $this->model->setDesignConfig([
-            'area' => 'adminhtml',
-            'store' => $adminStore->getId(),
-        ]);
+        $this->model->setDesignConfig(
+            [
+                'area' => 'adminhtml',
+                'store' => $adminStore->getId(),
+            ]
+        );
     }
 
     /**
@@ -516,12 +524,14 @@ protected function setUpThemeFallback($area)
                 'fixturestore'
             );
 
-        $this->model->setDesignConfig([
-            'area' => 'frontend',
-            'store' => $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-                ->getStore('fixturestore')
-                ->getId(),
-        ]);
+        $this->model->setDesignConfig(
+            [
+                'area' => 'frontend',
+                'store' => $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
+                    ->getStore('fixturestore')
+                    ->getId(),
+            ]
+        );
     }
 
     /**
@@ -578,12 +588,14 @@ public function testGetProcessedTemplateSubject()
             ->load();
 
         $this->model->setTemplateSubject('{{view url="Magento_Theme::favicon.ico"}}');
-        $this->model->setDesignConfig([
-            'area' => 'frontend',
-            'store' => $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-                ->getStore('fixturestore')
-                ->getId(),
-        ]);
+        $this->model->setDesignConfig(
+            [
+                'area' => 'frontend',
+                'store' => $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
+                    ->getStore('fixturestore')
+                    ->getId(),
+            ]
+        );
 
         $this->setNotDefaultThemeForFixtureStore();
         $this->assertStringMatchesFormat(
@@ -703,8 +715,8 @@ public function testGetVariablesOptionArrayInGroup()
         $testTemplateVariables = '{"var data.name":"Sender Name","var data.email":"Sender Email"}';
         $this->model->setOrigTemplateVariables($testTemplateVariables);
         $variablesOptionArray = $this->model->getVariablesOptionArray(true);
-        $this->assertEquals('Template Variables', $variablesOptionArray[0]['label']->getText());
-        $this->assertEquals($this->model->getVariablesOptionArray(), $variablesOptionArray[0]['value']);
+        $this->assertEquals('Template Variables', $variablesOptionArray['label']->getText());
+        $this->assertEquals($this->model->getVariablesOptionArray(), $variablesOptionArray['value']);
     }
 
     /**