AppState emulateAreaCode was not respected by file collector

johan-lindahl · johan-lindahl · commit 0ec2c916c5c8 · 2020-06-29T11:07:20.000+02:00
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Base.php b/lib/internal/Magento/Framework/View/File/Collector/Base.php
@@ -65,7 +65,7 @@ public function getFiles(ThemeInterface $theme, $filePath)
         foreach ($sharedFiles as $file) {
             $result[] = $this->fileFactory->create($file->getFullPath(), $file->getComponentName(), null, true);
         }
-        $area = $theme->getData('area');
+        $area = $theme->getArea();
         $themeFiles = $this->componentDirSearch->collectFilesWithContext(
             ComponentRegistrar::MODULE,
             "view/{$area}/{$this->subDir}{$filePath}"

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function getFiles(ThemeInterface $theme, $filePath)`
`65`	`65`	`foreach ($sharedFiles as $file) {`
`66`	`66`	`$result[] = $this->fileFactory->create($file->getFullPath(), $file->getComponentName(), null, true);`
`67`	`67`	`}`
`68`		`- $area = $theme->getData('area');`
	`68`	`+ $area = $theme->getArea();`
`69`	`69`	`$themeFiles = $this->componentDirSearch->collectFilesWithContext(`
`70`	`70`	`ComponentRegistrar::MODULE,`
`71`	`71`	`"view/{$area}/{$this->subDir}{$filePath}"`