From c89ff9f16db4ae677abf5e77593fc606ccfce662 Mon Sep 17 00:00:00 2001
From: dannylamb <dlamb@islandora.ca>
Date: Thu, 12 Mar 2020 11:32:14 -0600
Subject: [PATCH] No longer double negating conditions (#763)

---
 src/Plugin/Condition/EntityBundle.php     | 4 ++--
 src/Plugin/Condition/MediaHasMimetype.php | 2 +-
 src/Plugin/Condition/NodeHadNamespace.php | 4 ++--
 src/Plugin/Condition/NodeHasParent.php    | 3 ++-
 src/Plugin/Condition/NodeIsPublished.php  | 9 +++++----
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Plugin/Condition/EntityBundle.php b/src/Plugin/Condition/EntityBundle.php
index 77cf28266..13500f689 100644
--- a/src/Plugin/Condition/EntityBundle.php
+++ b/src/Plugin/Condition/EntityBundle.php
@@ -61,11 +61,11 @@ public function evaluate() {
       if ($context->hasContextValue()) {
         $entity = $context->getContextValue();
         if (!empty($this->configuration['bundles'][$entity->bundle()])) {
-          return !$this->isNegated();
+          return TRUE;
         }
       }
     }
-    return $this->isNegated();
+    return FALSE;
   }
 
   /**
diff --git a/src/Plugin/Condition/MediaHasMimetype.php b/src/Plugin/Condition/MediaHasMimetype.php
index 3b5e08224..291c0da63 100644
--- a/src/Plugin/Condition/MediaHasMimetype.php
+++ b/src/Plugin/Condition/MediaHasMimetype.php
@@ -152,7 +152,7 @@ public function evaluate() {
       foreach ($media as $medium) {
         $file = $this->mediaSource->getSourceFile($medium);
         if (in_array($file->getMimeType(), $mimetypes)) {
-          return $this->isNegated() ? FALSE : TRUE;
+          return TRUE;
         }
       }
     }
diff --git a/src/Plugin/Condition/NodeHadNamespace.php b/src/Plugin/Condition/NodeHadNamespace.php
index 2e8042c8b..b1d1efe0c 100644
--- a/src/Plugin/Condition/NodeHadNamespace.php
+++ b/src/Plugin/Condition/NodeHadNamespace.php
@@ -154,12 +154,12 @@ protected function evaluateEntity(EntityInterface $entity) {
       foreach ($registered_namespaces as &$registered_namespace) {
         $registered_namespace = trim($registered_namespace);
         if (in_array($namespace, $registered_namespaces)) {
-          return $this->isNegated() ? FALSE : TRUE;
+          return TRUE;
         }
       }
     }
 
-    return $this->isNegated() ? TRUE : FALSE;
+    return FALSE;
   }
 
   /**
diff --git a/src/Plugin/Condition/NodeHasParent.php b/src/Plugin/Condition/NodeHasParent.php
index 8455b233f..ca5703ec0 100644
--- a/src/Plugin/Condition/NodeHasParent.php
+++ b/src/Plugin/Condition/NodeHasParent.php
@@ -145,12 +145,13 @@ protected function evaluateEntity(EntityInterface $entity) {
           $nids = $field->getValue();
           foreach ($nids as $nid) {
             if ($nid['target_id'] == $this->configuration['parent_nid']) {
-              return $this->isNegated() ? FALSE : TRUE;
+              return TRUE;
             }
           }
         }
       }
     }
+    return FALSE;
   }
 
   /**
diff --git a/src/Plugin/Condition/NodeIsPublished.php b/src/Plugin/Condition/NodeIsPublished.php
index dcf648ee4..1b81270da 100644
--- a/src/Plugin/Condition/NodeIsPublished.php
+++ b/src/Plugin/Condition/NodeIsPublished.php
@@ -72,11 +72,12 @@ public function evaluate() {
     if (!$node  && !$this->isNegated()) {
       return FALSE;
     }
-    if ($node->isPublished() && !$this->isNegated()) {
-      return TRUE;
+    elseif (!$node) {
+      return FALSE;
+    }
+    else {
+      return $node->isPublished();
     }
-
-    return FALSE;
   }
 
   /**