Merge pull request #119 from DaveLiddament/fix/psalm-errors

FIX new psalm errors and deptrac updates
DaveLiddament · Aug 7, 2022 · 27667a9 · 27667a9
2 parents 3fb2318 + 6028842
commit 27667a9
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/depfile.yaml b/depfile.yaml
diff --git a/deptrac.yaml b/deptrac.yaml
@@ -0,0 +1,23 @@
+deptrac:
+  paths:
+    - ./src
+  layers:
+    - name: Domain
+      collectors:
+        - type: directory
+          regex: src/Domain
+    - name: Framework
+      collectors:
+        - type: directory
+          regex: src/Framework
+    - name: Plugins
+      collectors:
+        - type: directory
+          regex: src/Plugins
+  ruleset:
+    Domain: ~
+    Framework:
+      - Domain
+      - Plugins
+    Plugins:
+      - Domain
diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="true"
+    errorLevel="1"
     checkForThrowsDocblock="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

diff --git a/src/Plugins/OutputFormatters/JunitOutputFormatter.php b/src/Plugins/OutputFormatters/JunitOutputFormatter.php
@@ -96,7 +96,7 @@ public function outputResults(AnalysisResults $analysisResults): string
         $dom->formatOutput = true;
         $asXml = $test->asXML();
 
-        if (false !== $asXml) {
+        if ((false !== $asXml) && ('' !== $asXml)) {
             $dom->loadXML($asXml);
         } else {
             throw new SarbException('xml could not be loaded'); // @codeCoverageIgnore