Merge pull request #180 from amauryvallier/patch-3

Fix for mismatched method declarations
kaliop-uk · Dec 6, 2018 · 4af18e2 · 4af18e2
2 parents e385a5f + 7fd4806
commit 4af18e2
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Core/Matcher/ContentVersionMatcher.php b/Core/Matcher/ContentVersionMatcher.php
@@ -107,13 +107,17 @@ public function matchContentVersions(array $versionConditions, Content $content)
         }
     }
 
-    protected function matchAnd(array $conditionsArray, $content)
+    protected function matchAnd(array $conditionsArray, $content = null)
     {
         /// @todo introduce proper re-validation of all child conditions
         if (!is_array($conditionsArray) || !count($conditionsArray)) {
             throw new \Exception($this->returns . " can not be matched because no matching conditions found for 'and' clause.");
         }
 
+        if (is_null($content)) {
+            throw new \Exception($this->returns . " can not be matched because there was no content to match for 'and' clause.");
+        }
+
         foreach ($conditionsArray as $conditions) {
             $out = $this->matchContentVersions($conditions, $content);
             if (!isset($results)) {
@@ -126,13 +130,17 @@ protected function matchAnd(array $conditionsArray, $content)
         return $results;
     }
 
-    protected function matchOr(array $conditionsArray, $content)
+    protected function matchOr(array $conditionsArray, $content = null)
     {
         /// @todo introduce proper re-validation of all child conditions
         if (!is_array($conditionsArray) || !count($conditionsArray)) {
             throw new \Exception($this->returns . " can not be matched because no matching conditions found for 'or' clause.");
         }
 
+        if (is_null($content)) {
+            throw new \Exception($this->returns . " can not be matched because there was no content to match for 'or' clause.");
+        }
+
         $results = array();
         foreach ($conditionsArray as $conditions) {
             $out = $this->matchContentVersions($conditions, $content);