Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9dbe896
2080: Thread context was already set
VitaliyBoyko May 24, 2025
f0ba6c3
2080: removed ok and cancels
VitaliyBoyko May 24, 2025
be386bd
2080: Add custom dialogs to generate new Magento 2 classes
VitaliyBoyko May 24, 2025
1cdaafc
2080: adds a new action to generate a Magento 2 EAV customer attribut…
VitaliyBoyko May 24, 2025
5cafb40
2080: Implemented new action for generating EAV Product attribute wit…
VitaliyBoyko May 24, 2025
5921c02
2080: bumped up version
VitaliyBoyko May 24, 2025
728a40a
Code style fixes
VitaliyBoyko May 26, 2025
01a3f3c
2880: Refactor code formatting for improved readability
VitaliyBoyko May 26, 2025
b86cf57
2880: Remove unused Swing imports and simplify dialog classes
VitaliyBoyko May 26, 2025
9649908
2880: static fixes
VitaliyBoyko May 26, 2025
4deb987
2880: static fixes 2
VitaliyBoyko May 26, 2025
e9fe89c
2880: static fixes 3
VitaliyBoyko May 26, 2025
5424030
2880: static fixes 4
VitaliyBoyko May 26, 2025
588a321
2880: static fixes 5
VitaliyBoyko May 26, 2025
03f9003
2880: static fixes 6
VitaliyBoyko May 26, 2025
771260f
2880: static fixes 7
VitaliyBoyko May 26, 2025
2ee1355
2080: bumped up version of phpstorm
VitaliyBoyko Jun 1, 2025
f3b22e7
2080: updated SharedSteps.kt asn gradle plugin version
VitaliyBoyko Jun 1, 2025
117e67f
2080: removed license activation
VitaliyBoyko Jun 1, 2025
03df6c8
2080: fixed UI tests
VitaliyBoyko Jun 8, 2025
90b2f5e
2080: debug
VitaliyBoyko Jun 8, 2025
0ec28cb
2080: debug 2
VitaliyBoyko Jun 8, 2025
6d7fa79
Removed UI tests, since there is no way to get license for CI
VitaliyBoyko Aug 2, 2025
7170c3f
Fixed tests
VitaliyBoyko Aug 2, 2025
aa7f733
Updated gradle.properties
VitaliyBoyko Aug 2, 2025
a4dfdd4
Adjusted new entity dialog
VitaliyBoyko Aug 2, 2025
632a103
Adjusted new entity dialog
VitaliyBoyko Aug 2, 2025
76b1931
Static fixes
VitaliyBoyko Aug 2, 2025
dfcb199
Static fixes 2
VitaliyBoyko Aug 2, 2025
9e2dd92
Removed mocker
VitaliyBoyko Aug 2, 2025
f117cb9
Updated platform
VitaliyBoyko Aug 17, 2025
6adde1b
Updated tests
VitaliyBoyko Aug 17, 2025
6871344
Removed checkstyle and PMD configurations
VitaliyBoyko Aug 17, 2025
deb7f6e
Updated Qodana cache configuration in GitHub Actions
VitaliyBoyko Aug 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 9 additions & 24 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
84 changes: 0 additions & 84 deletions .github/workflows/uitests.yml

This file was deleted.

7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
80 changes: 6 additions & 74 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
}
}

Expand Down Expand Up @@ -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 {
Expand All @@ -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"
)
}
}
Expand All @@ -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 {
Expand Down
Loading
Loading