Merge pull request #1350 from Haehnchen/feature/phpstorm-2019.2

PhpStorm 2019.2 travis environment

Author: Haehnchen

.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 language: java
 jdk:
   - oraclejdk8
+  - oraclejdk11
 
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -23,7 +24,8 @@ before_install:
 - "export ORG_GRADLE_PROJECT_annotationPluginVersion=${ANNOTATION_PLUGIN_VERSION}"
 
 env:
-  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2019.1.2" PHP_PLUGIN_VERSION="191.7141.52" TWIG_PLUGIN_VERSION="191.6183.95" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3" DQL_PLUGIN_VERSION="191.5849.16"
+  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2019.1.3" PHP_PLUGIN_VERSION="191.7141.52" TWIG_PLUGIN_VERSION="191.6183.95" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3" DQL_PLUGIN_VERSION="191.5849.16"
+  - PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2019.2" PHP_PLUGIN_VERSION="192.5728.108" TWIG_PLUGIN_VERSION="192.5728.26" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3" DQL_PLUGIN_VERSION="192.5728.12"
 
 script:
 - "./gradlew check verifyPlugin buildPlugin"

build.gradle

@@ -30,32 +30,64 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 apply plugin: 'org.jetbrains.intellij'
-intellij {
-    version ideaVersion
-    updateSinceUntilBuild false
-    plugins = [
-            "com.jetbrains.php:${phpPluginVersion}",
-            "com.jetbrains.twig:${twigPluginVersion}",
-            "com.jetbrains.php.dql:${dqlPluginVersion}",
-            "de.espend.idea.php.annotation:${annotationPluginVersion}",
-            "de.espend.idea.php.toolbox:${toolboxPluginVersion}",
-            'coverage',
-            'webDeployment',
-            'yaml',
-            'CSS',
-            'java-i18n',
-            'properties',
-            'xpath'
-    ]
-    pluginName 'Symfony Support'
-
-    // Can't instantiate configurable for PHP Toolbox 
-    // at de.espend.idea.php.toolbox.ui.application.ToolboxApplicationForm.<init>(ToolboxApplicationForm.java:26)
-    tasks {
-        "buildSearchableOptions" {
-            enabled = false
+
+if (ideaVersion == "IU-2019.1.3") {
+    intellij {
+        version ideaVersion
+        updateSinceUntilBuild false
+        plugins = [
+                "com.jetbrains.php:${phpPluginVersion}",
+                "com.jetbrains.twig:${twigPluginVersion}",
+                "com.jetbrains.php.dql:${dqlPluginVersion}",
+                "de.espend.idea.php.annotation:${annotationPluginVersion}",
+                "de.espend.idea.php.toolbox:${toolboxPluginVersion}",
+                'coverage',
+                'webDeployment',
+                'yaml',
+                'CSS',
+                'java-i18n',
+                'properties',
+                'xpath'
+        ]
+        pluginName 'Symfony Support'
+
+        // Can't instantiate configurable for PHP Toolbox
+        // at de.espend.idea.php.toolbox.ui.application.ToolboxApplicationForm.<init>(ToolboxApplicationForm.java:26)
+        tasks {
+            "buildSearchableOptions" {
+                enabled = false
+            }
         }
-    }    
+    }
+} else {
+    intellij {
+        version ideaVersion
+        updateSinceUntilBuild false
+        plugins = [
+                "com.jetbrains.php:${phpPluginVersion}",
+                "com.jetbrains.twig:${twigPluginVersion}",
+                "com.jetbrains.php.dql:${dqlPluginVersion}",
+                "de.espend.idea.php.annotation:${annotationPluginVersion}",
+                "de.espend.idea.php.toolbox:${toolboxPluginVersion}",
+                'coverage',
+                'webDeployment',
+                'yaml',
+                'CSS',
+                'java-i18n',
+                'properties',
+                'xpath',
+                'java'
+        ]
+        pluginName 'Symfony Support'
+
+        // Can't instantiate configurable for PHP Toolbox
+        // at de.espend.idea.php.toolbox.ui.application.ToolboxApplicationForm.<init>(ToolboxApplicationForm.java:26)
+        tasks {
+            "buildSearchableOptions" {
+                enabled = false
+            }
+        }
+    }
 }
 
 patchPluginXml {