ENGCOM-6239: Fix loose switch comparison when adding links without content types #25473

Author: VladimirZaets

lib/internal/Magento/Framework/View/Page/Config/Renderer.php

@@ -349,19 +349,18 @@ protected function getGroupAttributes($group)
      */
     protected function addDefaultAttributes($contentType, $attributes)
     {
-        switch ($contentType) {
-            case 'js':
-                $attributes = ' type="text/javascript" ' . $attributes;
-                break;
+        if ($contentType === 'js') {
+            return ' type="text/javascript" ' . $attributes;
+        }
 
-            case 'css':
-                $attributes = ' rel="stylesheet" type="text/css" ' . ($attributes ?: ' media="all"');
-                break;
+        if ($contentType === 'css') {
+            return ' rel="stylesheet" type="text/css" ' . ($attributes ?: ' media="all"');
+        }
 
-            case $this->canTypeBeFont($contentType):
-                $attributes = 'rel="preload" as="font" crossorigin="anonymous"';
-                break;
+        if ($this->canTypeBeFont($contentType)) {
+            return 'rel="preload" as="font" crossorigin="anonymous"';
         }
+
         return $attributes;
     }
 

lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php

@@ -427,4 +427,48 @@ public function dataProviderRenderAssets()
             ],
         ];
     }
+
+    public function testRenderAssetWithNoContentType() : void
+    {
+        $type = '';
+
+        $assetMockOne = $this->createMock(\Magento\Framework\View\Asset\AssetInterface::class);
+        $assetMockOne->expects($this->exactly(1))
+            ->method('getUrl')
+            ->willReturn('url');
+
+        $assetMockOne->expects($this->atLeastOnce())->method('getContentType')->willReturn($type);
+
+        $groupAssetsOne = [$assetMockOne];
+
+        $groupMockOne = $this->getMockBuilder(\Magento\Framework\View\Asset\PropertyGroup::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $groupMockOne->expects($this->once())
+            ->method('getAll')
+            ->willReturn($groupAssetsOne);
+        $groupMockOne->expects($this->any())
+            ->method('getProperty')
+            ->willReturnMap(
+                [
+                    [GroupedCollection::PROPERTY_CAN_MERGE, true],
+                    [GroupedCollection::PROPERTY_CONTENT_TYPE, $type],
+                    ['attributes', 'rel="some-rel"'],
+                    ['ie_condition', null],
+                ]
+            );
+
+        $this->pageConfigMock->expects($this->once())
+            ->method('getAssetCollection')
+            ->willReturn($this->assetsCollection);
+
+        $this->assetsCollection->expects($this->once())
+            ->method('getGroups')
+            ->willReturn([$groupMockOne]);
+
+        $this->assertEquals(
+            '<link  rel="some-rel" href="url" />' . "\n",
+            $this->renderer->renderAssets($this->renderer->getAvailableResultGroups())
+        );
+    }
 }