wrapped the deprecated "getBaseDir" for getting the project root directory

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java

@@ -13,6 +13,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import fr.adrienbrault.idea.symfony2plugin.stubs.util.IndexUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import fr.adrienbrault.idea.symfony2plugin.webDeployment.WebDeploymentUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
@@ -175,7 +176,7 @@ private TextBrowseFolderListener createBrowseFolderListener(final JTextField tex
         return new TextBrowseFolderListener(fileChooserDescriptor) {
             @Override
             public void actionPerformed(ActionEvent e) {
-                VirtualFile projectDirectory = project.getBaseDir();
+                VirtualFile projectDirectory = ProjectUtil.getProjectDir(project);
                 VirtualFile selectedFile = FileChooser.chooseFile(
                     fileChooserDescriptor,
                     project,

src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java

@@ -19,6 +19,7 @@
 import fr.adrienbrault.idea.symfony2plugin.profiler.widget.SymfonyProfilerWidget;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
 import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -129,7 +130,7 @@ public Collection<File> getContainerFiles() {
     private void checkProject() {
         if(!this.isEnabled()
             && !Settings.getInstance(project).dismissEnableNotification
-            && VfsUtil.findRelativeFile(this.project.getBaseDir(), "vendor", "symfony") != null
+            && VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(this.project), "vendor", "symfony") != null
             ) {
 
             IdeHelper.notifyEnableMessage(project);
@@ -155,12 +156,12 @@ public static boolean isEnabledForIndex(Project project) {
             return true;
         }
 
-        if(VfsUtil.findRelativeFile(project.getBaseDir(), "vendor", "symfony") != null) {
+        if(VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), "vendor", "symfony") != null) {
             return true;
         }
 
         // drupal8; this should not really here
-        if(VfsUtil.findRelativeFile(project.getBaseDir(), "core", "vendor", "symfony") != null) {
+        if(VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), "core", "vendor", "symfony") != null) {
             return true;
         }
 

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/dict/TranslationFileModel.java

@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.psi.PsiFile;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
 import org.jetbrains.annotations.Nullable;
 
@@ -34,7 +35,7 @@ public void addWeight(int weight) {
 
     @Nullable
     public String getRelativePath() {
-        return VfsUtil.getRelativePath(psiFile.getVirtualFile(), psiFile.getProject().getBaseDir(), '/');
+        return VfsUtil.getRelativePath(psiFile.getVirtualFile(), ProjectUtil.getProjectDir(psiFile), '/');
     }
 
     public String getDomain() {

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/JavascriptServiceNameStrategy.java

@@ -7,6 +7,7 @@
 import fr.adrienbrault.idea.symfony2plugin.Settings;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -54,7 +55,7 @@ public static Object run(@NotNull Project project, @NotNull String className, @N
 
         PhpClass aClass = PhpElementsUtil.getClass(project, className);
         if(aClass != null) {
-            String relativePath = VfsUtil.getRelativePath(aClass.getContainingFile().getVirtualFile(), project.getBaseDir(), '/');
+            String relativePath = VfsUtil.getRelativePath(aClass.getContainingFile().getVirtualFile(), ProjectUtil.getProjectDir(aClass), '/');
             if(relativePath != null) {
                 jsonObject.addProperty("relativePath", relativePath);
             }

src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java

@@ -6,6 +6,7 @@
 import com.intellij.openapi.vfs.VirtualFileVisitor;
 import com.intellij.psi.PsiDirectory;
 import fr.adrienbrault.idea.symfony2plugin.Settings;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.SymfonyBundleUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
 import org.apache.commons.lang.StringUtils;
@@ -42,9 +43,8 @@ public AssetDirectoryReader(@NotNull String[] filterExtension, boolean includeBu
 
     @Nullable
     private static VirtualFile getProjectAssetRoot(@NotNull Project project) {
-        VirtualFile projectDirectory = project.getBaseDir();
         String webDirectoryName = Settings.getInstance(project).directoryToWeb;
-        return VfsUtil.findRelativeFile(projectDirectory, webDirectoryName.split("/"));
+        return VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), webDirectoryName.split("/"));
     }
 
     @NotNull

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java

@@ -11,6 +11,7 @@
 import com.jetbrains.php.lang.psi.elements.*;
 import fr.adrienbrault.idea.symfony2plugin.util.FilesystemUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.yaml.YAMLFileType;
@@ -171,7 +172,7 @@ public static Collection<VirtualFile> getConfigurations(@NotNull Project project
         Collection<VirtualFile> virtualFiles = new HashSet<>();
 
         for (String[] path : paths) {
-            VirtualFile configFile = VfsUtil.findRelativeFile(project.getBaseDir(), path);
+            VirtualFile configFile = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), path);
             if(configFile != null) {
                 virtualFiles.add(configFile);
             }

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java

@@ -12,6 +12,7 @@
 import com.intellij.util.containers.ContainerUtil;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper;
 import org.apache.commons.lang.StringUtils;
 import org.apache.xerces.dom.CommentImpl;
@@ -81,7 +82,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
         // reverse to get top most item first
         Collections.reverse(items);
 
-        Document document = getConfigTemplate(element.getProject().getBaseDir());
+        Document document = getConfigTemplate(ProjectUtil.getProjectDir(element));
         if(document == null) {
             return;
         }
@@ -332,7 +333,7 @@ private Map<String, String> getNodeCommentVars(@Nullable Node node) {
 
     private void attachRootConfig(CompletionResultSet completionResultSet, PsiElement element) {
 
-        Document document = getConfigTemplate(element.getProject().getBaseDir());
+        Document document = getConfigTemplate(ProjectUtil.getProjectDir(element));
         if(document == null) {
             return;
         }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerFile.java

@@ -6,6 +6,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.xmlb.annotations.Tag;
 import fr.adrienbrault.idea.symfony2plugin.ui.dict.AbstractUiFilePath;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -26,7 +27,7 @@ public ContainerFile(String path) {
     @Nullable
     public File getFile(Project project) {
         if (!FileUtil.isAbsolute(this.path)) {
-            VirtualFile virtualFile = VfsUtil.findRelativeFile(this.path, project.getBaseDir());
+            VirtualFile virtualFile = VfsUtil.findRelativeFile(this.path, ProjectUtil.getProjectDir(project));
             if(virtualFile == null) {
                 return null;
             }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java

@@ -11,6 +11,7 @@
 import com.intellij.psi.search.FilenameIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.*;
+import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -102,7 +103,7 @@ private static void visitEnvironment(@NotNull Project project, @NotNull Consumer
         }
 
         // search root directory for all ".env*" files
-        VirtualFile projectDir = VfsUtil.findRelativeFile(project.getBaseDir());
+        VirtualFile projectDir = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project));
         if (projectDir != null) {
             for (VirtualFile child : projectDir.getChildren()) {
                 if (child.getName().startsWith(".env")) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java

@@ -697,7 +697,7 @@ private static Collection<String> getContainerFilesInner(@NotNull Project projec
 
             // several Symfony cache folder structures
             for (String root : new String[] {"var/cache", "app/cache"}) {
-                VirtualFile baseDir = project.getBaseDir();
+                VirtualFile baseDir = ProjectUtil.getProjectDir(project);
 
                 VirtualFile relativeFile = VfsUtil.findRelativeFile(root, baseDir);
                 if (relativeFile == null) {