Update code and remove setArea deprecated method

magento · May 25, 2021 · e351f4f · e351f4f
1 parent 4a22daf
commit e351f4f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 35 deletions.
diff --git a/app/code/Magento/Theme/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php
@@ -101,18 +101,6 @@ public function __construct(
         $this->objectManager = $objectManager;
     }
 
-    /**
-     * Set design area
-     *
-     * @param string $area
-     * @return $this
-     */
-    public function setArea($area)
-    {
-        $this->_area = $area;
-        return $this;
-    }
-
     /**
      * Retrieve package area
      *
@@ -137,8 +125,8 @@ public function getArea()
     public function setDesignTheme($theme, $area = null)
     {
         if ($area) {
-            $this->setArea($area);
-        } elseif (null == $area) {
+            $this->_area = $area;
+        } else {
             $area = $this->getArea();
         }
 

diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Design/Edit/Tab/GeneralTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Design/Edit/Tab/GeneralTest.php
@@ -23,8 +23,6 @@ public function testPrepareForm()
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $objectManager->get(
             \Magento\Framework\View\DesignInterface::class
-        )->setArea(
-            \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
         )->setDefaultDesignTheme();
         $objectManager->get(
             \Magento\Framework\Registry::class

diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/FormTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/FormTest.php
@@ -23,8 +23,6 @@ public function testSetFieldset()
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $objectManager->get(
             \Magento\Framework\View\DesignInterface::class
-        )->setArea(
-            \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
         )->setDefaultDesignTheme();
         $layout = $objectManager->create(\Magento\Framework\View\Layout::class);
         $formBlock = $layout->addBlock(\Magento\Backend\Block\Widget\Form::class);

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
@@ -11,8 +11,6 @@
 
 $objectManager->get(
     \Magento\Framework\View\DesignInterface::class
-)->setArea(
-    'frontend'
 )->setDefaultDesignTheme();
 
 /** @var \Magento\Catalog\Model\Product\Media\Config $config */

diff --git a/dev/tests/integration/testsuite/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/FormTest.php b/dev/tests/integration/testsuite/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/FormTest.php
@@ -24,7 +24,6 @@ public function testPrepareForm()
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         $objectManager->get(\Magento\Framework\View\DesignInterface::class)
-            ->setArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE)
             ->setDefaultDesignTheme();
 
         $block = $objectManager->get(\Magento\Framework\View\LayoutInterface::class)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/AreaTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/AreaTest.php
@@ -57,8 +57,6 @@ public function testInitDesign()
         )->getArea();
         $sameDesign = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\DesignInterface::class
-        )->setArea(
-            $designArea
         );
         $this->assertSame($design, $sameDesign);
     }

diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php
@@ -30,8 +30,6 @@ public function testPrepareForm()
 
         $objectManager->get(
             \Magento\Framework\View\DesignInterface::class
-        )->setArea(
-            FrontNameResolver::AREA_CODE
         )->setDefaultDesignTheme();
         $objectManager->get(
             \Magento\Framework\Config\ScopeInterface::class

diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Filter/FormTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Filter/FormTest.php
@@ -22,8 +22,6 @@ public function testPrepareForm()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\DesignInterface::class
-        )->setArea(
-            \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
         )->setDefaultDesignTheme();
         $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Framework\View\Layout::class

diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -95,7 +95,7 @@ public function testSetGetArea()
 
     public function testSetDesignTheme()
     {
-        $this->_model->setDesignTheme('Magento/blank', 'frontend');
+        $this->_model->setDesignTheme('Magento/blank', Area::AREA_FRONTEND);
         $this->assertEquals('Magento/blank', $this->_model->getDesignTheme()->getThemePath());
     }
 
@@ -118,11 +118,11 @@ public function testGetConfigurationDesignThemeDefaults()
         $model = $objectManager->get(\Magento\Theme\Model\View\Design::class);
 
         $this->assertEquals('test_f', $model->getConfigurationDesignTheme());
-        $this->assertEquals('test_f', $model->getConfigurationDesignTheme('frontend'));
-        $this->assertEquals('test_f', $model->getConfigurationDesignTheme('frontend', ['store' => 0]));
-        $this->assertEquals('test_f', $model->getConfigurationDesignTheme('frontend', ['store' => null]));
-        $this->assertEquals('test_a', $model->getConfigurationDesignTheme('adminhtml'));
-        $this->assertEquals('test_a', $model->getConfigurationDesignTheme('adminhtml', ['store' => uniqid()]));
+        $this->assertEquals('test_f', $model->getConfigurationDesignTheme(Area::AREA_FRONTEND));
+        $this->assertEquals('test_f', $model->getConfigurationDesignTheme(Area::AREA_FRONTEND, ['store' => 0]));
+        $this->assertEquals('test_f', $model->getConfigurationDesignTheme(Area::AREA_FRONTEND, ['store' => null]));
+        $this->assertEquals('test_a', $model->getConfigurationDesignTheme(Area::AREA_ADMINHTML));
+        $this->assertEquals('test_a', $model->getConfigurationDesignTheme(Area::AREA_ADMINHTML, ['store' => uniqid()]));
     }
 
     /**
@@ -142,11 +142,11 @@ public function testGetConfigurationDesignThemeStore()
             ->getId();
         $this->assertEquals('one', $this->_model->getConfigurationDesignTheme());
         $this->assertEquals('one', $this->_model->getConfigurationDesignTheme(null, ['store' => $storeId]));
-        $this->assertEquals('one', $this->_model->getConfigurationDesignTheme('frontend', ['store' => $storeId]));
+        $this->assertEquals('one', $this->_model->getConfigurationDesignTheme(Area::AREA_FRONTEND, ['store' => $storeId]));
         $this->assertEquals('two', $this->_model->getConfigurationDesignTheme(null, ['store' => 'fixturestore']));
         $this->assertEquals(
             'two',
-            $this->_model->getConfigurationDesignTheme('frontend', ['store' => 'fixturestore'])
+            $this->_model->getConfigurationDesignTheme(Area::AREA_FRONTEND, ['store' => 'fixturestore'])
         );
     }