make sure to not end in a never ending loop

core/ExceptionHandler.php

@@ -25,7 +25,7 @@ class ExceptionHandler
     }
 
     /**
-     * @param Exception $exception
+     * @param Exception|\Throwable $exception
      */
     public static function handleException($exception)
     {
@@ -37,7 +37,7 @@ class ExceptionHandler
     }
 
     /**
-     * @param Exception $exception
+     * @param Exception|\Throwable $exception
      */
     public static function dieWithCliError($exception)
     {
@@ -61,7 +61,7 @@ class ExceptionHandler
     }
 
     /**
-     * @param Exception $exception
+     * @param Exception|\Throwable $exception
      */
     public static function dieWithHtmlErrorPage($exception)
     {
@@ -73,7 +73,7 @@ class ExceptionHandler
     }
 
     /**
-     * @param Exception $ex
+     * @param Exception|\Throwable $ex
      */
     private static function getErrorResponse($ex)
     {

core/Plugin/Dimension/VisitDimension.php

@@ -354,7 +354,15 @@ abstract class VisitDimension extends Dimension
             }
         }
 
+        $count = 0;
         while (count($dimensions) > 0) {
+            $count++;
+            if ($count > 1000) {
+                foreach ($dimensions as $dimension) {
+                    $sorted[] = $dimension;
+                }
+                break; // to prevent an endless loop
+            }
             foreach ($dimensions as $key => $dimension) {
                 $fields = $depenencies[$dimension->getColumnName()];
                 if (count(array_intersect($fields, $exists)) === count($fields)) {