Repos sync: org.apache.commons.lang.ArrayUtils deprecations.

Author: ea-inspections-team

src/main/java/com/kalessil/phpStorm/phpInspectionsEA/gui/PrettyListControl.java

@@ -3,16 +3,15 @@
 import com.intellij.ui.DoubleClickListener;
 import com.intellij.ui.ToolbarDecorator;
 import com.intellij.ui.components.JBList;
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.function.Supplier;
 
 public class PrettyListControl {
@@ -115,7 +114,7 @@ private void rearrange(final int moveDelta) {
             list.clearSelection();
 
             if (moveDelta == 1) {
-                ArrayUtils.reverse(selectedIndices);
+                Collections.reverse(Arrays.asList(selectedIndices));
             }
 
             for (final int selectedIndex : selectedIndices) {

src/main/java/com/kalessil/phpStorm/phpInspectionsEA/inspectors/apiUsage/strings/CascadeStringReplacementInspector.java

@@ -17,7 +17,6 @@
 import com.kalessil.phpStorm.phpInspectionsEA.openApi.PhpLanguageLevel;
 import com.kalessil.phpStorm.phpInspectionsEA.options.OptionsComponent;
 import com.kalessil.phpStorm.phpInspectionsEA.utils.*;
-import org.apache.commons.lang.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -298,7 +297,7 @@ private void mergeArguments(@NotNull Project project, @NotNull PsiElement to, @N
                 if (comma != null && marker != null) {
                     if (from instanceof ArrayCreationExpression) {
                         final PsiElement[] values = from.getChildren();
-                        ArrayUtils.reverse(values);
+                        Collections.reverse(Arrays.asList(values));
                         Arrays.stream(values).forEach(value -> {
                             to.addAfter(comma, marker);
                             to.addAfter(value.copy(), marker);
@@ -318,7 +317,7 @@ private void mergeArguments(@NotNull Project project, @NotNull PsiElement to, @N
                     final PsiElement marker                   = firstValue == null ? null : firstValue.getPrevSibling();
                     if (comma != null && marker != null) {
                         final PsiElement[] values = from.getChildren();
-                        ArrayUtils.reverse(values);
+                        Collections.reverse(Arrays.asList(values));
                         Arrays.stream(values).forEach(value -> {
                             replacement.addAfter(comma, marker);
                             replacement.addAfter(value.copy(), marker);

src/main/java/com/kalessil/phpStorm/phpInspectionsEA/inspectors/forEach/DisconnectedForeachInstructionInspector.java

@@ -13,15 +13,11 @@
 import com.kalessil.phpStorm.phpInspectionsEA.openApi.BasePhpInspection;
 import com.kalessil.phpStorm.phpInspectionsEA.options.OptionsComponent;
 import com.kalessil.phpStorm.phpInspectionsEA.utils.*;
-import org.apache.commons.lang.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Stream;
 
 /*
@@ -235,7 +231,7 @@ private void investigateInfluence(
                         } else if (OpenapiTypesUtil.isFunctionReference(grandParent)) {
                             /* php will create variable, if it is by reference */
                             final FunctionReference reference = (FunctionReference) grandParent;
-                            final int position                = ArrayUtils.indexOf(reference.getParameters(), variable);
+                            final int position                = Arrays.asList(reference.getParameters()).indexOf(variable);
                             if (position != -1) {
                                 final PsiElement resolved = OpenapiResolveUtil.resolveReference(reference);
                                 if (resolved instanceof Function) {

testData/fixtures/foreach/disconnected-statements-foreach-false-positives.php

@@ -71,10 +71,12 @@
     }
 }
 
-/* loop with unpacking array into multiple variables */
-foreach ([[], [], []] as list($a, $b, $c)) {
-    if ($b === $count) {
-        unset($a, $b, $c);
+function test_loop_unpack_into_multiple() {
+    /* loop with unpacking array into multiple variables */
+    foreach ([[], [], []] as list($a, $b, $c)) {
+        if ($b === $count) {
+            unset($a, $b, $c);
+        }
     }
 }