Merge pull request #381 from markusweigelt/improve-error-handling

[IMPROVEMENT] Improve error handling of validation

Author: beatrycze-volk

Classes/Validation/Common/NodeListValidator.php

@@ -28,6 +28,7 @@
 use DOMNode;
 use DOMNodeList;
 use DOMXPath;
+use Exception;
 use TYPO3\CMS\Extbase\Error\Result;
 
 /**
@@ -61,7 +62,22 @@ public function __construct(DOMXPath $xpath, Result $result, string $expression,
         parent::__construct($severityLevel);
         $this->expression = $expression;
         $this->contextNode = $contextNode;
-        $this->nodeList = $xpath->query($expression, $contextNode);
+        try {
+            $nodeList = $xpath->query($expression, $contextNode);
+            if ($nodeList === false) {
+                throw new Exception(
+                    'A syntax error occurred while querying'
+                );
+            }
+            $this->nodeList = $nodeList;
+        } catch (Exception $e) {
+            $errorMessage = sprintf('%s with XPath expression "%s"', $e->getMessage(), $this->expression);
+            if ($this->contextNode) {
+                $errorMessage .= sprintf(' under "%s"', $this->contextNode->getNodePath());
+            }
+            throw new Exception($errorMessage, $e->getCode(), $e);
+        }
+
         $this->result = $result;
     }
 

Resources/Private/Less/components/validationform.less

@@ -31,59 +31,59 @@
                 margin: 1.5em 0;
                 margin-top: 0.5em;
             }
+        }
 
-            .callout {
-                border-radius: .25rem;
-                box-shadow: 0 1px 3px rgba(0 0 0 / 12%), 0 1px 2px rgba(0 0 0 / 24%);
-                background-color: #fff;
-                border-left: 5px solid #e9ecef;
-                margin-bottom: 1rem;
-                padding: 1rem;
+        .callout {
+            border-radius: .25rem;
+            box-shadow: 0 1px 3px rgba(0 0 0 / 12%), 0 1px 2px rgba(0 0 0 / 24%);
+            background-color: #fff;
+            border-left: 5px solid #e9ecef;
+            margin-bottom: 1rem;
+            padding: 1rem;
 
-                &.callout-error {
-                    border-left-color: @error-red;
+            &.callout-error {
+                border-left-color: @error-red;
 
-                    h3 {
-                        color: @error-red;
-                    }
+                h3 {
+                    color: @error-red;
                 }
+            }
 
-                &.callout-warning {
-                    border-left-color: @warning-yellow;
+            &.callout-warning {
+                border-left-color: @warning-yellow;
 
-                    h3 {
-                        color: @warning-yellow;
-                    }
+                h3 {
+                    color: @warning-yellow;
                 }
+            }
 
-                &.callout-notice {
-                    border-left-color: @base-blue;
+            &.callout-notice {
+                border-left-color: @base-blue;
 
-                    h3 {
-                        color: @base-blue;
-                    }
+                h3 {
+                    color: @base-blue;
                 }
+            }
 
-                &.callout-success {
-                    border-left-color: @okay-green;
+            &.callout-success {
+                border-left-color: @okay-green;
 
-                    h3 {
-                        color: @okay-green;
-                    }
+                h3 {
+                    color: @okay-green;
                 }
+            }
 
-                ul li {
-                    margin: 0.5em 0;
+            ul li {
+                margin: 0.5em 0;
 
-                    &::before {
-                        top: -1px;
-                    }
+                &::before {
+                    top: -1px;
                 }
+            }
 
-                h3 {
-                    margin: 0;
-                    font-size: 18px;
-                }
+            h3 {
+                margin: 0;
+                font-size: 18px;
             }
         }
     }