Merge pull request #11 from JostBaron/patch-1

Florian Körner · Florian Körner · commit c3b0010bf109 · 2015-12-11T10:51:47.000+01:00
Fix: Mark national holidays as state-holidays as well
diff --git a/lib/Checkdomain/Holiday/Provider/AbstractProvider.php b/lib/Checkdomain/Holiday/Provider/AbstractProvider.php
@@ -67,7 +67,12 @@ protected function hasState(Holiday $holiday, $state = null)
             return true;
         }
 
-        if (is_array($holiday->getStates()) && in_array($state, $holiday->getStates())) {
+        $states = $holiday->getStates();
+        if (empty($states)) {
+            return true;
+        }
+
+        if (is_array($states) && in_array($state, $states)) {
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,12 @@ protected function hasState(Holiday $holiday, $state = null)`
`67`	`67`	`return true;`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (is_array($holiday->getStates()) && in_array($state, $holiday->getStates())) {`
	`70`	`+ $states = $holiday->getStates();`
	`71`	`+ if (empty($states)) {`
	`72`	`+ return true;`
	`73`	`+ }`
	`74`	`+`
	`75`	`+ if (is_array($states) && in_array($state, $states)) {`
`71`	`76`	`return true;`
`72`	`77`	`}`
`73`	`78`