Merge branch 'master' into 7.0.x

pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/MethodReturnsInternalArray.xml

@@ -213,6 +213,17 @@ public class MethodReturnsInternalArrayCase {
         ]]></code>
     </test-code>
 
+    <test-code>
+        <description>nonempty static final fields</description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+            public class MyClass {
+                private static final String[] FOO_BAR = new String[] { "foo", "bar" };
+                public final String[] call() { return FOO_BAR; }
+            }
+            ]]></code>
+    </test-code>
+
     <test-code>
         <description> #1738 MethodReturnsInternalArray in inner classes</description>
         <expected-problems>1</expected-problems>