Fixed issue #1

Author: markpenaranda

Diff for: app/Juan/Repositories/Holiday/EloquentHoliday.php

@@ -1,10 +1,10 @@
 <?php namespace Juan\Repositories\Holiday;
 
-use Holiday, DB;
+use DB;
+use Holiday;
 
 class EloquentHoliday implements HolidayRepository {
 
-
 	/**
 	 * Gets holidays listings
 	 *
@@ -13,38 +13,35 @@ class EloquentHoliday implements HolidayRepository {
 	 * @param  string $day
 	 * @return Holiday
 	 */
-	public function get($year, $month = null, $day = null)
-	{
+	public function get($year, $month = null, $day = null) {
 		$rMonth = is_null($month) ? '12' : $month;
-		$month 	= !is_null($month) ? $month : '01';
+		$month  = !is_null($month) ? $month : '01';
 
 		$rDay = is_null($day) ? '31' : $day;
-		$day = !is_null($day) ? $day : '01';
+		$day  = !is_null($day) ? $day : '01';
 
 		return Holiday::where('start', '>=', $year . '-' . $month . '-' . $day)
 			->where('end', '<=', $year . '-' . $rMonth . '-' . $rDay)
 			->get();
 	}
 
-	public function getRegularHolidays($year, $month = null, $day = null)
-	{
+	public function getRegularHolidays($year, $month = null, $day = null) {
 		$rMonth = is_null($month) ? '12' : $month;
-		$month = !is_null($month) ? $month : '01';
+		$month  = !is_null($month) ? $month : '01';
 
 		$rDay = is_null($day) ? '31' : $day;
-		$day = !is_null($day) ? $day : '01';
+		$day  = !is_null($day) ? $day : '01';
 
-		$holidays = Holiday::whereRaw(DB::raw("DATE_FORMAT(`from`, '%m-%d') >= '$month-$day'"))
-			->whereRaw(DB::raw("DATE_FORMAT(`to`, '%m-%d') <= '$rMonth-$rDay'"))
-			->whereRaw(DB::raw("DATE_FORMAT(`from`, '%Y') <= '$year'"))
+		$holidays = Holiday::whereRaw(DB::raw("DATE_FORMAT(`start`, '%m-%d') >= '$month-$day'"))
+			->whereRaw(DB::raw("DATE_FORMAT(`end`, '%m-%d') <= '$rMonth-$rDay'"))
+			->whereRaw(DB::raw("DATE_FORMAT(`start`, '%Y') <= '$year'"))
 			->where('type', 'regular')
 			->groupBy('title')
 			->get();
 
-		foreach($holidays as $i => $holiday)
-		{
-			$holidays[$i]->to = preg_replace('/^\d{4}/i', $year, $holidays[$i]->to);
-			$holidays[$i]->from = preg_replace('/^\d{4}/i', $year, $holidays[$i]->from);
+		foreach ($holidays as $i => $holiday) {
+			$holidays[$i]->end   = preg_replace('/^\d{4}/i', $year, $holidays[$i]->end);
+			$holidays[$i]->start = preg_replace('/^\d{4}/i', $year, $holidays[$i]->start);
 		}
 
 		return $holidays;
@@ -53,23 +50,21 @@ public function getRegularHolidays($year, $month = null, $day = null)
 	/**
 	 * Returns holidays by range
 	 *
-	 * @param   $from
-	 * @param   $to
+	 * @param   $start
+	 * @param   $end
 	 * @return Holiday
 	 */
-	public function getByRange($from, $to)
-	{
-		return Holiday::where('start', '>=', $from)->where('end', '<', $to)
-			->get();
+	public function getByRange($start, $end) {
+		return Holiday::where('start', '>=', $start)->where('end', '<', $end)
+		                                            ->get();
 	}
 
-	public function getRegularHolidaysByRange($from, $to)
-	{
-		$from = preg_replace('/^d{4}/i', '', $from);
-		$to = preg_replace('/^d{4}/i', '', $from);
+	public function getRegularHolidaysByRange($start, $end) {
+		$start = preg_replace('/^d{4}/i', '', $start);
+		$end   = preg_replace('/^d{4}/i', '', $start);
 
-		$holidays = Holiday::whereRaw(DB::raw("DATE_FORMAT(`from`, '%m-%d') >= '$from'"))
-			->whereRaw(DB::raw("DATE_FORMAT(`to`, '%m-%d') <= '$to'"))
+		$holidays = Holiday::whereRaw(DB::raw("DATE_FORMAT(`start`, '%m-%d') >= '$start'"))
+			->whereRaw(DB::raw("DATE_FORMAT(`end`, '%m-%d') <= '$end'"))
 			->where('type', 'regular')
 			->groupBy('title')
 			->get();
@@ -80,68 +75,63 @@ public function getRegularHolidaysByRange($from, $to)
 	 *
 	 * @return Holiday
 	 */
-	public function all()
-	{
+	public function all() {
 		return Holiday::all();
 	}
 
-
 	/**
 	 * Get holiday by ID
 	 *
 	 * @param  $id
 	 * @return Holiday
 	 */
-	public function getById($id)
-	{
+	public function getById($id) {
 		return Holiday::find($id);
 	}
 
-
 	/**
 	 * Creates a holiday
 	 *
 	 * @param   $name
-	 * @param   $from
-	 * @param   $to
+	 * @param   $start
+	 * @param   $end
 	 * @param   $type
 	 * @return  bool
 	 */
-	public function create($name, $from, $to, $type)
-	{
-		$holiday 		= new Holiday;
-		$holiday->name 	= $name;
-		$holiday->from 	= $from;
-		$holiday->to 	= $to;
-		$holiday->type 	= $type;
-
-		if($holiday->save())
+	public function create($name, $start, $end, $type) {
+		$holiday        = new Holiday;
+		$holiday->name  = $name;
+		$holiday->start = $start;
+		$holiday->end   = $end;
+		$holiday->type  = $type;
+
+		if ($holiday->save()) {
 			return true;
+		}
 
 		return false;
 	}
 
-
 	/**
 	 * Updates a holiday
 	 *
 	 * @param   $id
 	 * @param   $name
-	 * @param   $from
-	 * @param   $to
+	 * @param   $start
+	 * @param   $end
 	 * @param   $type
 	 * @return  bool
 	 */
-	public function update($id, $name, $from, $to, $type)
-	{
-		$holiday = Holiday::find($id);
-		$holiday->name = $name;
-		$holiday->from = $from;
-		$holiday->to = $to;
-		$holiday->type = $type;
-
-		if($holiday->save())
+	public function update($id, $name, $start, $end, $type) {
+		$holiday        = Holiday::find($id);
+		$holiday->name  = $name;
+		$holiday->start = $start;
+		$holiday->end   = $end;
+		$holiday->type  = $type;
+
+		if ($holiday->save()) {
 			return true;
+		}
 
 		return false;
 	}