allow "setUpBeforeTest" to be a valid "setUp" method for checking property types Haehnchen#35

Author: Haehnchen

gradle.properties

@@ -1,2 +1,2 @@
-ideaVersion = IU-2019.2
-phpPluginVersion = 192.5728.108
+ideaVersion = IU-2020.1
+phpPluginVersion = 201.6668.153

src/main/java/de/espend/idea/php/phpunit/utils/ChainVisitorUtil.java

@@ -98,17 +98,19 @@ private static PhpPsiElement resolveField(@NotNull FieldReference fieldReference
  Method methodScope = PhpPsiUtil.getParentByCondition(fieldReference, Method.INSTANCEOF);
  if(methodScope != null) {
  PhpClass phpClass = methodScope.getContainingClass();
- if(phpClass != null/* && PhpUnitPluginUtil.isTestClassWithoutIndexAccess(phpClass) */) {
- Method method = phpClass.findOwnMethodByName("setUp");
-
- // "setUp" is our "constructor" for test classes
- if(method != null) {
- for (AssignmentExpression assignmentExpression : PsiTreeUtil.collectElementsOfType(method, AssignmentExpression.class)) {
- PhpPsiElement variable = assignmentExpression.getVariable();
-
- // remember or field name and attach is for a later resolve
- if(variable instanceof FieldReference && name.equals(variable.getName())) {
- return assignmentExpression.getValue();
+ if(phpClass != null) {
+ for (String setupMethod : new String[]{"setUp", "setUpBeforeTest"}) {
+ Method method = phpClass.findOwnMethodByName(setupMethod);
+
+ // "setUp" is our "constructor" for test classes
+ if(method != null) {
+ for (AssignmentExpression assignmentExpression : PsiTreeUtil.collectElementsOfType(method, AssignmentExpression.class)) {
+ PhpPsiElement variable = assignmentExpression.getVariable();
+
+ // remember or field name and attach is for a later resolve
+ if(variable instanceof FieldReference && name.equals(variable.getName())) {
+ return assignmentExpression.getValue();
+ }
  }
  }
  }