Fixed broken subscriptions (for real this time).

sciactive · May 2, 2019 · 77c8525 · 77c8525
1 parent 86ddf4f
commit 77c8525
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/MessageHandler.php b/src/MessageHandler.php
@@ -277,7 +277,7 @@ private function handleSubscriptionQuery(ConnectionInterface $from, $data) {
       if ($count === 0) {
         // No more subscribed clients.
         unset($this->querySubs[$etype][$serialArgs]);
-        if (count($this->querySubs[$etype])) {
+        if (count($this->querySubs[$etype]) === 0) {
           unset($this->querySubs[$etype]);
         }
         return;
@@ -514,7 +514,9 @@ private function handlePublishEntity(ConnectionInterface $from, $data) {
         $entityData['mdate'] = $data['entity']['mdate'];
         $entitySData = [];
 
-        if ($options['class'] === $data['entity']['class']
+        if (class_exists($options['class'])
+            && class_exists($data['entity']['class'])
+            && $options['class']::ETYPE === $data['entity']['class']::ETYPE
             && \Nymph\Nymph::checkData(
                 $entityData,
                 $entitySData,