Merge pull request #12 from laravel-workflow/feature/filter-closures

Update new exception format

Author: rmcdaniel

app/Http/Controllers/DashboardStatsController.php

@@ -25,7 +25,12 @@ public function index() {
             ->first();
 
         $maxDurationWorkflow = config('workflows.stored_workflow_model', StoredWorkflow::class)::select('*')
-            ->addSelect(DB::raw('TIMEDIFF(created_at, updated_at) as duration'))
+            ->when(config('database.default') === 'mysql', function ($q) {
+                return $q->addSelect(DB::raw('TIMEDIFF(created_at, updated_at) as duration'));
+            })
+            ->when(config('database.default') === 'pgsql', function ($q) {
+                return $q->addSelect(DB::raw('(EXTRACT(EPOCH FROM created_at - updated_at)) as duration'));
+            })
             ->where('status', '!=', 'pending')
             ->orderBy('duration')
             ->first();

app/Http/Controllers/WorkflowsController.php

@@ -43,21 +43,33 @@ public function show($id) {
 
         $flow->exceptions = $flow->exceptions->map(function ($exception) {
             $unserialized = Y::unserialize($exception->exception);
-            if (is_object($unserialized) && method_exists($unserialized, 'getFile')) {
-                $file = new SplFileObject($unserialized->getFile());
-                $file->seek($unserialized->getLine() - 4);
+            if (is_array($unserialized) && array_key_exists('class', $unserialized) && is_subclass_of($unserialized['class'], \Throwable::class)) {
+                $file = new SplFileObject($unserialized['file']);
+                $file->seek($unserialized['line'] - 4);
                 for ($line = 0; $line < 7; ++$line) {
                     $exception->code .= $file->current();
                     $file->next();
                     if ($file->eof()) break;
                 }
                 $exception->code = rtrim($exception->code);
-                try {
-                    $unserialized->trace = $unserialized->getTrace();
-                } catch (\Throwable $th) {
+                $exception->exception = serialize($unserialized);
+            } else {
+                if (is_object($unserialized) && method_exists($unserialized, 'getFile')) {
+                    $file = new SplFileObject($unserialized->getFile());
+                    $file->seek($unserialized->getLine() - 4);
+                    for ($line = 0; $line < 7; ++$line) {
+                        $exception->code .= $file->current();
+                        $file->next();
+                        if ($file->eof()) break;
+                    }
+                    $exception->code = rtrim($exception->code);
+                    try {
+                        $unserialized->trace = $unserialized->getTrace();
+                    } catch (\Throwable $th) {
+                    }
                 }
+                $exception->exception = serialize($unserialized);
             }
-            $exception->exception = serialize($unserialized);
             return $exception;
         });
 

public/app.js

@@ -1,8 +1,7 @@
 {
-    "/app.js": "/app.js?id=2cc20d4b72226021ffad651f80cc7963",
+    "/app.js": "/app.js?id=2d746dcd282d0f999e7bd41a3187dc71",
     "/app-dark.css": "/app-dark.css?id=f522096d329c54701f099916e0416c38",
     "/app.css": "/app.css?id=768ca5ff3a1358fcfb02f40296b64d0b",
     "/img/favicon.png": "/img/favicon.png?id=7c006241b093796d6abfa3049df93a59",
-    "/img/sprite.svg": "/img/sprite.svg?id=afc4952b74895bdef3ab4ebe9adb746f",
-    "/img/waterline.svg": "/img/waterline.svg?id=904d5b5185fefb09035384e15bfca765"
+    "/img/sprite.svg": "/img/sprite.svg?id=afc4952b74895bdef3ab4ebe9adb746f"
 }

public/mix-manifest.json

@@ -239,7 +239,11 @@ export default {
                         if (seriesIndex === 1) {
                             let exception = phpunserialize(this.flow.exceptions[dataPointIndex].exception)
                             if (typeof exception !== 'object') return '';
-                            exception.__constructor = this.flow.exceptions[dataPointIndex].exception.split('"')[1]
+                            if (exception.class) {
+                                exception.__constructor = exception.class
+                            } else {
+                                exception.__constructor = this.flow.exceptions[dataPointIndex].exception.split('"')[1]
+                            }
 
                             return '<div style="padding: 1em">' +
                                 '<b>Class</b>: ' + exception.__constructor + '<br />' +
@@ -340,7 +344,11 @@ export default {
         unserialize(data) {
             try {
                 let result = phpunserialize(data)
-                result.__constructor = data.split('"')[1]
+                if (result.class) {
+                    result.__constructor = result.class
+                } else {
+                    result.__constructor = data.split('"')[1]
+                }
                 return result
             } catch (err) {
                 try {