From 44c515da531cb30416b11b5deb827df44e0bc7c6 Mon Sep 17 00:00:00 2001
From: vitaliy <vitaliyboyko@i.ua>
Date: Thu, 13 Feb 2025 20:28:19 +0200
Subject: [PATCH 1/8] 2464: Fixed Upgrade Compatibility Tool

Replaced hardcoded Magento versions with dynamic fetching via Packagist API. Updated version-related logic to leverage dynamically fetched versions and adjusted default version references where applicable. Improved UI icon references and updated layout configurations for better clarity and usability.
---
 .../configurations/UctRunConfiguration.java   |   5 +
 .../configurations/UctSettingsEditor.form     |  10 +-
 .../configurations/UctSettingsEditor.java     |  18 ++--
 .../packages/SupportedVersion.java            | 102 ++++++++++++------
 .../settings/UctSettingsService.java          |   2 +-
 .../indexes/data/ApiCoverageStateIndex.java   |   2 +-
 .../indexes/data/DeprecationStateIndex.java   |   2 +-
 .../indexes/data/ExistenceStateIndex.java     |   2 +-
 src/main/resources/icons/information.png      | Bin 0 -> 833 bytes
 src/main/resources/icons/install.png          | Bin 0 -> 600 bytes
 src/main/resources/icons/warning.png          | Bin 0 -> 687 bytes
 11 files changed, 93 insertions(+), 50 deletions(-)
 create mode 100644 src/main/resources/icons/information.png
 create mode 100644 src/main/resources/icons/install.png
 create mode 100644 src/main/resources/icons/warning.png

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..858ad94af 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;
@@ -263,6 +264,10 @@ 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 @@
   <grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="18" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="983" height="546"/>
+      <xy x="20" y="20" width="1264" height="1030"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -137,7 +137,7 @@
         </constraints>
         <properties>
           <font size="12"/>
-          <icon value="general/information.png"/>
+          <icon value="icons/information.png"/>
           <text value="If your CLI output is cut, you should increase your buffer size:"/>
         </properties>
       </component>
@@ -176,7 +176,7 @@
               <alignmentY value="0.5"/>
               <enabled value="true"/>
               <font size="12" style="1"/>
-              <icon value="general/warning.png"/>
+              <icon value="icons/warning.png"/>
               <text value="Could not find UCT in the project:"/>
             </properties>
           </component>
@@ -195,7 +195,7 @@
               <contentAreaFilled value="true"/>
               <hideActionText value="false"/>
               <horizontalTextPosition value="11"/>
-              <icon value="actions/install.png"/>
+              <icon value="icons/install.png"/>
               <iconTextGap value="5"/>
               <inheritsPopupMenu value="false"/>
               <label value="Download"/>
@@ -249,7 +249,7 @@
               <foreground color="-2730672"/>
               <horizontalAlignment value="2"/>
               <horizontalTextPosition value="11"/>
-              <icon value="general/warning.png"/>
+              <icon value="icons/warning.png"/>
               <text value="Adobe Commerce only."/>
               <toolTipText value="You should have Magento authentication keys"/>
             </properties>
