Skip to content

Commit b01965c

Browse files
authored
Merge branch '5.4.0-develop' into fix/full-text-search
2 parents c9ef89b + 4807653 commit b01965c

File tree

5 files changed

+53
-30
lines changed

5 files changed

+53
-30
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,26 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
66

7+
## 5.4.0
8+
9+
## 5.3.1
10+
11+
### Fixed
12+
13+
- Custom theme couldn't be detected [#2348](https://github.com/magento/magento2-phpstorm-plugin/pull/2348)
14+
715
## 5.3.0
816

17+
### Added
18+
19+
- Mage-os support [#2081](https://github.com/magento/magento2-phpstorm-plugin/pull/2081)
20+
21+
### Fixed
22+
23+
- Workaround for "thread context was already set" exception [#2082](https://github.com/magento/magento2-phpstorm-plugin/pull/2082)
24+
- NewObserverDialog form typo [#2087](https://github.com/magento/magento2-phpstorm-plugin/pull/2087)
25+
- ActionUpdateThread.OLD_EDT deprecation on DumbAwareActions [#2088](https://github.com/magento/magento2-phpstorm-plugin/pull/2088)
26+
927
## 5.2.0
1028

1129
### Fixed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
1. Check out this repository
4444
1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
45-
1. Make sure that you on the latest develop branch (e.g `5.3.0-develop`)
45+
1. Make sure that you on the latest develop branch (e.g `5.4.0-develop`)
4646
1. Right-click on the `build.gradle` file, choose "Import Gradle project" (if this is not exist look for "Build module '<root folder name>'") (you need to have Gradle plugin installed)
4747
1. Check if the right SDK version is used for the project.
4848
- Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK`

build.gradle

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,52 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
56

67
plugins {
7-
id 'org.jetbrains.intellij' version '1.17.3'
8+
id "org.jetbrains.intellij.platform" version "2.1.0"
89
id 'checkstyle'
910
id 'pmd'
1011
id 'org.jetbrains.changelog' version '2.2.0'
1112
}
1213

1314
repositories {
1415
mavenCentral()
16+
17+
intellijPlatform {
18+
defaultRepositories()
19+
marketplace()
20+
}
1521
}
1622

1723
group 'com.magento.idea'
18-
version '5.3.0'
24+
version '5.4.0'
1925

20-
apply plugin: 'org.jetbrains.intellij'
26+
apply plugin: 'org.jetbrains.intellij.platform'
2127
apply plugin: 'java'
2228
apply plugin: 'idea'
2329
apply plugin: 'groovy'
2430
apply plugin: 'org.jetbrains.changelog'
2531

26-
def phpPluginVersion = System.getProperty("phpPluginVersion", "241.14494.158")
27-
def ideaVersion = System.getProperty("ideaVersion", "2024.1")
32+
def phpPluginVersion = System.getProperty("phpPluginVersion", "242.20224.427")
33+
def ideaVersion = System.getProperty("ideaVersion", "2024.2")
2834
def javaVersion = 17
2935

3036
java {
3137
sourceCompatibility = javaVersion
3238
targetCompatibility = javaVersion
3339
}
3440

35-
intellij {
41+
intellijPlatform {
3642
version = ideaVersion
37-
type = 'IU'
38-
pluginName = 'com.magento.idea.magento2plugin'
39-
plugins = [
40-
"com.jetbrains.php:$phpPluginVersion",
41-
'yaml',
42-
'java-i18n',
43-
'properties',
44-
'com.intellij.css',
45-
'JavaScript',
46-
'com.intellij.lang.jsgraphql:241.14494.150',
47-
'platform-images',
48-
'copyright'
49-
]
50-
updateSinceUntilBuild = false
51-
sameSinceUntilBuild = false
52-
downloadSources = !Boolean.valueOf(System.getenv('CI'))
53-
sandboxDir = "${project.rootDir}/.idea-sandbox"
54-
55-
patchPluginXml {
56-
changeNotes = provider { changelog.getLatest().toHTML() }
43+
projectName = 'com.magento.idea.magento2plugin'
44+
45+
pluginConfiguration {
46+
id = 'com.magento.idea.magento2plugin'
47+
name = 'Magento PhpStorm'
48+
version = '5.4.0'
49+
description = 'This is a PhpStorm IDE plugin for a better Magento 2 development workflow.'
50+
changeNotes = provider { changelog.getLatest().toHTML() } as Provider<? extends String>
5751
}
5852
}
5953

@@ -114,6 +108,17 @@ dependencies {
114108
testRuntimeOnly('org.junit.vintage:junit-vintage-engine:5.9.0')
115109
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.0")
116110
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.00")
111+
112+
intellijPlatform {
113+
intellijIdeaUltimate '2024.2.3'
114+
plugin("com.jetbrains.php", phpPluginVersion)
115+
plugin("com.intellij.lang.jsgraphql", "242.20224.155")
116+
bundledPlugin "JavaScript"
117+
instrumentationTools()
118+
bundledPlugin 'com.intellij.java'
119+
120+
testFramework TestFrameworkType.Platform.INSTANCE
121+
}
117122
}
118123

119124
test {

resources/META-INF/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<idea-plugin require-restart="true">
88
<id>com.magento.idea.magento2plugin</id>
99
<name>Magento PhpStorm</name>
10-
<version>5.3.0</version>
10+
<version>5.4.0</version>
1111
<vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
1212

1313
<description><![CDATA[
@@ -24,7 +24,7 @@
2424
</change-notes>
2525

2626
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
27-
<idea-version since-build="241.14494.158"/>
27+
<idea-version since-build="242.20224.300"/>
2828

2929
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
3030
on how to target different products -->

src/com/magento/idea/magento2plugin/util/RegExUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static class Magento {
6464
= "[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+";
6565

6666
public static final String THEME_NAME
67-
= "[a-z]+/[A-Z][a-zA-Z0-9_]+/[a-z][a-zA-Z0-9_]+";
67+
= "[a-z]+/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+";
6868

6969
public static final String MFTF_CURLY_BRACES
7070
= ".*\\{\\{[^\\}]+\\}\\}.*";

0 commit comments

Comments
 (0)