fix(核心): 修复 TS+ 获取未读数据接口报错

#449
slimkit · Nov 28, 2018 · 4cba2b3 · 4cba2b3
1 parent 5e55478
commit 4cba2b3
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/app/Support/PinnedsNotificationEventer.php b/app/Support/PinnedsNotificationEventer.php
@@ -70,10 +70,18 @@ public function dispatch()
     {
         $notifications = collect($this->events->dispatch($this->prefix));
 
-        $notifications = $notifications->reject(function ($notification) {
-            return (! isset($notification['namespace']) && $notification['namespace'] && class_exists($notification['namespace'])) || array_diff_key($this->fillable, $notification);
-        });
+        return $notification->reject(function ($notification): bool {
+            if (! is_array($notification)) {
+                return true;
+            } elseif (! isset($notification['namespace'])) {
+                return true;
+            } elseif (! class_exists($notification['namespace'])) {
+                return true;
+            } elseif (array_diff_key($this->fillable, $notification)) {
+                return true;
+            }
 
-        return $notifications;
+            return false;
+        });
     }
 }