Merge remote-tracking branch 'origin/MC-30416' into borg-2.4.0

Author: nathanjosiah

lib/internal/Magento/Framework/App/AreaList.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App;
 
+/**
+ * Lists router area codes & processes resolves FrontEndNames to area codes
+ */
 class AreaList
 {
     /**
@@ -72,7 +75,7 @@ public function getCodeByFrontName($frontName)
                 $resolver = $this->_resolverFactory->create($areaInfo['frontNameResolver']);
                 $areaInfo['frontName'] = $resolver->getFrontName(true);
             }
-            if ($areaInfo['frontName'] == $frontName) {
+            if ($areaInfo['frontName'] === $frontName) {
                 return $areaCode;
             }
         }

lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php

@@ -100,6 +100,19 @@ public function testGetFrontNameWhenAreaCodeAndFrontNameArentSet()
         $this->assertSame('test', $model->getArea($code));
     }
 
+    public function testGetFrontNameWhenFrontNameIsInvalid() : void
+    {
+        $this->_model = new AreaList(
+            $this->objectManagerMock,
+            $this->_resolverFactory,
+            [
+                'testAreaCode' => []
+            ]
+        );
+
+        $this->assertNull($this->_model->getFrontName('0'));
+    }
+
     public function testGetCodes()
     {
         $areas = ['area1' => 'value1', 'area2' => 'value2'];