Merge pull request #19 from gaarf/running-tests

gaarf · web-flow · commit 9dab45c36449 · 2020-05-24T13:16:11.000-07:00
fix tests / CI
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,4 +38,4 @@ jobs:
       run: composer phpstan
 
     - name: Run tests
-      run: bash tests/test.sh
+      run: tests/test.sh
diff --git a/src/Helper.php b/src/Helper.php
@@ -36,7 +36,7 @@ public static function domNodeToArray($node)
 						if (!isset($output[$t])) {
 							$output[$t] = [];
 						}
-						if (empty($v)) {
+						if (is_array($v) && empty($v)) {
 							$v = '';
 						}
 						$output[$t][] = $v;
diff --git a/tests/test.sh b/tests/test.sh
@@ -36,10 +36,6 @@ EOD;
 
 $expected = array(
 
-  "@root" => 'tv',
-
-  "@attributes" => array( "type" => "cartoon" ),
-
   "show" => array(
 
     array(
@@ -82,7 +78,11 @@ $expected = array(
       )
     )
 
-  )
+  ),
+
+  "@attributes" => array( "type" => "cartoon" ),
+
+  "@root" => 'tv',
 );
 
 $result = \Gaarf\XmlToPhp\Convertor::covertToArray($xmlstr);
@@ -92,7 +92,8 @@ if ($result == $expected) {
 } else {
 	prettyPrint('Result', 'FAILURE :-(');
 	prettyPrint('Input', $xmlstr);
-    prettyPrint('Expected', $expected);
-    prettyPrint('Output', $result);
+  prettyPrint('Expected', $expected);
+  prettyPrint('Output', $result);
 	prettyPrint('Result', 'FAILURE :-(');
+  exit(1);
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static function domNodeToArray($node)`
`36`	`36`	`if (!isset($output[$t])) {`
`37`	`37`	`$output[$t] = [];`
`38`	`38`	`}`
`39`		`- if (empty($v)) {`
	`39`	`+ if (is_array($v) && empty($v)) {`
`40`	`40`	`$v = '';`
`41`	`41`	`}`
`42`	`42`	`$output[$t][] = $v;`