Merge remote-tracking branch 'remotes/mainline/2.3-develop' into ENGCOM-1663-magento-graphql-ce-48

Alex Paliarush · Alex Paliarush · commit 2cb9aaf2bec1 · 2018-05-30T19:32:53.000-05:00
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
@@ -68,7 +68,7 @@ public function getXmlFiles()
         $componentRegistrar = new ComponentRegistrar();
         $codeXml = [];
         foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $modulePath) {
-            $codeXml = array_merge($codeXml, $this->_getFiles($modulePath, '*.xml', '/.\/Test\/Unit/'));
+            $codeXml = array_merge($codeXml, $this->_getFiles($modulePath, '*.xml', '/.\/Test\/./'));
         }
         $this->_filterSpecialCases($codeXml);
         $designXml = [];

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function getXmlFiles()`
`68`	`68`	`$componentRegistrar = new ComponentRegistrar();`
`69`	`69`	`$codeXml = [];`
`70`	`70`	`foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $modulePath) {`
`71`		`- $codeXml = array_merge($codeXml, $this->_getFiles($modulePath, '*.xml', '/.\/Test\/Unit/'));`
	`71`	`+ $codeXml = array_merge($codeXml, $this->_getFiles($modulePath, '*.xml', '/.\/Test\/./'));`
`72`	`72`	`}`
`73`	`73`	`$this->_filterSpecialCases($codeXml);`
`74`	`74`	`$designXml = [];`