Merge branch 'MAGETWO-86990' into MPI-PR-2.2.5

Author: YevSent

dev/tests/integration/testsuite/Magento/Ui/Component/ConfigurationTest.php

@@ -7,13 +7,17 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentFile;
+use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\DirSearch;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Ui\Config\Reader\DefinitionMap;
-use Magento\Framework\Component\ComponentRegistrar;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ConfigurationTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -26,6 +30,11 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase
      */
     private $appDir;
 
+    /**
+     * @var ReadInterface
+     */
+    private $rootDir;
+
     /**
      * @var \DOMDocument
      */
@@ -66,9 +75,8 @@ public function setUp()
 
         /** @var Filesystem $filesystem */
         $filesystem = $objectManager->create(Filesystem::class);
-        $this->appDir = $this->isComposerBuilt()
-            ? $filesystem->getDirectoryRead(DirectoryList::ROOT)
-            : $filesystem->getDirectoryRead(DirectoryList::APP);
+        $this->appDir = $filesystem->getDirectoryRead(DirectoryList::APP);
+        $this->rootDir = $filesystem->getDirectoryRead(DirectoryList::ROOT);
     }
 
     /**
@@ -86,7 +94,14 @@ public function testConfiguration()
         /** @var ComponentFile $file */
         foreach ($uiConfigurationFiles as $file) {
             $this->currentFile = $file;
-            $content = $this->appDir->readFile($this->appDir->getRelativePath($file->getFullPath()));
+            $fullPath = $file->getFullPath();
+            // by default search files in `app` directory but Magento can be installed via composer
+            // or some modules can be in `vendor` directory (like bundled extensions)
+            try {
+                $content = $this->appDir->readFile($this->appDir->getRelativePath($fullPath));
+            } catch (FileSystemException $e) {
+                $content = $this->rootDir->readFile($this->rootDir->getRelativePath($fullPath));
+            }
             $this->assertConfigurationSemantic($this->getDom($content), $result);
         }
         if (!empty($result)) {
@@ -251,20 +266,4 @@ private function getDom($content = null)
         }
         return $this->dom;
     }
-
-    /**
-     * Check magento modules is in app/code.
-     *
-     * @return bool
-     */
-    private function isComposerBuilt()
-    {
-        $result = false;
-        $rootJson = json_decode(file_get_contents(BP . '/composer.json'), true);
-        if (preg_match('/magento\/project-*/', $rootJson['name']) == 1) {
-            $result  = true;
-        }
-
-        return $result;
-    }
 }