test fixes re customfield and setup.xml loading

Author: paulmhh

tests/tine20/Tinebase/CustomFieldTest.php

@@ -139,6 +139,7 @@ public function testCustomFieldRecordsResolving()
             array('field' => 'n_family', 'operator' => 'equals', 'value' => 'Friendly')
         ), 'AND');
 
+        Addressbook_Controller_Contact::getInstance()->resolveCustomfields(true);
         $jsonResult = (new Addressbook_Frontend_Json)->searchContacts($filter->toArray(), []);
         $this->assertSame($jsonResult['results'][0]['n_given'], 'Matt');
         $this->assertArrayNotHasKey($cf1->name, $jsonResult['results'][0]['customfields'] ?? []);

tine20/Setup/Controller.php

@@ -784,7 +784,10 @@ public function getSetupXml($_applicationName, $_disableAppIfNotFound = false)
             }
         }
 
-        $xml = simplexml_load_file($setupXML);
+        if (false === ($xml = simplexml_load_file($setupXML))) {
+            Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' ' . $setupXML
+                . ' failed to load xml: ' . print_r(libxml_get_last_error(), true));
+        }
 
         return $xml;
     }