Skip to content

Commit a621a92

Browse files
committed
Do not report every missing column definiton
Better unit tests
1 parent f75681c commit a621a92

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

src/AbraFlexi/RO.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,9 @@ public function fixRecordTypes(array $record, $evidence = null) {
10371037
if ($column && !strstr($column, '@')) {
10381038
$columnInfo = $this->getColumnInfo($column, $evidence);
10391039
if (is_null($columnInfo)) {
1040-
$this->addStatusMessage(sprintf(_('Unknown response field %s. (Please update library or static definitions)'), $column . '@' . $evidence), 'debug');
1040+
if ($this->debug === true) {
1041+
$this->addStatusMessage(sprintf(_('Unknown response field %s. (Please update library or static definitions)'), $column . '@' . $evidence), 'debug');
1042+
}
10411043
} else {
10421044
switch ($columnInfo['type']) {
10431045
case 'logic':
@@ -1665,7 +1667,7 @@ public function idExists($identifer = null) {
16651667
}
16661668
$ignorestate = $this->ignore404();
16671669
$this->ignore404(true);
1668-
$cands = $this->getFlexiData(null,
1670+
$cands = $this->getFlexiData('',
16691671
[
16701672
'detail' => 'custom:' . $this->getKeyColumn(),
16711673
$this->getKeyColumn() => $identifer
@@ -2130,7 +2132,7 @@ public function getExternalIDs() {
21302132
* @return int
21312133
*/
21322134
public function getGlobalVersion() {
2133-
$this->getFlexiData(null, ['add-global-version' => 'true', 'limit' => 1]);
2135+
$this->getFlexiData('', ['add-global-version' => 'true', 'limit' => 1]);
21342136

21352137
return $this->globalVersion;
21362138
}

testing/src/AbraFlexi/FakturaVydanaTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public function makeInvoice($invoiceData = []) {
190190
if (!isset($invoiceData['firma'])) {
191191
$adresar = new \AbraFlexi\Adresar();
192192

193-
$adresy = $adresar->getFlexiData(null,
193+
$adresy = $adresar->getFlexiData('',
194194
['typVztahuK' => 'typVztahu.odberatel']);
195195
if (count($adresy)) {
196196
$dodavatel = $adresy[array_rand($adresy)];

testing/src/AbraFlexi/NastaveniTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testGetFlexiData() {
4040
$flexidata = $this->object->getFlexiData();
4141
$this->assertArrayHasKey(0, $flexidata);
4242
$this->assertArrayHasKey('id', $flexidata[0]);
43-
$filtrered = $this->object->getFlexiData(null,
43+
$filtrered = $this->object->getFlexiData('',
4444
key($flexidata[0]) . " = " . current($flexidata[0]));
4545
$this->assertArrayHasKey(0, $filtrered);
4646
$this->assertArrayHasKey('id', $filtrered[0]);

testing/src/AbraFlexi/ROTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,13 +535,13 @@ public function testGetFlexiData() {
535535
$this->assertArrayHasKey('company', $flexidata);
536536
break;
537537
case 'evidence-list':
538-
$flexidata = $this->object->getFlexiData(null,
538+
$flexidata = $this->object->getFlexiData('',
539539
['detail' => 'id']);
540540
$this->assertArrayHasKey('evidenceType', $flexidata[0]);
541541
break;
542542

543543
default:
544-
$flexidata = $this->object->getFlexiData(null,
544+
$flexidata = $this->object->getFlexiData('',
545545
['detail' => 'id']);
546546

547547
if (is_array($flexidata)) {
@@ -551,7 +551,7 @@ public function testGetFlexiData() {
551551
$this->assertArrayHasKey(0, $flexidata);
552552

553553
$this->assertArrayHasKey('id', $flexidata[0]);
554-
$filtrered = $this->object->getFlexiData(null,
554+
$filtrered = $this->object->getFlexiData('',
555555
["id = " . $flexidata[0]['id'], 'detail' => 'full']);
556556
$this->assertArrayHasKey(0, $filtrered);
557557
$this->assertArrayHasKey('id', $filtrered[0]);
@@ -672,7 +672,7 @@ public function testRecordExists() {
672672
break;
673673

674674
default:
675-
$flexidata = $this->object->getFlexiData(null,
675+
$flexidata = $this->object->getFlexiData('',
676676
['limit' => 1, 'detail' => 'id']);
677677
if (is_array($flexidata) && !count($flexidata)) {
678678
$this->assertFalse($this->object->recordExists(['id' => 1]),
@@ -744,8 +744,7 @@ public function testGetGlobalVersion() {
744744
$this->object->getGlobalVersion();
745745
break;
746746
default:
747-
$this->assertInternalType("int",
748-
$this->object->getGlobalVersion(),
747+
$this->assertTrue(is_int($this->object->getGlobalVersion()),
749748
'error obtaining of GlobalVersion');
750749
break;
751750
}

0 commit comments

Comments
 (0)