No longer double negating conditions (#763)

Islandora · Mar 12, 2020 · c89ff9f · c89ff9f
1 parent 2a1024c
commit c89ff9f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;
   }
 
   /**