Skip to content

Commit 24d053a

Browse files
committed
Merge branch 'ticket/OPP-102' of https://github.com/oroinc/oro-phpstorm-plugin
# Conflicts: # src/main/resources/META-INF/plugin.xml
2 parents 11d3021 + c80b2e5 commit 24d053a

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

src/main/java/com/oroplatform/idea/oroplatform/schema/SchemasV1.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,9 @@ private static Schema actions() {
898898
)),
899899
Property.named("actions", actions),
900900
Property.named("conditions", conditions),
901-
Property.named("acl_resource", acl)
901+
Property.named("acl_resource", acl),
902+
Property.named("replace", OneOf.from(Sequence.of(Scalars.choices("actions", "conditions", "acl_resource")))
903+
)
902904
)
903905
)),
904906
Property.named("skipped_config", Container.any)

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Plugin for the PHPStorm that will help to increase the development speed on the
1313
<h2>1.1.2</h2>
1414
<ul>
1515
<li>Upgrade compatibility with 2024.3 version of PHPStorm.</li>
16+
<li>Fix lack of support for "replace" keyword in action_groups node in actions.yml schema.</li>
1617
</ul>
1718
<h2>1.1.1</h2>
1819
<ul>

0 commit comments

Comments
 (0)