Fixing bug

Fixing bug Fixing bug
JanGalek · Apr 13, 2018 · 2b341ab · 2b341ab
1 parent 8ae5276
commit 2b341ab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 53 deletions.
diff --git a/src/Galek/Utils/Calendar/Business/Work.php b/src/Galek/Utils/Calendar/Business/Work.php
@@ -29,8 +29,8 @@ public function __construct(Localization $localization, array $settings)
 	{
 		$startHour = $settings['start']['hour'];
 		$startMinute = $settings['start']['minute'];
-		$endHour = $settings['start']['hour'];
-		$endMinute = $settings['start']['minute'];
+		$endHour = $settings['end']['hour'];
+		$endMinute = $settings['end']['minute'];
 		HourValidator::validate($startHour);
 		MinuteValidator::validate($startMinute);
 		HourValidator::validate($endHour);

diff --git a/src/Galek/Utils/Calendar/Calendar.php b/src/Galek/Utils/Calendar/Calendar.php
@@ -435,34 +435,34 @@ public function werbDif(): string
 
 	/**
 	 * Get Easter Monday
-	 * @param bool|int $year
+	 * @param int|null $year
 	 * @return Calendar
 	 */
-	public function getEasterMonday($year = false): Calendar
+	public function getEasterMonday($year = null): Calendar
 	{
-		$year = ($year === false ? $this->getYear() : $year);
+		$year = $year ?? $this->getYear();
 		return EasterHoliday::getMonday($year);
 	}
 
 	/**
 	 * Get Easter
-	 * @param bool|int $year
+	 * @param int|null $year
 	 * @return Calendar
 	 */
-	public function getEaster($year = false): Calendar
+	public function getEaster($year = null): Calendar
 	{
-		$year = ($year === false ? $this->getYear() : $year);
+		$year = $year ?? $this->getYear();
 		return EasterHoliday::getEaster($year);
 	}
 
 	/**
 	 * Is Big Friday (friday before Easter, Czech republic = Holiday) ?
-	 * @param bool|int $year
+	 * @param int|null $year
 	 * @return Calendar
 	 */
-	public function getGoodFriday($year = false): Calendar
+	public function getGoodFriday($year = null): Calendar
 	{
-		$year = ($year === false ? $this->getYear() : $year);
+		$year = $year ?? $this->getYear();
 		return EasterHoliday::getGoodFriday($year);
 	}
 
@@ -489,7 +489,7 @@ public function getWorkDay($next = false, $date = null): Calendar
 			$date = $this;
 		}
 
-		if ($next instanceof \DateTime) {
+		if ($next instanceof self) {
 			$date = $next;
 			$next = false;
 		}
@@ -518,13 +518,13 @@ public function getWorkDay($next = false, $date = null): Calendar
 
 	/**
 	 * @param bool $workTime
-	 * @param bool $date
+	 * @param Calendar|null $date
 	 * @return Calendar
 	 * @throws \Exception
 	 */
-	public function GetWorkDayLimit($workTime = true, $date = false): Calendar
+	public function getWorkDayLimit($workTime = true, $date = null): Calendar
 	{
-		if (!$date) {
+		if ($date === null) {
 			$date = $this;
 		}
 
@@ -592,13 +592,13 @@ public function setWorkTime($worktime, $startMinute = false, $endHour = false, $
 	}
 
 	/**
-	 * @param bool $type
+	 * @param int|null $type
 	 * @return array|mixed
 	 * @throws \Exception
 	 */
-	public function getWorkTime($type = false)
+	public function getWorkTime(int $type = null)
 	{
-		if ($type === false) {
+		if ($type === null) {
 			return $this->working_time;
 		}
 

diff --git a/src/Galek/Utils/Calendar/DI/TExtension.php b/src/Galek/Utils/Calendar/DI/TExtension.php
@@ -48,7 +48,6 @@ protected function checkConfig(array & $config): void
 	{
 		$this->checkCountry($config);
 		$this->checkShippers($config);
-		$this->checkWork($config);
 	}
 
 
@@ -85,38 +84,4 @@ protected function checkShippers(array & $config): void
 			}
 		}
 	}
-
-
-	protected function checkWork(array & $config): void
-	{
-		foreach ($config as $group => $setting) {
-			if (!array_key_exists('work', $setting)) {
-				$config[$group]['work'] = $this->defaultWork;
-			} else {
-				if (!array_key_exists('start', $setting['work'])) {
-					$config[$group]['work']['start'] = $this->defaultWork['start'];
-				} else {
-					if (!array_key_exists('hour', $setting['work']['start'])) {
-						$config[$group]['work']['start']['hour'] = $this->defaultWork['start']['hour'];
-					}
-					if (!array_key_exists('minute', $setting['work']['start'])) {
-						$config[$group]['work']['start']['minute'] = $this->defaultWork['start']['minute'];
-					}
-				}
-				if (!array_key_exists('end', $setting['work'])) {
-					$config[$group]['work']['end'] = $this->defaultWork['end'];
-				} else {
-					if (!array_key_exists('hour', $setting['work']['end'])) {
-						$config[$group]['work']['end']['hour'] = $this->defaultWork['end']['hour'];
-					}
-					if (!array_key_exists('minute', $setting['work']['start'])) {
-						$config[$group]['work']['end']['minute'] = $this->defaultWork['end']['minute'];
-					}
-				}
-				if (!array_key_exists('weekend', $setting['work'])) {
-					$config[$group]['work']['weekend'] = $this->defaultWork['weekend'];
-				}
-			}
-		}
-	}
 }