Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6cfd6b2

Browse files
2025.1 build
1 parent 1928b76 commit 6cfd6b2

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ Changelog
22
=========
33

44
# Version names
5-
* 2024.x: PhpStorm 2024.1+
5+
* 2025.x: PhpStorm 2025.1+
6+
* 2024.x: PhpStorm 2024.1+ (no support)
67
* 2023.x: PhpStorm 2023.1+ (no support)
78
* 2022.x: PhpStorm 2022.1+ (no support)
89
* 0.23.x: PhpStorm 2021.1+ (no support)

‎gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginGroup = fr.adrienbrault.idea.symfony2plugin
55
pluginName = Symfony Plugin
66

77
# SemVer format -> https://semver.org
8-
pluginVersion = 2022.1.264
8+
pluginVersion = 2025.1.264
99

1010
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
1111
# for insight into build numbers and IntelliJ Platform versions.
@@ -15,11 +15,11 @@ pluginUntilBuild =
1515

1616
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
1717
platformType = IU
18-
platformVersion = 2024年3月5日
18+
platformVersion = 2025.1
1919

2020
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
2121
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
22-
platformPlugins = com.jetbrains.php:243.26053.27,de.espend.idea.php.annotation:11.1.1,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:243.26053.20,com.jetbrains.php.dql:243.21565.129
22+
platformPlugins = com.jetbrains.php:251.23774.318,de.espend.idea.php.annotation:12.0.0,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:251.23774.318,com.jetbrains.php.dql:251.23774.318
2323
platformBundledPlugins = com.intellij.java,com.jetbrains.plugins.webDeployment,org.jetbrains.plugins.yaml,JavaScript
2424

2525
# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ private static int getArgumentIndexByCount(@NotNull XmlTag xmlTag) {
809809
* <service class="Foobar"></service>
810810
*/
811811
public static PsiElementPattern.Capture<PsiElement> getXmlTagNameLeafStartPattern() {
812-
return PlatformPatterns.psiElement(XmlElementType.XML_NAME)
812+
return PlatformPatterns.psiElement(XmlTokenType.XML_NAME)
813813
.afterLeaf(PlatformPatterns.psiElement(XmlTokenType.XML_START_TAG_START))
814814
.withParent(XmlTag.class);
815815
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.intellij.openapi.vfs.VirtualFile;
1010
import com.intellij.psi.PsiElement;
1111
import com.intellij.util.ProcessingContext;
12-
import com.intellij.util.containers.ContainerUtil;
1312
import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
1413
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
1514
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
@@ -32,10 +31,7 @@
3231
import javax.xml.xpath.XPathExpressionException;
3332
import javax.xml.xpath.XPathFactory;
3433
import java.io.IOException;
35-
import java.util.Collections;
36-
import java.util.HashMap;
37-
import java.util.List;
38-
import java.util.Map;
34+
import java.util.*;
3935
import java.util.regex.Matcher;
4036
import java.util.regex.Pattern;
4137

@@ -71,15 +67,15 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
7167
}
7268

7369
// get all parent yaml keys
74-
List<String> items = YamlHelper.getParentArrayKeys(element);
75-
if(items.isEmpty()) {
70+
List<String> itemsRaw = YamlHelper.getParentArrayKeys(element);
71+
if(itemsRaw.isEmpty()) {
7672
return;
7773
}
7874

7975
// normalize for xml
80-
items = ContainerUtil.map(items, s -> s.replace('_', '-'));
76+
List<String> items = newArrayList<>(itemsRaw.stream().map(s -> s.replace('_', '-')).toList());
8177

82-
// reverse to get top most item first
78+
// reverse to get the top most item first
8379
Collections.reverse(items);
8480

8581
Document document = getConfigTemplate(ProjectUtil.getProjectDir(element));

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/DuplicateLocalRouteInspection.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.jetbrains.yaml.psi.YAMLKeyValue;
3030
import org.jetbrains.yaml.psi.YAMLMapping;
3131

32+
import java.util.ArrayList;
3233
import java.util.Collection;
3334

3435
/**
@@ -103,7 +104,7 @@ private void visitPhp(@NotNull StringLiteralExpression element) {
103104
String contents = element.getContents();
104105

105106
for (Method ownMethod : method.getContainingClass().getOwnMethods()) {
106-
Collection<PhpAttribute> attributes = ownMethod.getAttributes("\\Symfony\\Component\\Routing\\Annotation\\Route");
107+
Collection<PhpAttribute> attributes = newArrayList<>(ownMethod.getAttributes("\\Symfony\\Component\\Routing\\Annotation\\Route"));
107108
attributes.addAll(ownMethod.getAttributes("\\Symfony\\Component\\Routing\\Attribute\\Route"));
108109

109110
for (PhpAttribute attribute : attributes) {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /