Skip to content

Commit 2f1216b

Browse files
authored
Merge pull request #1889 from Haehnchen/feature/deprecated
replace some deprecated usages
2 parents 49012bc + 5adaa95 commit 2f1216b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private static void visitEnvironment(@NotNull Project project, @NotNull Consumer
9999

100100
// try to find some env's ;)
101101
for (String file : new String[]{".env", ".env.dist", ".env.test", ".env.local"}) {
102-
files.addAll(FilenameIndex.getVirtualFilesByName(project, file, GlobalSearchScope.allScope(project)));
102+
files.addAll(FilenameIndex.getVirtualFilesByName(file, GlobalSearchScope.allScope(project)));
103103
}
104104

105105
// search root directory for all ".env*" files

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/webpack/SymfonyWebpackUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ public class SymfonyWebpackUtil {
2929
* - entrypoints.json
3030
*/
3131
public static void visitAllEntryFileTypes(@NotNull Project project, @NotNull Consumer<Pair<VirtualFile, String>> consumer) {
32-
for (VirtualFile virtualFile : FilenameIndex.getVirtualFilesByName(project, "webpack.config.js", GlobalSearchScope.allScope(project))) {
32+
for (VirtualFile virtualFile : FilenameIndex.getVirtualFilesByName("webpack.config.js", GlobalSearchScope.allScope(project))) {
3333
if (!isTestFile(project, virtualFile)) {
3434
visitWebpackConfiguration(virtualFile, consumer);
3535
}
3636
}
3737

38-
for (VirtualFile virtualFile : FilenameIndex.getVirtualFilesByName(project, "entrypoints.json", GlobalSearchScope.allScope(project))) {
38+
for (VirtualFile virtualFile : FilenameIndex.getVirtualFilesByName("entrypoints.json", GlobalSearchScope.allScope(project))) {
3939
if (!isTestFile(project, virtualFile)) {
4040
visitEntryPointJson(virtualFile, consumer);
4141
}

src/main/java/fr/adrienbrault/idea/symfony2plugin/webDeployment/WebDeploymentUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.adrienbrault.idea.symfony2plugin.webDeployment;
22

33
import com.intellij.ide.plugins.IdeaPluginDescriptor;
4-
import com.intellij.ide.plugins.PluginManager;
4+
import com.intellij.ide.plugins.PluginManagerCore;
55
import com.intellij.openapi.extensions.PluginId;
66
import com.intellij.openapi.project.Project;
77
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
@@ -20,7 +20,7 @@ public static boolean isEnabled(@Nullable Project project) {
2020
}
2121

2222
if(PLUGIN_ENABLED == null) {
23-
IdeaPluginDescriptor plugin = PluginManager.getPlugin(PluginId.getId("com.jetbrains.plugins.webDeployment"));
23+
IdeaPluginDescriptor plugin = PluginManagerCore.getPlugin(PluginId.getId("com.jetbrains.plugins.webDeployment"));
2424
PLUGIN_ENABLED = plugin != null && plugin.isEnabled();
2525
}
2626

0 commit comments

Comments
 (0)