@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | echo sprintf('<h2>Find the holidays that are nor %s nor %s </h2>', AbstractHoliday::SATURDAY, AbstractHoliday::SUNDAY); |
| 21 | 21 | for ($i = intval(date('Y')); $i <= date('Y') + NUMBER_OF_YEAR_TO_PROCESS; ++$i) { |
| 22 | 22 | echo '<h2>'.$i.'</h2>'; |
| 23 | - $holidayFiltered = FranceHoliday::getFilteredHolidays($i, [AbstractHoliday::SATURDAY, AbstractHoliday::SUNDAY]); |
|
| 23 | + $holidayFiltered = FranceHoliday::getFilteredHolidays($i, [ AbstractHoliday::SATURDAY, AbstractHoliday::SUNDAY ]); |
|
| 24 | 24 | foreach ($holidayFiltered as $d) { |
| 25 | 25 | echo $d->format('l d-m-y').'<br>'; |
| 26 | 26 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | echo sprintf('<h2>Find the holidays that are %s or %s </h2>', AbstractHoliday::SATURDAY, AbstractHoliday::SUNDAY); |
| 30 | 30 | for ($i = intval(date('Y')); $i <= date('Y') + NUMBER_OF_YEAR_TO_PROCESS; ++$i) { |
| 31 | 31 | echo '<h2>'.$i.'</h2>'; |
| 32 | - $holidayFiltered = FranceHoliday::getFilteredHolidays($i, [AbstractHoliday::SATURDAY, AbstractHoliday::SUNDAY], AbstractHoliday::FILTER_MODE_INCLUSION); |
|
| 32 | + $holidayFiltered = FranceHoliday::getFilteredHolidays($i, [ AbstractHoliday::SATURDAY, AbstractHoliday::SUNDAY ], AbstractHoliday::FILTER_MODE_INCLUSION); |
|
| 33 | 33 | foreach ($holidayFiltered as $d) { |
| 34 | 34 | echo $d->format('l d-m-y').'<br>'; |
| 35 | 35 | } |
@@ -19,10 +19,10 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | public static function getEasterDate($year) |
| 21 | 21 | { |
| 22 | - $easter = new \DateTime('@' . easter_date($year)); |
|
| 22 | + $easter = new \DateTime('@'.easter_date($year)); |
|
| 23 | 23 | $easter->setTimezone(new \DateTimeZone(self::TIME_ZONE)); |
| 24 | 24 | |
| 25 | - return $easter ; |
|
| 25 | + return $easter; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | public static function getEasterMonday($year) |
@@ -43,25 +43,25 @@ discard block |
||
| 43 | 43 | public static function isClosedDay(\Datetime $date) |
| 44 | 44 | { |
| 45 | 45 | $year = intval($date->format('Y')); |
| 46 | - $holidaysString = array_map(function ($holiday) { |
|
| 47 | - return $holiday->format('y-m-d') ; |
|
| 46 | + $holidaysString = array_map(function($holiday) { |
|
| 47 | + return $holiday->format('y-m-d'); |
|
| 48 | 48 | }, static::getHolidays($year)); |
| 49 | 49 | |
| 50 | - return in_array($date->format('y-m-d'), $holidaysString) ? true : false ; |
|
| 50 | + return in_array($date->format('y-m-d'), $holidaysString) ? true : false; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | public static function getFilteredHolidays($year, array $filters, $mode = self::FILTER_MODE_EXCLUSION) |
| 54 | 54 | { |
| 55 | 55 | $holidays = static::getHolidays($year); |
| 56 | - $cleanedHolidays = []; |
|
| 56 | + $cleanedHolidays = [ ]; |
|
| 57 | 57 | foreach ($holidays as $holiday) { |
| 58 | 58 | if ($mode === self::FILTER_MODE_EXCLUSION) { |
| 59 | 59 | if (!in_array($holiday->format('l'), $filters)) { |
| 60 | - $cleanedHolidays [] = $holiday; |
|
| 60 | + $cleanedHolidays [ ] = $holiday; |
|
| 61 | 61 | } |
| 62 | 62 | } else { |
| 63 | 63 | if (in_array($holiday->format('l'), $filters)) { |
| 64 | - $cleanedHolidays [] = $holiday; |
|
| 64 | + $cleanedHolidays [ ] = $holiday; |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -14,12 +14,12 @@ |
||
| 14 | 14 | parent::getWitmonday($year), |
| 15 | 15 | new \DateTime(sprintf('%d-%d-%d', $year, 1, 1)), // 1er janvier |
| 16 | 16 | new \DateTime(sprintf('%d-%d-%d', $year, 5, 1)), // Fête du travail |
| 17 | - new \DateTime(sprintf('%d-%d-%d', $year, 5, 8)), // Victoire des alliés |
|
| 18 | - new \DateTime(sprintf('%d-%d-%d', $year, 7, 14)), // Fête nationale |
|
| 19 | - new \DateTime(sprintf('%d-%d-%d', $year, 8, 15)), // Assomption |
|
| 20 | - new \DateTime(sprintf('%d-%d-%d', $year, 11, 01)), // Toussaint |
|
| 21 | - new \DateTime(sprintf('%d-%d-%d', $year, 11, 11)), // Armistice |
|
| 22 | - new \DateTime(sprintf('%d-%d-%d', $year, 12, 25)), // Noel |
|
| 17 | + new \DateTime(sprintf('%d-%d-%d', $year, 5, 8)), // Victoire des alliés |
|
| 18 | + new \DateTime(sprintf('%d-%d-%d', $year, 7, 14)), // Fête nationale |
|
| 19 | + new \DateTime(sprintf('%d-%d-%d', $year, 8, 15)), // Assomption |
|
| 20 | + new \DateTime(sprintf('%d-%d-%d', $year, 11, 01)), // Toussaint |
|
| 21 | + new \DateTime(sprintf('%d-%d-%d', $year, 11, 11)), // Armistice |
|
| 22 | + new \DateTime(sprintf('%d-%d-%d', $year, 12, 25)), // Noel |
|
| 23 | 23 | ]; |
| 24 | 24 | |
| 25 | 25 | sort($holidays); |