Skip to content

Commit 9919c88

Browse files
committed
tweak(TB tests) fix update test case
1 parent 024a789 commit 9919c88

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

tests/tine20/Tinebase/Frontend/Json/AreaLockTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public function tearDown(): void
3939
*/
4040
public function testAreaLockProviderConfigRemovedFromRegistryData()
4141
{
42+
Tinebase_TransactionManager::getInstance()->unitTestForceSkipRollBack(true);
4243
$this->_createAreaLockConfig([Tinebase_Model_AreaLockConfig::FLD_AREAS => ['foo']]);
4344

4445
$this->assertSame(['pin'], Tinebase_Config::getInstance()->{Tinebase_Config::AREA_LOCKS}->records

tine20/Setup/Controller.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -793,12 +793,12 @@ public function getSetupXml($_applicationName, $_disableAppIfNotFound = false)
793793
$xmlString = file_get_contents($setupXML);
794794
if (str_starts_with($xmlString, '<?xml')) {
795795
libxml_clear_errors();
796-
if (false === ($xml = simplexml_load_string($setupXML))) {
796+
if (false === ($xml = simplexml_load_string($xmlString))) {
797797
Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' ' . $setupXML
798798
. ' failed to load xml: ' . print_r(libxml_get_last_error(), true));
799799
$logMsg = '';
800-
for ($i = 0; $i < mb_strlen($setupXML); ++$i) {
801-
$char = mb_substr($setupXML, $i, 1);
800+
for ($i = 0; $i < mb_strlen($xmlString); ++$i) {
801+
$char = mb_substr($xmlString, $i, 1);
802802
$logMsg .= strlen($char) . ' ' . $char . ' ' . ord($char) . PHP_EOL;
803803
}
804804
Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' ' . $setupXML

0 commit comments

Comments
 (0)