Fix errors in integration tests 2

src/org/rascalmpl/compiler/lang/rascalcore/check/CollectStatement.rsc

@@ -715,7 +715,7 @@ private void checkAssignment(Statement current, (Assignable) `<QualifiedName nam
             if(c.isAlreadyDefined("<name>", name)){
                 c.use(name, variableRoles);
             } else {
-                c.define(base, variableId(), name, defLub([statement],
+                c.define(base, variableId(), name, defType([statement],
                     AType(Solver s){
                         // TODO: this seemingly redundant call is needed; suspicion: the interpreter does not
                         // handle the combination of return and possible exception thrown by s.getType properly

src/org/rascalmpl/compiler/lang/rascalcore/check/RascalConfig.rsc

@@ -45,6 +45,7 @@ import util::FileSystem;
 import util::Reflective;
 import lang::rascalcore::compile::util::Names;
 import analysis::typepal::StringSimilarity;
+import analysis::typepal::LocationChecks;
 
 import IO;
 import List;

src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc

@@ -161,7 +161,8 @@ public PathConfig getAllSrcREPOPathConfig(bool keep = false) {
                             REPO + "typepal/src",
                             LSP_REPO + "src/main/rascal/library",
                             LSP_REPO + "src/main/rascal/lsp",
-                            LSP_REPO + "src/test/rascal"
+                            LSP_REPO + "src/test/rascal",
+                            REPO + "php-analysis/src/main/rascal"
                         ],
                         [ ], 
                         keep=keep);

src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/ConcreteSyntax.rsc

@@ -38,6 +38,7 @@ import Message;
 import String;
 import IO;
 import Location;
+import analysis::typepal::LocationChecks;
 
 // WARNING: this module is sensitive to bootstrapping dependencies and implicit contracts:
 // 

src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc

@@ -44,6 +44,7 @@ import lang::rascalcore::check::NameUtils;
 import lang::rascalcore::compile::Rascal2muRascal::TmpAndLabel;
 
 import Location;
+import analysis::typepal::LocationChecks;
 
 import lang::rascalcore::check::BasicRascalConfig;
 import lang::rascalcore::check::BuiltinFields;
@@ -267,7 +268,7 @@ private loc findContainer(Define d){
     }
     return cscope;
 }
-
+  
 str findDefiningModule(loc l){
     for(ms <- module_scopes,isContainedIn(l, ms, current_tmodel.logical2physical)){
         return definitions[ms].id;