diff --git a/src/main/java/de/espend/idea/php/toolbox/dict/json/JsonRawContainerProvider.java b/src/main/java/de/espend/idea/php/toolbox/dict/json/JsonRawContainerProvider.java index 74e01d4..22e27d4 100644 --- a/src/main/java/de/espend/idea/php/toolbox/dict/json/JsonRawContainerProvider.java +++ b/src/main/java/de/espend/idea/php/toolbox/dict/json/JsonRawContainerProvider.java @@ -11,7 +11,7 @@ import de.espend.idea.php.toolbox.navigation.locator.utils.TargetLocatorUtil; import de.espend.idea.php.toolbox.type.PhpToolboxTypeProviderArguments; import de.espend.idea.php.toolbox.type.PhpToolboxTypeProviderInterface; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/gotoCompletion/contributor/PhpArrayCallbackGotoCompletion.java b/src/main/java/de/espend/idea/php/toolbox/gotoCompletion/contributor/PhpArrayCallbackGotoCompletion.java index 0984011..e655d92 100644 --- a/src/main/java/de/espend/idea/php/toolbox/gotoCompletion/contributor/PhpArrayCallbackGotoCompletion.java +++ b/src/main/java/de/espend/idea/php/toolbox/gotoCompletion/contributor/PhpArrayCallbackGotoCompletion.java @@ -14,7 +14,7 @@ import com.jetbrains.php.lang.parser.PhpElementTypes; import com.jetbrains.php.lang.psi.elements.*; import de.espend.idea.php.toolbox.gotoCompletion.GotoCompletionContributor; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/matcher/php/ArrayKeySignatureRegistrarMatcher.java b/src/main/java/de/espend/idea/php/toolbox/matcher/php/ArrayKeySignatureRegistrarMatcher.java index 0e16e15..943924a 100644 --- a/src/main/java/de/espend/idea/php/toolbox/matcher/php/ArrayKeySignatureRegistrarMatcher.java +++ b/src/main/java/de/espend/idea/php/toolbox/matcher/php/ArrayKeySignatureRegistrarMatcher.java @@ -14,7 +14,7 @@ import de.espend.idea.php.toolbox.matcher.php.container.ContainerConditions; import de.espend.idea.php.toolbox.matcher.php.util.PhpMatcherUtil; import de.espend.idea.php.toolbox.symfony.util.MethodMatcher; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/matcher/php/ArrayKeyValueSignatureRegistrarMatcher.java b/src/main/java/de/espend/idea/php/toolbox/matcher/php/ArrayKeyValueSignatureRegistrarMatcher.java index c9d7cf0..38d3829 100644 --- a/src/main/java/de/espend/idea/php/toolbox/matcher/php/ArrayKeyValueSignatureRegistrarMatcher.java +++ b/src/main/java/de/espend/idea/php/toolbox/matcher/php/ArrayKeyValueSignatureRegistrarMatcher.java @@ -14,7 +14,7 @@ import de.espend.idea.php.toolbox.matcher.php.container.ContainerConditions; import de.espend.idea.php.toolbox.symfony.utils.PhpElementsUtil; import de.espend.idea.php.toolbox.symfony.util.MethodMatcher; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/matcher/php/MethodParameterRegistrarMatcher.java b/src/main/java/de/espend/idea/php/toolbox/matcher/php/MethodParameterRegistrarMatcher.java index 5e2650f..9d709b0 100644 --- a/src/main/java/de/espend/idea/php/toolbox/matcher/php/MethodParameterRegistrarMatcher.java +++ b/src/main/java/de/espend/idea/php/toolbox/matcher/php/MethodParameterRegistrarMatcher.java @@ -10,7 +10,7 @@ import de.espend.idea.php.toolbox.extension.LanguageRegistrarMatcherInterface; import de.espend.idea.php.toolbox.matcher.php.container.ContainerConditions; import de.espend.idea.php.toolbox.symfony.util.MethodMatcher; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/src/main/java/de/espend/idea/php/toolbox/matcher/php/container/ContainerConditions.java b/src/main/java/de/espend/idea/php/toolbox/matcher/php/container/ContainerConditions.java index 63a2810..33a8d3a 100644 --- a/src/main/java/de/espend/idea/php/toolbox/matcher/php/container/ContainerConditions.java +++ b/src/main/java/de/espend/idea/php/toolbox/matcher/php/container/ContainerConditions.java @@ -2,7 +2,7 @@ import com.intellij.openapi.util.Condition; import de.espend.idea.php.toolbox.dict.json.JsonSignature; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/de/espend/idea/php/toolbox/matcher/php/docTag/PhpDocTagGotoCompletionContributor.java b/src/main/java/de/espend/idea/php/toolbox/matcher/php/docTag/PhpDocTagGotoCompletionContributor.java index 56a16f1..a9912f0 100644 --- a/src/main/java/de/espend/idea/php/toolbox/matcher/php/docTag/PhpDocTagGotoCompletionContributor.java +++ b/src/main/java/de/espend/idea/php/toolbox/matcher/php/docTag/PhpDocTagGotoCompletionContributor.java @@ -18,7 +18,7 @@ import de.espend.idea.php.toolbox.navigation.dict.PhpToolboxDeclarationHandlerParameter; import de.espend.idea.php.toolbox.utils.ExtensionProviderUtil; import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/matcher/php/util/PhpMatcherUtil.java b/src/main/java/de/espend/idea/php/toolbox/matcher/php/util/PhpMatcherUtil.java index 762d8af..04be4be 100644 --- a/src/main/java/de/espend/idea/php/toolbox/matcher/php/util/PhpMatcherUtil.java +++ b/src/main/java/de/espend/idea/php/toolbox/matcher/php/util/PhpMatcherUtil.java @@ -9,7 +9,7 @@ import de.espend.idea.php.toolbox.matcher.php.container.ContainerConditions; import de.espend.idea.php.toolbox.symfony.Symfony2InterfacesUtil; import de.espend.idea.php.toolbox.symfony.utils.PhpElementsUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/src/main/java/de/espend/idea/php/toolbox/matcher/twig/TwigBlockRegistrarMatcher.java b/src/main/java/de/espend/idea/php/toolbox/matcher/twig/TwigBlockRegistrarMatcher.java index 4bbaf4d..70e7229 100644 --- a/src/main/java/de/espend/idea/php/toolbox/matcher/twig/TwigBlockRegistrarMatcher.java +++ b/src/main/java/de/espend/idea/php/toolbox/matcher/twig/TwigBlockRegistrarMatcher.java @@ -6,7 +6,7 @@ import de.espend.idea.php.toolbox.dict.matcher.LanguageMatcherParameter; import de.espend.idea.php.toolbox.extension.LanguageRegistrarMatcherInterface; import de.espend.idea.php.toolbox.utils.TwigUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.util.HashSet; diff --git a/src/main/java/de/espend/idea/php/toolbox/navigation/PhpToolboxGotoDeclarationHandler.java b/src/main/java/de/espend/idea/php/toolbox/navigation/PhpToolboxGotoDeclarationHandler.java index faefb26..0969dac 100644 --- a/src/main/java/de/espend/idea/php/toolbox/navigation/PhpToolboxGotoDeclarationHandler.java +++ b/src/main/java/de/espend/idea/php/toolbox/navigation/PhpToolboxGotoDeclarationHandler.java @@ -15,7 +15,7 @@ import de.espend.idea.php.toolbox.extension.PhpToolboxProviderInterface; import de.espend.idea.php.toolbox.navigation.dict.PhpToolboxDeclarationHandlerParameter; import de.espend.idea.php.toolbox.utils.RegistrarMatchUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/ArrayReturnSourceContributor.java b/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/ArrayReturnSourceContributor.java index 9706753..7346c0d 100644 --- a/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/ArrayReturnSourceContributor.java +++ b/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/ArrayReturnSourceContributor.java @@ -14,7 +14,7 @@ import de.espend.idea.php.toolbox.provider.source.SourceContributorDeclarationHandlerParameter; import de.espend.idea.php.toolbox.provider.source.SourceContributorParameter; import de.espend.idea.php.toolbox.provider.source.contributor.utils.ReturnSourceUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/StringReturnSourceContributor.java b/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/StringReturnSourceContributor.java index f82fbec..3fd6a53 100644 --- a/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/StringReturnSourceContributor.java +++ b/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/StringReturnSourceContributor.java @@ -14,7 +14,7 @@ import de.espend.idea.php.toolbox.provider.source.SourceContributorParameter; import de.espend.idea.php.toolbox.provider.source.contributor.utils.ReturnSourceUtil; import de.espend.idea.php.toolbox.symfony.utils.PhpElementsUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/SubClassesSourceContributor.java b/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/SubClassesSourceContributor.java index c226525..b853238 100644 --- a/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/SubClassesSourceContributor.java +++ b/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/SubClassesSourceContributor.java @@ -8,7 +8,7 @@ import de.espend.idea.php.toolbox.extension.SourceContributorInterface; import de.espend.idea.php.toolbox.provider.source.SourceContributorDeclarationHandlerParameter; import de.espend.idea.php.toolbox.provider.source.SourceContributorParameter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/utils/ReturnSourceUtil.java b/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/utils/ReturnSourceUtil.java index dc7f591..260f825 100644 --- a/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/utils/ReturnSourceUtil.java +++ b/src/main/java/de/espend/idea/php/toolbox/provider/source/contributor/utils/ReturnSourceUtil.java @@ -6,7 +6,7 @@ import com.jetbrains.php.lang.psi.elements.PhpClass; import de.espend.idea.php.toolbox.dict.json.JsonRawLookupElement; import de.espend.idea.php.toolbox.utils.JsonParseUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/refactoring/TypeHintSuggestionProvider.java b/src/main/java/de/espend/idea/php/toolbox/refactoring/TypeHintSuggestionProvider.java index 5df95bf..3e0fcfe 100644 --- a/src/main/java/de/espend/idea/php/toolbox/refactoring/TypeHintSuggestionProvider.java +++ b/src/main/java/de/espend/idea/php/toolbox/refactoring/TypeHintSuggestionProvider.java @@ -7,7 +7,7 @@ import com.intellij.util.containers.ContainerUtil; import com.jetbrains.php.lang.psi.elements.Parameter; import com.jetbrains.php.refactoring.PhpNameSuggestionUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang.WordUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/symfony/utils/PhpElementsUtil.java b/src/main/java/de/espend/idea/php/toolbox/symfony/utils/PhpElementsUtil.java index 597d31e..5ea098a 100644 --- a/src/main/java/de/espend/idea/php/toolbox/symfony/utils/PhpElementsUtil.java +++ b/src/main/java/de/espend/idea/php/toolbox/symfony/utils/PhpElementsUtil.java @@ -15,7 +15,7 @@ import com.jetbrains.php.lang.psi.elements.*; import de.espend.idea.php.toolbox.symfony.dic.MethodReferenceBag; import de.espend.idea.php.toolbox.symfony.util.ParameterBag; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/type/PhpToolboxTypeProvider.java b/src/main/java/de/espend/idea/php/toolbox/type/PhpToolboxTypeProvider.java index f905ae1..50842a5 100644 --- a/src/main/java/de/espend/idea/php/toolbox/type/PhpToolboxTypeProvider.java +++ b/src/main/java/de/espend/idea/php/toolbox/type/PhpToolboxTypeProvider.java @@ -19,7 +19,7 @@ import de.espend.idea.php.toolbox.symfony.Symfony2InterfacesUtil; import de.espend.idea.php.toolbox.type.utils.PhpTypeProviderUtil; import de.espend.idea.php.toolbox.utils.ExtensionProviderUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/espend/idea/php/toolbox/type/utils/PhpTypeProviderUtil.java b/src/main/java/de/espend/idea/php/toolbox/type/utils/PhpTypeProviderUtil.java index 74a4a5a..8e4ea26 100644 --- a/src/main/java/de/espend/idea/php/toolbox/type/utils/PhpTypeProviderUtil.java +++ b/src/main/java/de/espend/idea/php/toolbox/type/utils/PhpTypeProviderUtil.java @@ -5,7 +5,7 @@ import com.jetbrains.php.PhpIndex; import com.jetbrains.php.lang.psi.elements.*; import de.espend.idea.php.toolbox.symfony.utils.PhpElementsUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import java.util.Collection; diff --git a/src/main/java/de/espend/idea/php/toolbox/utils/JsonParseUtil.java b/src/main/java/de/espend/idea/php/toolbox/utils/JsonParseUtil.java index 1ff33f6..51c6e8c 100644 --- a/src/main/java/de/espend/idea/php/toolbox/utils/JsonParseUtil.java +++ b/src/main/java/de/espend/idea/php/toolbox/utils/JsonParseUtil.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.lookup.LookupElementPresentation; import de.espend.idea.php.toolbox.PhpToolboxApplicationService; import de.espend.idea.php.toolbox.dict.json.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/de/espend/idea/php/toolbox/tests/SymfonyLightCodeInsightFixtureTestCase.java b/src/test/java/de/espend/idea/php/toolbox/tests/SymfonyLightCodeInsightFixtureTestCase.java index 44617d4..3ac2e3c 100644 --- a/src/test/java/de/espend/idea/php/toolbox/tests/SymfonyLightCodeInsightFixtureTestCase.java +++ b/src/test/java/de/espend/idea/php/toolbox/tests/SymfonyLightCodeInsightFixtureTestCase.java @@ -15,7 +15,7 @@ import com.jetbrains.php.lang.psi.elements.Function; import com.jetbrains.php.lang.psi.elements.Method; import com.jetbrains.php.lang.psi.elements.PhpReference; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.io.IOException;