diff --git a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
index ff71c219e..5875966e6 100644
--- a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
+++ b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
@@ -381,15 +381,15 @@ private void validateExecutablePathField() {
      * @param selectedItem ComboBoxItemData
      */
     private void validateComingVersionField(final ComboBoxItemData selectedItem) {
-        final Matcher matcher = MAGENTO_VERSION_PATTERN.matcher(selectedItem.getText());
-
-        if (selectedItem != null && selectedItem.getKey().isEmpty()) {
-            comingVersionError.setText("Please, specify target version");
-        } else if (!matcher.find()) { // NOPMD
-            comingVersionError.setText("Please, correct target version");
-        } else {
-            comingVersionError.setText("");
-        }
+//        final Matcher matcher = MAGENTO_VERSION_PATTERN.matcher(selectedItem.getText());
+//
+//        if (selectedItem != null && selectedItem.getKey().isEmpty()) {
+//            comingVersionError.setText("Please, specify target version");
+//        } else if (!matcher.find()) { // NOPMD
+//            comingVersionError.setText("Please, correct target version");
+//        } else {
+//            comingVersionError.setText("");
+//        }
     }
 
     /**
diff --git a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
index aae7e66c2..75231d8a2 100644
--- a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
+++ b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
@@ -5,41 +5,19 @@
 
 package com.magento.idea.magento2uct.packages;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 public enum SupportedVersion {
-
-    V230("2.3.0"),
-    V231("2.3.1"),
-    V232("2.3.2"),
-    V2322("2.3.2-p2"),
-    V233("2.3.3"),
-    V2331("2.3.3-p1"),
-    V234("2.3.4"),
-    V2341("2.3.4-p1"),
-    V2342("2.3.4-p2"),
-    V235("2.3.5"),
-    V2351("2.3.5-p1"),
-    V2352("2.3.5-p2"),
-    V236("2.3.6"),
-    V2361("2.3.6-p1"),
-    V237("2.3.7"),
-    V2371("2.3.7-p1"),
-    V240("2.4.0"),
-    V2401("2.4.0-p1"),
-    V241("2.4.1"),
-    V2411("2.4.1-p1"),
-    V242("2.4.2"),
-    V2421("2.4.2-p1"),
-    V2422("2.4.2-p2"),
-    V243("2.4.3"),
-    V2431("2.4.3-p1"),
-    V2444("2.4.4-beta4");
-
+    ;
     private final String version;
 
     SupportedVersion(final String version) {
@@ -77,10 +55,70 @@ public String getVersion() {
      * @return List[String]
      */
     public static List<String> getSupportedVersions() {
-        final List<String> versions = new LinkedList<>();
+        try {
+            return fetchSupportedVersions();
+        } catch (Exception e) {
+            // Return an empty list or log the exception
+            return List.of();
+        }
+    }
 
-        for (final SupportedVersion version : SupportedVersion.values()) {
-            versions.add(version.getVersion());
+    /**
+     * Fetch supported versions dynamically from Packagist.
+     * <p>
+     * This method performs an HTTP GET request to fetch version data in JSON format
+     * from a predefined URL and parses it into a list of version strings.
+     *
+     * @return List[String] containing supported version strings
+     * @throws Exception if an error occurs during HTTP connection or JSON parsing
+     */
+    public static List<String> fetchSupportedVersions() throws Exception {
+        String url = "https://repo.packagist.org/p2/magento/community-edition.json";
+        List<String> versions = new ArrayList<>();
+
+        HttpURLConnection connection = null;
+        try {
+            // Establish HTTP connection
+            connection = (HttpURLConnection) new URL(url).openConnection();
+            connection.setRequestMethod("GET");
+            connection.setRequestProperty("Accept", "application/json");
+
+            if (connection.getResponseCode() != 200) {
+                throw new Exception("Failed to fetch data, HTTP response code: " + connection.getResponseCode());
+            }
+
+            // Read JSON response
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                StringBuilder response = new StringBuilder();
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    response.append(line);
+                }
+
+                // Parse JSON for version data
+                JSONObject jsonResponse = new JSONObject(response.toString());
+                JSONArray packageObject = jsonResponse
+                        .getJSONObject("packages")
+                        .getJSONArray("magento/community-edition");
+
+                for (Object o : packageObject) {
+                    JSONObject version = (JSONObject) o;
+                    if (version == null) {
+                        continue;
+                    }
+                    String versionstring = version.getString("version");
+                    if (versionstring == null) {
+                        continue;
+                    }
+                    versions.add(versionstring);
+                }
+            }
+        } catch (Exception e) {
+            throw new Exception("Error fetching or parsing supported versions: " + e.getMessage(), e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
         }
 
         return versions;
diff --git a/src/main/java/com/magento/idea/magento2uct/settings/UctSettingsService.java b/src/main/java/com/magento/idea/magento2uct/settings/UctSettingsService.java
index dea0e0b5c..99e1848de 100644
--- a/src/main/java/com/magento/idea/magento2uct/settings/UctSettingsService.java
+++ b/src/main/java/com/magento/idea/magento2uct/settings/UctSettingsService.java
@@ -175,7 +175,7 @@ public void setCurrentVersion(final @Nullable SupportedVersion version) {
     public @NotNull SupportedVersion getCurrentVersionOrDefault() {
         final SupportedVersion currentVersion = getCurrentVersion();
 
-        return currentVersion == null ? SupportedVersion.V230 : currentVersion;
+        return currentVersion == null ? SupportedVersion.valueOf("2.4.7") : currentVersion;
     }
 
     /**
diff --git a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java
index b223220a5..c5d225ff0 100644
--- a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java
+++ b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java
@@ -168,7 +168,7 @@ private void groupLoadedData() {
                     VersioningDataOperationsUtil.unionVersionDataWithChangelog(
                             versioningData,
                             new ArrayList<>(Collections.singletonList(
-                                    SupportedVersion.V230.getVersion()
+                                    SupportedVersion.valueOf("2.4.7").getVersion()
                             )),
                             true
                     );
diff --git a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java
index b5d2b1c36..f107e2fee 100644
--- a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java
+++ b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java
@@ -151,7 +151,7 @@ private void groupLoadedData() {
                     VersioningDataOperationsUtil.unionVersionDataWithChangelog(
                             versioningData,
                             new ArrayList<>(Collections.singletonList(
-                                    SupportedVersion.V230.getVersion()
+                                    SupportedVersion.valueOf("2.4.7").getVersion()
                             )),
                             true
                     );
diff --git a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java
index 14813bf9a..58d7d2fe3 100644
--- a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java
+++ b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java
@@ -196,7 +196,7 @@ private void groupLoadedData() {
                     VersioningDataOperationsUtil.unionVersionDataWithChangelog(
                             versioningData,
                             new ArrayList<>(Collections.singletonList(
-                                    SupportedVersion.V230.getVersion()
+                                    SupportedVersion.valueOf("2.4.7").getVersion()
                             )),
                             false
                     );
diff --git a/src/main/resources/icons/information.png b/src/main/resources/icons/information.png
new file mode 100644
index 0000000000000000000000000000000000000000..70b82474c584791c16d8afcfc43b6dcaa972df5d
GIT binary patch
literal 833
zcmV-H1HSx;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009BNkl<ZcwTjq
zYe<t(9L7({ykKf%*=kcisVRk(e(3Tc`XUxxA)zp`o68a{gbcEanmUubOqb4iOR*Aj
zmMC84TsrSMM{3@k%2w!<40Jd%^65QqF;nP)!~eYJJkO7F{_i1Vqdd;|6W<Vt!`XWV
zm!KFU9du6D*uDSCE5MTMy(mAPBSX}{1ajtoAaiOJ>3Tq<Ga|gL9|zJ)K|QQ@oqPlw
zaxi!{c47jmr4?LNeuZzzAYSy$Ah1@8qq0%7E&}qUWeC~_K)r0nEbq(m<cTjRnED34
z@)3By9mc@C2~@QDSB}H`^&k>7Gw53Rg~*;!(9GX(kl*#vMnn%z<Jh}l9FdK|<IOPC
zvr8<1)}!U)I9xV{lNDN=tJb1+aRnzN6`)zN`A~#3OrytzhDij~Pa;gE!>LLwJc@_m
zB-Owotqljuw211OfuK=`^9<mULXVhU9cY%gUP(0E>d+&k=?i?y#$hQPfLqBpDz)D+
zGQZ4L_o6<Kv~KLm>O!bekKjf<ZuBpKW(n_($V8jAhY4-XRKqH%37o_RXr>p~E70nd
zp#q7j!gg^h?8P0psnFr!&`<C}L?+_-;FZZbMFqPg1$fB{*u=>}Vr$F*^~@sNvf4nN
zR>SpWE9<io$`LuV3eWp_Cc?j+W!NtM2&WV!T*NJ~7AmkQzJ3j0U;vU1kSDe5J~y=i
zcETFCy`Ka>RAM03fhp46g=%m!n!!(3!8$<!i?}*7pvPc@yQGr=RKq2s1v^t4!DCLc
zL)r?OCAO!9e%y2=czK-+pb1tCfD<n_13t|fu`h=KJf?u=KY)ThI3?GBX4$7;drd5N
zF4Dj?yAzho{q3JC%z)lGBla_J@~8^VA{BVK8t|EKnpt~^f^3dmMB%JU@h5O|G~fv9
z5Tl-h=<@<wH!&x2WV+AK?*+f08`MiPYXGW%Qp+uO^X0pkU&fQR!y&r|7WrD(<T4M6
zX(B(n4P4PjP!IL45C0?E@LYd~XqjZ&vkwNx#A+iQbWYdk-bVj#87Mh1nukgf00000
LNkvXXu0mjf8YYHX

literal 0
HcmV?d00001

diff --git a/src/main/resources/icons/install.png b/src/main/resources/icons/install.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c1f108f53ebfd09d09adb782a95759e7c3a48b4
GIT binary patch
literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006XNkl<ZcwU{;
zTS(Jk7{~FqgRPr_f=*1ZOv5tBYOV4j%BdIOg$NcBw1O_gs|ZY?f=r2wQc)MSN>~S}
zhN7KlW#s|Z!6lZuk?GQ{Wt(no>W1dUw||>AY1r(6|IG`(&;Nbj=Xr&grDW=7EX;bs
z^!2bR;>atM7us2x-Gs=fpBu6)zdab<ZEzyWY#}7=UU<l=vz<g0c5t}W#~Pgz+0{W-
z*M1Kn`)|#T$crt+TsC8|yHPy!5U+Q!Qa6auI!Jgrg(P49JF>2%k2uX|28KPn{N^X6
z(aVkoH_<gNmfVn#b8pyV7)EwLk4UQg6N$g;LRss??w<&T^DF_fj3cDJ@Uip34>sI)
zAvAWxd6NVgr;tk_MA6_4hP%9hU^w4AMzwu{V{Kz(Hv3Q+JZ!HYVzKrsqM!qj*Niyx
z4v~5jp(;V_dhBCs?GRCwHX@~CY`O9Ym>}o9A9d>}X-z&7A9+|_-Ya!N`g7VHL`qdC
zoLoBdKDKFlCEzEy-2t-OMmg9rg6g>sxu&0a>2)&$(@R<1F9DNW9GIlQI?nNr0n~5(
zB-A*VpAiPIxvGyuot3!q9%72Sh?ZtTe##VV;eyOLPUL^pCcT^A-^OYOvDa*@udotb
z+CyYf7m<aX|K35;?JvPQIAIy*&}%>Yq*;iqb4zccn~3x<jv&u9qNp&lw&(*ZPMcVC
mQtEk53*xBsnD&;<0Db}D7-$J9s`wfJ0000<MNUMnLSTZbHXZN)

literal 0
HcmV?d00001

diff --git a/src/main/resources/icons/warning.png b/src/main/resources/icons/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..62b02c9a2abf3105d9eaa76ec3843f203bb1d331
GIT binary patch
literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007ZNkl<ZcwV)U
zeMnPL7{+fAiDhJEVooz5qiwouiU~^SOiM~hWA+7Eff14kr7;kc{0IyQ@&odZF%mJe
z1f7C~SsEHcG%IUrQ&^>&mGka;n$x*_y7&B1c#G(t9{9oGyzldzm-jHt|CCvGID0~O
zL?gccCz-X0Wvrn9w!SMEsZJ;p*Z-=iT9tCPCl8pp4p_1={Wue^s}Cy0eSegxGTFo0
zm|<N0SO}{j2h#%@VDvPMwJAoSChq@DmOC-&-$zPdHk?IaaW(P_Zqbm%7iZ94aUfmX
zzd~P{;=I_7EWln)IhlD4QL$;jR32rtUX6D(YA><xr)KICb@Ss@09!<nDdG_j90`~*
zD09z`qqj6hC-za<>ym;Uh9WFZmH_5-ieFF^wn`#^-VlnbYd2mNZiZgX1dIKQO{eNx
zFy(*@?&FshLGjtP7v8?1fFX?Hc%%SnmZJ6i`ks~MQqN;^9m#M`90eKJ4@|^Sm{n3R
ztEE7{f?{u#W4Tj-k(&}Up7Q*)P+QH8&(6t9a16!r6R6-CPM~P>e4x$u#Zq@Tg=?2%
z?x7TJy&P>>UK};E#U7Wx4PL<f`&2kyCD8!)n>esf0_hJ3i=5SOfvbBDINr$d0j?G)
zK2-*yHf^njAq|l(r$u;O#Ulj717oq&#B7KLvnGt5(Hjb`O%6LBz%}dw9)zGPcOw|m
z7>xz)DxBjfaGFx#96JPj;2BcFct3z5oCOx2g~P=!a*3Y=?J{%<0c^SVIreUdd$uK<
z*qXw~*9JMU*2#$d-cDk!@+0O-e`3{2i0O6^8Lik(-rkUq;WB^nG<TD`?!>x_KLGZz
Vu^Pgo;p_ka002ovPDHLkV1gmmIgkJV

literal 0
HcmV?d00001


From 7a75f5835dd49f74f74d41d10f6eabde30df291d Mon Sep 17 00:00:00 2001
From: vitaliy <vitaliyboyko@i.ua>
Date: Thu, 13 Feb 2025 20:33:37 +0200
Subject: [PATCH 2/8] 2464: Update default Magento version references

Replaced default version "2.4.7" with "2.3.0" across various logic to reflect the updated versioning requirements. Removed redundant validation calls while keeping essential validations intact to improve code maintainability. These changes enhance version consistency and simplify future modifications.
---
 .../configurations/UctSettingsEditor.java     | 19 +++++++++----------
 .../settings/UctSettingsService.java          |  2 +-
 .../indexes/data/ApiCoverageStateIndex.java   |  2 +-
 .../indexes/data/DeprecationStateIndex.java   |  2 +-
 .../indexes/data/ExistenceStateIndex.java     |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
index 5875966e6..ee5355100 100644
--- a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
+++ b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
@@ -339,7 +339,6 @@ private void validateSettingsForm() {
         comingVersionError.setForeground(new Color(252, 119, 83));
 
         validateExecutablePathField();
-        validateComingVersionField((ComboBoxItemData) comingVersion.getSelectedItem());
 
         myScriptName
                 .getComponent()
@@ -381,15 +380,15 @@ private void validateExecutablePathField() {
      * @param selectedItem ComboBoxItemData
      */
     private void validateComingVersionField(final ComboBoxItemData selectedItem) {
-//        final Matcher matcher = MAGENTO_VERSION_PATTERN.matcher(selectedItem.getText());
-//
-//        if (selectedItem != null && selectedItem.getKey().isEmpty()) {
-//            comingVersionError.setText("Please, specify target version");
-//        } else if (!matcher.find()) { // NOPMD
-//            comingVersionError.setText("Please, correct target version");
-//        } else {
-//            comingVersionError.setText("");
-//        }
+        final Matcher matcher = MAGENTO_VERSION_PATTERN.matcher(selectedItem.getText());
+
+        if (selectedItem != null && selectedItem.getKey().isEmpty()) {
+            comingVersionError.setText("Please, specify target version");
+        } else if (!matcher.find()) { // NOPMD
+            comingVersionError.setText("Please, correct target version");
+        } else {
+            comingVersionError.setText("");
+        }
     }
 
     /**
diff --git a/src/main/java/com/magento/idea/magento2uct/settings/UctSettingsService.java b/src/main/java/com/magento/idea/magento2uct/settings/UctSettingsService.java
index 99e1848de..0d96ea8d2 100644
--- a/src/main/java/com/magento/idea/magento2uct/settings/UctSettingsService.java
+++ b/src/main/java/com/magento/idea/magento2uct/settings/UctSettingsService.java
@@ -175,7 +175,7 @@ public void setCurrentVersion(final @Nullable SupportedVersion version) {
     public @NotNull SupportedVersion getCurrentVersionOrDefault() {
         final SupportedVersion currentVersion = getCurrentVersion();
 
-        return currentVersion == null ? SupportedVersion.valueOf("2.4.7") : currentVersion;
+        return currentVersion == null ? SupportedVersion.valueOf("2.3.0") : currentVersion;
     }
 
     /**
diff --git a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java
index c5d225ff0..df81bb117 100644
--- a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java
+++ b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java
@@ -168,7 +168,7 @@ private void groupLoadedData() {
                     VersioningDataOperationsUtil.unionVersionDataWithChangelog(
                             versioningData,
                             new ArrayList<>(Collections.singletonList(
-                                    SupportedVersion.valueOf("2.4.7").getVersion()
+                                    SupportedVersion.valueOf("2.3.0").getVersion()
                             )),
                             true
                     );
diff --git a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java
index f107e2fee..73a6cc725 100644
--- a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java
+++ b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java
@@ -151,7 +151,7 @@ private void groupLoadedData() {
                     VersioningDataOperationsUtil.unionVersionDataWithChangelog(
                             versioningData,
                             new ArrayList<>(Collections.singletonList(
-                                    SupportedVersion.valueOf("2.4.7").getVersion()
+                                    SupportedVersion.valueOf("2.3.0").getVersion()
                             )),
                             true
                     );
diff --git a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java
index 58d7d2fe3..b35b8d4a5 100644
--- a/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java
+++ b/src/main/java/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java
@@ -196,7 +196,7 @@ private void groupLoadedData() {
                     VersioningDataOperationsUtil.unionVersionDataWithChangelog(
                             versioningData,
                             new ArrayList<>(Collections.singletonList(
-                                    SupportedVersion.valueOf("2.4.7").getVersion()
+                                    SupportedVersion.valueOf("2.3.0").getVersion()
                             )),
                             false
                     );

From d0faa53716418a87de9091bc6a27950064d62c1e Mon Sep 17 00:00:00 2001
From: vitaliy <vitaliyboyko@i.ua>
Date: Thu, 13 Feb 2025 20:48:18 +0200
Subject: [PATCH 3/8] 2464: static fix

---
 .../configurations/UctRunConfiguration.java      |  4 +++-
 .../magento2uct/packages/SupportedVersion.java   | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

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 858ad94af..f2af1ad62 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
@@ -265,7 +265,9 @@ public boolean isNewlyCreated() {
                 }
 
                 if (!getComingVersion().isEmpty()) {
-                    commandSettingsBuilder.addArgument("--current-version=" + Settings.getInstance(getProject()).magentoVersion);
+                    commandSettingsBuilder.addArgument(
+                        "--current-version=" + Settings.getInstance(getProject()).magentoVersion
+                    );
                 }
 
                 final GeneralCommandLine commandLine =
diff --git a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
index 75231d8a2..845094934 100644
--- a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
+++ b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
@@ -64,8 +64,7 @@ public static List<String> getSupportedVersions() {
     }
 
     /**
-     * Fetch supported versions dynamically from Packagist.
-     * <p>
+     * Fetch supported versions dynamically from Packagist
      * This method performs an HTTP GET request to fetch version data in JSON format
      * from a predefined URL and parses it into a list of version strings.
      *
@@ -84,11 +83,15 @@ public static List<String> fetchSupportedVersions() throws Exception {
             connection.setRequestProperty("Accept", "application/json");
 
             if (connection.getResponseCode() != 200) {
-                throw new Exception("Failed to fetch data, HTTP response code: " + connection.getResponseCode());
+                throw new Exception(
+                    "Failed to fetch data, HTTP response code: " + connection.getResponseCode()
+                );
             }
 
             // Read JSON response
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+            try (BufferedReader reader = new BufferedReader(
+                new InputStreamReader(connection.getInputStream()))
+            ) {
                 StringBuilder response = new StringBuilder();
                 String line;
                 while ((line = reader.readLine()) != null) {
@@ -114,7 +117,10 @@ public static List<String> fetchSupportedVersions() throws Exception {
                 }
             }
         } catch (Exception e) {
-            throw new Exception("Error fetching or parsing supported versions: " + e.getMessage(), e);
+            throw new Exception(
+                "Error fetching or parsing supported versions: " + e.getMessage(),
+                e
+            );
         } finally {
             if (connection != null) {
                 connection.disconnect();

From 1d812b4d278c6656264472362ec1971a5646dfac Mon Sep 17 00:00:00 2001
From: vitaliy <vitaliyboyko@i.ua>
Date: Thu, 13 Feb 2025 20:54:56 +0200
Subject: [PATCH 4/8] 2464: updated CHANGELOG.md

---
 CHANGELOG.md                                               | 7 +++++++
 .../execution/configurations/UctRunConfiguration.java      | 2 +-
 .../idea/magento2uct/packages/SupportedVersion.java        | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

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 f2af1ad62..b8f815a7d 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
@@ -266,7 +266,7 @@ public boolean isNewlyCreated() {
 
                 if (!getComingVersion().isEmpty()) {
                     commandSettingsBuilder.addArgument(
-                        "--current-version=" + Settings.getInstance(getProject()).magentoVersion
+                            "--current-version=" + Settings.getInstance(getProject()).magentoVersion
                     );
                 }
 
diff --git a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
index 845094934..4b5c2765b 100644
--- a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
+++ b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
@@ -90,7 +90,7 @@ public static List<String> fetchSupportedVersions() throws Exception {
 
             // Read JSON response
             try (BufferedReader reader = new BufferedReader(
-                new InputStreamReader(connection.getInputStream()))
+                    new InputStreamReader(connection.getInputStream()))
             ) {
                 StringBuilder response = new StringBuilder();
                 String line;

From 77c5620606e3bbe08fa3f4277a2dade3e6349996 Mon Sep 17 00:00:00 2001
From: vitaliy <vitaliyboyko@i.ua>
Date: Thu, 13 Feb 2025 21:18:36 +0200
Subject: [PATCH 5/8] 2464: stati fixes

---
 .../configurations/UctSettingsEditor.java     |  4 +--
 .../packages/SupportedVersion.java            | 31 ++++++++-----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
index ee5355100..09efede6c 100644
--- a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
+++ b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
@@ -43,7 +43,7 @@
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings({"PMD.TooManyFields", "PMD.ExcessiveImports"})
-public class UctSettingsEditor extends SettingsEditor<UctRunConfiguration> {
+public class UctSettingsEditor extends SettingsEditor<UctRunConfiguration> { //NOPMD - suppressed TooManyMethods
 
     private static final String LEARN_MORE_URI =
             "https://docs.magento.com/user-guide/getting-started.html#product-editions";
@@ -398,7 +398,7 @@ private void validateComingVersionField(final ComboBoxItemData selectedItem) {
      * @return ComboBoxItemData
      */
     private ComboBoxItemData getCorrectedSelectedItem(final Object selectedItem) {
-        ComboBoxItemData selectedComingVersion;
+        final ComboBoxItemData selectedComingVersion;
 
         if (selectedItem instanceof ComboBoxItemData) {
             selectedComingVersion = (ComboBoxItemData) selectedItem;
diff --git a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
index 4b5c2765b..e08230a90 100644
--- a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
+++ b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
@@ -57,7 +57,7 @@ public String getVersion() {
     public static List<String> getSupportedVersions() {
         try {
             return fetchSupportedVersions();
-        } catch (Exception e) {
+        } catch (Exception e) { //NOPMD - suppressed AvoidCatchingGenericException
             // Return an empty list or log the exception
             return List.of();
         }
@@ -71,9 +71,9 @@ public static List<String> getSupportedVersions() {
      * @return List[String] containing supported version strings
      * @throws Exception if an error occurs during HTTP connection or JSON parsing
      */
-    public static List<String> fetchSupportedVersions() throws Exception {
-        String url = "https://repo.packagist.org/p2/magento/community-edition.json";
-        List<String> versions = new ArrayList<>();
+    public static List<String> fetchSupportedVersions() throws Exception { //NOPMD - suppressed SignatureDeclareThrowsException
+        final String url = "https://repo.packagist.org/p2/magento/community-edition.json";
+        final List<String> versions = new ArrayList<>();
 
         HttpURLConnection connection = null;
         try {
@@ -82,8 +82,8 @@ public static List<String> fetchSupportedVersions() throws Exception {
             connection.setRequestMethod("GET");
             connection.setRequestProperty("Accept", "application/json");
 
-            if (connection.getResponseCode() != 200) {
-                throw new Exception(
+            if (connection.getResponseCode() != 200) { //NOPMD - suppressed AvoidLiteralsInIfCondition
+                throw new Exception( //NOPMD - suppressed AvoidThrowingRawExceptionTypes
                     "Failed to fetch data, HTTP response code: " + connection.getResponseCode()
                 );
             }
@@ -92,35 +92,30 @@ public static List<String> fetchSupportedVersions() throws Exception {
             try (BufferedReader reader = new BufferedReader(
                     new InputStreamReader(connection.getInputStream()))
             ) {
-                StringBuilder response = new StringBuilder();
+                final StringBuilder response = new StringBuilder();
                 String line;
-                while ((line = reader.readLine()) != null) {
+                while ((line = reader.readLine()) != null) { //NOPMD - suppressed AssignmentInOperand
                     response.append(line);
                 }
 
                 // Parse JSON for version data
-                JSONObject jsonResponse = new JSONObject(response.toString());
-                JSONArray packageObject = jsonResponse
+                final JSONObject jsonResponse = new JSONObject(response.toString());
+                final JSONArray packageObject = jsonResponse
                         .getJSONObject("packages")
                         .getJSONArray("magento/community-edition");
 
-                for (Object o : packageObject) {
-                    JSONObject version = (JSONObject) o;
+                for (final Object o : packageObject) {
+                    final JSONObject version = (JSONObject) o;
                     if (version == null) {
                         continue;
                     }
-                    String versionstring = version.getString("version");
+                    final String versionstring = version.getString("version");
                     if (versionstring == null) {
                         continue;
                     }
                     versions.add(versionstring);
                 }
             }
-        } catch (Exception e) {
-            throw new Exception(
-                "Error fetching or parsing supported versions: " + e.getMessage(),
-                e
-            );
         } finally {
             if (connection != null) {
                 connection.disconnect();

From cdfc33d8e2f99267ef94bab64992ccf657af7889 Mon Sep 17 00:00:00 2001
From: vitaliy <vitaliyboyko@i.ua>
Date: Thu, 13 Feb 2025 22:13:36 +0200
Subject: [PATCH 6/8] 2464: Static fix

---
 .../idea/magento2uct/packages/SupportedVersion.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
index e08230a90..990c5c3f2 100644
--- a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
+++ b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
@@ -6,6 +6,7 @@
 package com.magento.idea.magento2uct.packages;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -19,6 +20,7 @@
 public enum SupportedVersion {
     ;
     private final String version;
+    private static final Integer SUCCESS_CODE = 200;
 
     SupportedVersion(final String version) {
         this.version = version;
@@ -69,9 +71,9 @@ public static List<String> getSupportedVersions() {
      * from a predefined URL and parses it into a list of version strings.
      *
      * @return List[String] containing supported version strings
-     * @throws Exception if an error occurs during HTTP connection or JSON parsing
+     * @throws IOException if an error occurs during HTTP connection or JSON parsing
      */
-    public static List<String> fetchSupportedVersions() throws Exception { //NOPMD - suppressed SignatureDeclareThrowsException
+    public static List<String> fetchSupportedVersions() throws IOException {
         final String url = "https://repo.packagist.org/p2/magento/community-edition.json";
         final List<String> versions = new ArrayList<>();
 
@@ -82,8 +84,8 @@ public static List<String> fetchSupportedVersions() throws Exception { //NOPMD -
             connection.setRequestMethod("GET");
             connection.setRequestProperty("Accept", "application/json");
 
-            if (connection.getResponseCode() != 200) { //NOPMD - suppressed AvoidLiteralsInIfCondition
-                throw new Exception( //NOPMD - suppressed AvoidThrowingRawExceptionTypes
+            if (connection.getResponseCode() != SUCCESS_CODE) {
+                throw new IOException(//NOPMD - suppressed AvoidThrowingRawExceptionTypes
                     "Failed to fetch data, HTTP response code: " + connection.getResponseCode()
                 );
             }
@@ -94,7 +96,7 @@ public static List<String> fetchSupportedVersions() throws Exception { //NOPMD -
             ) {
                 final StringBuilder response = new StringBuilder();
                 String line;
-                while ((line = reader.readLine()) != null) { //NOPMD - suppressed AssignmentInOperand
+                while ((line = reader.readLine()) != null) {//NOPMD - suppressed AssignmentInOperand
                     response.append(line);
                 }
 

From cafcd6bb8ff4f9a12a875ccd0e73de8be6b4c851 Mon Sep 17 00:00:00 2001
From: vitaliy <vitaliyboyko@i.ua>
Date: Thu, 13 Feb 2025 22:21:53 +0200
Subject: [PATCH 7/8] 2464: Static fix again

---
 .../execution/configurations/UctSettingsEditor.java       | 8 ++++++--
 .../idea/magento2uct/packages/SupportedVersion.java       | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
index 09efede6c..c333c2844 100644
--- a/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
+++ b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java
@@ -42,8 +42,12 @@
 import org.jdesktop.swingx.JXHyperlink;
 import org.jetbrains.annotations.NotNull;
 
-@SuppressWarnings({"PMD.TooManyFields", "PMD.ExcessiveImports"})
-public class UctSettingsEditor extends SettingsEditor<UctRunConfiguration> { //NOPMD - suppressed TooManyMethods
+@SuppressWarnings({
+        "PMD.TooManyFields",
+        "PMD.ExcessiveImports",
+        "PMD.TooManyMethods"
+})
+public class UctSettingsEditor extends SettingsEditor<UctRunConfiguration> {
 
     private static final String LEARN_MORE_URI =
             "https://docs.magento.com/user-guide/getting-started.html#product-editions";
diff --git a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
index 990c5c3f2..92cee3a8c 100644
--- a/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
+++ b/src/main/java/com/magento/idea/magento2uct/packages/SupportedVersion.java
@@ -96,7 +96,11 @@ public static List<String> fetchSupportedVersions() throws IOException {
             ) {
                 final StringBuilder response = new StringBuilder();
                 String line;
-                while ((line = reader.readLine()) != null) {//NOPMD - suppressed AssignmentInOperand
+                while (true) {
+                    line = reader.readLine();
+                    if (line == null) {
+                        break;
+                    }
                     response.append(line);
                 }
 

From b5f32a34e5feaa102c78d49ea18b201ab71e2e5d Mon Sep 17 00:00:00 2001
From: vitaliy <vitaliyboyko@i.ua>
Date: Thu, 13 Feb 2025 22:33:04 +0200
Subject: [PATCH 8/8] 2464: Static fix again, removed alpha publishing

---
 .github/workflows/gradlepublishalpha.yml      | 31 -------------------
 .../configurations/UctRunConfiguration.java   |  3 +-
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/gradlepublishalpha.yml

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/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java b/src/main/java/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java
index b8f815a7d..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
@@ -43,7 +43,8 @@
         "PMD.NPathComplexity",
         "PMD.CyclomaticComplexity",
         "PMD.ExcessiveImports",
-        "PMD.CognitiveComplexity"
+        "PMD.CognitiveComplexity",
+        "PMD.ExcessiveMethodLength"
 })
 public class UctRunConfiguration extends LocatableConfigurationBase<UctRunConfigurationOptions> {