|
@@ -58,10 +58,10 @@ discard block |
|
|
block discarded – undo |
|
58
|
58
|
} |
|
59
|
59
|
$weekendDays = $this->getMonthWeekendDays($month); |
|
60
|
60
|
$this->holidays[] = ["month" => $monthInfo[0]->nodeValue, |
|
61
|
|
- "preholidays" => $this->getMonthPreNoworkholidays($month, $this->xpathPreholidays), |
|
62
|
|
- "noworkdays" => $this->getMonthPreNoworkholidays($month, $this->xpathNoworkdays), |
|
63
|
|
- "holidays" => $weekendDays["holidays"], |
|
64
|
|
- "weekends" => $weekendDays["weekends"]]; |
|
|
61
|
+ "preholidays" => $this->getMonthPreNoworkholidays($month, $this->xpathPreholidays), |
|
|
62
|
+ "noworkdays" => $this->getMonthPreNoworkholidays($month, $this->xpathNoworkdays), |
|
|
63
|
+ "holidays" => $weekendDays["holidays"], |
|
|
64
|
+ "weekends" => $weekendDays["weekends"]]; |
|
65
|
65
|
} |
|
66
|
66
|
|
|
67
|
67
|
private function getMonthPreNoworkholidays(DOMNode $month, string $query): array { |
|
@@ -83,7 +83,7 @@ discard block |
|
|
block discarded – undo |
|
83
|
83
|
|
|
84
|
84
|
private function getMonthWeekendDays(DOMNode $month): array { |
|
85
|
85
|
$daysList = ["weekends" => [], |
|
86
|
|
- "holidays" => []]; |
|
|
86
|
+ "holidays" => []]; |
|
87
|
87
|
$days = $this->xPath->query($this->xpathWeekends, $month); |
|
88
|
88
|
if (!count($days)) { |
|
89
|
89
|
return $daysList; |
Please login to merge, or discard this patch.