Add support for Symfony 2.8 and 3 using the new directory structure #635, also add auto configuration to set all custom paths and enabled plugin directly out of notification box

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/Settings.java

@@ -21,7 +21,12 @@
 )
 public class Settings implements PersistentStateComponent<Settings> {
 
-    public static String DEFAULT_CONTAINER_PATH = "app/cache/dev/appDevDebugProjectContainer.xml";
+    // Symfony 2 and 3 paths
+    public static String[] DEFAULT_CONTAINER_PATHS = new String[] {
+        "app/cache/dev/appDevDebugProjectContainer.xml",
+        "var/cache/dev/appDevDebugProjectContainer.xml",
+    };
+
     public static String DEFAULT_URL_GENERATOR_PATH = "app/cache/dev/appDevUrlGenerator.php";
     public static String DEFAULT_TRANSLATION_PATH = "app/cache/dev/translations";
 

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

@@ -5,20 +5,16 @@
 import com.intellij.notification.Notifications;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.editor.event.CaretListener;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.psi.PsiElement;
-import fr.adrienbrault.idea.symfony2plugin.codeInsight.caret.overlay.CaretTextOverlayListener;
 import fr.adrienbrault.idea.symfony2plugin.dic.ContainerFile;
 import fr.adrienbrault.idea.symfony2plugin.extension.ServiceContainerLoader;
 import fr.adrienbrault.idea.symfony2plugin.extension.ServiceContainerLoaderParameter;
-import fr.adrienbrault.idea.symfony2plugin.routing.Route;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
 import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
 import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
@@ -120,7 +116,9 @@ public List<File> getContainerFiles(boolean attachSetting) {
         }
 
         if(containerFiles.size() == 0) {
-            containerFiles.add(new ContainerFile(Settings.DEFAULT_CONTAINER_PATH));
+            for (String s : Settings.DEFAULT_CONTAINER_PATHS) {
+                containerFiles.add(new ContainerFile(s));
+            }
         }
 
         List<File> validFiles = new ArrayList<File>();
@@ -145,7 +143,8 @@ private void checkProject() {
 
         if(!this.isEnabled() && !Settings.getInstance(project).dismissEnableNotification) {
             if(VfsUtil.findRelativeFile(this.project.getBaseDir(), "vendor") != null
-                && VfsUtil.findRelativeFile(this.project.getBaseDir(), "app", "cache") != null
+                && VfsUtil.findRelativeFile(this.project.getBaseDir(), "app", "config") != null
+                && VfsUtil.findRelativeFile(this.project.getBaseDir(), "app", "Resources") != null
                 && VfsUtil.findRelativeFile(this.project.getBaseDir(), "vendor", "symfony", "symfony") != null
               ) {
                 IdeHelper.notifyEnableMessage(project);

src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerProjectGenerator.java

@@ -12,6 +12,7 @@
 import fr.adrienbrault.idea.symfony2plugin.Settings;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
+import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -65,7 +66,8 @@ public void generateProject(@NotNull final Project project, final @NotNull Virtu
         SymfonyInstallerCommandExecutor executor = new SymfonyInstallerCommandExecutor(project, baseDir, commands) {
             @Override
             protected void onFinish(@Nullable String message) {
-                Settings.getInstance(project).pluginEnabled = true;
+                IdeHelper.enablePluginAndConfigure(project);
+
                 if(message != null) {
                     // replace empty lines, provide html output, and remove our temporary path
                     showInfoNotification(project, message

src/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java

@@ -69,7 +69,9 @@ public void mouseClicked(MouseEvent e) {
                 resetContainerList();
 
                 // add default path
-                ContainerSettingsForm.this.modelList.addRow(new ContainerFile(Settings.DEFAULT_CONTAINER_PATH));
+                for (String defaultContainerPath : Settings.DEFAULT_CONTAINER_PATHS) {
+                    ContainerSettingsForm.this.modelList.addRow(new ContainerFile(defaultContainerPath));
+                }
 
             }
         });

src/fr/adrienbrault/idea/symfony2plugin/util/IdeHelper.java

@@ -136,7 +136,7 @@ public static boolean supportsStatusBar() {
 
     public static void notifyEnableMessage(final Project project) {
 
-        Notification notification = new Notification("Symfony Plugin", "Symfony Plugin", "Enable the Symfony Plugin in <a href=\"config\">Project Settings</a> or <a href=\"dismiss\">dismiss</a> further messages", NotificationType.INFORMATION, new NotificationListener() {
+        Notification notification = new Notification("Symfony Plugin", "Symfony Plugin", "Enable the Symfony Plugin <a href=\"enable\">with auto configuration now</a>, open <a href=\"config\">Project Settings</a> or <a href=\"dismiss\">dismiss</a> further messages", NotificationType.INFORMATION, new NotificationListener() {
             @Override
             public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) {
 
@@ -145,7 +145,9 @@ public void hyperlinkUpdate(@NotNull Notification notification, @NotNull Hyperli
 
                     // open settings dialog and show panel
                     SettingsForm.show(project);
-
+                } else if("enable".equals(event.getDescription())) {
+                    enablePluginAndConfigure(project);
+                    Notifications.Bus.notify(new Notification("Symfony Plugin", "Symfony Plugin", "Plugin enabled", NotificationType.INFORMATION), project);
                 } else if("dismiss".equals(event.getDescription())) {
 
                     // use dont want to show notification again
@@ -160,6 +162,16 @@ public void hyperlinkUpdate(@NotNull Notification notification, @NotNull Hyperli
         Notifications.Bus.notify(notification, project);
     }
 
+    public static void enablePluginAndConfigure(@NotNull Project project) {
+        Settings.getInstance(project).pluginEnabled = true;
+
+        // Symfony 3.0 structure
+        if(VfsUtil.findRelativeFile(project.getBaseDir(), "var", "cache") == null) {
+            Settings.getInstance(project).pathToUrlGenerator = "var/cache/dev/appDevUrlGenerator.php";
+            Settings.getInstance(project).pathToTranslation = "var/cache/dev/translations";
+        }
+    }
+
     public static void navigateToPsiElement(@NotNull PsiElement psiElement) {
         final Navigatable descriptor = PsiNavigationSupport.getInstance().getDescriptor(psiElement);
         if (descriptor != null) {