Fix layout file detected in wrong area scope

An adminhtml xml file is detected as being overridden in a frontend theme fix issue #2
AmpersandHQ · Dec 7, 2018 · c631006 · c631006
1 parent b376bdb
commit c631006
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/dev/TestModule/app/design/frontend/Ampersand/theme/Magento_Sales/layout/sales_order_view.xml b/dev/TestModule/app/design/frontend/Ampersand/theme/Magento_Sales/layout/sales_order_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+
+</page>
diff --git a/dev/output/expected/magento21.out.txt b/dev/output/expected/magento21.out.txt
@@ -18,4 +18,5 @@
 | Core file                                                              | Override/extended (layout xml)                                                 |
 +------------------------------------------------------------------------+--------------------------------------------------------------------------------+
 | vendor/magento/module-sales/view/frontend/layout/sales_order_print.xml | app/design/frontend/Ampersand/theme/Magento_Sales/layout/sales_order_print.xml |
+| vendor/magento/module-sales/view/frontend/layout/sales_order_view.xml  | app/design/frontend/Ampersand/theme/Magento_Sales/layout/sales_order_view.xml  |
 +------------------------------------------------------------------------+--------------------------------------------------------------------------------+
diff --git a/src/Ampersand/PatchHelper/Helper/PatchOverrideValidator.php b/src/Ampersand/PatchHelper/Helper/PatchOverrideValidator.php
@@ -330,13 +330,18 @@ public function validateWebTemplateHtml($file)
     private function validateLayoutFile($file)
     {
         $parts = explode('/', $file);
+        $area = (str_contains($file, '/adminhtml/')) ? 'adminhtml' : 'frontend';
         $module = $parts[2] . '_' . $parts[3];
 
         $layoutFile = end($parts);
 
-        $potentialOverrides = array_filter($this->listOfXmlFiles, function ($potentialFilePath) use ($module, $layoutFile) {
+        $potentialOverrides = array_filter($this->listOfXmlFiles, function ($potentialFilePath) use ($module, $area, $layoutFile) {
             $validFile = true;
 
+            if (!str_contains($potentialFilePath, $area)) {
+                // This is not in the same area
+                $validFile = false;
+            }
             if (!str_ends_with($potentialFilePath, $layoutFile)) {
                 // This is not the same file name as our layout file
                 $validFile = false;