diff --git a/.github/workflows/gradlepublishalpha.yml b/.github/workflows/gradlepublishalpha.yml deleted file mode 100644 index 3da070f9e..000000000 --- a/.github/workflows/gradlepublishalpha.yml +++ /dev/null @@ -1,31 +0,0 @@ -# This workflow will build a package using Gradle and then publish it to JetBrains alpha repository when a PR is merged to the develop branch - -name: Publish Plugin alpha version - -on: - push: - branches: - - master - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: 'temurin' - cache: gradle - - name: Gradle wrapper - run: gradle wrapper - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Run publish plugin - run: ./gradlew publishPlugin -i - env: - MAGENTO_PHPSTORM_intellijPublishToken: ${{ secrets.JET_BRAINS_TOKEN }} - MAGENTO_PHPSTORM_isAlpha: true diff --git a/CHANGELOG.md b/CHANGELOG.md index f033ef66e..7a5c2af67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0). ## 5.4.0 +### Fixed + +- Fixed Upgrade Compatibility Tool [#2482](https://github.com/magento/magento2-phpstorm-plugin/pull/2482) + Replaced hardcoded Magento versions with dynamic fetching via Packagist API. + Fixed UI icon references. + Updated Run command. + ### Changed - Updated Gradle Intellij plugin to version 2 [#2473](https://github.com/magento/magento2-phpstorm-plugin/pull/2473) diff --git a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java index 91cb841eb..84ea5ac6a 100644 --- a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java +++ b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java @@ -28,6 +28,7 @@ import com.jetbrains.php.config.commandLine.PhpCommandSettings; import com.jetbrains.php.config.commandLine.PhpCommandSettingsBuilder; import com.jetbrains.php.config.interpreters.PhpInterpreter; +import com.magento.idea.magento2plugin.project.Settings; import com.magento.idea.magento2uct.execution.filters.UctPhpFileFilter; import com.magento.idea.magento2uct.execution.filters.UctResultFileFilter; import com.magento.idea.magento2uct.packages.IssueSeverityLevel; @@ -42,7 +43,8 @@ "PMD.NPathComplexity", "PMD.CyclomaticComplexity", "PMD.ExcessiveImports", - "PMD.CognitiveComplexity" + "PMD.CognitiveComplexity", + "PMD.ExcessiveMethodLength" }) public class UctRunConfiguration extends LocatableConfigurationBase { @@ -263,6 +265,12 @@ public boolean isNewlyCreated() { commandSettingsBuilder.addArgument("--coming-version=" + getComingVersion()); } + if (!getComingVersion().isEmpty()) { + commandSettingsBuilder.addArgument( + "--current-version=" + Settings.getInstance(getProject()).magentoVersion + ); + } + final GeneralCommandLine commandLine = commandSettingsBuilder.createGeneralCommandLine(); diff --git a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.form b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.form index 1e7f0ca56..5d9291348 100644 --- a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.form +++ b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.form @@ -3,7 +3,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -195,7 +195,7 @@ - +