Merge pull request #23 from vaail/master

fix: catch convertAttribute exceptions

Author: mlanin

src/Collections/QueriesCollection.php

@@ -118,32 +118,45 @@ protected function convertAttribute($attribute)
     {
         try {
             return (string) $attribute;
+        } catch (\Throwable $e) {
+            return $this->handleConvertAttributeException($attribute);
         } catch (\Exception $e) {
-            switch (true) {
-                // Handle DateTime attribute pass.
-                case $attribute instanceof \DateTime:
-                    return $attribute->format('Y-m-d H:i:s');
-
-                // Handle callables.
-                case $attribute instanceof \Closure:
-                    return $this->convertAttribute($attribute());
-
-                // Handle arrays using json by default or print_r if error occurred.
-                case is_array($attribute):
-                    $json = json_encode($attribute);
-
-                    return json_last_error() === JSON_ERROR_NONE
-                        ? $json
-                        : print_r($attribute);
-
-                // Handle all other object.
-                case is_object($attribute):
-                    return get_class($attribute);
-
-                // For all unknown.
-                default:
-                    return '?';
-            }
+            return $this->handleConvertAttributeException($attribute);
+        }
+    }
+
+    /**
+     * Handle convert attribute exception and convert attribute to string.
+     *
+     * @param  mixed $attribute
+     * @return string
+     */
+    protected function handleConvertAttributeException($attribute)
+    {
+        switch (true) {
+            // Handle DateTime attribute pass.
+            case $attribute instanceof \DateTime:
+                return $attribute->format('Y-m-d H:i:s');
+
+            // Handle callables.
+            case $attribute instanceof \Closure:
+                return $this->convertAttribute($attribute());
+
+            // Handle arrays using json by default or print_r if error occurred.
+            case is_array($attribute):
+                $json = json_encode($attribute);
+
+                return json_last_error() === JSON_ERROR_NONE
+                    ? $json
+                    : print_r($attribute);
+
+            // Handle all other object.
+            case is_object($attribute):
+                return get_class($attribute);
+
+            // For all unknown.
+            default:
+                return '?';
         }
     }
 }