Merge remote-tracking branch 'origin/5.4.0-develop' into 2516-Argument-for-@NotNull-parameter-'psiDirectory'-of-com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectoryUtil.execute

Author: VitaliyBoyko

.github/workflows/gradle.yml

@@ -90,33 +90,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
           cache: gradle
-      - uses: actions/cache@v3
+      - name: Qodana - Code Quality
+        uses: JetBrains/qodana-action@v2024.2
         with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Gradle wrapper
-        run: gradle wrapper
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - id: file_changes
-        uses: trilom/file-changes-action@v1.2.4
-      - name: Run Code Style Check
-        run: ./gradlew checkstyleCI --no-daemon
-        env:
-          MODIFIED_FILES: ${{ steps.file_changes.outputs.files}}
-          ACTIONS_STEP_DEBUG: true
-      - name: Run PMD Quality Check
-        run: ./gradlew pmdCI --no-daemon
-        env:
-          MODIFIED_FILES: ${{ steps.file_changes.outputs.files}}
+          cache-default-branch-only: true
+          use-caches: true
+          args: '--baseline,qodana.sarif.json'

.github/workflows/uitests.yml

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
+## 2025.2.0
+
+### Fixed
+
+- Thread context was already set [#2550](https://github.com/magento/magento2-phpstorm-plugin/pull/2550)
+- Argument for @NotNull parameter 'psiDirectory' [#2553](https://github.com/magento/magento2-phpstorm-plugin/pull/2553)
+
 ## 2025.1.1
 
 ### Fixed

CHANGELOG.md

@@ -26,6 +26,7 @@
         <p style="margin: 10px 0;">Thank you to our sponsors—your support means everything:</p>
         <p><strong>Lucas van Staden</strong></p>
         <p><strong>Ivan Chepurnyi</strong></p>
+        <p><strong>Michael Ryvlin</strong></p>
       </td>
     </tr>
   </tfoot>

README.md

@@ -3,15 +3,12 @@
  * See COPYING.txt for license details.
  */
 
-import groovy.json.JsonSlurper
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
     id("java")
-    id("checkstyle")
-    id("pmd")
     alias(libs.plugins.kotlin)
     alias(libs.plugins.intelliJPlatform)
     alias(libs.plugins.changelog)
@@ -51,12 +48,9 @@ dependencies {
 
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
         plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
-        plugin("com.intellij.lang.jsgraphql", "243.21565.122")
         pluginVerifier()
         zipSigner()
         testFramework(TestFrameworkType.Platform)
-
-        phpstorm("2024.3")
     }
 }
 
@@ -146,22 +140,14 @@ tasks {
             }
         }
 
+        // Workaround for kernel-related crashes in tests (Fleet/Platform Kernel background tasks)
+        systemProperty("intellij.platform.kernel.disable", "true")
+        systemProperty("ide.fleet.launch", "false")
+
         useJUnitPlatform()
     }
 
-    checkstyle {
-        toolVersion = "8.31"
-        isIgnoreFailures = false
-        maxWarnings = 0
-        configFile = rootProject.file("${rootDir}/gradle-tasks/checkstyle/checkstyle.xml")
-    }
 
-    pmd {
-        toolVersion = "6.21.0"
-        isConsoleOutput = true
-        ruleSetFiles = files("${rootDir}/gradle-tasks/pmd/ruleset.xml")
-        ruleSets = listOf()
-    }
 }
 
 intellijPlatformTesting {
@@ -174,6 +160,8 @@ intellijPlatformTesting {
                         "-Dide.mac.message.dialogs.as.sheets=false",
                         "-Djb.privacy.policy.text=<!--999.999-->",
                         "-Djb.consents.confirmation.enabled=false",
+                        "-Deap.require.license=true",
+                        "-Dide.show.tips.on.startup.default.value=false"
                     )
                 }
             }
@@ -185,68 +173,12 @@ intellijPlatformTesting {
     }
 }
 
-// Configure Checkstyle tasks
-tasks.withType(Checkstyle::class).configureEach {
-    // Specify all files that should be checked
-    classpath = files()
-    setSource("${project.rootDir}")
-}
-
-// Execute Checkstyle on all files
-tasks.register<Checkstyle>("checkstyle") {
-    // Task-specific configuration can go here if necessary
-}
-
-// Execute Checkstyle on all modified files
-tasks.register<Checkstyle>("checkstyleCI") {
-    val changedFiles = getChangedFiles()
-    include(changedFiles)
-}
-
-// Configure PMD tasks
-tasks.withType(Pmd::class).configureEach {
-    // Specify all files that should be checked
-    classpath = files()
-    setSource("${project.rootDir}")
-}
-
-// Execute PMD on all files
-tasks.register<Pmd>("pmd") {
-    // Task-specific configuration can go here if necessary
-}
-
-// Execute PMD on all modified files
-tasks.register<Pmd>("pmdCI") {
-    val changedFiles = getChangedFiles()
-    include(changedFiles)
-}
 
-/**
- * Get all files that are changed but not deleted nor renamed.
- * Compares to master or the specified target branch.
- *
- * @return list of all changed files
- */
-fun getChangedFiles(): List<String> {
-    val modifiedFilesJson = System.getenv("MODIFIED_FILES")
-    val files = mutableListOf<String>()
 
-    if (modifiedFilesJson == null) {
-        return files
-    }
 
-    println("Modified Files: $modifiedFilesJson")
 
-    // Parse the JSON string into a list of files
-    val modifiedFiles = JsonSlurper().parseText(modifiedFilesJson) as List<*>
 
-    modifiedFiles.forEach {
-        files.add(it.toString())
-    }
 
-    // Return the list of touched files
-    return files
-}
 
 kover {
     currentProject {