MC-35855: CSP cannot be configured from a theme

ogorkun · ogorkun · commit c2f29b40dbef · 2020-09-15T14:42:05.000-05:00
diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
@@ -87,7 +87,9 @@ public function get($filename, $scope)
                 }
                 $theme = $theme->getParentTheme();
             }
-            $configs = $this->iteratorFactory->create(['paths' => $files, 'existingIterator' => $configs]);
+            $configs = $this->iteratorFactory->create(
+                ['paths' => array_reverse($files), 'existingIterator' => $configs]
+            );
         }
 
         return $configs;

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,9 @@ public function get($filename, $scope)`
`87`	`87`	`}`
`88`	`88`	`$theme = $theme->getParentTheme();`
`89`	`89`	`}`
`90`		`- $configs = $this->iteratorFactory->create(['paths' => $files, 'existingIterator' => $configs]);`
	`90`	`+ $configs = $this->iteratorFactory->create(`
	`91`	`+ ['paths' => array_reverse($files), 'existingIterator' => $configs]`
	`92`	`+ );`
`91`	`93`	`}`
`92`	`94`
`93`	`95`	`return $configs;`