diff --git a/.gitignore b/.gitignore index a4e34247e..191a0a5a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ out/ /.idea /.idea/misc.xml +/.gradle +/build diff --git a/.travis.yml b/.travis.yml index f8ff1e487..32aa0688e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,28 @@ sudo: false language: java jdk: - oraclejdk8 - -script: "./travis.sh" + +before_cache: +- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock +- rm -fr $HOME/.gradle/caches/*/plugin-resolution/ +- rm -fr $HOME/.gradle/caches/*/fileHashes/fileHashes.bin +- rm -fr $HOME/.gradle/caches/*/fileHashes/fileHashes.lock + cache: directories: - - .cache -before_script: - - sudo apt-get -qq update - - sudo apt-get install ant-optional - - chmod +x travis.sh + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + +before_install: +- "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}" +- "export ORG_GRADLE_PROJECT_phpPluginVersion=${PHP_PLUGIN_VERSION}" +- "export ORG_GRADLE_PROJECT_twigPluginVersion=${TWIG_PLUGIN_VERSION}" +- "export ORG_GRADLE_PROJECT_toolboxPluginVersion=${TOOLBOX_PLUGIN_VERSION}" +- "export ORG_GRADLE_PROJECT_annotationPluginVersion=${ANNOTATION_PLUGIN_VERSION}" env: - #- PHPSTORM_ENV=2017.2 # unsupported api - #- PHPSTORM_ENV=2017.2.4 # unsupported api - - PHPSTORM_ENV=2017.3.2 - #- PHPSTORM_ENV=eap # disabled never used + - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.1" PHP_PLUGIN_VERSION="181.4203.565" TWIG_PLUGIN_VERSION="181.3741.23" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3" + - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2017.3.5" PHP_PLUGIN_VERSION="173.4301.34" TWIG_PLUGIN_VERSION="173.4301.7" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.2.1" -matrix: - allow_failures: - - env: PHPSTORM_ENV=eap +script: +- "./gradlew check buildPlugin" diff --git a/build-test.xml b/build-test.xml deleted file mode 100644 index 9c1843d61..000000000 --- a/build-test.xml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..57ebb7be3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,48 @@ +import org.gradle.api.tasks.testing.logging.TestExceptionFormat + +buildscript { + repositories { + mavenCentral() + + maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' } + } +} + +plugins { + id "org.jetbrains.intellij" version "0.2.18" +} + +apply plugin: 'idea' +apply plugin: 'org.jetbrains.intellij' +apply plugin: 'java' + +intellij { + version ideaVersion + plugins = [ + "com.jetbrains.php:${phpPluginVersion}", + "com.jetbrains.twig:${twigPluginVersion}", + "de.espend.idea.php.annotation:${annotationPluginVersion}", + "de.espend.idea.php.toolbox:${toolboxPluginVersion}", + 'coverage', + 'webDeployment', + 'yaml', + 'CSS', + 'java-i18n', + 'properties' + ] + pluginName 'Symfony Plugin' + + patchPluginXml { + sinceBuild '173' + untilBuild '181.*' + } +} + +group 'fr.adrienbrault.idea.symfony2plugin' +version '0.16.165' + +wrapper { + gradleVersion '4.3.1' +} + +test.testLogging.exceptionFormat = TestExceptionFormat.FULL diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..7cc7da1a4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,10 @@ +ideaVersion = IU-2018.1 +phpPluginVersion = 181.4203.565 +twigPluginVersion = 181.3741.23 +toolboxPluginVersion = 0.4.6 +annotationPluginVersion = 5.3 +#ideaVersion = IU-2017.3.5 +#phpPluginVersion = 173.4301.34 +#twigPluginVersion = 173.4301.7 +#toolboxPluginVersion = 0.4.6 +#annotationPluginVersion = 5.2.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..21ac1f242 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..3c7228a1a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Mar 22 15:32:22 CET 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..cccdd3d51 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ServiceContainerSettingsLoader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ServiceContainerSettingsLoader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ServiceContainerSettingsLoader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ServiceContainerSettingsLoader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/Settings.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java similarity index 90% rename from src/fr/adrienbrault/idea/symfony2plugin/Settings.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java index d3145e76c..bde7ac30f 100644 --- a/src/fr/adrienbrault/idea/symfony2plugin/Settings.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java @@ -1,111 +1,113 @@ -package fr.adrienbrault.idea.symfony2plugin; - -import com.intellij.openapi.components.*; -import com.intellij.openapi.project.Project; -import com.intellij.util.xmlb.XmlSerializerUtil; -import fr.adrienbrault.idea.symfony2plugin.assistant.reference.MethodParameterSetting; -import fr.adrienbrault.idea.symfony2plugin.assistant.signature.MethodSignatureSetting; -import fr.adrienbrault.idea.symfony2plugin.dic.ContainerFile; -import fr.adrienbrault.idea.symfony2plugin.routing.dict.RoutingFile; -import fr.adrienbrault.idea.symfony2plugin.templating.path.TwigNamespaceSetting; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.List; - -@State( - name = "Symfony2PluginSettings", - storages = { - @Storage(id = "default", file = StoragePathMacros.PROJECT_FILE), - @Storage(id = "dir", file = StoragePathMacros.PROJECT_CONFIG_DIR + "/symfony2.xml", scheme = StorageScheme.DIRECTORY_BASED) - } -) -public class Settings implements PersistentStateComponent { - - // Default Symfony 2, 3 and 4 paths - public static String[] DEFAULT_CONTAINER_PATHS = new String[] { - "app/cache/dev/appDevDebugProjectContainer.xml", - "var/cache/dev/appDevDebugProjectContainer.xml", - "var/cache/dev/srcDevDebugProjectContainer.xml", - }; - - // Default Symfony 2, 3 and 4 paths - public static String[] DEFAULT_ROUTES = new String[] { - "app/cache/dev/appDevUrlGenerator.php", - "var/cache/dev/appDevUrlGenerator.php", - "var/cache/dev/appDevDebugProjectContainerUrlGenerator.php", - "var/cache/dev/srcDevDebugProjectContainerUrlGenerator.php", - }; - - public static String DEFAULT_TRANSLATION_PATH = "app/cache/dev/translations"; - - public static String DEFAULT_WEB_DIRECTORY = "web"; - public static String DEFAULT_APP_DIRECTORY = "app"; - - public String pathToTranslation = DEFAULT_TRANSLATION_PATH; - public String directoryToWeb = DEFAULT_WEB_DIRECTORY; - public String directoryToApp = DEFAULT_APP_DIRECTORY; - public String serviceJsNameStrategy = null; - - public boolean remoteDevFileScheduler = false; - - public boolean pluginEnabled = false; - - public boolean objectSignatureTypeProvider = false; - - public boolean codeFoldingPhpRoute = true; - public boolean codeFoldingPhpModel = true; - public boolean codeFoldingPhpTemplate = true; - public boolean codeFoldingTwigRoute = true; - public boolean codeFoldingTwigTemplate = true; - public boolean codeFoldingTwigConstant = true; - - public boolean dismissEnableNotification = false; - - public boolean profilerLocalEnabled = false; - public String profilerLocalUrl = "http://127.0.0.1:8000"; - public String profilerCsvPath; - - public boolean profilerHttpEnabled = false; - public String profilerHttpUrl = "http://127.0.0.1:8000"; - - /** - * Use service id attribute as class name for service generator - */ - public boolean serviceClassAsIdAttribute = false; - - /** - * Last user selected output of service generator eg: yaml or xml - */ - public String lastServiceGeneratorLanguage = null; - - @Nullable - public List twigNamespaces = new ArrayList<>(); - - @Nullable - public List containerFiles = new ArrayList<>(); - - @Nullable - public List routingFiles = new ArrayList<>(); - - @Nullable - public List methodParameterSettings = new ArrayList<>(); - - @Nullable - public List methodSignatureSettings = new ArrayList<>(); - - public static Settings getInstance(Project project) { - return ServiceManager.getService(project, Settings.class); - } - - @Nullable - @Override - public Settings getState() { - return this; - } - - @Override - public void loadState(Settings settings) { - XmlSerializerUtil.copyBean(settings, this); - } -} +package fr.adrienbrault.idea.symfony2plugin; + +import com.intellij.openapi.components.PersistentStateComponent; +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.components.State; +import com.intellij.openapi.components.Storage; +import com.intellij.openapi.project.Project; +import com.intellij.util.xmlb.XmlSerializerUtil; +import fr.adrienbrault.idea.symfony2plugin.assistant.reference.MethodParameterSetting; +import fr.adrienbrault.idea.symfony2plugin.assistant.signature.MethodSignatureSetting; +import fr.adrienbrault.idea.symfony2plugin.dic.ContainerFile; +import fr.adrienbrault.idea.symfony2plugin.routing.dict.RoutingFile; +import fr.adrienbrault.idea.symfony2plugin.templating.path.TwigNamespaceSetting; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +@State( + name = "Symfony2PluginSettings", + storages = { + @Storage("/symfony2.xml") + } +) +public class Settings implements PersistentStateComponent { + + // Default Symfony 2, 3 and 4 paths + public static String[] DEFAULT_CONTAINER_PATHS = new String[] { + "app/cache/dev/appDevDebugProjectContainer.xml", + "var/cache/dev/appDevDebugProjectContainer.xml", + "var/cache/dev/srcDevDebugProjectContainer.xml", + }; + + // Default Symfony 2, 3 and 4 paths + public static String[] DEFAULT_ROUTES = new String[] { + "app/cache/dev/appDevUrlGenerator.php", + "var/cache/dev/appDevUrlGenerator.php", + "var/cache/dev/appDevDebugProjectContainerUrlGenerator.php", + "var/cache/dev/srcDevDebugProjectContainerUrlGenerator.php", + }; + + public static String DEFAULT_TRANSLATION_PATH = "app/cache/dev/translations"; + + public static String DEFAULT_WEB_DIRECTORY = "web"; + public static String DEFAULT_APP_DIRECTORY = "app"; + + public String pathToTranslation = DEFAULT_TRANSLATION_PATH; + public String directoryToWeb = DEFAULT_WEB_DIRECTORY; + public String directoryToApp = DEFAULT_APP_DIRECTORY; + public String serviceJsNameStrategy = null; + + public boolean remoteDevFileScheduler = false; + + public boolean pluginEnabled = false; + + public boolean objectSignatureTypeProvider = false; + + public boolean codeFoldingPhpRoute = true; + public boolean codeFoldingPhpModel = true; + public boolean codeFoldingPhpTemplate = true; + public boolean codeFoldingTwigRoute = true; + public boolean codeFoldingTwigTemplate = true; + public boolean codeFoldingTwigConstant = true; + + public boolean dismissEnableNotification = false; + + public boolean profilerLocalEnabled = false; + public String profilerLocalUrl = "http://127.0.0.1:8000"; + public String profilerCsvPath; + + public boolean profilerHttpEnabled = false; + public String profilerHttpUrl = "http://127.0.0.1:8000"; + + /** + * Use service id attribute as class name for service generator + */ + public boolean serviceClassAsIdAttribute = false; + + /** + * Last user selected output of service generator eg: yaml or xml + */ + public String lastServiceGeneratorLanguage = null; + + @Nullable + public List twigNamespaces = new ArrayList<>(); + + @Nullable + public List containerFiles = new ArrayList<>(); + + @Nullable + public List routingFiles = new ArrayList<>(); + + @Nullable + public List methodParameterSettings = new ArrayList<>(); + + @Nullable + public List methodSignatureSettings = new ArrayList<>(); + + public static Settings getInstance(Project project) { + return ServiceManager.getService(project, Settings.class); + } + + @Nullable + @Override + public Settings getState() { + return this; + } + + @Override + public void loadState(Settings settings) { + XmlSerializerUtil.copyBean(settings, this); + } +} diff --git a/src/fr/adrienbrault/idea/symfony2plugin/SettingsForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/SettingsForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/Symfony2Icons.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2Icons.java similarity index 52% rename from src/fr/adrienbrault/idea/symfony2plugin/Symfony2Icons.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2Icons.java index a6accb81e..dd131b226 100644 --- a/src/fr/adrienbrault/idea/symfony2plugin/Symfony2Icons.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2Icons.java @@ -19,59 +19,59 @@ public class Symfony2Icons { static { if(Calendar.getInstance().get(Calendar.MONTH) == 11 && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) > 7) { - SYMFONY = IconLoader.getIcon("icons/symfony_dec.png"); - SYMFONY_LINE_MARKER = IconLoader.getIcon("icons/symfony_line_marker_dec.png"); + SYMFONY = IconLoader.getIcon("/icons/symfony_dec.png"); + SYMFONY_LINE_MARKER = IconLoader.getIcon("/icons/symfony_line_marker_dec.png"); } else if(Calendar.getInstance().get(Calendar.MONTH) == 3 && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) == 7) { - SYMFONY = IconLoader.getIcon("icons/symfony_birth.png"); - SYMFONY_LINE_MARKER = IconLoader.getIcon("icons/symfony_line_marker_birth.png"); + SYMFONY = IconLoader.getIcon("/icons/symfony_birth.png"); + SYMFONY_LINE_MARKER = IconLoader.getIcon("/icons/symfony_line_marker_birth.png"); } else { - SYMFONY = IconLoader.getIcon("icons/symfony.png"); - SYMFONY_LINE_MARKER = IconLoader.getIcon("icons/symfony_line_marker.png"); + SYMFONY = IconLoader.getIcon("/icons/symfony.png"); + SYMFONY_LINE_MARKER = IconLoader.getIcon("/icons/symfony_line_marker.png"); } } - public static final Icon SYMFONY_TOOL_WINDOW = IconLoader.getIcon("icons/symfony_tool_window.png"); - public static final Icon DOCTRINE = IconLoader.getIcon("icons/doctrine.png"); - public static final Icon DOCTRINE_LINE_MARKER = IconLoader.getIcon("icons/doctrine_line_marker.png"); - public static final Icon DOCTRINE_WEAK = IconLoader.getIcon("icons/doctrine_weak.png"); - public static final Icon NO_SQL = IconLoader.getIcon("icons/no_sql.png"); - public static final Icon ROUTE = IconLoader.getIcon("icons/route.png"); - public static final Icon ROUTE_WEAK = IconLoader.getIcon("icons/route_weak.png"); - public static final Icon SERVICE = IconLoader.getIcon("icons/service.png"); - public static final Icon SERVICE_OPACITY = IconLoader.getIcon("icons/service_opacity.png"); - public static final Icon FORM_TYPE = IconLoader.getIcon("icons/form_type.png"); - public static final Icon FORM_TYPE_WEAK = IconLoader.getIcon("icons/form_type_weak.png"); - public static final Icon TRANSLATION = IconLoader.getIcon("icons/translation.png"); - public static final Icon TRANSLATION_WEAK = IconLoader.getIcon("icons/translation_weak.png"); - public static final Icon PARAMETER = IconLoader.getIcon("icons/parameter.png"); - public static final Icon FORM_OPTION = IconLoader.getIcon("icons/form_option.png"); - public static final Icon FORM_EXTENSION = IconLoader.getIcon("icons/form_extension.png"); - public static final Icon FORM_EXTENSION_WEAK = IconLoader.getIcon("icons/form_extension_weak.png"); - public static final Icon SERVICE_TAG = IconLoader.getIcon("icons/service_tag.png"); - public static final Icon SERVICE_TAG_WEAK = IconLoader.getIcon("icons/service_tag_weak.png"); - public static final Icon EVENT = IconLoader.getIcon("icons/event.png"); - public static final Icon BUNDLE = IconLoader.getIcon("icons/bundle.png"); - - public static final Icon SERVICE_PRIVATE_OPACITY = IconLoader.getIcon("icons/service_private_opacity.png"); - - public static final Icon SERVICE_LINE_MARKER = IconLoader.getIcon("icons/service_line_marker.png"); - public static final Icon FORM_TYPE_LINE_MARKER = IconLoader.getIcon("icons/form_type_line_marker.png"); - public static final Icon ROUTE_LINE_MARKER = IconLoader.getIcon("icons/route_line_marker.png"); - public static final Icon TWIG_CONTROLLER_LINE_MARKER = IconLoader.getIcon("icons/twig_controller_line_marker.png"); - public static final Icon TWIG_LINE_MARKER = IconLoader.getIcon("icons/twig_line_marker.png"); - public static final Icon TWIG_LINE_OVERWRITE = IconLoader.getIcon("icons/overwrite.png"); - - public static final Icon TWIG_EXTENDS_FILE = IconLoader.getIcon("icons/twig_extends_file.png"); - public static final Icon TWIG_IMPLEMENTS_FILE = IconLoader.getIcon("icons/twig_implements_file.png"); - - public static final Icon PARAMETER_OPACITY = IconLoader.getIcon("icons/parameter_opacity.png"); - - public static final Icon MAIL = IconLoader.getIcon("icons/mail.png"); - public static final Icon PROFILER_LINK = IconLoader.getIcon("icons/profiler_link.png"); - - public static final Icon CONFIG_PROTOTYPE = IconLoader.getIcon("icons/config_prototype.png"); - public static final Icon CONFIG_VALUE = IconLoader.getIcon("icons/config_value.png"); - public static final Icon CONFIG_VALUE_SHORTCUT = IconLoader.getIcon("icons/config_value_shortcut.png"); + public static final Icon SYMFONY_TOOL_WINDOW = IconLoader.getIcon("/icons/symfony_tool_window.png"); + public static final Icon DOCTRINE = IconLoader.getIcon("/icons/doctrine.png"); + public static final Icon DOCTRINE_LINE_MARKER = IconLoader.getIcon("/icons/doctrine_line_marker.png"); + public static final Icon DOCTRINE_WEAK = IconLoader.getIcon("/icons/doctrine_weak.png"); + public static final Icon NO_SQL = IconLoader.getIcon("/icons/no_sql.png"); + public static final Icon ROUTE = IconLoader.getIcon("/icons/route.png"); + public static final Icon ROUTE_WEAK = IconLoader.getIcon("/icons/route_weak.png"); + public static final Icon SERVICE = IconLoader.getIcon("/icons/service.png"); + public static final Icon SERVICE_OPACITY = IconLoader.getIcon("/icons/service_opacity.png"); + public static final Icon FORM_TYPE = IconLoader.getIcon("/icons/form_type.png"); + public static final Icon FORM_TYPE_WEAK = IconLoader.getIcon("/icons/form_type_weak.png"); + public static final Icon TRANSLATION = IconLoader.getIcon("/icons/translation.png"); + public static final Icon TRANSLATION_WEAK = IconLoader.getIcon("/icons/translation_weak.png"); + public static final Icon PARAMETER = IconLoader.getIcon("/icons/parameter.png"); + public static final Icon FORM_OPTION = IconLoader.getIcon("/icons/form_option.png"); + public static final Icon FORM_EXTENSION = IconLoader.getIcon("/icons/form_extension.png"); + public static final Icon FORM_EXTENSION_WEAK = IconLoader.getIcon("/icons/form_extension_weak.png"); + public static final Icon SERVICE_TAG = IconLoader.getIcon("/icons/service_tag.png"); + public static final Icon SERVICE_TAG_WEAK = IconLoader.getIcon("/icons/service_tag_weak.png"); + public static final Icon EVENT = IconLoader.getIcon("/icons/event.png"); + public static final Icon BUNDLE = IconLoader.getIcon("/icons/bundle.png"); + + public static final Icon SERVICE_PRIVATE_OPACITY = IconLoader.getIcon("/icons/service_private_opacity.png"); + + public static final Icon SERVICE_LINE_MARKER = IconLoader.getIcon("/icons/service_line_marker.png"); + public static final Icon FORM_TYPE_LINE_MARKER = IconLoader.getIcon("/icons/form_type_line_marker.png"); + public static final Icon ROUTE_LINE_MARKER = IconLoader.getIcon("/icons/route_line_marker.png"); + public static final Icon TWIG_CONTROLLER_LINE_MARKER = IconLoader.getIcon("/icons/twig_controller_line_marker.png"); + public static final Icon TWIG_LINE_MARKER = IconLoader.getIcon("/icons/twig_line_marker.png"); + public static final Icon TWIG_LINE_OVERWRITE = IconLoader.getIcon("/icons/overwrite.png"); + + public static final Icon TWIG_EXTENDS_FILE = IconLoader.getIcon("/icons/twig_extends_file.png"); + public static final Icon TWIG_IMPLEMENTS_FILE = IconLoader.getIcon("/icons/twig_implements_file.png"); + + public static final Icon PARAMETER_OPACITY = IconLoader.getIcon("/icons/parameter_opacity.png"); + + public static final Icon MAIL = IconLoader.getIcon("/icons/mail.png"); + public static final Icon PROFILER_LINK = IconLoader.getIcon("/icons/profiler_link.png"); + + public static final Icon CONFIG_PROTOTYPE = IconLoader.getIcon("/icons/config_prototype.png"); + public static final Icon CONFIG_VALUE = IconLoader.getIcon("/icons/config_value.png"); + public static final Icon CONFIG_VALUE_SHORTCUT = IconLoader.getIcon("/icons/config_value_shortcut.png"); public static Image getImage(Icon icon) { diff --git a/src/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/AbstractProjectDumbAwareAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/AbstractProjectDumbAwareAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/AbstractProjectDumbAwareAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/AbstractProjectDumbAwareAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/NewXmlServiceAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewXmlServiceAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/NewXmlServiceAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewXmlServiceAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/NewYamlServiceAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewYamlServiceAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/NewYamlServiceAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewYamlServiceAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/SymfonyContainerServiceBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonyContainerServiceBuilder.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/SymfonyContainerServiceBuilder.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonyContainerServiceBuilder.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/SymfonySymbolSearchAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/bundle/BundleClassGeneratorUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/BundleClassGeneratorUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/bundle/BundleClassGeneratorUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/BundleClassGeneratorUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCompilerPass.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCompilerPass.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCompilerPass.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCompilerPass.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleControllerAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleControllerAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleControllerAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleControllerAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFileActionAbstract.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFileActionAbstract.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFileActionAbstract.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFileActionAbstract.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFormAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFormAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFormAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFormAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleTwigExtensionAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleTwigExtensionAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleTwigExtensionAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleTwigExtensionAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/bundle/WebTestCaseGeneratorAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/WebTestCaseGeneratorAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/bundle/WebTestCaseGeneratorAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/WebTestCaseGeneratorAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/comparator/PsiWeightListComparator.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/comparator/PsiWeightListComparator.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/comparator/PsiWeightListComparator.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/comparator/PsiWeightListComparator.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/comparator/ValueComparator.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/comparator/ValueComparator.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/comparator/ValueComparator.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/comparator/ValueComparator.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/dict/TranslationFileModel.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/dict/TranslationFileModel.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/dict/TranslationFileModel.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/dict/TranslationFileModel.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/generator/PhpBundleCompilerPassGenerateAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/PhpBundleCompilerPassGenerateAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/generator/PhpBundleCompilerPassGenerateAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/PhpBundleCompilerPassGenerateAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceArgumentGenerateAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceArgumentGenerateAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceArgumentGenerateAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceArgumentGenerateAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceGenerateAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceGenerateAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceGenerateAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/ServiceGenerateAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/DefaultServiceNameStrategy.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/DefaultServiceNameStrategy.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/DefaultServiceNameStrategy.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/DefaultServiceNameStrategy.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/JavascriptServiceNameStrategy.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/JavascriptServiceNameStrategy.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/JavascriptServiceNameStrategy.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/JavascriptServiceNameStrategy.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/ServiceNameStrategyInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/ServiceNameStrategyInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/ServiceNameStrategyInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/ServiceNameStrategyInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/ServiceNameStrategyParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/ServiceNameStrategyParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/ServiceNameStrategyParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/ServiceNameStrategyParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/model/SymfonySymbolSearchModel.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/model/SymfonySymbolSearchModel.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/model/SymfonySymbolSearchModel.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/model/SymfonySymbolSearchModel.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/quickfix/AddServiceXmlArgumentLocalQuickFix.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/quickfix/AddServiceXmlArgumentLocalQuickFix.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/quickfix/AddServiceXmlArgumentLocalQuickFix.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/quickfix/AddServiceXmlArgumentLocalQuickFix.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ui/MethodParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/MethodParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ui/MethodParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/MethodParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialogDialog.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialogDialog.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialogDialog.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialogDialog.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceBuilder.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceBuilder.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceBuilder.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyJavascriptServiceNameForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyJavascriptServiceNameForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyJavascriptServiceNameForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyJavascriptServiceNameForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyJavascriptServiceNameForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyJavascriptServiceNameForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyJavascriptServiceNameForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyJavascriptServiceNameForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/asset/AssetEnum.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetEnum.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/asset/AssetEnum.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetEnum.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/asset/AssetFile.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetFile.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/asset/AssetFile.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetFile.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/asset/AssetLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/asset/AssetLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/asset/provider/AssetCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/provider/AssetCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/asset/provider/AssetCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/provider/AssetCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantPsiReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantPsiReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantPsiReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantPsiReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantReferenceProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantReferenceProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantReferenceProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/AssistantReferenceProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/reference/AssistantReferenceUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/AssistantReferenceUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/reference/AssistantReferenceUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/AssistantReferenceUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/reference/DefaultReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/DefaultReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/reference/DefaultReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/DefaultReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/reference/DefaultReferenceProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/DefaultReferenceProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/reference/DefaultReferenceProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/DefaultReferenceProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/reference/MethodParameterSetting.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/MethodParameterSetting.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/reference/MethodParameterSetting.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/MethodParameterSetting.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureSetting.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureSetting.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureSetting.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureSetting.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/signature/PhpTypeSignatureInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/PhpTypeSignatureInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/signature/PhpTypeSignatureInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/PhpTypeSignatureInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/assistant/signature/PhpTypeSignatureTypes.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/PhpTypeSignatureTypes.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/assistant/signature/PhpTypeSignatureTypes.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/PhpTypeSignatureTypes.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderInterfaceEx.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderInterfaceEx.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderInterfaceEx.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderInterfaceEx.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderLookupArguments.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderLookupArguments.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderLookupArguments.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionProviderLookupArguments.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/GotoCompletionRegistrarParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/completion/CompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/completion/CompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/completion/CompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/completion/CompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/navigation/GotoHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/navigation/GotoHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/navigation/GotoHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/navigation/GotoHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInsight/utils/GotoCompletionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/utils/GotoCompletionUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInsight/utils/GotoCompletionUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/utils/GotoCompletionUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInspection/InspectionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/InspectionUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInspection/InspectionUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/InspectionUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInspection/form/FormTypeAsClassConstantInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/form/FormTypeAsClassConstantInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInspection/form/FormTypeAsClassConstantInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/form/FormTypeAsClassConstantInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInspection/quickfix/CreateMethodQuickFix.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/quickfix/CreateMethodQuickFix.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInspection/quickfix/CreateMethodQuickFix.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/quickfix/CreateMethodQuickFix.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/ServiceDeprecatedClassesInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/ServiceDeprecatedClassesInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/ServiceDeprecatedClassesInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/ServiceDeprecatedClassesInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/TaggedExtendsInterfaceClassInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/TaggedExtendsInterfaceClassInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/TaggedExtendsInterfaceClassInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/TaggedExtendsInterfaceClassInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/ConstantEnumCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/ConstantEnumCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/ConstantEnumCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/ConstantEnumCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/DecoratedServiceCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/DecoratedServiceCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/DecoratedServiceCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/DecoratedServiceCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/PhpParameterStringCompletionConfidence.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/PhpParameterStringCompletionConfidence.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/PhpParameterStringCompletionConfidence.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/PhpParameterStringCompletionConfidence.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/command/ConsoleHelperGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/ConsoleHelperGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/command/ConsoleHelperGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/ConsoleHelperGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/constant/ConstantEnumCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/constant/ConstantEnumCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/constant/ConstantEnumCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/constant/ConstantEnumCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/constant/EnumConstantFilter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/constant/EnumConstantFilter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/constant/EnumConstantFilter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/constant/EnumConstantFilter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/insertHandler/ClassConstantInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/insertHandler/ClassConstantInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/insertHandler/ClassConstantInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/insertHandler/ClassConstantInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/lookup/ClassConstantLookupElementAbstract.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/lookup/ClassConstantLookupElementAbstract.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/lookup/ClassConstantLookupElementAbstract.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/lookup/ClassConstantLookupElementAbstract.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/lookup/ContainerTagLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/lookup/ContainerTagLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/lookup/ContainerTagLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/lookup/ContainerTagLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/lookup/PhpConstantFieldPhpLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/lookup/PhpConstantFieldPhpLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/lookup/PhpConstantFieldPhpLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/lookup/PhpConstantFieldPhpLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/yaml/YamlGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/yaml/YamlGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/completion/yaml/YamlGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/yaml/YamlGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/ClassPublicMethodReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ClassPublicMethodReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/ClassPublicMethodReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ClassPublicMethodReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/PhpClassReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/PhpClassReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/PhpClassReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/PhpClassReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/PhpClassServiceGotoDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/PhpClassServiceGotoDeclarationHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/PhpClassServiceGotoDeclarationHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/PhpClassServiceGotoDeclarationHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/SymfonyAnnotationReferences.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyAnnotationReferences.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/SymfonyAnnotationReferences.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyAnnotationReferences.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/component/ParameterLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/ParameterLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/component/ParameterLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/ParameterLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/component/ParameterReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/ParameterReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/component/ParameterReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/ParameterReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterLookupPercentElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterLookupPercentElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterLookupPercentElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterLookupPercentElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterServiceCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterServiceCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterServiceCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterServiceCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/component/parser/ParameterServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherEventReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherEventReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherEventReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherEventReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherSubscribedEvent.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherSubscribedEvent.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherSubscribedEvent.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherSubscribedEvent.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/doctrine/DoctrineStaticTypeLookupBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/doctrine/DoctrineStaticTypeLookupBuilder.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/doctrine/DoctrineStaticTypeLookupBuilder.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/doctrine/DoctrineStaticTypeLookupBuilder.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/doctrine/DoctrineTypeLookup.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/doctrine/DoctrineTypeLookup.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/doctrine/DoctrineTypeLookup.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/doctrine/DoctrineTypeLookup.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/php/PhpEventDispatcherGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpEventDispatcherGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/php/PhpEventDispatcherGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpEventDispatcherGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/ConstantXmlReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/ConstantXmlReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/ConstantXmlReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/ConstantXmlReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/ParameterXmlReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/ParameterXmlReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/ParameterXmlReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/ParameterXmlReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/ServiceXmlReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/ServiceXmlReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/ServiceXmlReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/ServiceXmlReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlHelper.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlHelper.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlHelper.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlDuplicateParameterKeyInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlDuplicateParameterKeyInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlDuplicateParameterKeyInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlDuplicateParameterKeyInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlDuplicateServiceKeyInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlDuplicateServiceKeyInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlDuplicateServiceKeyInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlDuplicateServiceKeyInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/provider/ServiceReferenceProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/provider/ServiceReferenceProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/xml/provider/ServiceReferenceProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/provider/ServiceReferenceProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/ParameterPercentWrapInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/ParameterPercentWrapInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/ParameterPercentWrapInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/ParameterPercentWrapInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java similarity index 99% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java index cf9ad3d9c..e5d20e02b 100644 --- a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java @@ -120,7 +120,7 @@ private Document getConfigTemplate(VirtualFile projectBaseDir) { if(virtualFile != null) { document = builder.parse(VfsUtil.virtualToIoFile(virtualFile)); } else { - document = builder.parse(ConfigCompletionProvider.class.getResourceAsStream("/resources/symfony2-config.xml")); + document = builder.parse(ConfigCompletionProvider.class.getResourceAsStream("/symfony2-config.xml")); } return document; @@ -167,7 +167,7 @@ private LookupElementBuilder getNodeAttributeLookupElement(Node node, Map items) { if(currentNodeItem == null) { return null; } - + for (int i = 1; i < items.size(); i++) { currentNodeItem = getElementByTagNameWithUnPluralize(currentNodeItem, items.get(i)); @@ -298,7 +298,7 @@ private boolean isPrototype(@Nullable Node node) { @NotNull private Map getNodeCommentVars(@Nullable Node node) { Map comments = new HashMap<>(); - + if(node == null) return comments; Node previousSibling = node.getPreviousSibling(); diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/EventMethodCallInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/EventMethodCallInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/EventMethodCallInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/EventMethodCallInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/YamlDuplicateParameterKeyInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/YamlDuplicateParameterKeyInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/YamlDuplicateParameterKeyInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/YamlDuplicateParameterKeyInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/YamlDuplicateServiceKeyInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/YamlDuplicateServiceKeyInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/YamlDuplicateServiceKeyInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/YamlDuplicateServiceKeyInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/AbstractServiceReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/AbstractServiceReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/AbstractServiceReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/AbstractServiceReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ClassServiceDefinitionTargetLazyValue.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ClassServiceDefinitionTargetLazyValue.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ClassServiceDefinitionTargetLazyValue.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ClassServiceDefinitionTargetLazyValue.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ConstraintPropertyReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ConstraintPropertyReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ConstraintPropertyReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ConstraintPropertyReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ContainerFile.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerFile.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ContainerFile.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerFile.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ContainerParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ContainerParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ContainerService.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerService.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ContainerService.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerService.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ControllerMethodLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ControllerMethodLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ControllerMethodLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ControllerMethodLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/DefaultServiceCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/DefaultServiceCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/DefaultServiceCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/DefaultServiceCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/MethodReferenceBag.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/MethodReferenceBag.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/MethodReferenceBag.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/MethodReferenceBag.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ParameterResolverConsumer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ParameterResolverConsumer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ParameterResolverConsumer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ParameterResolverConsumer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/RelatedPopupGotoLineMarker.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/RelatedPopupGotoLineMarker.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/RelatedPopupGotoLineMarker.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/RelatedPopupGotoLineMarker.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceArgumentParameterHintsProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceArgumentParameterHintsProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceArgumentParameterHintsProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceArgumentParameterHintsProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceIndexedReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceIndexedReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceIndexedReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceIndexedReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceMap.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceMap.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceMap.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceMap.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceMapParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceMapParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceMapParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceMapParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceStringLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceStringLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceStringLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceStringLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/SymfonyContainerTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/SymfonyContainerTypeProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/SymfonyContainerTypeProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/SymfonyContainerTypeProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/TagReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/TagReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/TagReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/TagReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/TaggedParameterGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/TaggedParameterGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/TaggedParameterGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/TaggedParameterGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/XmlEventParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/XmlEventParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/XmlEventParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/XmlEventParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/XmlServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/XmlServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/XmlServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/XmlServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/XmlTagParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/XmlTagParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/XmlTagParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/XmlTagParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueAbstract.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueAbstract.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueAbstract.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueAbstract.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/DummyAttributeValue.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/DummyAttributeValue.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/DummyAttributeValue.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/DummyAttributeValue.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/XmlTagAttributeValue.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/XmlTagAttributeValue.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/XmlTagAttributeValue.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/XmlTagAttributeValue.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/YamlKeyValueAttributeValue.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/YamlKeyValueAttributeValue.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/YamlKeyValueAttributeValue.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/YamlKeyValueAttributeValue.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/ImmutableDecoratorService.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/ImmutableDecoratorService.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/ImmutableDecoratorService.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/ImmutableDecoratorService.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/SerializableService.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/SerializableService.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/SerializableService.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/SerializableService.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceSerializable.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceSerializable.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceSerializable.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/ServiceSerializable.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/XmlService.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/XmlService.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/XmlService.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/XmlService.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ContainerBuilderCall.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ContainerBuilderCall.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ContainerBuilderCall.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ContainerBuilderCall.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ServiceFileDefaults.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ServiceFileDefaults.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ServiceFileDefaults.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ServiceFileDefaults.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ServiceTypeHint.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ServiceTypeHint.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ServiceTypeHint.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/dict/ServiceTypeHint.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/ServiceSuggestionCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/ServiceSuggestionCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/ServiceSuggestionCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/ServiceSuggestionCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlCallServiceSuggestionCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlCallServiceSuggestionCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlCallServiceSuggestionCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlCallServiceSuggestionCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlConstructServiceSuggestionCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlConstructServiceSuggestionCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlConstructServiceSuggestionCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlConstructServiceSuggestionCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlServiceSuggestIntentionAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlServiceSuggestIntentionAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlServiceSuggestIntentionAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/XmlServiceSuggestIntentionAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/YamlConstructServiceSuggestionCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/YamlConstructServiceSuggestionCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/YamlConstructServiceSuggestionCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/YamlConstructServiceSuggestionCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/utils/ServiceSuggestionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/utils/ServiceSuggestionUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/utils/ServiceSuggestionUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/suggestion/utils/ServiceSuggestionUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/container/visitor/ServiceConsumer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/visitor/ServiceConsumer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/container/visitor/ServiceConsumer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/visitor/ServiceConsumer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/CaseSensitivityServiceInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/CaseSensitivityServiceInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/CaseSensitivityServiceInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/CaseSensitivityServiceInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerConstantInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerConstantInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerConstantInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerConstantInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerSettingDeprecatedInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerSettingDeprecatedInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerSettingDeprecatedInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerSettingDeprecatedInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/MissingServiceInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/MissingServiceInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/MissingServiceInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/MissingServiceInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/XmlServiceInstanceInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/XmlServiceInstanceInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/XmlServiceInstanceInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/XmlServiceInstanceInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlClassInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlClassInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlClassInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlClassInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlParameterInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlParameterInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlParameterInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlParameterInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlXmlServiceInstanceInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlXmlServiceInstanceInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlXmlServiceInstanceInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlXmlServiceInstanceInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/intention/YamlSuggestIntentionAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/intention/YamlSuggestIntentionAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/inspection/intention/YamlSuggestIntentionAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/intention/YamlSuggestIntentionAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpServiceArgumentIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpServiceArgumentIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpServiceArgumentIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpServiceArgumentIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/LazyDecoratedParentServiceValues.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/LazyDecoratedParentServiceValues.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/LazyDecoratedParentServiceValues.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/LazyDecoratedParentServiceValues.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/XmlLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/XmlLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/XmlLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/XmlLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/YamlLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/YamlLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/YamlLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/YamlLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/registrar/DicGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/registrar/DicGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/registrar/DicGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/registrar/DicGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagVisitorInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagVisitorInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagVisitorInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/ServiceTagVisitorInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/tags/xml/XmlServiceTag.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/xml/XmlServiceTag.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/tags/xml/XmlServiceTag.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/xml/XmlServiceTag.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/AttributeResolverInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/AttributeResolverInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/AttributeResolverInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/AttributeResolverInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/StaticAttributeResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/StaticAttributeResolver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/StaticAttributeResolver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/StaticAttributeResolver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/YamlMappingAttributeResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/YamlMappingAttributeResolver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/YamlMappingAttributeResolver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/tags/yaml/YamlMappingAttributeResolver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/ServiceContainerRemoteFileStorage.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/ServiceContainerRemoteFileStorage.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/ServiceContainerRemoteFileStorage.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/ServiceContainerRemoteFileStorage.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/dict/ServiceParameterStorage.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/dict/ServiceParameterStorage.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/dict/ServiceParameterStorage.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/dict/ServiceParameterStorage.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineAnnotationReferencedColumnReferences.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineAnnotationReferencedColumnReferences.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineAnnotationReferencedColumnReferences.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineAnnotationReferencedColumnReferences.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineAnnotationTargetEntityReferences.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineAnnotationTargetEntityReferences.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineAnnotationTargetEntityReferences.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineAnnotationTargetEntityReferences.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineYamlAnnotationLookupBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineYamlAnnotationLookupBuilder.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineYamlAnnotationLookupBuilder.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineYamlAnnotationLookupBuilder.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindTypeProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindTypeProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindTypeProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryTypeProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryTypeProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryTypeProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/completion/DoctrineCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/completion/DoctrineCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/completion/DoctrineCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/completion/DoctrineCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/component/DocumentNamespacesParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/component/DocumentNamespacesParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/component/DocumentNamespacesParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/component/DocumentNamespacesParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/component/EntityNamesServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/component/EntityNamesServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/component/EntityNamesServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/component/EntityNamesServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/component/PhpEntityClassCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/component/PhpEntityClassCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/component/PhpEntityClassCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/component/PhpEntityClassCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineEntityLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineEntityLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineEntityLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineEntityLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModel.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModel.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModel.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModel.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelField.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelField.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelField.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelField.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelFieldLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelFieldLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelFieldLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelFieldLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelSerializable.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelSerializable.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelSerializable.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelSerializable.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineTypes.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineTypes.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineTypes.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineTypes.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/intention/DoctrineRepositoryClassConstantIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/intention/DoctrineRepositoryClassConstantIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/intention/DoctrineRepositoryClassConstantIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/intention/DoctrineRepositoryClassConstantIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineMetadataLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineMetadataLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineMetadataLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineMetadataLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineMetadataPattern.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineMetadataPattern.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineMetadataPattern.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineMetadataPattern.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineYamlGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineYamlGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineYamlGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineYamlGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/dict/DoctrineManagerEnum.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/dict/DoctrineManagerEnum.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/dict/DoctrineManagerEnum.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/dict/DoctrineManagerEnum.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/dict/DoctrineMetadataModel.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/dict/DoctrineMetadataModel.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/dict/DoctrineMetadataModel.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/dict/DoctrineMetadataModel.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineMappingDriverArguments.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineMappingDriverArguments.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineMappingDriverArguments.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineMappingDriverArguments.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineMappingDriverInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineMappingDriverInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineMappingDriverInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineMappingDriverInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrinePhpMappingDriver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrinePhpMappingDriver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrinePhpMappingDriver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrinePhpMappingDriver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineXmlMappingDriver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineXmlMappingDriver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineXmlMappingDriver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineXmlMappingDriver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineYamlMappingDriver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineYamlMappingDriver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineYamlMappingDriver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/driver/DoctrineYamlMappingDriver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/lookup/DoctrineRepositoryLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/lookup/DoctrineRepositoryLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/lookup/DoctrineRepositoryLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/lookup/DoctrineRepositoryLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/util/DoctrineMetadataTypeUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/util/DoctrineMetadataTypeUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/util/DoctrineMetadataTypeUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/type/util/DoctrineMetadataTypeUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderGotoDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderGotoDeclarationHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderGotoDeclarationHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderGotoDeclarationHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderMethodReferenceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderMethodReferenceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderMethodReferenceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderMethodReferenceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderRelationClassResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderRelationClassResolver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderRelationClassResolver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderRelationClassResolver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderScopeContext.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderScopeContext.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderScopeContext.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderScopeContext.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dbal/DoctrineDbalQbGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dbal/DoctrineDbalQbGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dbal/DoctrineDbalQbGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dbal/DoctrineDbalQbGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/FormQueryBuilderRepositoryDetector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/FormQueryBuilderRepositoryDetector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/FormQueryBuilderRepositoryDetector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/FormQueryBuilderRepositoryDetector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/QueryBuilderRepositoryDetector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/QueryBuilderRepositoryDetector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/QueryBuilderRepositoryDetector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/QueryBuilderRepositoryDetector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/QueryBuilderRepositoryDetectorParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/QueryBuilderRepositoryDetectorParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/QueryBuilderRepositoryDetectorParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/QueryBuilderRepositoryDetectorParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderJoin.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderJoin.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderJoin.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderJoin.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderPropertyAlias.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderRelation.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderRelation.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderRelation.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/dict/QueryBuilderRelation.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/MatcherUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/MatcherUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/MatcherUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/MatcherUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/QueryBuilderUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/QueryBuilderUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/QueryBuilderUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/QueryBuilderUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/CompiledServiceBuilderArguments.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/CompiledServiceBuilderArguments.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/CompiledServiceBuilderArguments.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/CompiledServiceBuilderArguments.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/CompiledServiceBuilderFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/CompiledServiceBuilderFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/CompiledServiceBuilderFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/CompiledServiceBuilderFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/ControllerActionGotoRelatedCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ControllerActionGotoRelatedCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/ControllerActionGotoRelatedCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ControllerActionGotoRelatedCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/ControllerActionGotoRelatedCollectorParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ControllerActionGotoRelatedCollectorParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/ControllerActionGotoRelatedCollectorParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ControllerActionGotoRelatedCollectorParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/DoctrineModelProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/DoctrineModelProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/DoctrineModelProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/DoctrineModelProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/DoctrineModelProviderParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/DoctrineModelProviderParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/DoctrineModelProviderParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/DoctrineModelProviderParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/MethodParameterReferenceContributorExtension.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/MethodParameterReferenceContributorExtension.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/MethodParameterReferenceContributorExtension.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/MethodParameterReferenceContributorExtension.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/MethodParameterReferenceContributorParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/MethodParameterReferenceContributorParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/MethodParameterReferenceContributorParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/MethodParameterReferenceContributorParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/MethodSignatureTypeProviderExtension.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/MethodSignatureTypeProviderExtension.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/MethodSignatureTypeProviderExtension.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/MethodSignatureTypeProviderExtension.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/MethodSignatureTypeProviderParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/MethodSignatureTypeProviderParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/MethodSignatureTypeProviderParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/MethodSignatureTypeProviderParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/RoutingLoader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/RoutingLoader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/RoutingLoader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/RoutingLoader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/RoutingLoaderParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/RoutingLoaderParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/RoutingLoaderParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/RoutingLoaderParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceCollectorParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceCollectorParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceCollectorParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceCollectorParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceContainerLoader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceContainerLoader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceContainerLoader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceContainerLoader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceContainerLoaderParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceContainerLoaderParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceContainerLoaderParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceContainerLoaderParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceDefinitionLocator.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceDefinitionLocator.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceDefinitionLocator.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceDefinitionLocator.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceDefinitionLocatorParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceDefinitionLocatorParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/ServiceDefinitionLocatorParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/ServiceDefinitionLocatorParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/TwigNamespaceExtension.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/TwigNamespaceExtension.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/TwigNamespaceExtension.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/TwigNamespaceExtension.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/extension/TwigNamespaceExtensionParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/TwigNamespaceExtensionParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/extension/TwigNamespaceExtensionParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/extension/TwigNamespaceExtensionParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/locator/BundleFileToolboxTargetLocator.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/locator/BundleFileToolboxTargetLocator.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/locator/BundleFileToolboxTargetLocator.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/locator/BundleFileToolboxTargetLocator.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/locator/TwigFileToolboxTargetLocator.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/locator/TwigFileToolboxTargetLocator.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/locator/TwigFileToolboxTargetLocator.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/locator/TwigFileToolboxTargetLocator.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ControllerToolboxProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ControllerToolboxProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ControllerToolboxProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ControllerToolboxProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/DoctrineModelProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/DoctrineModelProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/DoctrineModelProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/DoctrineModelProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/RoutesToolboxProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/RoutesToolboxProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/RoutesToolboxProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/RoutesToolboxProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceParameterToolboxProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceParameterToolboxProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceParameterToolboxProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceParameterToolboxProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceToolboxProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceToolboxProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceToolboxProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceToolboxProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TranslationDomainToolboxProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TranslationDomainToolboxProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TranslationDomainToolboxProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TranslationDomainToolboxProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TwigToolboxProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TwigToolboxProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TwigToolboxProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TwigToolboxProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormDefaultOptionsKeyReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormDefaultOptionsKeyReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/FormDefaultOptionsKeyReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormDefaultOptionsKeyReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormExtensionKeyReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormExtensionKeyReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/FormExtensionKeyReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormExtensionKeyReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/FormGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormOptionGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormOptionGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/FormOptionGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormOptionGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormTypeLookup.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeLookup.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/FormTypeLookup.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeLookup.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/FormUnderscoreMethodReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormUnderscoreMethodReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/FormUnderscoreMethodReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormUnderscoreMethodReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/PhpFormPropertyMethodLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/PhpFormPropertyMethodLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/PhpFormPropertyMethodLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/PhpFormPropertyMethodLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/action/generator/FormTypeConstantMigrationAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/action/generator/FormTypeConstantMigrationAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/action/generator/FormTypeConstantMigrationAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/action/generator/FormTypeConstantMigrationAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/completion/FormClassConstantsLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/completion/FormClassConstantsLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/completion/FormClassConstantsLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/completion/FormClassConstantsLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/completion/FormCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/completion/FormCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/completion/FormCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/completion/FormCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/EnumFormTypeSource.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/EnumFormTypeSource.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/EnumFormTypeSource.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/EnumFormTypeSource.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormClass.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormClass.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormClass.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormClass.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormClassEnum.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormClassEnum.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormClassEnum.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormClassEnum.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormExtensionServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormExtensionServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormExtensionServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormExtensionServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOption.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOption.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOption.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOption.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOptionEnum.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOptionEnum.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOptionEnum.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOptionEnum.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeClass.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeClass.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeClass.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeClass.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeMap.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeMap.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeMap.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeMap.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormTypeServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationDomainGotoCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationDomainGotoCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationDomainGotoCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationDomainGotoCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationGotoCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationGotoCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationGotoCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationGotoCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/intention/FormStringToClassConstantIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/intention/FormStringToClassConstantIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/intention/FormStringToClassConstantIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/intention/FormStringToClassConstantIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/util/FormFieldNameReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormFieldNameReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/util/FormFieldNameReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormFieldNameReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/util/FormOptionsUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormOptionsUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/util/FormOptionsUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormOptionsUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/util/FormUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/util/FormUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionLookupVisitor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionLookupVisitor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionLookupVisitor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionLookupVisitor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionTargetVisitor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionTargetVisitor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionTargetVisitor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionTargetVisitor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionVisitor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionVisitor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionVisitor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionVisitor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerCommandExecutor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerCommandExecutor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerCommandExecutor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerCommandExecutor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerGeneratorPeer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerGeneratorPeer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerGeneratorPeer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerGeneratorPeer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerProjectGenerator.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerProjectGenerator.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerProjectGenerator.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerProjectGenerator.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerSettings.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerSettings.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerSettings.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerSettings.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerTemplatesFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerTemplatesFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerTemplatesFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerTemplatesFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/installer/dict/SymfonyInstallerVersion.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/dict/SymfonyInstallerVersion.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/installer/dict/SymfonyInstallerVersion.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/dict/SymfonyInstallerVersion.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/php/PhpBundleCompilerPassIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/PhpBundleCompilerPassIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/php/PhpBundleCompilerPassIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/PhpBundleCompilerPassIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/php/PhpServiceIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/PhpServiceIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/php/PhpServiceIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/PhpServiceIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/php/XmlServiceArgumentIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/XmlServiceArgumentIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/php/XmlServiceArgumentIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/XmlServiceArgumentIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/ui/ServiceSuggestDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/ui/ServiceSuggestDialog.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/ui/ServiceSuggestDialog.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/ui/ServiceSuggestDialog.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceSuggestIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceSuggestIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceSuggestIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceSuggestIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceTagIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceTagIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceTagIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceTagIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlQuotedEscapedInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlQuotedEscapedInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlQuotedEscapedInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlQuotedEscapedInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceArgumentInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceArgumentInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceArgumentInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceArgumentInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlUnquotedColon.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlUnquotedColon.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlUnquotedColon.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlUnquotedColon.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlCreateServiceArgumentsCallback.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlCreateServiceArgumentsCallback.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlCreateServiceArgumentsCallback.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlCreateServiceArgumentsCallback.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/NavigationItemEx.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/NavigationItemEx.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/NavigationItemEx.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/NavigationItemEx.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/PhpGotoRelatedProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/PhpGotoRelatedProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/PhpGotoRelatedProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/PhpGotoRelatedProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/RouteSymbolContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/RouteSymbolContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/RouteSymbolContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/RouteSymbolContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/ServiceSymbolContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/ServiceSymbolContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/ServiceSymbolContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/ServiceSymbolContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/controller/ModelsControllerRelatedGotoCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/ModelsControllerRelatedGotoCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/controller/ModelsControllerRelatedGotoCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/ModelsControllerRelatedGotoCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/controller/RouteControllerRelatedGotoCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/RouteControllerRelatedGotoCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/controller/RouteControllerRelatedGotoCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/RouteControllerRelatedGotoCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/HttpProfilerIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/HttpProfilerIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/HttpProfilerIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/HttpProfilerIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/LocalProfilerIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/LocalProfilerIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/LocalProfilerIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/LocalProfilerIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/ProfilerIndexInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ProfilerIndexInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/ProfilerIndexInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ProfilerIndexInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/SymfonyWebProfilerPane.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/SymfonyWebProfilerPane.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/SymfonyWebProfilerPane.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/SymfonyWebProfilerPane.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/SymfonyWebProfilerWindowFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/SymfonyWebProfilerWindowFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/SymfonyWebProfilerWindowFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/SymfonyWebProfilerWindowFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/DefaultDataCollectorInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/DefaultDataCollectorInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/DefaultDataCollectorInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/DefaultDataCollectorInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/HttpDefaultDataCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/HttpDefaultDataCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/HttpDefaultDataCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/HttpDefaultDataCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/LocalDefaultDataCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/LocalDefaultDataCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/LocalDefaultDataCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/LocalDefaultDataCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/LocalMailCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/LocalMailCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/LocalMailCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/LocalMailCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/MailCollectorInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/MailCollectorInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/collector/MailCollectorInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/collector/MailCollectorInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/HttpProfilerRequest.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/dict/MailMessage.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/MailMessage.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/dict/MailMessage.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/MailMessage.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/dict/ProfilerRequestInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/ProfilerRequestInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/dict/ProfilerRequestInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/ProfilerRequestInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/DefaultLocalProfilerFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/DefaultLocalProfilerFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/DefaultLocalProfilerFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/DefaultLocalProfilerFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/HttpProfilerFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/HttpProfilerFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/HttpProfilerFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/HttpProfilerFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/LocalProfilerFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/LocalProfilerFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/LocalProfilerFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/LocalProfilerFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/ProfilerFactoryInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/ProfilerFactoryInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/ProfilerFactoryInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/ProfilerFactoryInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/ProfilerFactoryUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/ProfilerFactoryUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/factory/ProfilerFactoryUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/ProfilerFactoryUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/reader/ReverseFileLineReader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/reader/ReverseFileLineReader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/reader/ReverseFileLineReader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/reader/ReverseFileLineReader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/widget/SymfonyProfilerWidget.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/widget/SymfonyProfilerWidget.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/widget/SymfonyProfilerWidget.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/widget/SymfonyProfilerWidget.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/widget/action/SymfonyProfilerWidgetActions.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/widget/action/SymfonyProfilerWidgetActions.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/profiler/widget/action/SymfonyProfilerWidgetActions.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/widget/action/SymfonyProfilerWidgetActions.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/PhpRouteReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpRouteReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/PhpRouteReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpRouteReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/Route.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/Route.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/Route.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/Route.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/RouteGotoCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteGotoCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/RouteGotoCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteGotoCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/RouteLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/RouteLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/RouteParameterReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteParameterReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/RouteParameterReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteParameterReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/RouteReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/RouteReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/RouteXmlReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteXmlReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/RouteXmlReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteXmlReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/YamlLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/YamlLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/YamlLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/YamlLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/dic/ControllerClassOnShortcutReturn.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dic/ControllerClassOnShortcutReturn.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/dic/ControllerClassOnShortcutReturn.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dic/ControllerClassOnShortcutReturn.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/dic/ServiceRouteContainer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dic/ServiceRouteContainer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/dic/ServiceRouteContainer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dic/ServiceRouteContainer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/dict/JsonRoute.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dict/JsonRoute.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/dict/JsonRoute.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dict/JsonRoute.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/dict/RouteInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dict/RouteInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/dict/RouteInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dict/RouteInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/dict/RoutesContainer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dict/RoutesContainer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/dict/RoutesContainer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dict/RoutesContainer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/dict/RoutingFile.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dict/RoutingFile.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/dict/RoutingFile.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/dict/RoutingFile.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/ControllerMethodInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/ControllerMethodInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/ControllerMethodInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/ControllerMethodInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/DuplicateLocalRouteInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/DuplicateLocalRouteInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/DuplicateLocalRouteInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/DuplicateLocalRouteInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/PhpRouteMissingInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/PhpRouteMissingInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/PhpRouteMissingInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/PhpRouteMissingInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/RouteSettingDeprecatedInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/RouteSettingDeprecatedInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/RouteSettingDeprecatedInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/RouteSettingDeprecatedInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/TwigRouteMissingInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/TwigRouteMissingInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/TwigRouteMissingInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/TwigRouteMissingInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/routing/webDeployment/RoutingRemoteFileStorage.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/webDeployment/RoutingRemoteFileStorage.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/routing/webDeployment/RoutingRemoteFileStorage.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/webDeployment/RoutingRemoteFileStorage.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/security/AnnotationExpressionGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/security/AnnotationExpressionGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/security/AnnotationExpressionGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/security/AnnotationExpressionGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/security/VoterGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/security/VoterGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/security/VoterGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/security/VoterGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/security/utils/VoterUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/security/utils/VoterUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/security/utils/VoterUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/security/utils/VoterUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/ContainerCollectionResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ContainerCollectionResolver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/ContainerCollectionResolver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ContainerCollectionResolver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/SymfonyProcessors.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/SymfonyProcessors.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/SymfonyProcessors.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/SymfonyProcessors.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/DispatcherEvent.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/DispatcherEvent.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/DispatcherEvent.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/DispatcherEvent.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/FileResource.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/FileResource.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/FileResource.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/FileResource.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/StubIndexedRoute.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/StubIndexedRoute.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/StubIndexedRoute.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/StubIndexedRoute.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TemplateUsage.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TemplateUsage.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TemplateUsage.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TemplateUsage.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TwigMacroTagIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TwigMacroTagIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TwigMacroTagIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TwigMacroTagIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerBuilderStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerBuilderStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerBuilderStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerBuilderStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerIdUsagesStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerIdUsagesStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerIdUsagesStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerIdUsagesStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerParameterStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerParameterStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerParameterStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerParameterStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/DoctrineMetadataFileStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/DoctrineMetadataFileStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/DoctrineMetadataFileStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/DoctrineMetadataFileStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/EventAnnotationStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/EventAnnotationStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/EventAnnotationStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/EventAnnotationStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/FileResourcesIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/FileResourcesIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/FileResourcesIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/FileResourcesIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/PhpTwigTemplateUsageStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/PhpTwigTemplateUsageStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/PhpTwigTemplateUsageStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/PhpTwigTemplateUsageStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/RoutesStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/RoutesStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/RoutesStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/RoutesStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesDefinitionStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesDefinitionStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesDefinitionStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesDefinitionStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesTagStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesTagStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesTagStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesTagStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigBlockIndexExtension.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigBlockIndexExtension.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigBlockIndexExtension.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigBlockIndexExtension.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigExtendsStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigExtendsStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigExtendsStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigExtendsStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigIncludeStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigIncludeStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigIncludeStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigIncludeStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/ObjectStreamDataExternalizer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/ObjectStreamDataExternalizer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/ObjectStreamDataExternalizer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/ObjectStreamDataExternalizer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/StringSetDataExternalizer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/StringSetDataExternalizer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/StringSetDataExternalizer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/StringSetDataExternalizer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationElementWalkingVisitor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationElementWalkingVisitor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationElementWalkingVisitor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationElementWalkingVisitor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationRouteElementWalkingVisitor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationRouteElementWalkingVisitor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationRouteElementWalkingVisitor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationRouteElementWalkingVisitor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/util/EventDispatcherUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/util/EventDispatcherUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/util/EventDispatcherUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/util/EventDispatcherUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/util/IndexUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/util/IndexUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/stubs/util/IndexUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/util/IndexUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/BlockGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/BlockGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/BlockGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/BlockGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateGlobalStringGoToDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateGlobalStringGoToDeclarationHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateGlobalStringGoToDeclarationHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateGlobalStringGoToDeclarationHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateMissingInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateMissingInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateMissingInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateMissingInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTwigMethodLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/PhpTwigMethodLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTwigMethodLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/PhpTwigMethodLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/README.md b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/README.md similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/README.md rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/README.md diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/RenderParameterGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/RenderParameterGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/RenderParameterGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/RenderParameterGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TemplateGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TemplateGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TemplateLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TemplateLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TemplateReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TemplateReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TranslationTagGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TranslationTagGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/TranslationTagGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TranslationTagGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java similarity index 99% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java index 0d523e32d..5252d0dac 100644 --- a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java @@ -256,10 +256,15 @@ private Collection getControllerGoTo(@NotNull PsiElement psiElement @NotNull private Collection getTwigFiles(@NotNull PsiElement psiElement, int offset) { + int calulatedOffset = offset - psiElement.getTextRange().getStartOffset(); + if (calulatedOffset < 0) { + calulatedOffset = 0; + } + return TwigUtil.getTemplateNavigationOnOffset( psiElement.getProject(), psiElement.getText(), - offset - psiElement.getTextRange().getStartOffset() + calulatedOffset ); } diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertionLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertionLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertionLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertionLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigAssetFunctionInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigAssetFunctionInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigAssetFunctionInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigAssetFunctionInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigPathFunctionInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigPathFunctionInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigPathFunctionInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigPathFunctionInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigTranslationFilterInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigTranslationFilterInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigTranslationFilterInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigTranslationFilterInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TemplateInclude.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TemplateInclude.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TemplateInclude.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TemplateInclude.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigBlock.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigBlock.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigBlock.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigBlock.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigConfigJson.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigConfigJson.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigConfigJson.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigConfigJson.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigCreateContainer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigCreateContainer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigCreateContainer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigCreateContainer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtension.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtension.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtension.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtension.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacro.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacro.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacro.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacro.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTag.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTag.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTag.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTag.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTagInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTagInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTagInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTagInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateCreateByNameLocalQuickFix.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateCreateByNameLocalQuickFix.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateCreateByNameLocalQuickFix.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateCreateByNameLocalQuickFix.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigAssetMissingInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigAssetMissingInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigAssetMissingInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigAssetMissingInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigAssetsTagMissingInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigAssetsTagMissingInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigAssetsTagMissingInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigAssetsTagMissingInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigTemplateMissingInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigTemplateMissingInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigTemplateMissingInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigTemplateMissingInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigVariableDeprecatedInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigVariableDeprecatedInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigVariableDeprecatedInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigVariableDeprecatedInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigVariablePathInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigVariablePathInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigVariablePathInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigVariablePathInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/BundleOverwriteNamespaceExtensions.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/BundleOverwriteNamespaceExtensions.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/BundleOverwriteNamespaceExtensions.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/BundleOverwriteNamespaceExtensions.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/BundleTwigNamespaceExtension.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/BundleTwigNamespaceExtension.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/BundleTwigNamespaceExtension.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/BundleTwigNamespaceExtension.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/ConfigAddPathTwigNamespaces.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/ConfigAddPathTwigNamespaces.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/ConfigAddPathTwigNamespaces.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/ConfigAddPathTwigNamespaces.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/ContainerTwigNamespaceExtension.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/ContainerTwigNamespaceExtension.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/ContainerTwigNamespaceExtension.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/ContainerTwigNamespaceExtension.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/GlobalAppTwigNamespaceExtension.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/GlobalAppTwigNamespaceExtension.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/GlobalAppTwigNamespaceExtension.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/GlobalAppTwigNamespaceExtension.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigNamespaceSetting.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigNamespaceSetting.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigNamespaceSetting.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigNamespaceSetting.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPath.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPath.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPath.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPath.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/path/dict/TwigPathJson.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/dict/TwigPathJson.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/path/dict/TwigPathJson.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/dict/TwigPathJson.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigHtmlCompletionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigHtmlCompletionUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigHtmlCompletionUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigHtmlCompletionUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollectorParameter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollectorParameter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollectorParameter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollectorParameter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigTypeContainer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigTypeContainer.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigTypeContainer.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigTypeContainer.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/FileDocVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/FileDocVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/FileDocVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/FileDocVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/GlobalExtensionVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/GlobalExtensionVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/GlobalExtensionVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/GlobalExtensionVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/MarcoScopeVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/MarcoScopeVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/MarcoScopeVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/MarcoScopeVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/StaticVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/StaticVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/StaticVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/StaticVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/dict/PsiVariable.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/dict/PsiVariable.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/dict/PsiVariable.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/dict/PsiVariable.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormFieldResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormFieldResolver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormFieldResolver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormFieldResolver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormVarsResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormVarsResolver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormVarsResolver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormVarsResolver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/TwigTypeResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/TwigTypeResolver.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/TwigTypeResolver.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/TwigTypeResolver.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/holder/FormDataHolder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/holder/FormDataHolder.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/holder/FormDataHolder.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/holder/FormDataHolder.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationDomainInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationDomainInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationDomainInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationDomainInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationKeyInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationKeyInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationKeyInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationKeyInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationDomainReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationDomainReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationDomainReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationDomainReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationKeyIntentionAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationKeyIntentionAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationKeyIntentionAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationKeyIntentionAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationKeyIntentionAndQuickFixAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationKeyIntentionAndQuickFixAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationKeyIntentionAndQuickFixAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationKeyIntentionAndQuickFixAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/TranslatorLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslatorLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/TranslatorLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslatorLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/ValidatorTranslationGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/ValidatorTranslationGotoCompletionRegistrar.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/ValidatorTranslationGotoCompletionRegistrar.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/ValidatorTranslationGotoCompletionRegistrar.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/collector/YamlTranslationCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/collector/YamlTranslationCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/collector/YamlTranslationCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/collector/YamlTranslationCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/collector/YamlTranslationVisitor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/collector/YamlTranslationVisitor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/collector/YamlTranslationVisitor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/collector/YamlTranslationVisitor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/dict/DomainFileMap.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/DomainFileMap.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/dict/DomainFileMap.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/DomainFileMap.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TwigTranslationDomainInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TwigTranslationDomainInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TwigTranslationDomainInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TwigTranslationDomainInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TwigTranslationKeyInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TwigTranslationKeyInspection.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TwigTranslationKeyInspection.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TwigTranslationKeyInspection.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/intention/TwigTranslationKeyIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/intention/TwigTranslationKeyIntention.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/intention/TwigTranslationKeyIntention.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/intention/TwigTranslationKeyIntention.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/parser/DomainMappings.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/DomainMappings.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/parser/DomainMappings.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/DomainMappings.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationPsiParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationPsiParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationPsiParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationPsiParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/translation/util/TranslationInsertUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/util/TranslationInsertUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/translation/util/TranslationInsertUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/util/TranslationInsertUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/action/TwigTranslationGeneratorAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/action/TwigTranslationGeneratorAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/action/TwigTranslationGeneratorAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/action/TwigTranslationGeneratorAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationAnnotator.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationAnnotator.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationAnnotator.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationAnnotator.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationGotoHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationGotoHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationGotoHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationGotoHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationReferences.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationReferences.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationReferences.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationReferences.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/assets/TwigNamedAssetsServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/assets/TwigNamedAssetsServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/assets/TwigNamedAssetsServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/assets/TwigNamedAssetsServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/loader/FileImplementsLazyLoader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/loader/FileImplementsLazyLoader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/loader/FileImplementsLazyLoader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/loader/FileImplementsLazyLoader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/loader/FileOverwritesLazyLoader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/loader/FileOverwritesLazyLoader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/loader/FileOverwritesLazyLoader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/loader/FileOverwritesLazyLoader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigBlockUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigBlockUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigBlockUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigBlockUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerDocVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerDocVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerDocVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerDocVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ServiceContainerGlobalVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ServiceContainerGlobalVariableCollector.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ServiceContainerGlobalVariableCollector.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ServiceContainerGlobalVariableCollector.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalEnum.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalEnum.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalEnum.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalEnum.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalVariable.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalVariable.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalVariable.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalVariable.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalsServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalsServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalsServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalsServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterDialog.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeDialog.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/TwigJsonExampleDialog.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigJsonExampleDialog.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/TwigJsonExampleDialog.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigJsonExampleDialog.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/TwigJsonExampleDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigJsonExampleDialog.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/TwigJsonExampleDialog.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigJsonExampleDialog.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigNamespaceDialog.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/dict/AbstractUiFilePath.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/AbstractUiFilePath.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/dict/AbstractUiFilePath.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/AbstractUiFilePath.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathPresentable.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathPresentable.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathPresentable.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathPresentable.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/utils/ClassCompletionPanelWrapper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/ClassCompletionPanelWrapper.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/utils/ClassCompletionPanelWrapper.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/ClassCompletionPanelWrapper.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/utils/UiSettingsUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/UiSettingsUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/utils/UiSettingsUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/UiSettingsUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/UiPathColumnInfo.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/UiPathColumnInfo.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/UiPathColumnInfo.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/UiPathColumnInfo.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/WebServerFileDialogExtensionCallback.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/WebServerFileDialogExtensionCallback.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/WebServerFileDialogExtensionCallback.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/WebServerFileDialogExtensionCallback.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/CodeUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/CodeUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/CodeUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/CodeUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/CommandUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/CommandUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/CommandUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/CommandUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/EventDispatcherTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventDispatcherTypeProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/EventDispatcherTypeProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventDispatcherTypeProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/EventSubscriberUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventSubscriberUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/EventSubscriberUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventSubscriberUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/FileResourceVisitorUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/FileResourceVisitorUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/FileResourceVisitorUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/FileResourceVisitorUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/FilesystemUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/FilesystemUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/FilesystemUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/FilesystemUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/IdeHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/IdeHelper.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/IdeHelper.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/IdeHelper.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/MethodParameterReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodParameterReferenceContributor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/MethodParameterReferenceContributor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodParameterReferenceContributor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/ParameterBag.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/ParameterBag.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/ParameterBag.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/ParameterBag.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/PhpIndexUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpIndexUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/PhpIndexUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpIndexUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/PhpTypeProviderUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpTypeProviderUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/PhpTypeProviderUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpTypeProviderUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/StringUtils.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/StringUtils.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/StringUtils.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/StringUtils.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleFileCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleFileCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleFileCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleFileCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyCommandUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyCommandUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyCommandUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyCommandUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/VfsExUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/VfsExUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/VfsExUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/VfsExUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationConfig.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationConfig.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationConfig.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationConfig.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationValue.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationValue.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationValue.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/annotation/AnnotationValue.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/EventCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/EventCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/EventCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/EventCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/FunctionInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/FunctionInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/FunctionInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/FunctionInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassAndParameterCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassAndParameterCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassAndParameterCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassAndParameterCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassReferenceInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassReferenceInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassReferenceInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassReferenceInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpReferenceTrimBackslashInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpReferenceTrimBackslashInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpReferenceTrimBackslashInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpReferenceTrimBackslashInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/TagNameCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/TagNameCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/TagNameCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/TagNameCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/TwigTypeInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/TwigTypeInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/TwigTypeInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/TwigTypeInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationMethodInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationMethodInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationMethodInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationMethodInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationTagInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationTagInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationTagInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationTagInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationUseImporter.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationUseImporter.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationUseImporter.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/annotations/AnnotationUseImporter.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerActionLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerActionLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerActionLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerActionLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerCompletionProvider.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerCompletionProvider.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerCompletionProvider.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerIndex.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerIndex.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerIndex.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerReference.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerReference.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerReference.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/BundleFile.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/BundleFile.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/BundleFile.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/BundleFile.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/DoctrineModel.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/DoctrineModel.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/DoctrineModel.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/DoctrineModel.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/PhpMethodReferenceCall.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/PhpMethodReferenceCall.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/PhpMethodReferenceCall.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/PhpMethodReferenceCall.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/ResourceFileInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ResourceFileInsertHandler.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/ResourceFileInsertHandler.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ResourceFileInsertHandler.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceTag.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceTag.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceTag.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceTag.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundle.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundle.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundle.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundle.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundleFileLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundleFileLookupElement.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundleFileLookupElement.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundleFileLookupElement.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyCommand.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyCommand.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyCommand.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyCommand.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/psi/ParentPathPatternCondition.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/ParentPathPatternCondition.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/psi/ParentPathPatternCondition.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/ParentPathPatternCondition.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpPsiMatcher.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpPsiMatcher.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpPsiMatcher.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpPsiMatcher.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PsiElementAssertUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/psi/matcher/ArrayValueWithKeyAndMethodMatcher.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/matcher/ArrayValueWithKeyAndMethodMatcher.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/psi/matcher/ArrayValueWithKeyAndMethodMatcher.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/matcher/ArrayValueWithKeyAndMethodMatcher.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/psi/matcher/ArrayValueWithKeyAndNewExpressionMatcher.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/matcher/ArrayValueWithKeyAndNewExpressionMatcher.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/psi/matcher/ArrayValueWithKeyAndNewExpressionMatcher.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/matcher/ArrayValueWithKeyAndNewExpressionMatcher.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/service/AbstractServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/AbstractServiceParser.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/service/AbstractServiceParser.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/AbstractServiceParser.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceFileInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceFileInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceFileInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceFileInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceParserInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceParserInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceParserInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceParserInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/service/ServiceXmlParserFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlPsiElementFactory.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/ParameterVisitor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/ParameterVisitor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/ParameterVisitor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/ParameterVisitor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/YamlServiceTag.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/YamlServiceTag.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/YamlServiceTag.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/YamlServiceTag.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/YamlTagVisitor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/YamlTagVisitor.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/YamlTagVisitor.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/visitor/YamlTagVisitor.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentProjectComponent.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentProjectComponent.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentProjectComponent.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentProjectComponent.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentUtil.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/webDeployment/actions/SymfonyWebDeploymentDownloadAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/actions/SymfonyWebDeploymentDownloadAction.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/webDeployment/actions/SymfonyWebDeploymentDownloadAction.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/actions/SymfonyWebDeploymentDownloadAction.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/webDeployment/container/RemoteCompiledServiceContainerLoader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/container/RemoteCompiledServiceContainerLoader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/webDeployment/container/RemoteCompiledServiceContainerLoader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/container/RemoteCompiledServiceContainerLoader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/webDeployment/routing/WebDeploymentRoutingLoader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/routing/WebDeploymentRoutingLoader.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/webDeployment/routing/WebDeploymentRoutingLoader.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/routing/WebDeploymentRoutingLoader.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/webDeployment/storage/RemoteFileStorageInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/storage/RemoteFileStorageInterface.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/webDeployment/storage/RemoteFileStorageInterface.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/storage/RemoteFileStorageInterface.java diff --git a/src/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java rename to src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/utils/RemoteWebServerUtil.java diff --git a/src/icons/SymfonyIcons.java b/src/main/java/icons/SymfonyIcons.java similarity index 100% rename from src/icons/SymfonyIcons.java rename to src/main/java/icons/SymfonyIcons.java diff --git a/META-INF/deployment-aware.xml b/src/main/resources/META-INF/deployment-aware.xml similarity index 100% rename from META-INF/deployment-aware.xml rename to src/main/resources/META-INF/deployment-aware.xml diff --git a/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml similarity index 100% rename from META-INF/plugin.xml rename to src/main/resources/META-INF/plugin.xml diff --git a/src/resources/fileTemplates/command.php b/src/main/resources/fileTemplates/command.php similarity index 100% rename from src/resources/fileTemplates/command.php rename to src/main/resources/fileTemplates/command.php diff --git a/src/resources/fileTemplates/compiler_pass.php b/src/main/resources/fileTemplates/compiler_pass.php similarity index 100% rename from src/resources/fileTemplates/compiler_pass.php rename to src/main/resources/fileTemplates/compiler_pass.php diff --git a/src/resources/fileTemplates/container.xml b/src/main/resources/fileTemplates/container.xml similarity index 100% rename from src/resources/fileTemplates/container.xml rename to src/main/resources/fileTemplates/container.xml diff --git a/src/resources/fileTemplates/container.yml b/src/main/resources/fileTemplates/container.yml similarity index 100% rename from src/resources/fileTemplates/container.yml rename to src/main/resources/fileTemplates/container.yml diff --git a/src/resources/fileTemplates/controller.php b/src/main/resources/fileTemplates/controller.php similarity index 100% rename from src/resources/fileTemplates/controller.php rename to src/main/resources/fileTemplates/controller.php diff --git a/src/resources/fileTemplates/form_type_configure.php b/src/main/resources/fileTemplates/form_type_configure.php similarity index 100% rename from src/resources/fileTemplates/form_type_configure.php rename to src/main/resources/fileTemplates/form_type_configure.php diff --git a/src/resources/fileTemplates/form_type_defaults.php b/src/main/resources/fileTemplates/form_type_defaults.php similarity index 100% rename from src/resources/fileTemplates/form_type_defaults.php rename to src/main/resources/fileTemplates/form_type_defaults.php diff --git a/src/resources/fileTemplates/twig_extension.php b/src/main/resources/fileTemplates/twig_extension.php similarity index 100% rename from src/resources/fileTemplates/twig_extension.php rename to src/main/resources/fileTemplates/twig_extension.php diff --git a/src/resources/fileTemplates/web_test_case.php b/src/main/resources/fileTemplates/web_test_case.php similarity index 100% rename from src/resources/fileTemplates/web_test_case.php rename to src/main/resources/fileTemplates/web_test_case.php diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/bundle.png b/src/main/resources/icons/bundle.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/bundle.png rename to src/main/resources/icons/bundle.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/bundle@2x.png b/src/main/resources/icons/bundle@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/bundle@2x.png rename to src/main/resources/icons/bundle@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/config_prototype.png b/src/main/resources/icons/config_prototype.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/config_prototype.png rename to src/main/resources/icons/config_prototype.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/config_prototype@2x.png b/src/main/resources/icons/config_prototype@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/config_prototype@2x.png rename to src/main/resources/icons/config_prototype@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/config_value.png b/src/main/resources/icons/config_value.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/config_value.png rename to src/main/resources/icons/config_value.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/config_value@2x.png b/src/main/resources/icons/config_value@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/config_value@2x.png rename to src/main/resources/icons/config_value@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/config_value_shortcut.png b/src/main/resources/icons/config_value_shortcut.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/config_value_shortcut.png rename to src/main/resources/icons/config_value_shortcut.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/config_value_shortcut@2x.png b/src/main/resources/icons/config_value_shortcut@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/config_value_shortcut@2x.png rename to src/main/resources/icons/config_value_shortcut@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine.png b/src/main/resources/icons/doctrine.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine.png rename to src/main/resources/icons/doctrine.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine@2x.png b/src/main/resources/icons/doctrine@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine@2x.png rename to src/main/resources/icons/doctrine@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine_line_marker.png b/src/main/resources/icons/doctrine_line_marker.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine_line_marker.png rename to src/main/resources/icons/doctrine_line_marker.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine_line_marker@2x.png b/src/main/resources/icons/doctrine_line_marker@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine_line_marker@2x.png rename to src/main/resources/icons/doctrine_line_marker@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine_weak.png b/src/main/resources/icons/doctrine_weak.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine_weak.png rename to src/main/resources/icons/doctrine_weak.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine_weak@2x.png b/src/main/resources/icons/doctrine_weak@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/doctrine_weak@2x.png rename to src/main/resources/icons/doctrine_weak@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/event.png b/src/main/resources/icons/event.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/event.png rename to src/main/resources/icons/event.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/event@2x.png b/src/main/resources/icons/event@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/event@2x.png rename to src/main/resources/icons/event@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_extension.png b/src/main/resources/icons/form_extension.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_extension.png rename to src/main/resources/icons/form_extension.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_extension@2x.png b/src/main/resources/icons/form_extension@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_extension@2x.png rename to src/main/resources/icons/form_extension@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_extension_weak.png b/src/main/resources/icons/form_extension_weak.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_extension_weak.png rename to src/main/resources/icons/form_extension_weak.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_extension_weak@2x.png b/src/main/resources/icons/form_extension_weak@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_extension_weak@2x.png rename to src/main/resources/icons/form_extension_weak@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_option.png b/src/main/resources/icons/form_option.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_option.png rename to src/main/resources/icons/form_option.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_option@2x.png b/src/main/resources/icons/form_option@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_option@2x.png rename to src/main/resources/icons/form_option@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_type.png b/src/main/resources/icons/form_type.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_type.png rename to src/main/resources/icons/form_type.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_type@2x.png b/src/main/resources/icons/form_type@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_type@2x.png rename to src/main/resources/icons/form_type@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_type_line_marker.png b/src/main/resources/icons/form_type_line_marker.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_type_line_marker.png rename to src/main/resources/icons/form_type_line_marker.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_type_line_marker@2x.png b/src/main/resources/icons/form_type_line_marker@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_type_line_marker@2x.png rename to src/main/resources/icons/form_type_line_marker@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_type_weak.png b/src/main/resources/icons/form_type_weak.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_type_weak.png rename to src/main/resources/icons/form_type_weak.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/form_type_weak@2x.png b/src/main/resources/icons/form_type_weak@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/form_type_weak@2x.png rename to src/main/resources/icons/form_type_weak@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/mail.png b/src/main/resources/icons/mail.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/mail.png rename to src/main/resources/icons/mail.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/mail@2x.png b/src/main/resources/icons/mail@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/mail@2x.png rename to src/main/resources/icons/mail@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/no_sql.png b/src/main/resources/icons/no_sql.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/no_sql.png rename to src/main/resources/icons/no_sql.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/no_sql@2x.png b/src/main/resources/icons/no_sql@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/no_sql@2x.png rename to src/main/resources/icons/no_sql@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/overwrite.png b/src/main/resources/icons/overwrite.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/overwrite.png rename to src/main/resources/icons/overwrite.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/overwrite@2x.png b/src/main/resources/icons/overwrite@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/overwrite@2x.png rename to src/main/resources/icons/overwrite@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/parameter.png b/src/main/resources/icons/parameter.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/parameter.png rename to src/main/resources/icons/parameter.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/parameter@2x.png b/src/main/resources/icons/parameter@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/parameter@2x.png rename to src/main/resources/icons/parameter@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/parameter_opacity.png b/src/main/resources/icons/parameter_opacity.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/parameter_opacity.png rename to src/main/resources/icons/parameter_opacity.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/parameter_opacity@2x.png b/src/main/resources/icons/parameter_opacity@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/parameter_opacity@2x.png rename to src/main/resources/icons/parameter_opacity@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/profiler_link.png b/src/main/resources/icons/profiler_link.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/profiler_link.png rename to src/main/resources/icons/profiler_link.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/profiler_link@2x.png b/src/main/resources/icons/profiler_link@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/profiler_link@2x.png rename to src/main/resources/icons/profiler_link@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/route.png b/src/main/resources/icons/route.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/route.png rename to src/main/resources/icons/route.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/route@2x.png b/src/main/resources/icons/route@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/route@2x.png rename to src/main/resources/icons/route@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/route_line_marker.png b/src/main/resources/icons/route_line_marker.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/route_line_marker.png rename to src/main/resources/icons/route_line_marker.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/route_line_marker@2x.png b/src/main/resources/icons/route_line_marker@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/route_line_marker@2x.png rename to src/main/resources/icons/route_line_marker@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/route_weak.png b/src/main/resources/icons/route_weak.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/route_weak.png rename to src/main/resources/icons/route_weak.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/route_weak@2x.png b/src/main/resources/icons/route_weak@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/route_weak@2x.png rename to src/main/resources/icons/route_weak@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service.png b/src/main/resources/icons/service.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service.png rename to src/main/resources/icons/service.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service@2x.png b/src/main/resources/icons/service@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service@2x.png rename to src/main/resources/icons/service@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_line_marker.png b/src/main/resources/icons/service_line_marker.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_line_marker.png rename to src/main/resources/icons/service_line_marker.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_line_marker@2x.png b/src/main/resources/icons/service_line_marker@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_line_marker@2x.png rename to src/main/resources/icons/service_line_marker@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_opacity.png b/src/main/resources/icons/service_opacity.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_opacity.png rename to src/main/resources/icons/service_opacity.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_opacity@2x.png b/src/main/resources/icons/service_opacity@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_opacity@2x.png rename to src/main/resources/icons/service_opacity@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_private_opacity.png b/src/main/resources/icons/service_private_opacity.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_private_opacity.png rename to src/main/resources/icons/service_private_opacity.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_private_opacity@2x.png b/src/main/resources/icons/service_private_opacity@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_private_opacity@2x.png rename to src/main/resources/icons/service_private_opacity@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_tag.png b/src/main/resources/icons/service_tag.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_tag.png rename to src/main/resources/icons/service_tag.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_tag@2x.png b/src/main/resources/icons/service_tag@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_tag@2x.png rename to src/main/resources/icons/service_tag@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_tag_weak.png b/src/main/resources/icons/service_tag_weak.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_tag_weak.png rename to src/main/resources/icons/service_tag_weak.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/service_tag_weak@2x.png b/src/main/resources/icons/service_tag_weak@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/service_tag_weak@2x.png rename to src/main/resources/icons/service_tag_weak@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony.png b/src/main/resources/icons/symfony.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony.png rename to src/main/resources/icons/symfony.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony@2x.png b/src/main/resources/icons/symfony@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony@2x.png rename to src/main/resources/icons/symfony@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_birth.png b/src/main/resources/icons/symfony_birth.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_birth.png rename to src/main/resources/icons/symfony_birth.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_birth@2x.png b/src/main/resources/icons/symfony_birth@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_birth@2x.png rename to src/main/resources/icons/symfony_birth@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_dec.png b/src/main/resources/icons/symfony_dec.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_dec.png rename to src/main/resources/icons/symfony_dec.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_dec@2x.png b/src/main/resources/icons/symfony_dec@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_dec@2x.png rename to src/main/resources/icons/symfony_dec@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker.png b/src/main/resources/icons/symfony_line_marker.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker.png rename to src/main/resources/icons/symfony_line_marker.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker@2x.png b/src/main/resources/icons/symfony_line_marker@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker@2x.png rename to src/main/resources/icons/symfony_line_marker@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker_birth.png b/src/main/resources/icons/symfony_line_marker_birth.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker_birth.png rename to src/main/resources/icons/symfony_line_marker_birth.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker_birth@2x.png b/src/main/resources/icons/symfony_line_marker_birth@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker_birth@2x.png rename to src/main/resources/icons/symfony_line_marker_birth@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker_dec.png b/src/main/resources/icons/symfony_line_marker_dec.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker_dec.png rename to src/main/resources/icons/symfony_line_marker_dec.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker_dec@2x.png b/src/main/resources/icons/symfony_line_marker_dec@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_line_marker_dec@2x.png rename to src/main/resources/icons/symfony_line_marker_dec@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_tool_window.png b/src/main/resources/icons/symfony_tool_window.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_tool_window.png rename to src/main/resources/icons/symfony_tool_window.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_tool_window@2x.png b/src/main/resources/icons/symfony_tool_window@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/symfony_tool_window@2x.png rename to src/main/resources/icons/symfony_tool_window@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/translation.png b/src/main/resources/icons/translation.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/translation.png rename to src/main/resources/icons/translation.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/translation@2x.png b/src/main/resources/icons/translation@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/translation@2x.png rename to src/main/resources/icons/translation@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/translation_weak.png b/src/main/resources/icons/translation_weak.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/translation_weak.png rename to src/main/resources/icons/translation_weak.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/translation_weak@2x.png b/src/main/resources/icons/translation_weak@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/translation_weak@2x.png rename to src/main/resources/icons/translation_weak@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/twig_controller_line_marker.png b/src/main/resources/icons/twig_controller_line_marker.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/twig_controller_line_marker.png rename to src/main/resources/icons/twig_controller_line_marker.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/twig_extends_file.png b/src/main/resources/icons/twig_extends_file.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/twig_extends_file.png rename to src/main/resources/icons/twig_extends_file.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/twig_extends_file@2x.png b/src/main/resources/icons/twig_extends_file@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/twig_extends_file@2x.png rename to src/main/resources/icons/twig_extends_file@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/twig_implements_file.png b/src/main/resources/icons/twig_implements_file.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/twig_implements_file.png rename to src/main/resources/icons/twig_implements_file.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/twig_implements_file@2x.png b/src/main/resources/icons/twig_implements_file@2x.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/twig_implements_file@2x.png rename to src/main/resources/icons/twig_implements_file@2x.png diff --git a/src/fr/adrienbrault/idea/symfony2plugin/icons/twig_line_marker.png b/src/main/resources/icons/twig_line_marker.png similarity index 100% rename from src/fr/adrienbrault/idea/symfony2plugin/icons/twig_line_marker.png rename to src/main/resources/icons/twig_line_marker.png diff --git a/src/inspectionDescriptions/CaseSensitivityServiceInspection.html b/src/main/resources/inspectionDescriptions/CaseSensitivityServiceInspection.html similarity index 100% rename from src/inspectionDescriptions/CaseSensitivityServiceInspection.html rename to src/main/resources/inspectionDescriptions/CaseSensitivityServiceInspection.html diff --git a/src/inspectionDescriptions/ContainerConstant.html b/src/main/resources/inspectionDescriptions/ContainerConstant.html similarity index 100% rename from src/inspectionDescriptions/ContainerConstant.html rename to src/main/resources/inspectionDescriptions/ContainerConstant.html diff --git a/src/inspectionDescriptions/ContainerSettingDeprecated.html b/src/main/resources/inspectionDescriptions/ContainerSettingDeprecated.html similarity index 100% rename from src/inspectionDescriptions/ContainerSettingDeprecated.html rename to src/main/resources/inspectionDescriptions/ContainerSettingDeprecated.html diff --git a/src/inspectionDescriptions/ControllerMethodInspection.html b/src/main/resources/inspectionDescriptions/ControllerMethodInspection.html similarity index 100% rename from src/inspectionDescriptions/ControllerMethodInspection.html rename to src/main/resources/inspectionDescriptions/ControllerMethodInspection.html diff --git a/src/inspectionDescriptions/EventMethodCall.html b/src/main/resources/inspectionDescriptions/EventMethodCall.html similarity index 100% rename from src/inspectionDescriptions/EventMethodCall.html rename to src/main/resources/inspectionDescriptions/EventMethodCall.html diff --git a/src/inspectionDescriptions/FormTypeAsClassConstant.html b/src/main/resources/inspectionDescriptions/FormTypeAsClassConstant.html similarity index 100% rename from src/inspectionDescriptions/FormTypeAsClassConstant.html rename to src/main/resources/inspectionDescriptions/FormTypeAsClassConstant.html diff --git a/src/inspectionDescriptions/MissingService.html b/src/main/resources/inspectionDescriptions/MissingService.html similarity index 100% rename from src/inspectionDescriptions/MissingService.html rename to src/main/resources/inspectionDescriptions/MissingService.html diff --git a/src/inspectionDescriptions/PhpRouteMissingInspection.html b/src/main/resources/inspectionDescriptions/PhpRouteMissingInspection.html similarity index 100% rename from src/inspectionDescriptions/PhpRouteMissingInspection.html rename to src/main/resources/inspectionDescriptions/PhpRouteMissingInspection.html diff --git a/src/inspectionDescriptions/PhpTemplateMissingInspection.html b/src/main/resources/inspectionDescriptions/PhpTemplateMissingInspection.html similarity index 100% rename from src/inspectionDescriptions/PhpTemplateMissingInspection.html rename to src/main/resources/inspectionDescriptions/PhpTemplateMissingInspection.html diff --git a/src/inspectionDescriptions/PhpTranslationDomain.html b/src/main/resources/inspectionDescriptions/PhpTranslationDomain.html similarity index 100% rename from src/inspectionDescriptions/PhpTranslationDomain.html rename to src/main/resources/inspectionDescriptions/PhpTranslationDomain.html diff --git a/src/inspectionDescriptions/PhpTranslationKey.html b/src/main/resources/inspectionDescriptions/PhpTranslationKey.html similarity index 100% rename from src/inspectionDescriptions/PhpTranslationKey.html rename to src/main/resources/inspectionDescriptions/PhpTranslationKey.html diff --git a/src/inspectionDescriptions/RouteSettingDeprecated.html b/src/main/resources/inspectionDescriptions/RouteSettingDeprecated.html similarity index 100% rename from src/inspectionDescriptions/RouteSettingDeprecated.html rename to src/main/resources/inspectionDescriptions/RouteSettingDeprecated.html diff --git a/src/inspectionDescriptions/TaggedExtendsInterfaceClass.html b/src/main/resources/inspectionDescriptions/TaggedExtendsInterfaceClass.html similarity index 100% rename from src/inspectionDescriptions/TaggedExtendsInterfaceClass.html rename to src/main/resources/inspectionDescriptions/TaggedExtendsInterfaceClass.html diff --git a/src/inspectionDescriptions/TwigAssetMissingInspection.html b/src/main/resources/inspectionDescriptions/TwigAssetMissingInspection.html similarity index 100% rename from src/inspectionDescriptions/TwigAssetMissingInspection.html rename to src/main/resources/inspectionDescriptions/TwigAssetMissingInspection.html diff --git a/src/inspectionDescriptions/TwigAssetsTagMissingInspection.html b/src/main/resources/inspectionDescriptions/TwigAssetsTagMissingInspection.html similarity index 100% rename from src/inspectionDescriptions/TwigAssetsTagMissingInspection.html rename to src/main/resources/inspectionDescriptions/TwigAssetsTagMissingInspection.html diff --git a/src/inspectionDescriptions/TwigTemplateMissingInspection.html b/src/main/resources/inspectionDescriptions/TwigTemplateMissingInspection.html similarity index 100% rename from src/inspectionDescriptions/TwigTemplateMissingInspection.html rename to src/main/resources/inspectionDescriptions/TwigTemplateMissingInspection.html diff --git a/src/inspectionDescriptions/TwigTranslationDomain.html b/src/main/resources/inspectionDescriptions/TwigTranslationDomain.html similarity index 100% rename from src/inspectionDescriptions/TwigTranslationDomain.html rename to src/main/resources/inspectionDescriptions/TwigTranslationDomain.html diff --git a/src/inspectionDescriptions/TwigTranslationKey.html b/src/main/resources/inspectionDescriptions/TwigTranslationKey.html similarity index 100% rename from src/inspectionDescriptions/TwigTranslationKey.html rename to src/main/resources/inspectionDescriptions/TwigTranslationKey.html diff --git a/src/inspectionDescriptions/TwigVariableDeprecated.html b/src/main/resources/inspectionDescriptions/TwigVariableDeprecated.html similarity index 100% rename from src/inspectionDescriptions/TwigVariableDeprecated.html rename to src/main/resources/inspectionDescriptions/TwigVariableDeprecated.html diff --git a/src/inspectionDescriptions/TwigVariablePath.html b/src/main/resources/inspectionDescriptions/TwigVariablePath.html similarity index 100% rename from src/inspectionDescriptions/TwigVariablePath.html rename to src/main/resources/inspectionDescriptions/TwigVariablePath.html diff --git a/src/inspectionDescriptions/XmlServiceArgument.html b/src/main/resources/inspectionDescriptions/XmlServiceArgument.html similarity index 100% rename from src/inspectionDescriptions/XmlServiceArgument.html rename to src/main/resources/inspectionDescriptions/XmlServiceArgument.html diff --git a/src/inspectionDescriptions/XmlServiceInstanceInspection.html b/src/main/resources/inspectionDescriptions/XmlServiceInstanceInspection.html similarity index 100% rename from src/inspectionDescriptions/XmlServiceInstanceInspection.html rename to src/main/resources/inspectionDescriptions/XmlServiceInstanceInspection.html diff --git a/src/inspectionDescriptions/YamlClassInspection.html b/src/main/resources/inspectionDescriptions/YamlClassInspection.html similarity index 100% rename from src/inspectionDescriptions/YamlClassInspection.html rename to src/main/resources/inspectionDescriptions/YamlClassInspection.html diff --git a/src/inspectionDescriptions/YamlDeprecatedClasses.html b/src/main/resources/inspectionDescriptions/YamlDeprecatedClasses.html similarity index 100% rename from src/inspectionDescriptions/YamlDeprecatedClasses.html rename to src/main/resources/inspectionDescriptions/YamlDeprecatedClasses.html diff --git a/src/inspectionDescriptions/YamlParameterInspection.html b/src/main/resources/inspectionDescriptions/YamlParameterInspection.html similarity index 100% rename from src/inspectionDescriptions/YamlParameterInspection.html rename to src/main/resources/inspectionDescriptions/YamlParameterInspection.html diff --git a/src/inspectionDescriptions/YamlQuotedEscapedInspection.html b/src/main/resources/inspectionDescriptions/YamlQuotedEscapedInspection.html similarity index 100% rename from src/inspectionDescriptions/YamlQuotedEscapedInspection.html rename to src/main/resources/inspectionDescriptions/YamlQuotedEscapedInspection.html diff --git a/src/inspectionDescriptions/YamlServiceArgument.html b/src/main/resources/inspectionDescriptions/YamlServiceArgument.html similarity index 100% rename from src/inspectionDescriptions/YamlServiceArgument.html rename to src/main/resources/inspectionDescriptions/YamlServiceArgument.html diff --git a/src/inspectionDescriptions/YamlUnquotedColon.html b/src/main/resources/inspectionDescriptions/YamlUnquotedColon.html similarity index 100% rename from src/inspectionDescriptions/YamlUnquotedColon.html rename to src/main/resources/inspectionDescriptions/YamlUnquotedColon.html diff --git a/src/inspectionDescriptions/YamlXmlServiceInstanceInspection.html b/src/main/resources/inspectionDescriptions/YamlXmlServiceInstanceInspection.html similarity index 100% rename from src/inspectionDescriptions/YamlXmlServiceInstanceInspection.html rename to src/main/resources/inspectionDescriptions/YamlXmlServiceInstanceInspection.html diff --git a/src/intentionDescriptions/DoctrineRepositoryClassConstantIntention/description.html b/src/main/resources/intentionDescriptions/DoctrineRepositoryClassConstantIntention/description.html similarity index 100% rename from src/intentionDescriptions/DoctrineRepositoryClassConstantIntention/description.html rename to src/main/resources/intentionDescriptions/DoctrineRepositoryClassConstantIntention/description.html diff --git a/src/intentionDescriptions/FormStringToClassConstantIntention/description.html b/src/main/resources/intentionDescriptions/FormStringToClassConstantIntention/description.html similarity index 100% rename from src/intentionDescriptions/FormStringToClassConstantIntention/description.html rename to src/main/resources/intentionDescriptions/FormStringToClassConstantIntention/description.html diff --git a/src/intentionDescriptions/PhpBundleCompilerPassIntention/description.html b/src/main/resources/intentionDescriptions/PhpBundleCompilerPassIntention/description.html similarity index 100% rename from src/intentionDescriptions/PhpBundleCompilerPassIntention/description.html rename to src/main/resources/intentionDescriptions/PhpBundleCompilerPassIntention/description.html diff --git a/src/intentionDescriptions/PhpServiceArgumentIntention/description.html b/src/main/resources/intentionDescriptions/PhpServiceArgumentIntention/description.html similarity index 100% rename from src/intentionDescriptions/PhpServiceArgumentIntention/description.html rename to src/main/resources/intentionDescriptions/PhpServiceArgumentIntention/description.html diff --git a/src/intentionDescriptions/Symfony2MethodCreateService/description.html b/src/main/resources/intentionDescriptions/Symfony2MethodCreateService/description.html similarity index 100% rename from src/intentionDescriptions/Symfony2MethodCreateService/description.html rename to src/main/resources/intentionDescriptions/Symfony2MethodCreateService/description.html diff --git a/src/intentionDescriptions/SymfonyXmlServiceTagIntention/description.html b/src/main/resources/intentionDescriptions/SymfonyXmlServiceTagIntention/description.html similarity index 100% rename from src/intentionDescriptions/SymfonyXmlServiceTagIntention/description.html rename to src/main/resources/intentionDescriptions/SymfonyXmlServiceTagIntention/description.html diff --git a/src/intentionDescriptions/SymfonyYamlServiceTagIntention/description.html b/src/main/resources/intentionDescriptions/SymfonyYamlServiceTagIntention/description.html similarity index 100% rename from src/intentionDescriptions/SymfonyYamlServiceTagIntention/description.html rename to src/main/resources/intentionDescriptions/SymfonyYamlServiceTagIntention/description.html diff --git a/src/intentionDescriptions/TwigTranslationKeyIntention/description.html b/src/main/resources/intentionDescriptions/TwigTranslationKeyIntention/description.html similarity index 100% rename from src/intentionDescriptions/TwigTranslationKeyIntention/description.html rename to src/main/resources/intentionDescriptions/TwigTranslationKeyIntention/description.html diff --git a/src/intentionDescriptions/XmlServiceArgumentIntention/description.html b/src/main/resources/intentionDescriptions/XmlServiceArgumentIntention/description.html similarity index 100% rename from src/intentionDescriptions/XmlServiceArgumentIntention/description.html rename to src/main/resources/intentionDescriptions/XmlServiceArgumentIntention/description.html diff --git a/src/intentionDescriptions/XmlServiceSuggestIntention/description.html b/src/main/resources/intentionDescriptions/XmlServiceSuggestIntention/description.html similarity index 100% rename from src/intentionDescriptions/XmlServiceSuggestIntention/description.html rename to src/main/resources/intentionDescriptions/XmlServiceSuggestIntention/description.html diff --git a/src/resources/symfony2-config.xml b/src/main/resources/symfony2-config.xml similarity index 100% rename from src/resources/symfony2-config.xml rename to src/main/resources/symfony2-config.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java index 1dc65f66b..10ac58b7a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java @@ -48,7 +48,6 @@ import fr.adrienbrault.idea.symfony2plugin.Settings; import org.jetbrains.annotations.NotNull; -import java.io.File; import java.util.*; /** @@ -549,12 +548,9 @@ public void visitElement(PsiElement element) { return Pair.create(problemsHolder.getResults(), caretOffset); } - protected void createDummyFiles(String... files) throws Exception { + protected void createDummyFiles(String... files) { for (String file : files) { - String path = myFixture.getProject().getBaseDir().getPath() + "/" + file; - File f = new File(path); - f.getParentFile().mkdirs(); - f.createNewFile(); + myFixture.addFileToProject(file, ""); } } @@ -685,7 +681,7 @@ public interface Assert { boolean match(@NotNull T value); } } - + public static class LineMarker { public interface Assert { boolean match(@NotNull LineMarkerInfo markerInfo); @@ -802,7 +798,7 @@ public boolean value(LookupElement lookupElement) { CommandProcessor.getInstance().executeCommand(indicator.getProject(), new Runnable() { @Override public void run() { - indicator.setMergeCommand(); + CommandProcessor.getInstance().setCurrentCommandGroupId("Completion" + indicator.hashCode()); indicator.getLookup().finishLookup(Lookup.AUTO_INSERT_SELECT_CHAR, lookupElement); } }, "Autocompletion", null); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyTempCodeInsightFixtureTestCase.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyTempCodeInsightFixtureTestCase.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyTempCodeInsightFixtureTestCase.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyTempCodeInsightFixtureTestCase.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/ServiceActionUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/ServiceActionUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/action/ServiceActionUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/ServiceActionUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/SymfonyContainerServiceBuilderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/SymfonyContainerServiceBuilderTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/action/SymfonyContainerServiceBuilderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/SymfonyContainerServiceBuilderTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/generator/ServiceArgumentGenerateActionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/generator/ServiceArgumentGenerateActionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/action/generator/ServiceArgumentGenerateActionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/generator/ServiceArgumentGenerateActionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/DefaultServiceNameStrategyTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/DefaultServiceNameStrategyTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/DefaultServiceNameStrategyTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/DefaultServiceNameStrategyTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/JavascriptServiceNameStrategyTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/JavascriptServiceNameStrategyTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/JavascriptServiceNameStrategyTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/JavascriptServiceNameStrategyTest.java index d31c0db28..dcaf404ac 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/JavascriptServiceNameStrategyTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/JavascriptServiceNameStrategyTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/fixtures"; } public void testGetServiceName() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/ServiceBuilderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/ServiceBuilderTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/ServiceBuilderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/ServiceBuilderTest.java index 151c7094d..c2f2a27bf 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/ServiceBuilderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/ServiceBuilderTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/fixtures"; } public void testBuildForClassWithoutParameter() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/ui/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/asset/AssetDirectoryReaderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/asset/AssetDirectoryReaderTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/asset/AssetDirectoryReaderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/asset/AssetDirectoryReaderTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/asset/AssetGoToDeclarationHandlerTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/asset/AssetGoToDeclarationHandlerTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/asset/AssetGoToDeclarationHandlerTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/asset/AssetGoToDeclarationHandlerTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/FormTypeAsClassConstantInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/FormTypeAsClassConstantInspectionTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/FormTypeAsClassConstantInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/FormTypeAsClassConstantInspectionTest.java index 5a4988bbd..366ff565d 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/FormTypeAsClassConstantInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/FormTypeAsClassConstantInspectionTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/fixtures"; } public void testThatFormNamesAreInspectedAsDeprecated() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/fixtures/form.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/fixtures/form.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/fixtures/form.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/form/fixtures/form.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/ServiceDeprecatedClassesInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/ServiceDeprecatedClassesInspectionTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/ServiceDeprecatedClassesInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/ServiceDeprecatedClassesInspectionTest.java index 6972fee8c..37c5aba1a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/ServiceDeprecatedClassesInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/ServiceDeprecatedClassesInspectionTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures"; } public void testPhpClassDocBlockDeprecated() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/TaggedExtendsInterfaceClassInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/TaggedExtendsInterfaceClassInspectionTest.java similarity index 91% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/TaggedExtendsInterfaceClassInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/TaggedExtendsInterfaceClassInspectionTest.java index 1b124850b..4482edf3f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/TaggedExtendsInterfaceClassInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/TaggedExtendsInterfaceClassInspectionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures"; } public void testThatKnownTagsShouldInspectionForMissingServiceClassImplementations() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInspection/service/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/ConsoleHelperGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/ConsoleHelperGotoCompletionRegistrarTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/ConsoleHelperGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/ConsoleHelperGotoCompletionRegistrarTest.java index 304f304f0..acd86e340 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/ConsoleHelperGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/ConsoleHelperGotoCompletionRegistrarTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/PhpCommandGotoCompletionRegistrar.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/PhpCommandGotoCompletionRegistrar.java similarity index 92% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/PhpCommandGotoCompletionRegistrar.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/PhpCommandGotoCompletionRegistrar.java index 9f2b97725..32eaf3dca 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/PhpCommandGotoCompletionRegistrar.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/PhpCommandGotoCompletionRegistrar.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures"; } public void testCommandArguments() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures/FooCommand.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures/FooCommand.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures/FooCommand.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures/FooCommand.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures/helper.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures/helper.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures/helper.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/command/fixtures/helper.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/XmlGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/XmlGotoCompletionRegistrarTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/XmlGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/XmlGotoCompletionRegistrarTest.java index 97bdb84fd..e713ccc36 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/XmlGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/XmlGotoCompletionRegistrarTest.java @@ -23,7 +23,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures"; } public void testResourcesInsideSameDirectoryProvidesNavigation() { @@ -123,7 +123,7 @@ public void testThatTemplateInsideRouteDefaultKeyCompletedAndNavigable() { if(System.getenv("PHPSTORM_ENV") != null) return; try { - createDummyFiles("app/Resources/views/foo.html.twig"); + myFixture.addFileToProject("app/Resources/views/foo.html.twig", ""); } catch (Exception e) { e.printStackTrace(); } diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/XmlGotoCompletionRegistrar.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/XmlGotoCompletionRegistrar.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/XmlGotoCompletionRegistrar.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/XmlGotoCompletionRegistrar.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/routes.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/routes.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/routes.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/routes.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/xml/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java index 9f1a8ab2c..d3018af37 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java @@ -22,7 +22,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures"; } public void testThatRouteInsideRouteDefaultKeyCompletedAndNavigable() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/YamlGotoCompletionRegistrar.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/YamlGotoCompletionRegistrar.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/YamlGotoCompletionRegistrar.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/YamlGotoCompletionRegistrar.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/routes.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/routes.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/routes.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/routes.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/ConfigLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ConfigLineMarkerProviderTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/ConfigLineMarkerProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ConfigLineMarkerProviderTest.java index 3f03cf21c..025708303 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/ConfigLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ConfigLineMarkerProviderTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures"; } public void testThatConfigRootProvidesLinemarker() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/EventDispatcherSubscriberUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/EventDispatcherSubscriberUtilTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/EventDispatcherSubscriberUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/EventDispatcherSubscriberUtilTest.java index ef25b2651..c7d642041 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/EventDispatcherSubscriberUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/EventDispatcherSubscriberUtilTest.java @@ -31,7 +31,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java index 4c51a52af..de715313a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java @@ -31,7 +31,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures"; } public void testDoctrineModelLineMarker() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/SymfonyPhpReferenceContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/SymfonyPhpReferenceContributorTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/SymfonyPhpReferenceContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/SymfonyPhpReferenceContributorTest.java index 6236fdc64..b507cf2f8 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/SymfonyPhpReferenceContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/SymfonyPhpReferenceContributorTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures"; } public void testThatPrivateServiceAreNotInCompletionListForContainerGet() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/ParameterServiceParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/ParameterServiceParserTest.java similarity index 87% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/ParameterServiceParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/ParameterServiceParserTest.java index 84c4b1d5c..981f84108 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/ParameterServiceParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/ParameterServiceParserTest.java @@ -12,7 +12,7 @@ public class ParameterServiceParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/appDevDebugProjectContainer.xml"); ParameterServiceParser parameterServiceParser = new ParameterServiceParser(); parameterServiceParser.parser(new FileInputStream(testFile)); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/component/parser/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/BundleScopeLineMarkerProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/BundleScopeLineMarkerProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/BundleScopeLineMarkerProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/BundleScopeLineMarkerProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ConfigLineMarkerProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ConfigLineMarkerProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ConfigLineMarkerProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ConfigLineMarkerProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/EventSubscriber.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/EventSubscriber.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/EventSubscriber.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/EventSubscriber.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/EventSubscriberAnnotation.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/EventSubscriberAnnotation.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/EventSubscriberAnnotation.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/EventSubscriberAnnotation.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ServiceLineMarkerProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ServiceLineMarkerProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ServiceLineMarkerProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ServiceLineMarkerProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/SymfonyPhpReferenceContributor.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/SymfonyPhpReferenceContributor.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/SymfonyPhpReferenceContributor.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/SymfonyPhpReferenceContributor.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/Validation.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/Validation.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/Validation.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/Validation.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/event.services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/event.services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/event.services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/event.services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/event.services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/event.services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/event.services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/event.services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpConfigReferenceContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpConfigReferenceContributorTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpConfigReferenceContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpConfigReferenceContributorTest.java index 15ff562ba..233d9dbe2 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpConfigReferenceContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpConfigReferenceContributorTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures"; } public void testTagReferences() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures/tags.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures/tags.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures/tags.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/fixtures/tags.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTempTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTempTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTempTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTempTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTest.java index c46cfcfe5..584454428 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTest.java @@ -21,7 +21,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/fixtures/ConfigUtilTest.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/fixtures/ConfigUtilTest.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/fixtures/ConfigUtilTest.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/fixtures/ConfigUtilTest.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlHelperTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlHelperTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlHelperTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlHelperTest.java index ea1fec6a0..6d9f8f62f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlHelperTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlHelperTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlReferenceContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlReferenceContributorTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlReferenceContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlReferenceContributorTest.java index e0e4bcb49..5ff458772 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlReferenceContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/XmlReferenceContributorTest.java @@ -23,7 +23,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures"; } public void testThatAutowiringTypeReferenceToPhpClass() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlHelper.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlHelper.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlHelper.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlHelper.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlReferenceContributor.env b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlReferenceContributor.env similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlReferenceContributor.env rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlReferenceContributor.env diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlReferenceContributor.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlReferenceContributor.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlReferenceContributor.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/XmlReferenceContributor.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/XmlServiceArgumentInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/XmlServiceArgumentInspectionTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/XmlServiceArgumentInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/XmlServiceArgumentInspectionTest.java index 65c155c66..6109a95b2 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/XmlServiceArgumentInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/XmlServiceArgumentInspectionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/fixtures"; } public void testMissingArgumentProvidesInspection() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java index 508ed6d5c..fa316714a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java @@ -3,10 +3,12 @@ import com.intellij.patterns.PlatformPatterns; import com.jetbrains.php.lang.PhpFileType; import com.jetbrains.php.lang.psi.elements.PhpClass; +import fr.adrienbrault.idea.symfony2plugin.config.yaml.YamlCompletionContributor; import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase; import org.jetbrains.yaml.YAMLFileType; import java.io.File; +import java.net.URL; /** * @author Daniel Espendiller @@ -27,7 +29,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures"; } public void testResourcesInsideSameDirectoryProvidesCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlElementPatternHelperTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlElementPatternHelperTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlElementPatternHelperTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlElementPatternHelperTest.java index 1965a6bbe..63289ae31 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlElementPatternHelperTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlElementPatternHelperTest.java @@ -16,7 +16,7 @@ */ public class YamlElementPatternHelperTest extends SymfonyLightCodeInsightFixtureTestCase { public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures"; } private String[] dataProviders() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java index 375c92e50..6afe2f320 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java @@ -33,7 +33,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures"; } public void testGlobalServiceName() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlServiceArgumentInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlServiceArgumentInspectionTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlServiceArgumentInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlServiceArgumentInspectionTest.java index f2778bf3e..636c23e57 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlServiceArgumentInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlServiceArgumentInspectionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures"; } public void testMissingArgumentProvidesInspection() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/completion/ConfigCompletionProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/completion/ConfigCompletionProviderTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/completion/ConfigCompletionProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/completion/ConfigCompletionProviderTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlAnnotator.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlAnnotator.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlAnnotator.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlAnnotator.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlAnnotator.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlAnnotator.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlAnnotator.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlAnnotator.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.env b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.env similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.env rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.env diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToDeclarationHandler.env b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToDeclarationHandler.env similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToDeclarationHandler.env rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToDeclarationHandler.env diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToDeclarationHandler.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToDeclarationHandler.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToDeclarationHandler.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToDeclarationHandler.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToKnownDeclarationHandlerConfig.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToKnownDeclarationHandlerConfig.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToKnownDeclarationHandlerConfig.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlGoToKnownDeclarationHandlerConfig.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/config.yaml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/config.yaml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/config.yaml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/config.yaml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/tagged.services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/tagged.services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/tagged.services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/tagged.services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/EventMethodCallInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/EventMethodCallInspectionTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/EventMethodCallInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/EventMethodCallInspectionTest.java index 1ad433fa8..bc72d4fb4 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/EventMethodCallInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/EventMethodCallInspectionTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/fixtures"; } public void testThatYmlCallsProvidesMethodExistsCheck() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/YamlDuplicateServiceKeyInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/YamlDuplicateServiceKeyInspectionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/YamlDuplicateServiceKeyInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/YamlDuplicateServiceKeyInspectionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/inspection/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/DefaultServiceCollectorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/DefaultServiceCollectorTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/DefaultServiceCollectorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/DefaultServiceCollectorTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceArgumentParameterHintsProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceArgumentParameterHintsProviderTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceArgumentParameterHintsProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceArgumentParameterHintsProviderTest.java index eddbebb58..7956cbbcb 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceArgumentParameterHintsProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceArgumentParameterHintsProviderTest.java @@ -26,7 +26,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures"; } public void testXmlParameterTypeHintForIdAttribute() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceMapParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceMapParserTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceMapParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceMapParserTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceStringLookupElementTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceStringLookupElementTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceStringLookupElementTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceStringLookupElementTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/SymfonyContainerTypeProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/SymfonyContainerTypeProviderTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/SymfonyContainerTypeProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/SymfonyContainerTypeProviderTest.java index 0913deb58..3102161bc 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/SymfonyContainerTypeProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/SymfonyContainerTypeProviderTest.java @@ -21,7 +21,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/TaggedParameterGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/TaggedParameterGotoCompletionRegistrarTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/TaggedParameterGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/TaggedParameterGotoCompletionRegistrarTest.java index ef47da5a9..fe80e73a1 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/TaggedParameterGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/TaggedParameterGotoCompletionRegistrarTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures"; } public void testThatYamlTaggedParameterProvidesNavigation() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlEventParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlEventParserTest.java similarity index 88% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlEventParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlEventParserTest.java index 81b458524..de50bc9b1 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlEventParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlEventParserTest.java @@ -13,7 +13,7 @@ public class XmlEventParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/appDevDebugProjectContainer.xml"); XmlEventParser serviceMapParser = new XmlEventParser(); serviceMapParser.parser(new FileInputStream(testFile)); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlTagParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlTagParserTest.java similarity index 86% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlTagParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlTagParserTest.java index 618cba643..57dd4ceb6 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlTagParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/XmlTagParserTest.java @@ -13,7 +13,7 @@ public class XmlTagParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/appDevDebugProjectContainer.xml"); XmlTagParser xmlTagParser = new XmlTagParser(); xmlTagParser.parser(new FileInputStream(testFile)); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/XmlServiceTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/XmlServiceTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/XmlServiceTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/XmlServiceTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlCallServiceSuggestionCollectorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlCallServiceSuggestionCollectorTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlCallServiceSuggestionCollectorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlCallServiceSuggestionCollectorTest.java index 8d3db3f45..bdf095b55 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlCallServiceSuggestionCollectorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlCallServiceSuggestionCollectorTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures"; } public void testServiceSuggestionForCallArguments() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlConstructServiceSuggestionCollectorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlConstructServiceSuggestionCollectorTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlConstructServiceSuggestionCollectorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlConstructServiceSuggestionCollectorTest.java index ef9d4ea57..15738e52c 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlConstructServiceSuggestionCollectorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/XmlConstructServiceSuggestionCollectorTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures"; } public void testServiceSuggestionForCallArguments() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/YamlConstructServiceSuggestionCollectorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/YamlConstructServiceSuggestionCollectorTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/YamlConstructServiceSuggestionCollectorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/YamlConstructServiceSuggestionCollectorTest.java index f8f7be0d5..252e695d6 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/YamlConstructServiceSuggestionCollectorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/YamlConstructServiceSuggestionCollectorTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures"; } public void testConstructorArguments() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/suggestion/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/DotEnvUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/DotEnvUtilTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/DotEnvUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/DotEnvUtilTest.java index bd1f490dd..e5d2ea4ad 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/DotEnvUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/DotEnvUtilTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures"; } public void testGetEnvironmentVariables() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java index 014ad8e02..5491d241e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java @@ -41,7 +41,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures"; } public void testDefaults() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/Dockerfile b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/Dockerfile similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/Dockerfile rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/Dockerfile diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/docker-compose.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/docker-compose.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/docker-compose.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/docker-compose.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/env.env b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/env.env similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/env.env rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/env.env diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services3-3.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services3-3.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services3-3.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services3-3.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services3-3.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services3-3.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services3-3.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services3-3.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/usage.services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/usage.services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/usage.services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/usage.services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/usage1.services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/usage1.services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/usage1.services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/usage1.services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/ServiceArgumentParameterHintsProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/ServiceArgumentParameterHintsProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/ServiceArgumentParameterHintsProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/ServiceArgumentParameterHintsProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/ServiceArgumentParameterHintsProvider.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/ServiceArgumentParameterHintsProvider.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/ServiceArgumentParameterHintsProvider.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/ServiceArgumentParameterHintsProvider.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/TaggedParameterGotoCompletionRegistrar.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/TaggedParameterGotoCompletionRegistrar.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/TaggedParameterGotoCompletionRegistrar.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/TaggedParameterGotoCompletionRegistrar.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/TaggedParameterGotoCompletionRegistrar.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/TaggedParameterGotoCompletionRegistrar.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/TaggedParameterGotoCompletionRegistrar.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/TaggedParameterGotoCompletionRegistrar.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/types.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/types.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/types.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/types.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/types2.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/types2.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/types2.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/fixtures/types2.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/CaseSensitivityServiceInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/CaseSensitivityServiceInspectionTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/CaseSensitivityServiceInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/CaseSensitivityServiceInspectionTest.java index 7e2b1bcf3..cec1b7d7e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/CaseSensitivityServiceInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/CaseSensitivityServiceInspectionTest.java @@ -15,7 +15,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures"; } public void testCaseSensitivityForXmlFiles() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerConstantInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerConstantInspectionTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerConstantInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerConstantInspectionTest.java index 3f3e9f17c..3056e0912 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerConstantInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerConstantInspectionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures"; } public void testConstantInspectionForYamlFiles() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerSettingDeprecatedInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerSettingDeprecatedInspectionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerSettingDeprecatedInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/ContainerSettingDeprecatedInspectionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/MissingServiceInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/MissingServiceInspectionTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/MissingServiceInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/MissingServiceInspectionTest.java index fe922ddca..fa3dd7fc4 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/MissingServiceInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/MissingServiceInspectionTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures"; } public void testThatPhpServiceInterfaceForGetMethodIsInspected() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/XmlServiceInstanceInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/XmlServiceInstanceInspectionTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/XmlServiceInstanceInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/XmlServiceInstanceInspectionTest.java index 5e5aea62a..4a3ee45d3 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/XmlServiceInstanceInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/XmlServiceInstanceInspectionTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures"; } public void testConstructorInstance() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlClassInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlClassInspectionTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlClassInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlClassInspectionTest.java index e519cf17f..97057f389 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlClassInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlClassInspectionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures"; } public void testInspectionForClass() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlParameterInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlParameterInspectionTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlParameterInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlParameterInspectionTest.java index a67ca4e8e..987dde43e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlParameterInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlParameterInspectionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures"; } public void testParameterInspection() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlXmlServiceInstanceInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlXmlServiceInstanceInspectionTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlXmlServiceInstanceInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlXmlServiceInstanceInspectionTest.java index 960107224..db8a77ef9 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlXmlServiceInstanceInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/YamlXmlServiceInstanceInspectionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures"; } public void testInspectionForConstructorArguments() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/XmlServiceInstanceInspection.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/XmlServiceInstanceInspection.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/XmlServiceInstanceInspection.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/XmlServiceInstanceInspection.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/XmlServiceInstanceInspection.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/XmlServiceInstanceInspection.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/XmlServiceInstanceInspection.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/XmlServiceInstanceInspection.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlClassInspection.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlClassInspection.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlClassInspection.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlClassInspection.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlParameterInspection.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlParameterInspection.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlParameterInspection.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlParameterInspection.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlXmlServiceInstanceInspection.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlXmlServiceInstanceInspection.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlXmlServiceInstanceInspection.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlXmlServiceInstanceInspection.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlXmlServiceInstanceInspection.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlXmlServiceInstanceInspection.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlXmlServiceInstanceInspection.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/YamlXmlServiceInstanceInspection.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/PhpServiceArgumentIntentionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/PhpServiceArgumentIntentionTest.java similarity index 91% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/PhpServiceArgumentIntentionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/PhpServiceArgumentIntentionTest.java index 4610ce006..5ad061a08 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/PhpServiceArgumentIntentionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/PhpServiceArgumentIntentionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/fixtures"; } public void testIntentionIsAvailable() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/fixtures/services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/fixtures/services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/fixtures/services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/intention/fixtures/services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/XmlLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/XmlLineMarkerProviderTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/XmlLineMarkerProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/XmlLineMarkerProviderTest.java index 45cee0cae..a2cbd72da 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/XmlLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/XmlLineMarkerProviderTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/fixtures"; } public void testThatDecoratedServiceShouldProvideMarker() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/YamlLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/YamlLineMarkerProviderTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/YamlLineMarkerProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/YamlLineMarkerProviderTest.java index 16c2fedcb..cff86bc25 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/YamlLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/YamlLineMarkerProviderTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/fixtures"; } public void testThatDecoratedServiceShouldProvideMarker() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/linemarker/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/DicGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/DicGotoCompletionRegistrarTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/DicGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/DicGotoCompletionRegistrarTest.java index 2810b72ad..2a0aabe97 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/DicGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/DicGotoCompletionRegistrarTest.java @@ -20,7 +20,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/fixtures"; } public void testParameterContributor() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/tags/ServiceTagFactoryTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/tags/ServiceTagFactoryTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/tags/ServiceTagFactoryTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/tags/ServiceTagFactoryTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/TranslationStringParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/TranslationStringParserTest.java similarity index 80% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/TranslationStringParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/TranslationStringParserTest.java index b45a0b6e1..ea81dac5f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/TranslationStringParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/TranslationStringParserTest.java @@ -13,7 +13,7 @@ public class TranslationStringParserTest extends Assert { @Test public void testParse() { - File testFile = new File(this.getClass().getResource("translations/catalogue.de.php").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/translations/catalogue.de.php"); TranslationStringMap map = new TranslationStringParser().parse(testFile); assertTrue(map.getDomainMap("FOSUserBundle").contains("registration.email.message")); @@ -27,7 +27,7 @@ public void testParse() { @Test public void testParsePathMatcher() { - File testFile = new File(this.getClass().getResource("translations/catalogue.de.php").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/translations/catalogue.de.php"); TranslationStringMap map = new TranslationStringParser().parsePathMatcher(testFile.getParentFile().getPath()); assertTrue(map.getDomainMap("FOSUserBundle").contains("registration.email.message")); } diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/translations/catalogue.de.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/translations/catalogue.de.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/translations/catalogue.de.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/translations/catalogue.de.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicCompletionContributorTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicCompletionContributorTest.java index b53493b98..1ee33b93b 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicCompletionContributorTest.java @@ -29,7 +29,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicInspectionsTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicInspectionsTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicInspectionsTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicInspectionsTest.java index d47de43ac..782a201a0 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicInspectionsTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/XmlDicInspectionsTest.java @@ -26,7 +26,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("..").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures"; } public void testThatUnknownServiceIsHighlighted() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/XmlDicCompletionContributorTest.env b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/XmlDicCompletionContributorTest.env similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/XmlDicCompletionContributorTest.env rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/XmlDicCompletionContributorTest.env diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/classes1.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/classes1.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/classes1.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/classes1.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/xml/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicCompletionContributorTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicCompletionContributorTest.java index d51415ae0..e8d0291ca 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicCompletionContributorTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("..").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic"; } public void testServiceCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicNavigationContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicNavigationContributorTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicNavigationContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicNavigationContributorTest.java index 2e8813dc4..57e775d6f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicNavigationContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/yaml/YamlDicNavigationContributorTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("..").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic"; } public void testFactoryClassMethodNavigation() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/DoctrineUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/DoctrineUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/DoctrineUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/DoctrineUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java index 0aa795af6..617877112 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java @@ -28,7 +28,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures"; } /** @@ -45,7 +45,7 @@ public void testGetEntityRepositoryClass() { public void testGetEntityRepositoryClassInSameNamespaceFallback() { assertEquals("FooBundle\\Entity\\Car\\BarRepository", EntityHelper.getEntityRepositoryClass(getProject(), "FooBundle:Car\\Bar").getPresentableFQN()); } - + /** * @see fr.adrienbrault.idea.symfony2plugin.doctrine.EntityHelper#resolveShortcutName */ diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectManagerFindTypeProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectManagerFindTypeProviderTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectManagerFindTypeProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectManagerFindTypeProviderTest.java index 5b41257fb..ea6cc717e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectManagerFindTypeProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectManagerFindTypeProviderTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures"; } public void testThatObjectManagerFindMethodIsResolved() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryResultTypeProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryResultTypeProviderTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryResultTypeProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryResultTypeProviderTest.java index aa3943dec..c1ae35c56 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryResultTypeProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryResultTypeProviderTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures"; } public void testThatClassAsStringIsResolved() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryTypeProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryTypeProviderTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryTypeProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryTypeProviderTest.java index c37ff1e87..6fd4b1b2f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryTypeProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryTypeProviderTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/DoctrineCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/DoctrineCompletionContributorTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/DoctrineCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/DoctrineCompletionContributorTest.java index 68ee510f9..fe91d0f12 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/DoctrineCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/DoctrineCompletionContributorTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/fixtures"; } public void testClassConstantsCompletionWithoutNamespace() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/completion/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/DocumentNamespacesParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/DocumentNamespacesParserTest.java similarity index 88% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/DocumentNamespacesParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/DocumentNamespacesParserTest.java index 4d90e2a46..a6c58f5f5 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/DocumentNamespacesParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/DocumentNamespacesParserTest.java @@ -16,7 +16,7 @@ public class DocumentNamespacesParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/appDevDebugProjectContainer.xml"); DocumentNamespacesParser entityNamesServiceParser = new DocumentNamespacesParser(); entityNamesServiceParser.parser(new FileInputStream(testFile)); Map map = entityNamesServiceParser.getNamespaceMap(); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/EntityNamesServiceParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/EntityNamesServiceParserTest.java similarity index 85% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/EntityNamesServiceParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/EntityNamesServiceParserTest.java index 4faec28dc..31c9cb13b 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/EntityNamesServiceParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/EntityNamesServiceParserTest.java @@ -15,7 +15,7 @@ public class EntityNamesServiceParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/appDevDebugProjectContainer.xml"); EntityNamesServiceParser entityNamesServiceParser = new EntityNamesServiceParser(); entityNamesServiceParser.parser(new FileInputStream(testFile)); Map map = entityNamesServiceParser.getEntityNameMap(); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/component/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/DoctrineDbalQbGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/DoctrineDbalQbGotoCompletionRegistrarTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/DoctrineDbalQbGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/DoctrineDbalQbGotoCompletionRegistrarTest.java index cde5a3673..ba55a198f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/DoctrineDbalQbGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/DoctrineDbalQbGotoCompletionRegistrarTest.java @@ -20,7 +20,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures/doctrine.orm.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures/doctrine.orm.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures/doctrine.orm.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dbal/fixtures/doctrine.orm.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dict/DoctrineModelTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dict/DoctrineModelTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dict/DoctrineModelTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/dict/DoctrineModelTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectManagerFindTypeProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectManagerFindTypeProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectManagerFindTypeProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectManagerFindTypeProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectRepositoryResultTypeProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectRepositoryResultTypeProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectRepositoryResultTypeProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectRepositoryResultTypeProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/doctrine.orm.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/doctrine.orm.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/doctrine.orm.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/doctrine.orm.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/entity_helper.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/entity_helper.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/entity_helper.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/entity_helper.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/DoctrineRepositoryClassConstantIntentionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/DoctrineRepositoryClassConstantIntentionTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/DoctrineRepositoryClassConstantIntentionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/DoctrineRepositoryClassConstantIntentionTest.java index fdb95c1a9..5a42e121a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/DoctrineRepositoryClassConstantIntentionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/DoctrineRepositoryClassConstantIntentionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/fixtures"; } public void testIntentionIsAvailable() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/intention/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataLineMarkerProviderTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataLineMarkerProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataLineMarkerProviderTest.java index 79565508d..05e4e5388 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataLineMarkerProviderTest.java @@ -22,7 +22,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures"; } public void testTargetDocumentLineMarker() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataPatternTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataPatternTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataPatternTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineMetadataPatternTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlCompletionContributorTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlCompletionContributorTest.java index c173b22ae..b062e9d7f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlCompletionContributorTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures"; } public void testEntityNameCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlGotoCompletionRegistrarTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlGotoCompletionRegistrarTest.java index 8ba06467b..50a49eea5 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineXmlGotoCompletionRegistrarTest.java @@ -20,7 +20,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures"; } public void testEntityNameNavigation() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java index 4ddce5a1a..3fa06dfd5 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java @@ -24,7 +24,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures"; } public void testRepositoryClass() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrarTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrarTest.java index 9404a9636..18b8b9992 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/ObjectRepositoryFindGotoCompletionRegistrarTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures"; } public void testThatCompletionForDoctrineMetadataInArrayIsProvided() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/DoctrinePhpMappingDriverTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/DoctrinePhpMappingDriverTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/DoctrinePhpMappingDriverTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/DoctrinePhpMappingDriverTest.java index 68d3ac1aa..f79ecd24e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/DoctrinePhpMappingDriverTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/DoctrinePhpMappingDriverTest.java @@ -22,7 +22,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/driver/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures/ObjectRepositoryFindGotoCompletionRegistrar.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures/ObjectRepositoryFindGotoCompletionRegistrar.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures/ObjectRepositoryFindGotoCompletionRegistrar.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures/ObjectRepositoryFindGotoCompletionRegistrar.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/DoctrineRepositoryLookupElementTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/DoctrineRepositoryLookupElementTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/DoctrineRepositoryLookupElementTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/DoctrineRepositoryLookupElementTest.java index e351644f1..98fb5c001 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/DoctrineRepositoryLookupElementTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/DoctrineRepositoryLookupElementTest.java @@ -21,7 +21,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/fixtures"; } public void testCreate() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/lookup/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java index b1886e631..28e6d0669 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java @@ -21,7 +21,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/fixtures"; } public void testXmlTypes() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java index cb59bebef..0c4a83738 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java @@ -34,7 +34,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.orm.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.orm.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.orm.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.orm.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.orm.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.orm.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.orm.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.orm.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/querybuilder/util/QueryBuilderUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/querybuilder/util/QueryBuilderUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/querybuilder/util/QueryBuilderUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/querybuilder/util/QueryBuilderUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/KernelEventListenerReferences.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/KernelEventListenerReferencesTest.java similarity index 92% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/KernelEventListenerReferences.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/KernelEventListenerReferencesTest.java index 72c29c8a3..a67e1c3a9 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/KernelEventListenerReferences.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/KernelEventListenerReferencesTest.java @@ -10,7 +10,7 @@ /** * @author Daniel Espendiller */ -public class KernelEventListenerReferences extends SymfonyLightCodeInsightFixtureTestCase { +public class KernelEventListenerReferencesTest extends SymfonyLightCodeInsightFixtureTestCase { public void setUp() throws Exception { super.setUp(); @@ -20,7 +20,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures"; } /** @@ -28,6 +28,7 @@ public String getTestDataPath() { * @see fr.adrienbrault.idea.symfony2plugin.config.dic.EventDispatcherEventReference */ public void testKernelEventListenerTagOnIndexCompletion() { + if(System.getenv("PHPSTORM_ENV") != null) return; assertCompletionContains(XmlFileType.INSTANCE, "\n" + " \n" + diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/eventDispatcher/fixtures/services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/ServiceToolboxProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/ServiceToolboxProviderTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/ServiceToolboxProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/ServiceToolboxProviderTest.java index e4d390fe0..81356cef1 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/ServiceToolboxProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/ServiceToolboxProviderTest.java @@ -23,7 +23,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/external/toolbox/provider/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormArrayOptionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormArrayOptionTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormArrayOptionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormArrayOptionTest.java index 26226c227..47c54e830 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormArrayOptionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormArrayOptionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures"; } public void testFormOptionCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormGotoCompletionRegistrarTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormGotoCompletionRegistrarTest.java index 07115d601..d624ab895 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormGotoCompletionRegistrarTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures"; } public void testFormTypeCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormOptionGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormOptionGotoCompletionRegistrarTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormOptionGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormOptionGotoCompletionRegistrarTest.java index 0cf842fb8..f59649776 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormOptionGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormOptionGotoCompletionRegistrarTest.java @@ -20,7 +20,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures"; } public void testFormReferenceCompletionProvider() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormTypeReferenceContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormTypeReferenceContributorTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormTypeReferenceContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormTypeReferenceContributorTest.java index 782617b7b..425cc7095 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/FormTypeReferenceContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/FormTypeReferenceContributorTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures"; } public void testDataClassPropertyCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/FormTypeConstantMigrationActionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/FormTypeConstantMigrationActionTest.java similarity index 92% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/FormTypeConstantMigrationActionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/FormTypeConstantMigrationActionTest.java index d900255bf..b66a26dad 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/FormTypeConstantMigrationActionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/FormTypeConstantMigrationActionTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/fixtures"; } public void testActionAvailableForFileScope() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/action/generator/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/FormCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/FormCompletionContributorTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/FormCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/FormCompletionContributorTest.java index b59f13cee..8ce6d6113 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/FormCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/FormCompletionContributorTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/fixtures"; } public void testClassConstantsCompletionWithoutNamespace() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/completion/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormExtensionServiceParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormExtensionServiceParserTest.java similarity index 87% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormExtensionServiceParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormExtensionServiceParserTest.java index d9250ff0c..7b87dcb36 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormExtensionServiceParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormExtensionServiceParserTest.java @@ -16,7 +16,7 @@ public class FormExtensionServiceParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/appDevDebugProjectContainer.xml"); FormExtensionServiceParser formExtensionServiceParser = new FormExtensionServiceParser(); formExtensionServiceParser.parser(new FileInputStream(testFile)); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormTypeServiceParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormTypeServiceParserTest.java similarity index 87% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormTypeServiceParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormTypeServiceParserTest.java index 7578045d4..4e25ca2a0 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormTypeServiceParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/FormTypeServiceParserTest.java @@ -14,7 +14,7 @@ public class FormTypeServiceParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/appDevDebugProjectContainer.xml"); FormTypeServiceParser parser = new FormTypeServiceParser(); parser.parser(new FileInputStream(testFile)); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/dict/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/FormGotoCompletionRegistrarTest.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/FormGotoCompletionRegistrarTest.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/FormGotoCompletionRegistrarTest.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/FormGotoCompletionRegistrarTest.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/FormOptionGotoCompletionRegistrar.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/FormOptionGotoCompletionRegistrar.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/FormOptionGotoCompletionRegistrar.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/FormOptionGotoCompletionRegistrar.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/foo.de.xlf b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/foo.de.xlf similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/foo.de.xlf rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/foo.de.xlf diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/foo.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/foo.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/foo.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/foo.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/messages.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/messages.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/messages.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/fixtures/messages.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/FormStringToClassConstantIntentionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/FormStringToClassConstantIntentionTest.java similarity index 91% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/FormStringToClassConstantIntentionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/FormStringToClassConstantIntentionTest.java index 9adfeba78..4d5a0b24f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/FormStringToClassConstantIntentionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/FormStringToClassConstantIntentionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/fixtures"; } public void testIntentionIsAvailable() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/intention/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java index 53f24766a..1fa7b7526 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java @@ -50,7 +50,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures"; } /** @@ -119,4 +119,4 @@ public void testGetMethodReferenceStringParameter() { MethodReference methodReference = PhpPsiElementFactory.createFromText(getProject(), MethodReference.class, "bar('test', 'my_value'); } };\n"); assertContainsElements(FormOptionsUtil.getMethodReferenceStringParameter(methodReference, new String[] {"foo"}, "bar", "test"), "my_value"); } -} \ No newline at end of file +} diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java index 056dbfb2f..fed75b0c3 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java @@ -28,7 +28,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures"; } @SuppressWarnings({"ConstantConditions"}) diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/FormOptionsUtil.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/FormOptionsUtil.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/FormOptionsUtil.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/FormOptionsUtil.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/FormOptionsUtilKeys.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/FormOptionsUtilKeys.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/FormOptionsUtilKeys.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/FormOptionsUtilKeys.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/installer/SymfonyInstallerUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/installer/SymfonyInstallerUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/installer/SymfonyInstallerUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/installer/SymfonyInstallerUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceSuggestIntentionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceSuggestIntentionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceSuggestIntentionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceSuggestIntentionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceTagIntentionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceTagIntentionTest.java similarity index 90% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceTagIntentionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceTagIntentionTest.java index 2195dd24e..c04115298 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceTagIntentionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/XmlServiceTagIntentionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/fixtures"; } public void testTagIntentionIsAvailable() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/xml/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlQuotedEscapedInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlQuotedEscapedInspectionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlQuotedEscapedInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlQuotedEscapedInspectionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlServiceTagIntentionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlServiceTagIntentionTest.java similarity index 92% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlServiceTagIntentionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlServiceTagIntentionTest.java index 882ec5534..0f10fb3f3 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlServiceTagIntentionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlServiceTagIntentionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/fixtures"; } public void testTagIntentionIsAvailable() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlUnquotedColonTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlUnquotedColonTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlUnquotedColonTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/YamlUnquotedColonTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/dic/YamlCreateServiceArgumentsCallbackTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/dic/YamlCreateServiceArgumentsCallbackTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/dic/YamlCreateServiceArgumentsCallbackTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/dic/YamlCreateServiceArgumentsCallbackTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/dic/YamlUpdateArgumentServicesCallbackTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/dic/YamlUpdateArgumentServicesCallbackTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/dic/YamlUpdateArgumentServicesCallbackTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/dic/YamlUpdateArgumentServicesCallbackTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/intentions/yaml/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/RouteControllerRelatedGotoCollectorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/RouteControllerRelatedGotoCollectorTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/RouteControllerRelatedGotoCollectorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/RouteControllerRelatedGotoCollectorTest.java index 3ad6ed453..4c557412e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/RouteControllerRelatedGotoCollectorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/RouteControllerRelatedGotoCollectorTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/fixtures"; } public void testThatControllerProvidesYamDefinitionNavigation() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/fixtures/routing.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/fixtures/routing.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/fixtures/routing.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/navigation/controller/fixtures/routing.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/HttpProfilerIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/HttpProfilerIndexTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/HttpProfilerIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/HttpProfilerIndexTest.java index 0dd706753..cab2dbee7 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/HttpProfilerIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/HttpProfilerIndexTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures"; } public void testGetUrlForRequest() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/ProfilerUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/ProfilerUtilTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/ProfilerUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/ProfilerUtilTest.java index d31e55f63..28f00510b 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/ProfilerUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/ProfilerUtilTest.java @@ -23,7 +23,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/dict/LocalProfilerRequestTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/dict/LocalProfilerRequestTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/dict/LocalProfilerRequestTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/dict/LocalProfilerRequestTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-index.html b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-index.html similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-index.html rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-index.html diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-request-dumper.html b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-request-dumper.html similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-request-dumper.html rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-request-dumper.html diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-request.html b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-request.html similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-request.html rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-request.html diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-twig.html b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-twig.html similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-twig.html rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/profiler/fixtures/profiler-twig.html diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/DocTagCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/DocTagCompletionContributorTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/DocTagCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/DocTagCompletionContributorTest.java index 899fa2ce9..df9b09865 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/DocTagCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/DocTagCompletionContributorTest.java @@ -20,7 +20,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures"; } public void testRouteDocTagCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java index deded4c52..deb98d16d 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java @@ -22,7 +22,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures"; } public void testGenerateUrlProvidesNavigation() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java index 57b7a8950..a6316ce5a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java @@ -39,7 +39,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteXmlReferenceContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteXmlReferenceContributorTest.java similarity index 92% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteXmlReferenceContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteXmlReferenceContributorTest.java index 94ea92136..d9e36763b 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteXmlReferenceContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteXmlReferenceContributorTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures"; } public void testThatRouteLineMarkerForControllerIsGiven() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RoutingDefinitionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RoutingDefinitionTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RoutingDefinitionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RoutingDefinitionTest.java index 511d09e6a..d6dfda71b 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RoutingDefinitionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RoutingDefinitionTest.java @@ -36,7 +36,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures"; } public void testYamlCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/TwigRoutingCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/TwigRoutingCompletionContributorTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/TwigRoutingCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/TwigRoutingCompletionContributorTest.java index d4ffa3f11..75e5ec7c8 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/TwigRoutingCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/TwigRoutingCompletionContributorTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures"; } public void testTwigPathCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/XmlLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/XmlLineMarkerProviderTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/XmlLineMarkerProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/XmlLineMarkerProviderTest.java index 977dea0f5..c0a903a6e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/XmlLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/XmlLineMarkerProviderTest.java @@ -28,7 +28,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures"; } public void testThatResourceProvidesLineMarkerLineMarker() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java index 12f3f0cba..4e29e55fe 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java @@ -32,7 +32,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures"; } public void testDoctrineFirstLineModelNavigation() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/BundleScopeLineMarkerProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/BundleScopeLineMarkerProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/BundleScopeLineMarkerProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/BundleScopeLineMarkerProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.routing.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.routing.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.routing.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.routing.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/GetRoutesOnControllerAction.services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/PhpRouteReferenceContributor.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/PhpRouteReferenceContributor.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/PhpRouteReferenceContributor.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/PhpRouteReferenceContributor.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteHelper.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteHelper.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteHelper.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteHelper.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteHelper.services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteHelper.services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteHelper.services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteHelper.services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteXmlReferenceContributor.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteXmlReferenceContributor.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteXmlReferenceContributor.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/RouteXmlReferenceContributor.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/XmlLineMarkerProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/XmlLineMarkerProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/XmlLineMarkerProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/XmlLineMarkerProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/YamlLineMarkerProvider.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/YamlLineMarkerProvider.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/YamlLineMarkerProvider.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/YamlLineMarkerProvider.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/appDevUrlGenerator-28.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/appDevUrlGenerator-28.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/appDevUrlGenerator-28.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/appDevUrlGenerator-28.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/appTestUrlGenerator.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/appTestUrlGenerator.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/appTestUrlGenerator.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/appTestUrlGenerator.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/classes_routing.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/classes_routing.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/classes_routing.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/classes_routing.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/routing.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/routing.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/routing.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/routing.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/routing.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/routing.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/routing.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/routing.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/ControllerMethodInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/ControllerMethodInspectionTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/ControllerMethodInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/ControllerMethodInspectionTest.java index 26b90fbf2..ac4e31774 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/ControllerMethodInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/ControllerMethodInspectionTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures"; } public void testYamlClassControllerMethodNotFoundProvidesWarning() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/DuplicateLocalRouteInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/DuplicateLocalRouteInspectionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/DuplicateLocalRouteInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/DuplicateLocalRouteInspectionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/PhpRouteMissingInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/PhpRouteMissingInspectionTest.java similarity index 92% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/PhpRouteMissingInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/PhpRouteMissingInspectionTest.java index 58210f93a..579051984 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/PhpRouteMissingInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/PhpRouteMissingInspectionTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures"; } public void testRouteDoesNotExistsInspection() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/RouteSettingDeprecatedInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/RouteSettingDeprecatedInspectionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/RouteSettingDeprecatedInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/RouteSettingDeprecatedInspectionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/TwigRouteMissingInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/TwigRouteMissingInspectionTest.java similarity index 93% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/TwigRouteMissingInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/TwigRouteMissingInspectionTest.java index 372e0cfce..4e2f968c7 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/TwigRouteMissingInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/TwigRouteMissingInspectionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures"; } public void testThatMissingRouteProvidesInspection() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/PhpRouteMissingInspection.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/PhpRouteMissingInspection.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/PhpRouteMissingInspection.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/PhpRouteMissingInspection.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/PhpRouteMissingInspection.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/PhpRouteMissingInspection.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/PhpRouteMissingInspection.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/PhpRouteMissingInspection.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/TwigRouteMissingInspection.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/TwigRouteMissingInspection.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/TwigRouteMissingInspection.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/TwigRouteMissingInspection.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/fixtures/services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/AnnotationExpressionGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/AnnotationExpressionGotoCompletionRegistrarTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/security/AnnotationExpressionGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/AnnotationExpressionGotoCompletionRegistrarTest.java index 9210e10f7..07a714fa6 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/AnnotationExpressionGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/AnnotationExpressionGotoCompletionRegistrarTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures"; } public void testSecurityAnnotationProvidesCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/VoterGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/VoterGotoCompletionRegistrarTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/security/VoterGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/VoterGotoCompletionRegistrarTest.java index f8a24dd10..0a9982364 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/VoterGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/VoterGotoCompletionRegistrarTest.java @@ -21,7 +21,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures"; } public void testTwigIsGrantedCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures/security.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures/security.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures/security.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/fixtures/security.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/VoterUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/VoterUtilTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/VoterUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/VoterUtilTest.java index 6df1a27e7..69da1d1bd 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/VoterUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/VoterUtilTest.java @@ -21,7 +21,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures/security.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures/security.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures/security.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/security/utils/fixtures/security.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ContainerCollectionResolverTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ContainerCollectionResolverTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ContainerCollectionResolverTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ContainerCollectionResolverTest.java index 776258b02..b4ce2212d 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ContainerCollectionResolverTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ContainerCollectionResolverTest.java @@ -59,7 +59,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures"; } public void testCaseInsensitiveService() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ServiceIndexUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ServiceIndexUtilTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ServiceIndexUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ServiceIndexUtilTest.java index e64e61c3f..447cf6560 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ServiceIndexUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ServiceIndexUtilTest.java @@ -35,7 +35,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures"; } public void testFindServiceDefinitionsForStringInsideYaml() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/ContainerBuilder.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/ContainerBuilder.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/ContainerBuilder.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/ContainerBuilder.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/decorator.services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/decorator.services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/decorator.services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/decorator.services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/kernel_parameter.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/kernel_parameter.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/kernel_parameter.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/kernel_parameter.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerBuilderStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerBuilderStubIndexTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerBuilderStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerBuilderStubIndexTest.java index 422fb831a..706491605 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerBuilderStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerBuilderStubIndexTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } public void testThatMethodsAreFound() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerIdUsagesStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerIdUsagesStubIndexTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerIdUsagesStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerIdUsagesStubIndexTest.java index 96250dbac..9efc4b835 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerIdUsagesStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerIdUsagesStubIndexTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } public void testThatXmlArgumentUsageExtracted() { @@ -34,7 +34,7 @@ public void testThatXmlArgumentUsageOnSetterArgumentsAreExtracted() { assertIndexContainsKeyWithValue(ContainerIdUsagesStubIndex.KEY, "xml_setter_foobar_1", value -> value == 2); } - + public void testThatYamlArgumentUsageExtracted() { assertIndexContains(ContainerIdUsagesStubIndex.KEY, "usage_yml_foobar", "usage_yml_foobar2", "usage_yml_foobar3"); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerParameterStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerParameterStubIndexTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerParameterStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerParameterStubIndexTest.java index a1b81addb..24a026acf 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerParameterStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerParameterStubIndexTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } public void testThatParameterOfYamlFileIsInIndex() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/DoctrineMetadataFileStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/DoctrineMetadataFileStubIndexTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/DoctrineMetadataFileStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/DoctrineMetadataFileStubIndexTest.java index 92faf7c39..967a30501 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/DoctrineMetadataFileStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/DoctrineMetadataFileStubIndexTest.java @@ -42,7 +42,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/EventAnnotationStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/EventAnnotationStubIndexTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/EventAnnotationStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/EventAnnotationStubIndexTest.java index 5b9bf1d7d..429d42e6e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/EventAnnotationStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/EventAnnotationStubIndexTest.java @@ -23,7 +23,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } public void testInstanceExtractionOfDocComment() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/FileResourcesIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/FileResourcesIndexTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/FileResourcesIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/FileResourcesIndexTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/PhpTwigTemplateUsageStubIndexTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java index 1ee64e63d..114c749c9 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java @@ -24,9 +24,9 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } - + /** * @see fr.adrienbrault.idea.symfony2plugin.stubs.indexes.RoutesStubIndex#getIndexer() */ diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesDefinitionStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesDefinitionStubIndexTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesDefinitionStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesDefinitionStubIndexTest.java index d9d925032..3186d6d34 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesDefinitionStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesDefinitionStubIndexTest.java @@ -24,7 +24,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } public void testThatServiceIdOfYamlFileIsIndexed() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesTagStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesTagStubIndexTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesTagStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesTagStubIndexTest.java index 80ee714f7..88b262a8b 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesTagStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ServicesTagStubIndexTest.java @@ -22,7 +22,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } public void testTaggedServiceInIndex() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java index ef7ebef82..c012ee3e7 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java @@ -34,7 +34,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } public void testThatDomainFromFileIsExtracted() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigBlockIndexExtensionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigBlockIndexExtensionTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigBlockIndexExtensionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigBlockIndexExtensionTest.java index 79d54c2a8..c5eced81c 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigBlockIndexExtensionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigBlockIndexExtensionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures"; } public void testThatValuesAreInIndex() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigExtendsStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigExtendsStubIndexTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigExtendsStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigExtendsStubIndexTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigIncludeStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigIncludeStubIndexTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigIncludeStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigIncludeStubIndexTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigMacroFunctionStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigMacroFunctionStubIndexTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigMacroFunctionStubIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigMacroFunctionStubIndexTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/ContainerBuilder.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/ContainerBuilder.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/ContainerBuilder.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/ContainerBuilder.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/EventAnnotationStubIndex.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/EventAnnotationStubIndex.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/EventAnnotationStubIndex.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/EventAnnotationStubIndex.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/apple.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/apple.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/apple.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/apple.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/blocks.html.twig b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/blocks.html.twig similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/blocks.html.twig rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/blocks.html.twig diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/car.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/car.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/car.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/car.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/doctrine.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/doctrine.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/doctrine.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/doctrine.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/foo.fr.xliff b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/foo.fr.xliff similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/foo.fr.xliff rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/foo.fr.xliff diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/fr.xlf b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/fr.xlf similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/fr.xlf rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/fr.xlf diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages.fr.xlf b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages.fr.xlf similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages.fr.xlf rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages.fr.xlf diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages_two.fr.xlf b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages_two.fr.xlf similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages_two.fr.xlf rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages_two.fr.xlf diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.yaml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.yaml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.yaml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.yaml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/tagged.services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/util/EventDispatcherUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/util/EventDispatcherUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/util/EventDispatcherUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/util/EventDispatcherUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/FilterGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/FilterGotoCompletionRegistrarTest.java similarity index 91% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/FilterGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/FilterGotoCompletionRegistrarTest.java index a56ff5c5e..0807525fa 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/FilterGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/FilterGotoCompletionRegistrarTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures"; } public void testCompletionForTwigFilterTagIdentifier() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateGlobalStringGoToDeclarationHandlerTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateGlobalStringGoToDeclarationHandlerTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateGlobalStringGoToDeclarationHandlerTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateGlobalStringGoToDeclarationHandlerTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateMissingInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateMissingInspectionTest.java similarity index 90% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateMissingInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateMissingInspectionTest.java index 5e82b5429..c15540820 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateMissingInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateMissingInspectionTest.java @@ -15,7 +15,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures"; } public void testThatInspectionIsAvailable() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/RenderParameterGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/RenderParameterGotoCompletionRegistrarTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/RenderParameterGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/RenderParameterGotoCompletionRegistrarTest.java index d58e4b38f..9d5f39f3f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/RenderParameterGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/RenderParameterGotoCompletionRegistrarTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures"; } public void testTemplateNameExtractionForFunction() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TranslationTagGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TranslationTagGotoCompletionRegistrarTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TranslationTagGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TranslationTagGotoCompletionRegistrarTest.java index 9a78addbc..bcb9629e8 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TranslationTagGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TranslationTagGotoCompletionRegistrarTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures"; } public void testThatTransTagProvidesCompletionForTagValue() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigFilterCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigFilterCompletionContributorTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigFilterCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigFilterCompletionContributorTest.java index d471e2927..f8055cf25 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigFilterCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigFilterCompletionContributorTest.java @@ -23,7 +23,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures"; } public void testTwigExtensionFilterCompletion() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigLineMarkerProviderTest.java similarity index 89% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigLineMarkerProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigLineMarkerProviderTest.java index 1a20430cc..4958f7346 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigLineMarkerProviderTest.java @@ -17,7 +17,7 @@ public class TwigLineMarkerProviderTest extends SymfonyLightCodeInsightFixtureTestCase { public void testThatExtendsProvidesBlockLineMarker() { if(System.getenv("PHPSTORM_ENV") != null) return; - createWorkaroundFile("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); + myFixture.addFileToProject("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); PsiFile psiFile = myFixture.configureByText(TwigFileType.INSTANCE, "" + "{% extends 'block.html.twig' %}\n" + @@ -29,7 +29,7 @@ public void testThatExtendsProvidesBlockLineMarker() { public void testThatBlockInsideEmbedMustProvideBlockLineMarker() { if(System.getenv("PHPSTORM_ENV") != null) return; - createWorkaroundFile("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); + myFixture.addFileToProject("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); PsiFile psiFile = myFixture.configureByText(TwigFileType.INSTANCE, "" + "{% embed 'block.html.twig' %}\n" + @@ -42,7 +42,7 @@ public void testThatBlockInsideEmbedMustProvideBlockLineMarker() { public void testThatBlockInsideEmbedMustNotProvideBlockLineMarkerForFileScope() { if(System.getenv("PHPSTORM_ENV") != null) return; - createWorkaroundFile("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); + myFixture.addFileToProject("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); PsiFile psiFile = myFixture.configureByText(TwigFileType.INSTANCE, "" + "{% extends 'block.html.twig' %}\n" + diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigPatternTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigPatternTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigPatternTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigPatternTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateCompletionContributorTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateCompletionContributorTest.java index b1e2d5242..d6d1aa173 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateCompletionContributorTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures"; } /** @@ -34,7 +34,7 @@ public String getTestDataPath() { public void testBlockCompletion() { if(System.getenv("PHPSTORM_ENV") != null) return; - createWorkaroundFile("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); + myFixture.addFileToProject("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); assertCompletionContains(TwigFileType.INSTANCE, "{% extends '::block.html.twig' %}{% block %}", "foo"); assertCompletionContains(TwigFileType.INSTANCE, "{% extends '::block.html.twig' %}{% block \"\" %}", "foo"); @@ -52,7 +52,7 @@ public void testBlockCompletion() { public void testBlockCompletionForEmbed() { if(System.getenv("PHPSTORM_ENV") != null) return; - createWorkaroundFile("app/Resources/views/embed.html.twig", "{% block foo_embed %}{% endblock %}"); + myFixture.addFileToProject("app/Resources/views/embed.html.twig", "{% block foo_embed %}{% endblock %}"); assertCompletionContains(TwigFileType.INSTANCE, "" + "{% embed '::embed.html.twig' %}\n" + diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateGoToDeclarationHandlerTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateGoToDeclarationHandlerTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateGoToDeclarationHandlerTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateGoToDeclarationHandlerTest.java index 48c296a0c..cc300baa0 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateGoToDeclarationHandlerTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTemplateGoToDeclarationHandlerTest.java @@ -31,7 +31,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures"; } /** @@ -40,7 +40,7 @@ public String getTestDataPath() { public void testBlockNavigation() { if(System.getenv("PHPSTORM_ENV") != null) return; - createWorkaroundFile("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); + myFixture.addFileToProject("app/Resources/views/block.html.twig", "{% block foo %}{% endblock %}"); assertNavigationMatch( TwigFileType.INSTANCE, @@ -72,7 +72,7 @@ public void testBlockNavigation() { public void testBlockNavigationInEmbed() { if(System.getenv("PHPSTORM_ENV") != null) return; - createWorkaroundFile("app/Resources/views/embed.html.twig", "{% block foo_embed %}{% endblock %}"); + myFixture.addFileToProject("app/Resources/views/embed.html.twig", "{% block foo_embed %}{% endblock %}"); assertNavigationMatch( TwigFileType.INSTANCE, diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTranslationGeneratorActionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTranslationGeneratorActionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTranslationGeneratorActionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigTranslationGeneratorActionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigAssetsCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigAssetsCompletionContributorTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigAssetsCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigAssetsCompletionContributorTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigNamedAssetsServiceParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigNamedAssetsServiceParserTest.java similarity index 87% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigNamedAssetsServiceParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigNamedAssetsServiceParserTest.java index 097f83def..4ca93bdcf 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigNamedAssetsServiceParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/TwigNamedAssetsServiceParserTest.java @@ -15,7 +15,7 @@ public class TwigNamedAssetsServiceParserTest extends UsefulTestCase { public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/appDevDebugProjectContainer.xml"); TwigNamedAssetsServiceParser parser = new TwigNamedAssetsServiceParser(); parser.parser(new FileInputStream(testFile)); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/assets/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/TwigHtmlCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/TwigHtmlCompletionContributorTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/TwigHtmlCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/TwigHtmlCompletionContributorTest.java index e14bdefad..d4ddc1d4b 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/TwigHtmlCompletionContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/TwigHtmlCompletionContributorTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures"; } public void testThatRouteCompletionInsideHtmlMustProvidePrintPathBlock() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/messages.de.xlf b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/messages.de.xlf similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/messages.de.xlf rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/messages.de.xlf diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/routing.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/routing.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/routing.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/routing.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/symfony.de.xlf b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/symfony.de.xlf similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/symfony.de.xlf rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/completion/fixtures/symfony.de.xlf diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/FilterGotoCompletionRegistrarTest.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/FilterGotoCompletionRegistrarTest.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/FilterGotoCompletionRegistrarTest.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/FilterGotoCompletionRegistrarTest.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/RenderParameterGotoCompletionRegistrar.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/RenderParameterGotoCompletionRegistrar.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/RenderParameterGotoCompletionRegistrar.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/RenderParameterGotoCompletionRegistrar.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigFilterExtension.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigFilterExtension.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigFilterExtension.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigFilterExtension.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateCompletionContributorTest.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateCompletionContributorTest.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateCompletionContributorTest.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateCompletionContributorTest.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateGoToLocalDeclarationHandler.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateGoToLocalDeclarationHandler.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateGoToLocalDeclarationHandler.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateGoToLocalDeclarationHandler.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateMissingInspection.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateMissingInspection.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateMissingInspection.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/TwigTemplateMissingInspection.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/app.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/app.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/app.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/app.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/routing.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/routing.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/routing.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/fixtures/routing.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigAssetMissingInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigAssetMissingInspectionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigAssetMissingInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigAssetMissingInspectionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigAssetsTagMissingInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigAssetsTagMissingInspectionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigAssetsTagMissingInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigAssetsTagMissingInspectionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigTemplateMissingInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigTemplateMissingInspectionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigTemplateMissingInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigTemplateMissingInspectionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariableDeprecatedInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariableDeprecatedInspectionTest.java similarity index 88% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariableDeprecatedInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariableDeprecatedInspectionTest.java index e5e5f0ed3..10414eb43 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariableDeprecatedInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariableDeprecatedInspectionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/fixtures"; } public void testThatDeprecatedMethodIsHighlighted() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariablePathInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariablePathInspectionTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariablePathInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariablePathInspectionTest.java index 0f78614d9..ba3350273 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariablePathInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariablePathInspectionTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/fixtures"; } public void testThatUnknownBeforeLeafTypeShouldNotProvideHighlight() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/BundleTwigNamespaceExtensionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/BundleTwigNamespaceExtensionTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/BundleTwigNamespaceExtensionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/BundleTwigNamespaceExtensionTest.java index 54deeabf0..dc6365f8b 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/BundleTwigNamespaceExtensionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/BundleTwigNamespaceExtensionTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures"; } public void testThatBundleNamespacesAreAdded() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/GlobalAppTwigNamespaceExtensionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/GlobalAppTwigNamespaceExtensionTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/GlobalAppTwigNamespaceExtensionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/GlobalAppTwigNamespaceExtensionTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/JsonFileIndexTwigNamespacesTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/JsonFileIndexTwigNamespacesTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/JsonFileIndexTwigNamespacesTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/JsonFileIndexTwigNamespacesTest.java index d0898bce6..8ee7c8ec0 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/JsonFileIndexTwigNamespacesTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/JsonFileIndexTwigNamespacesTest.java @@ -20,7 +20,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures"; } public void testThatNamespaceAndPathIsAddedToNamespaceList() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathServiceParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathServiceParserTest.java similarity index 89% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathServiceParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathServiceParserTest.java index ab39b1790..4048f04b5 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathServiceParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathServiceParserTest.java @@ -16,7 +16,7 @@ public class TwigPathServiceParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/appDevDebugProjectContainer.xml"); TwigPathServiceParser parser = new TwigPathServiceParser(); parser.parser(new FileInputStream(testFile)); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathTempTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathTempTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathTempTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathTempTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/ide-twig.json b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/ide-twig.json similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/ide-twig.json rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/ide-twig.json diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/test.html.twig b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/test.html.twig similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/test.html.twig rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/fixtures/test.html.twig diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/TwigGlobalsServiceParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/TwigGlobalsServiceParserTest.java similarity index 85% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/TwigGlobalsServiceParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/TwigGlobalsServiceParserTest.java index 191fcfe20..27a831f1e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/TwigGlobalsServiceParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/TwigGlobalsServiceParserTest.java @@ -13,7 +13,7 @@ public class TwigGlobalsServiceParserTest extends Assert { @Test public void testParse() throws Exception { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/appDevDebugProjectContainer.xml"); TwigGlobalsServiceParser parser = new TwigGlobalsServiceParser(); parser.parser(new FileInputStream(testFile)); @@ -24,4 +24,4 @@ public void testParse() throws Exception { } -} \ No newline at end of file +} diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationCompletionContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationCompletionContributorTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationCompletionContributorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationCompletionContributorTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationFixturesTestCase.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationFixturesTestCase.java similarity index 88% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationFixturesTestCase.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationFixturesTestCase.java index ac71852e9..a8810e950 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationFixturesTestCase.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationFixturesTestCase.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures"; } } diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationNavigationTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationNavigationTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationNavigationTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationNavigationTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/foo.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/foo.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/foo.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/foo.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/interchange.en.xlf b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/interchange.en.xlf similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/interchange.en.xlf rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/interchange.en.xlf diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/messages.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/messages.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/messages.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/fixtures/messages.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/twig/TwigAppResourcesReferences.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/twig/TwigAppResourcesReferencesTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/twig/TwigAppResourcesReferences.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/twig/TwigAppResourcesReferencesTest.java index 2f292ba24..9b0db02a2 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/twig/TwigAppResourcesReferences.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/twig/TwigAppResourcesReferencesTest.java @@ -3,7 +3,7 @@ import com.jetbrains.twig.TwigFileType; import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase; -public class TwigAppResourcesReferences extends SymfonyLightCodeInsightFixtureTestCase { +public class TwigAppResourcesReferencesTest extends SymfonyLightCodeInsightFixtureTestCase { public void setUp() throws Exception { super.setUp(); @@ -16,9 +16,11 @@ public void setUp() throws Exception { } /** - * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigTemplateGoToLocalDeclarationHandler + * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigTemplateGoToDeclarationHandler */ public void testTwigTemplatesInsideTwigFileCompletion() { + if(System.getenv("PHPSTORM_ENV") != null) return; + assertCompletionContains(TwigFileType.INSTANCE, "{% extends '' %}", "::base.html.twig", ":Default:layout.html.twig"); assertCompletionContains(TwigFileType.INSTANCE, "{% extends \"\" %}", "::base.html.twig", ":Default:layout.html.twig"); @@ -61,6 +63,8 @@ public void testTwigTemplatesInsideTwigFileCompletion() { * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigTemplateCompletionContributor */ public void testTwigTemplatesInsideTwigFileNavigation() { + if(System.getenv("PHPSTORM_ENV") != null) return; + assertNavigationContainsFile(TwigFileType.INSTANCE, "{% extends '::base.html.twig' %}", "app/Resources/views/base.html.twig"); assertNavigationContainsFile(TwigFileType.INSTANCE, "{% extends \"::base.html.twig\" %}", "app/Resources/views/base.html.twig"); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/PhpMethodVariableResolveUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/PhpMethodVariableResolveUtilTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/PhpMethodVariableResolveUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/PhpMethodVariableResolveUtilTest.java index ea0bd957b..2564b545e 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/PhpMethodVariableResolveUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/PhpMethodVariableResolveUtilTest.java @@ -21,7 +21,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java index c7e722754..59626256f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigExtensionParserTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures"; } public void testExtensionAreCollected() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigTypeResolveUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigTypeResolveUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigTypeResolveUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigTypeResolveUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTempTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTempTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTempTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTempTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java index 2143a8a24..587afcb0f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java @@ -43,7 +43,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/GetTwigFileMethodUsageOnIndex.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/GetTwigFileMethodUsageOnIndex.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/GetTwigFileMethodUsageOnIndex.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/GetTwigFileMethodUsageOnIndex.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/PhpMethodVariableResolveUtilTest.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/PhpMethodVariableResolveUtilTest.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/PhpMethodVariableResolveUtilTest.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/PhpMethodVariableResolveUtilTest.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/TwigTypeResolveUtil.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/TwigTypeResolveUtil.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/TwigTypeResolveUtil.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/TwigTypeResolveUtil.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/bundle.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/bundle.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/bundle.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/bundle.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/controller_method.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/controller_method.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/controller_method.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/controller_method.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/dummy.html.twig b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/dummy.html.twig similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/dummy.html.twig rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/dummy.html.twig diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/ide-twig.json b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/ide-twig.json similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/ide-twig.json rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/ide-twig.json diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/twig_extensions.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/twig_extensions.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/twig_extensions.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/twig_extensions.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/variables.html.twig b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/variables.html.twig similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/variables.html.twig rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures/variables.html.twig diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/FileDocVariableCollectorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/FileDocVariableCollectorTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/FileDocVariableCollectorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/FileDocVariableCollectorTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/MarcoScopeVariableCollectorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/MarcoScopeVariableCollectorTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/MarcoScopeVariableCollectorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/MarcoScopeVariableCollectorTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationDomainInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationDomainInspectionTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationDomainInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationDomainInspectionTest.java index d3f45fe2f..f9a2acb75 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationDomainInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationDomainInspectionTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures"; } public void testThatPhpTranslationDomainInspectionsAreProvided() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java index ef6511d15..2b12000de 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures"; } public void testThatPhpTransInspectionsAreProvided() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/TranslationPlaceholderGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/TranslationPlaceholderGotoCompletionRegistrarTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/TranslationPlaceholderGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/TranslationPlaceholderGotoCompletionRegistrarTest.java index 6416aa7fb..b3bf613e8 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/TranslationPlaceholderGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/TranslationPlaceholderGotoCompletionRegistrarTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures"; } public void testCompletionForTwigTransPlaceholder() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/ValidatorTranslationGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/ValidatorTranslationGotoCompletionRegistrarTest.java similarity index 96% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/ValidatorTranslationGotoCompletionRegistrarTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/ValidatorTranslationGotoCompletionRegistrarTest.java index 1da42fd6d..a66e1362a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/ValidatorTranslationGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/ValidatorTranslationGotoCompletionRegistrarTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } protected String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures"; } public void testThatMessageValueForConstraintProvideValidatorTranslations() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/TranslationUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/TranslationUtilTest.java similarity index 98% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/TranslationUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/TranslationUtilTest.java index 4e6e4eeda..d4042ddd4 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/TranslationUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/TranslationUtilTest.java @@ -34,7 +34,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures"; } public void testGetDomainFilePsiElements() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/apple.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/apple.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/apple.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/apple.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/car.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/car.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/car.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/car.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/symfony.de.xlf b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/symfony.de.xlf similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/symfony.de.xlf rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/symfony.de.xlf diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/symfony.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/symfony.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/symfony.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/dict/fixtures/symfony.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/PhpTranslationInspection.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/PhpTranslationInspection.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/PhpTranslationInspection.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/PhpTranslationInspection.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/TranslationPlaceholderGotoCompletionRegistrar.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/TranslationPlaceholderGotoCompletionRegistrar.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/TranslationPlaceholderGotoCompletionRegistrar.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/TranslationPlaceholderGotoCompletionRegistrar.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/messages.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/messages.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/messages.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/messages.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/symfony.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/symfony.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/symfony.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/symfony.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/validators.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/validators.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/validators.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/fixtures/validators.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationDomainInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationDomainInspectionTest.java similarity index 90% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationDomainInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationDomainInspectionTest.java index 14b1cc66e..0eb286c44 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationDomainInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationDomainInspectionTest.java @@ -15,7 +15,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/fixtures"; } public void testUnknownDomainIsInspected() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationKeyInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationKeyInspectionTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationKeyInspectionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationKeyInspectionTest.java index 7a34bd6f2..8cf7d4215 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationKeyInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/TwigTranslationKeyInspectionTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/fixtures"; } public void testUnknownDomainIsInspected() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/fixtures/symfony.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/fixtures/symfony.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/fixtures/symfony.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/inspection/fixtures/symfony.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/TwigTranslationKeyIntentionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/TwigTranslationKeyIntentionTest.java similarity index 90% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/TwigTranslationKeyIntentionTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/TwigTranslationKeyIntentionTest.java index b5f279aef..7b911fd8d 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/TwigTranslationKeyIntentionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/TwigTranslationKeyIntentionTest.java @@ -17,7 +17,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/fixtures"; } public void testThatKeyAlreadyExistsAndProvidesIntentionForOtherDomains() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/fixtures/symfony.de.yml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/fixtures/symfony.de.yml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/fixtures/symfony.de.yml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/intention/fixtures/symfony.de.yml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/DomainMappingsTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/DomainMappingsTest.java similarity index 87% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/DomainMappingsTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/DomainMappingsTest.java index afd71b856..08000c9d6 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/DomainMappingsTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/DomainMappingsTest.java @@ -15,7 +15,7 @@ public class DomainMappingsTest extends Assert { @Test public void testParser() throws FileNotFoundException { - File testFile = new File(this.getClass().getResource("appDevDebugProjectContainer.xml").getFile()); + File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/appDevDebugProjectContainer.xml"); DomainMappings bla = new DomainMappings(); bla.parser(new FileInputStream(testFile)); diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/appDevDebugProjectContainer.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/appDevDebugProjectContainer.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/appDevDebugProjectContainer.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/util/TranslationInsertUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/util/TranslationInsertUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/translation/util/TranslationInsertUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/util/TranslationInsertUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/TemplateAnnotationAnnotatorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/TemplateAnnotationAnnotatorTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/TemplateAnnotationAnnotatorTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/TemplateAnnotationAnnotatorTest.java index a8e6ae8a6..a7d54d8cb 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/TemplateAnnotationAnnotatorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/TemplateAnnotationAnnotatorTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures/controller_method.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures/controller_method.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures/controller_method.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/annotation/fixtures/controller_method.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/utils/TwigBlockUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/utils/TwigBlockUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/twig/utils/TwigBlockUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/twig/utils/TwigBlockUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/EventDispatcherTypeProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/EventDispatcherTypeProviderTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/EventDispatcherTypeProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/EventDispatcherTypeProviderTest.java index 236c5f44e..3575dcce4 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/EventDispatcherTypeProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/EventDispatcherTypeProviderTest.java @@ -20,7 +20,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/EventSubscriberUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/EventSubscriberUtilTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/EventSubscriberUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/EventSubscriberUtilTest.java index 409d2618b..9ebd94f5a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/EventSubscriberUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/EventSubscriberUtilTest.java @@ -16,7 +16,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java index 954578900..45ebdaa01 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java @@ -26,7 +26,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpTypeProviderUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpTypeProviderUtilTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpTypeProviderUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpTypeProviderUtilTest.java index 50f9bbab0..2612a6b48 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpTypeProviderUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpTypeProviderUtilTest.java @@ -25,7 +25,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/StringUtilsTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/StringUtilsTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/StringUtilsTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/StringUtilsTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyCommandUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyCommandUtilTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyCommandUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyCommandUtilTest.java index 441696c91..75894aef5 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyCommandUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyCommandUtilTest.java @@ -19,7 +19,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyUtilTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyUtilTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/TagNameCompletionProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/TagNameCompletionProviderTest.java similarity index 94% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/TagNameCompletionProviderTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/TagNameCompletionProviderTest.java index ae793d063..d679e5b8f 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/TagNameCompletionProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/TagNameCompletionProviderTest.java @@ -21,7 +21,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures"; } public void testThatTagInServiceWithValidIdIsCompleted() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/completion/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/ControllerIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/ControllerIndexTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/ControllerIndexTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/ControllerIndexTest.java index 35b5c9cfd..dcf42d24a 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/ControllerIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/ControllerIndexTest.java @@ -18,7 +18,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/fixtures"; } public void testThatControllerActionsForBundlesAreGenerated() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/controller/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/ServiceUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/ServiceUtilTest.java similarity index 97% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/ServiceUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/ServiceUtilTest.java index 7e04ee728..891623518 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/ServiceUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/ServiceUtilTest.java @@ -27,7 +27,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/kernel_parameter.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/kernel_parameter.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/kernel_parameter.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/kernel_parameter.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/services.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/services.xml similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/services.xml rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/fixtures/services.xml diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/EventDispatcher.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/EventDispatcher.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/EventDispatcher.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/EventDispatcher.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/EventSubscriber.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/EventSubscriber.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/EventSubscriber.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/EventSubscriber.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/InstanceOf.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/InstanceOf.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/InstanceOf.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/InstanceOf.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/PhpElementsUtil.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/PhpElementsUtil.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/PhpElementsUtil.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/PhpElementsUtil.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/PhpTypeProviderUtil.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/PhpTypeProviderUtil.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/PhpTypeProviderUtil.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/PhpTypeProviderUtil.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/SymfonyCommandUtilTest.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/SymfonyCommandUtilTest.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/SymfonyCommandUtilTest.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/fixtures/SymfonyCommandUtilTest.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/FileResourceUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/FileResourceUtilTest.java similarity index 95% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/FileResourceUtilTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/FileResourceUtilTest.java index 176eda813..063f1f958 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/FileResourceUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/FileResourceUtilTest.java @@ -27,7 +27,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/fixtures"; } public void testGetFileResourceRefers() { diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/resource/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java similarity index 99% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java index f29fc23b9..554344e67 100644 --- a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java @@ -35,7 +35,7 @@ public void setUp() throws Exception { } public String getTestDataPath() { - return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath(); + return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/fixtures"; } /** diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperTest.java diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/fixtures/classes.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/fixtures/classes.php similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/fixtures/classes.php rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/fixtures/classes.php diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/visitor/YamlServiceTagTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/visitor/YamlServiceTagTest.java similarity index 100% rename from tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/visitor/YamlServiceTagTest.java rename to src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/visitor/YamlServiceTagTest.java diff --git a/symfony2-plugin.iml b/symfony2-plugin.iml deleted file mode 100644 index db2bb77b1..000000000 --- a/symfony2-plugin.iml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/travis.sh b/travis.sh deleted file mode 100644 index a3eb751f7..000000000 --- a/travis.sh +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/bash - -ideaVersion="2017.1" -if [ "$PHPSTORM_ENV" == "2017.3.2" ]; then - ideaVersion="2017.3.3" -elif [ "$PHPSTORM_ENV" == "eap" ]; then - ideaVersion="163.5644.15" -fi - -travisCache=".cache" - -if [ ! -d ${travisCache} ]; then - echo "Create cache" ${travisCache} - mkdir ${travisCache} -fi - -function download { - - url=$1 - basename=${url##*[/|\\]} - cachefile=${travisCache}/${basename} - - if [ ! -f ${cachefile} ]; then - wget --no-check-certificate $url -P ${travisCache}; - else - echo "Cached file `ls -sh $cachefile` - `date -r $cachefile +'%Y-%m-%d %H:%M:%S'`" - fi - - if [ ! -f ${cachefile} ]; then - echo "Failed to download: $url" - exit 1 - fi -} - -# Unzip IDEA - -if [ -d ./idea ]; then - rm -rf idea - mkdir idea - echo "created idea dir" -fi - -# Download main idea folder -download "http://download.jetbrains.com/idea/ideaIU-${ideaVersion}.tar.gz" -tar zxf ${travisCache}/ideaIU-${ideaVersion}.tar.gz -C . - -# Move the versioned IDEA folder to a known location -ideaPath=$(find . -name 'idea-IU*' | head -n 1) -mv ${ideaPath} ./idea - -if [ -d ./plugins ]; then - rm -rf plugins - mkdir plugins - echo "created plugin dir" -fi - -if [ "$PHPSTORM_ENV" == "2017.2" ]; then - - #php - download "http://phpstorm.espend.de/files/proxy/phpstorm-2017.2-php.zip" - unzip -qo $travisCache/phpstorm-2017.2-php.zip -d ./plugins - - #twig - download "http://phpstorm.espend.de/files/proxy/phpstorm-2017.2-twig.zip" - unzip -qo $travisCache/phpstorm-2017.2-twig.zip -d ./plugins - - -elif [ "$PHPSTORM_ENV" == "2017.2.4" ]; then - - #php - download "http://phpstorm.espend.de/files/proxy/phpstorm-2017.2.4-php.zip" - unzip -qo $travisCache/phpstorm-2017.2.4-php.zip -d ./plugins - - #twig - download "http://phpstorm.espend.de/files/proxy/phpstorm-2017.2.4-twig.zip" - unzip -qo $travisCache/phpstorm-2017.2.4-twig.zip -d ./plugins - -elif [ "$PHPSTORM_ENV" == "2017.3.2" ]; then - - #php - download "http://phpstorm.espend.de/files/proxy/phpstorm-2017.3.2-php.zip" - unzip -qo $travisCache/phpstorm-2017.3.2-php.zip -d ./plugins - - #twig - download "http://phpstorm.espend.de/files/proxy/phpstorm-2017.3.2-twig.zip" - unzip -qo $travisCache/phpstorm-2017.3.2-twig.zip -d ./plugins - -elif [ "$PHPSTORM_ENV" == "eap" ]; then - - #php - download "https://plugins.jetbrains.com/files/6610/28510/php-163.4830.18.zip" - unzip -qo $travisCache/php-163.4830.18.zip -d ./plugins - - #twig - download "https://plugins.jetbrains.com/files/7303/28516/twig-163.4830.18.zip" - unzip -qo $travisCache/twig-163.4830.18.zip -d ./plugins - - # TODO: extract latest builds for plugins from eap site they are not public - # https://confluence.jetbrains.com/display/PhpStorm/PhpStorm+Early+Access+Program - # echo "No configuration for PhpStorm: $PHPSTORM_ENV" - # exit 1 - -else - echo "Unknown PHPSTORM_ENV value: $PHPSTORM_ENV" - exit 1 -fi - -rm -f $travisCache/php-annotation.jar -download "http://phpstorm.espend.de/files/proxy/plugins/php-annotation-5.2.jar" -cp $travisCache/php-annotation-5.2.jar ./plugins/php-annotation.jar - -rm -f $travisCache/php-toolbox.jar -download "http://phpstorm.espend.de/files/proxy/plugins/php-toolbox.jar" -cp $travisCache/php-toolbox.jar ./plugins - -# Run the tests -if [ "$1" = "-d" ]; then - ant -d -f build-test.xml -DIDEA_HOME=./idea -else - ant -f build-test.xml -DIDEA_HOME=./idea -fi - -# Was our build successful? -stat=$? - -if [ "${TRAVIS}" != true ]; then - ant -f build-test.xml -q clean - - if [ "$1" = "-r" ]; then - rm -rf idea - rm -rf plugins - fi -fi - -# Return the build status -exit ${stat} \ No newline at end of file