version 1.2.7 for PhpStorm 2022.3 (#38)

Author: Danil42Russia

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
 
       # Validate wrapper
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.4
+        uses: gradle/wrapper-validation-action@v1.0.5
 
       # Setup Java 11 environment for the next steps
       - name: Setup Java
@@ -43,7 +43,7 @@ jobs:
 
       # Run tests
       - name: Run Tests
-        run: ./gradlew test
+        run: ./gradlew check
 
       # Cache Plugin Verifier IDEs
       - name: Setup Plugin Verifier IDEs Cache

.run/Run Plugin Tests.run.xml

@@ -11,7 +11,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="test" />
+          <option value="check" />
         </list>
       </option>
       <option name="vmOptions" value="" />

CHANGELOG.md

@@ -2,47 +2,51 @@
 
 ## [Unreleased]
 
-## [1.2.6]
+## [1.2.7] - 2022-12-12
+
+- adapt code for 2022.3
+
+## [1.2.6] - 2022-08-15
 
 - adapt code for 2022.2
 - enabled `PhpMethodOrClassCallIsNotCaseSensitiveInspection` by default
 - warning level for `PhpMethodOrClassCallIsNotCaseSensitiveInspection` - **error**
 
-## [1.2.5]
+## [1.2.5] - 2022-07-12
 
 - support `@kphp-json` tags
 
-## [1.2.4]
+## [1.2.4] - 2022-05-23
 
 - support `ffi_scope` and `ffi_cdata` in phpdoc
 - track calls to `end()` and `reset()`, suggesting replacing them
 
-## [1.2.3]
+## [1.2.3] - 2022-04-25
 
 - adapt code for 2022.1
 
-## [1.2.2]
+## [1.2.2] - 2021-12-07
 
 - adapt code for 2021.3
 
-## [1.2.1]
+## [1.2.1] - 2021-08-06
 
 - adapt code for 2021.2
 
-## [1.2.0]
+## [1.2.0] - 2021-04-21
 
 - adapt code for 2021.1
 - `@kphp-tags` added in the past 3 months
 - convert `@var` to field hint
 
-## [1.1.0]
+## [1.1.0] - 2020-12-04
 
 - better inferring for untyped arrays
 - `@kphp-tags` added in the past 3 months
 - able to import an undefined class
 - `mixed` instead of `var`
 
-## [1.0.0]
+## [1.0.0] - 2020-08-02
 
 - custom phpdoc type parsers: support tuple, shape, var, future, arbitrary nesting, nullable types
 - patched type inferring supporting tuples and shapes + hack php stdlib inferring

build.gradle.kts

@@ -1,14 +1,16 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.changelog.Changelog
 
 fun properties(key: String) = project.findProperty(key).toString()
 
 plugins {
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.7.10"
+    id("org.jetbrains.kotlin.jvm") version "1.7.21"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.8.0"
+    id("org.jetbrains.intellij") version "1.10.0"
     // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "1.3.1"
+    id("org.jetbrains.changelog") version "2.0.0"
+    // Gradle Kover Plugin
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 group = properties("pluginGroup")
@@ -19,6 +21,11 @@ repositories {
     mavenCentral()
 }
 
+// Set the JVM language level used to build project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     testCompileOnly("junit:junit:4.13.2")
 }
@@ -33,23 +40,18 @@ intellij {
     plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
 }
 
+// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
 changelog {
-    version.set(properties("pluginVersion"))
     groups.set(emptyList())
+    repositoryUrl.set(properties("pluginRepositoryUrl"))
 }
 
-tasks {
-    // Set the JVM compatibility versions
-    properties("javaVersion").let {
-        withType<JavaCompile> {
-            sourceCompatibility = it
-            targetCompatibility = it
-        }
-        withType<KotlinCompile> {
-            kotlinOptions.jvmTarget = it
-        }
-    }
+// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
+kover.xmlReport {
+    onCheck.set(true)
+}
 
+tasks {
     wrapper {
         gradleVersion = properties("gradleVersion")
     }
@@ -61,12 +63,23 @@ tasks {
 
         // Get the latest available change notes from the changelog file
         changeNotes.set(provider {
-            changelog.run {
-                getOrNull(properties("pluginVersion")) ?: getLatest()
-            }.toHTML()
+            with(changelog) {
+                renderItem(
+                    getOrNull(properties("pluginVersion")) ?: getLatest(),
+                    Changelog.OutputType.HTML,
+                )
+            }
         })
     }
 
+    runIde {
+        maxHeapSize = "8g"
+    }
+
+    buildSearchableOptions {
+        enabled = false
+    }
+
     test {
         exclude("com/vk/kphpstorm/testing/infrastructure/**")
         include("**/*Test.class")

gradle.properties

@@ -1,31 +1,31 @@
-# IntelliJ Platform Artifacts Repositories
-# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
+# IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 
 pluginGroup = com.vk
 pluginName = kphpstorm
+pluginRepositoryUrl = https://github.com/VKCOM/kphpstorm
+
 # SemVer format -> https://semver.org
-pluginVersion = 1.2.6
+pluginVersion = 1.2.7
 
-# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-# for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 222
-pluginUntilBuild = 222.*
+# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
+pluginSinceBuild = 223
+pluginUntilBuild = 223.*
 
-# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
-platformType = PS
-platformVersion = 2022.2
+# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
+platformType = IU
+platformVersion = 2022.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = com.jetbrains.php:222.3345.135
-
-# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 11
+# PHP Plugin - https://plugins.jetbrains.com/plugin/6610-php/versions
+platformPlugins = com.jetbrains.php:223.7571.212
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.5
+gradleVersion = 7.6
 
-# Opt-out flag for bundling Kotlin standard library.
-# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
+# Opt-out flag for bundling Kotlin standard library -> https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
 # suppress inspection "UnusedProperty"
 kotlin.stdlib.default.dependency = false
+
+# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
+org.gradle.unsafe.configuration-cache = true

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -116,7 +116,7 @@ class KphpParameterTypeMismatchInspection : PhpInspection() {
         // 2) allow passing everything to functions with @kphp-infer cast
         if (f.docComment != null) {
             val tag = KphpInferDocTag.findThisTagInDocComment(f)
-            if (tag != null && PhpDocUtil.getTagValue(tag).contains("cast"))
+            if (tag != null && PhpDocUtil.getTagValue(tag, false).contains("cast"))
                 return false
         }