Merge remote-tracking branch 'origin/MAGETWO-43842' into BugFestW2

Author: Maksym Aposov

dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/AclConfigFilesTest.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Test\Integrity\Modular;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 class AclConfigFilesTest extends \PHPUnit_Framework_TestCase
 {

dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/DiConfigFilesTest.php

@@ -92,7 +92,7 @@ public function linearFilesProvider()
 
         $output = [];
         foreach ($common as $path => $file) {
-            $output[$path] = [$file];
+            $output[substr($path, strlen(BP))] = [$file];
         }
 
         return $output;

dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/IndexerConfigFilesTest.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Test\Integrity\Modular;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 
 class IndexerConfigFilesTest extends \PHPUnit_Framework_TestCase
@@ -51,13 +50,6 @@ public function testIndexerConfigFile($file)
      */
     public function indexerConfigFileDataProvider()
     {
-        /** @var Filesystem $filesystem */
-        $utilityFiles = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get('\Magento\Framework\App\Utility\Files');
-
-        $utilityFiles->getConfigFiles('indexer.xml');
-
-        $dataProviderResult = $utilityFiles->getConfigFiles('indexer.xml');
-        return $dataProviderResult;
+        return \Magento\Framework\App\Utility\Files::init()->getConfigFiles('indexer.xml');
     }
 }

dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/XmlFilesTest.php

@@ -36,7 +36,7 @@ public function viewConfigFileDataProvider()
             ->get('Magento\Framework\Component\DirSearch');
         $files = $componentDirSearch->collectFiles(ComponentRegistrar::THEME, 'etc/view.xml');
         foreach ($files as $file) {
-            $result[$file] = [$file];
+            $result[substr($file, strlen(BP))] = [$file];
         }
         return $result;
     }
@@ -60,7 +60,7 @@ public function themeConfigFileExistsDataProvider()
         $componentRegistrar = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get('\Magento\Framework\Component\ComponentRegistrar');
         foreach ($componentRegistrar->getPaths(ComponentRegistrar::THEME) as $themeDir) {
-            $result[$themeDir] = [$themeDir];
+            $result[substr($themeDir, strlen(BP))] = [$themeDir];
         }
         return $result;
     }
@@ -102,7 +102,7 @@ public function themeConfigFileDataProvider()
             ->get('Magento\Framework\Component\DirSearch');
         $files = $componentDirSearch->collectFiles(ComponentRegistrar::THEME, 'theme.xml');
         foreach ($files as $file) {
-            $result[$file] = [$file];
+            $result[substr($file, strlen(BP))] = [$file];
         }
         return $result;
     }

lib/internal/Magento/Framework/App/Utility/Files.php

@@ -106,7 +106,7 @@ public static function composeDataSets(array $files)
     {
         $result = [];
         foreach ($files as $file) {
-            $result[$file] = [$file];
+            $result[substr($file, strlen(BP))] = [$file];
         }
         return $result;
     }