2080: thread context was already set fix

.github/workflows/gradle.yml

@@ -111,12 +111,50 @@ jobs:
         run: chmod +x gradlew
       - id: file_changes
         uses: trilom/file-changes-action@v1.2.4
+      - name: Filter Java Files
+        id: filter_java_files
+        run: |
+          # Get modified and added files
+          MODIFIED_FILES=${{ steps.file_changes.outputs.files_modified }}
+          ADDED_FILES=${{ steps.file_changes.outputs.files_added }}
+
+          echo "Modified files: $MODIFIED_FILES"
+          echo "Added files: $ADDED_FILES"
+
+          # Simple approach using shell commands to filter Java files
+          # Remove brackets and quotes from the JSON arrays
+          MODIFIED_FILES=$(echo "$MODIFIED_FILES" | sed 's/^\[//;s/\]$//;s/"//g;s/,/ /g')
+          ADDED_FILES=$(echo "$ADDED_FILES" | sed 's/^\[//;s/\]$//;s/"//g;s/,/ /g')
+
+          # Combine the files and filter for .java files
+          ALL_FILES="$MODIFIED_FILES $ADDED_FILES"
+          JAVA_FILES=""
+
+          # If there are files to process
+          if [ ! -z "$ALL_FILES" ]; then
+            # Filter for Java files and format as JSON array
+            for file in $ALL_FILES; do
+              if [[ "$file" == *.java ]]; then
+                if [ -z "$JAVA_FILES" ]; then
+                  JAVA_FILES="\"$file\""
+                else
+                  JAVA_FILES="$JAVA_FILES,\"$file\""
+                fi
+              fi
+            done
+          fi
+
+          # Create a proper JSON array
+          JAVA_FILES="[$JAVA_FILES]"
+
+          echo "JAVA_FILES=$JAVA_FILES" >> $GITHUB_ENV
+          echo "Filtered Java Files: $JAVA_FILES"
       - name: Run Code Style Check
         run: ./gradlew checkstyleCI --no-daemon
         env:
-          MODIFIED_FILES: ${{ steps.file_changes.outputs.files}}
+          MODIFIED_FILES: ${{ env.JAVA_FILES }}
           ACTIONS_STEP_DEBUG: true
       - name: Run PMD Quality Check
         run: ./gradlew pmdCI --no-daemon
         env:
-          MODIFIED_FILES: ${{ steps.file_changes.outputs.files}}
+          MODIFIED_FILES: ${{ env.JAVA_FILES }}

CHANGELOG.md

@@ -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

README.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>

build.gradle.kts

@@ -31,6 +31,7 @@ repositories {
 
     intellijPlatform {
         defaultRepositories()
+        maven("https://www.jetbrains.com/intellij-repository/snapshots")
     }
 }
 
@@ -51,12 +52,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")
     }
 }
 
@@ -174,6 +172,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"
                     )
                 }
             }

check_modified.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Get the list of modified files
+MODIFIED_FILES=$(git diff --name-only HEAD | grep -E '\.java$' | sed 's/^/"/;s/$/"/' | tr '\n' ',' | sed 's/,$//')
+MODIFIED_FILES="[$MODIFIED_FILES]"
+
+# Export the environment variable
+export MODIFIED_FILES
+
+# Run the checkstyle and PMD tasks
+./gradlew checkstyleCI pmdCI

gradle.properties

@@ -1,12 +1,12 @@
 pluginGroup = com.magento.idea.magento2plugin
 pluginName = Magento PhpStorm
 pluginRepositoryUrl = https://github.com/magento/magento2-phpstorm-plugin
-pluginVersion = 2025.1.1
-pluginSinceBuild = 243.3
+pluginVersion = 2025.2.0
+pluginSinceBuild = 250.*
 pluginUntilBuild = 258.*
 platformType = PS
-platformVersion = 2024.3
-platformPlugins =
+platformVersion = 2025.1.4.1
+platformPlugins = com.intellij.lang.jsgraphql:251.26927.39,org.jetbrains.junie:251.204.104
 platformBundledPlugins = com.intellij.modules.json,com.jetbrains.php,JavaScript,com.intellij.copyright
 gradleVersion = 8.10.2
 kotlin.stdlib.default.dependency = false

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ junit = "4.13.2"
 
 # plugins
 changelog = "2.2.1"
-intelliJPlatform = "2.4.0"
-kotlin = "1.9.25"
+intelliJPlatform = "2.7.0"
+kotlin = "2.1.0"
 kover = "0.8.3"
 qodana = "2024.2.3"