1 files changed, 7 insertions, 13 deletions
diff --git a/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php b/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
index 1aa1a74de8..59bac60155 100644
--- a/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
+++ b/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
@@ -227,16 +227,15 @@ class TestingEnvironmentManipulator implements EnvironmentManipulator
 
     private function getPluginAndRequiredPlugins($pluginName, $plugins)
     {
-        $pluginJsonPath = $this->makePathToPluginJson($pluginName);
+        $pluginLoader = new Plugin\MetadataLoader($pluginName);
+        $pluginJson = $pluginLoader->loadPluginInfoJson();
 
-        if (file_exists($pluginJsonPath)) {
-            $pluginJson = json_decode(trim(file_get_contents($pluginJsonPath)), true);
+        if (!empty($pluginJson['require'])) {
+            foreach ($pluginJson['require'] as $possiblePluginName => $requiredVersion) {
 
-            if (!empty($pluginJson['require'])) {
-                foreach ($pluginJson['require'] as $possiblePluginName => $requiredVersion) {
-                    if (file_exists($this->makePathToPluginJson($possiblePluginName))) {
-                        $plugins = $this->getPluginAndRequiredPlugins($possiblePluginName, $plugins);
-                    }
+                $pluginLoader2 = new Plugin\MetadataLoader($possiblePluginName);
+                if (file_exists($pluginLoader2->getPathToPluginJson())) {
+                    $plugins = $this->getPluginAndRequiredPlugins($possiblePluginName, $plugins);
                 }
             }
         }
@@ -248,11 +247,6 @@ class TestingEnvironmentManipulator implements EnvironmentManipulator
         return $plugins;
     }
 
-    private function makePathToPluginJson($pluginName)
-    {
-        return Plugin\Manager::getPluginsDirectory() . $pluginName . '/' . Plugin\MetadataLoader::PLUGIN_JSON_FILENAME;
-    }
-
     private function classExists($klass)
     {
         if (class_exists($klass)) {