@@ -121,7 +121,6 @@ discard block |
||
| 121 | 121 | /** |
| 122 | 122 | * Setter for interval. |
| 123 | 123 | * |
| 124 | - * @param int $minutes |
|
| 125 | 124 | * |
| 126 | 125 | * @return $this |
| 127 | 126 | */ |
@@ -280,8 +279,8 @@ discard block |
||
| 280 | 279 | * Helper method for Arr::set |
| 281 | 280 | * |
| 282 | 281 | * @param array &$array |
| 283 | - * @param mixed $key |
|
| 284 | - * @param mixed $value |
|
| 282 | + * @param string $key |
|
| 283 | + * @param integer $value |
|
| 285 | 284 | * |
| 286 | 285 | * @return mixed |
| 287 | 286 | */ |
@@ -294,7 +293,7 @@ discard block |
||
| 294 | 293 | * Helper method for Arr::get |
| 295 | 294 | * |
| 296 | 295 | * @param array &$array |
| 297 | - * @param mixed $key |
|
| 296 | + * @param string $key |
|
| 298 | 297 | * @param mixed $default |
| 299 | 298 | * |
| 300 | 299 | * @return mixed |
@@ -304,6 +303,9 @@ discard block |
||
| 304 | 303 | return Arr::get($array, $key, $default); |
| 305 | 304 | } |
| 306 | 305 | |
| 306 | + /** |
|
| 307 | + * @param string $array1 |
|
| 308 | + */ |
|
| 307 | 309 | private function array_substitute(&$array1, $array2) |
| 308 | 310 | { |
| 309 | 311 | foreach ($array1 as $key => $value) { |
@@ -17,10 +17,10 @@ |
||
| 17 | 17 | protected function initTimetable($starting, $days) |
| 18 | 18 | { |
| 19 | 19 | $this->timetable |
| 20 | - ->format('date.service.time') |
|
| 21 | - ->from($starting) |
|
| 22 | - ->future($days) |
|
| 23 | - ->init(); |
|
| 20 | + ->format('date.service.time') |
|
| 21 | + ->from($starting) |
|
| 22 | + ->future($days) |
|
| 23 | + ->init(); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -16,6 +16,10 @@ |
||
| 16 | 16 | $this->timetable = $timetable; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | + /** |
|
| 20 | + * @param string $starting |
|
| 21 | + * @param integer $days |
|
| 22 | + */ |
|
| 19 | 23 | protected function initTimetable($starting, $days) |
| 20 | 24 | { |
| 21 | 25 | $this->timetable |
@@ -17,10 +17,10 @@ |
||
| 17 | 17 | protected function initTimetable($starting, $days) |
| 18 | 18 | { |
| 19 | 19 | $this->timetable |
| 20 | - ->format('date.service.time') |
|
| 21 | - ->from($starting) |
|
| 22 | - ->future($days) |
|
| 23 | - ->init(); |
|
| 20 | + ->format('date.service.time') |
|
| 21 | + ->from($starting) |
|
| 22 | + ->future($days) |
|
| 23 | + ->init(); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -500,21 +500,21 @@ |
||
| 500 | 500 | public function scopeAffectingInterval($query, Carbon $startAt, Carbon $finishAt) |
| 501 | 501 | { |
| 502 | 502 | return $query |
| 503 | - ->where(function ($query) use ($startAt, $finishAt) { |
|
| 503 | + ->where(function($query) use ($startAt, $finishAt) { |
|
| 504 | 504 | |
| 505 | - $query->where(function ($query) use ($startAt, $finishAt) { |
|
| 505 | + $query->where(function($query) use ($startAt, $finishAt) { |
|
| 506 | 506 | $query->where('finish_at', '>=', $finishAt->timezone('UTC')) |
| 507 | 507 | ->where('start_at', '<=', $startAt->timezone('UTC')); |
| 508 | 508 | }) |
| 509 | - ->orWhere(function ($query) use ($startAt, $finishAt) { |
|
| 509 | + ->orWhere(function($query) use ($startAt, $finishAt) { |
|
| 510 | 510 | $query->where('finish_at', '<', $finishAt->timezone('UTC')) |
| 511 | 511 | ->where('finish_at', '>', $startAt->timezone('UTC')); |
| 512 | 512 | }) |
| 513 | - ->orWhere(function ($query) use ($startAt, $finishAt) { |
|
| 513 | + ->orWhere(function($query) use ($startAt, $finishAt) { |
|
| 514 | 514 | $query->where('start_at', '>', $startAt->timezone('UTC')) |
| 515 | 515 | ->where('start_at', '<', $finishAt->timezone('UTC')); |
| 516 | 516 | }) |
| 517 | - ->orWhere(function ($query) use ($startAt, $finishAt) { |
|
| 517 | + ->orWhere(function($query) use ($startAt, $finishAt) { |
|
| 518 | 518 | $query->where('start_at', '>', $startAt->timezone('UTC')) |
| 519 | 519 | ->where('finish_at', '<', $finishAt->timezone('UTC')); |
| 520 | 520 | }); |