From 98d600dca98a6b374f2543be4114156ba8178959 Mon Sep 17 00:00:00 2001
From: Alessandro Ronchi <aleron75@gmail.com>
Date: Tue, 10 Jul 2018 19:16:52 +0200
Subject: [PATCH] ControllerAclTest.php

Change regex in getControllerPath() to avoid classes which are under "Controller" namespace (like for example controller plugins) being interpreted as controllers causing the Act test to fail.
---
 .../Test/Integrity/Magento/Backend/ControllerAclTest.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
index 187cb9087013e..f204019988b79 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
@@ -232,7 +232,7 @@ private function isItTest($relativeFilePath)
      */
     private function getControllerPath($relativeFilePath)
     {
-        if (preg_match('~(Magento\/.*Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) {
+        if (preg_match('~(Magento\/[^\/]+\/Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) {
             if (count($matches) === 2) {
                 $partPath = $matches[1];
                 return $partPath;