ENGCOM-6371: #25042 Remove logo dimension parameters from layout files #25789

Author: VladimirZaets

app/code/Magento/Theme/Block/Html/Header/Logo.php

@@ -98,7 +98,7 @@ public function getLogoWidth()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return (int)$this->_data['logo_width'] ? : (int)$this->getLogoImgWidth();
+        return (int)$this->_data['logo_width'];
     }
 
     /**
@@ -114,7 +114,7 @@ public function getLogoHeight()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return (int)$this->_data['logo_height'] ? : (int)$this->getLogoImgHeight();
+        return (int)$this->_data['logo_height'];
     }
 
     /**

app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php

@@ -44,4 +44,38 @@ public function testGetLogoSrc()
 
         $this->assertEquals('http://localhost/pub/media/logo/default/image.gif', $block->getLogoSrc());
     }
+
+    /**
+     * cover \Magento\Theme\Block\Html\Header\Logo::getLogoHeight
+     */
+    public function testGetLogoHeight()
+    {
+        $scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $scopeConfig->expects($this->once())->method('getValue')->willReturn(null);
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $arguments = [
+            'scopeConfig' => $scopeConfig,
+        ];
+        $block = $objectManager->getObject(\Magento\Theme\Block\Html\Header\Logo::class, $arguments);
+
+        $this->assertEquals(null, $block->getLogoHeight());
+    }
+
+    /**
+     * @covers \Magento\Theme\Block\Html\Header\Logo::getLogoWidth
+     */
+    public function testGetLogoWidth()
+    {
+        $scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $scopeConfig->expects($this->once())->method('getValue')->willReturn('170');
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $arguments = [
+            'scopeConfig' => $scopeConfig,
+        ];
+        $block = $objectManager->getObject(\Magento\Theme\Block\Html\Header\Logo::class, $arguments);
+
+        $this->assertEquals('170', $block->getLogoHeight());
+    }
 }

app/code/Magento/Theme/view/frontend/layout/default.xml

@@ -50,12 +50,7 @@
                 </container>
             </container>
             <container name="header-wrapper" label="Page Header" as="header-wrapper" htmlTag="div" htmlClass="header content">
-                <block class="Magento\Theme\Block\Html\Header\Logo" name="logo">
-                    <arguments>
-                        <argument name="logo_img_width" xsi:type="number">189</argument>
-                        <argument name="logo_img_height" xsi:type="number">64</argument>
-                    </arguments>
-                </block>
+                <block class="Magento\Theme\Block\Html\Header\Logo" name="logo"/>
             </container>
         </referenceContainer>
         <referenceContainer name="page.top">

app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml

@@ -14,12 +14,6 @@
                 </arguments>
             </block>
         </referenceContainer>
-        <referenceBlock name="logo">
-            <arguments>
-                <argument name="logo_img_width" xsi:type="number">148</argument>
-                <argument name="logo_img_height" xsi:type="number">43</argument>
-            </arguments>
-        </referenceBlock>
         <referenceContainer name="footer">
             <block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" after="footer_links" template="Magento_Store::switch/stores.phtml"/>
         </referenceContainer>