JPBetley / pulse

app/Schedule/WeeklySchedule.php

Indentation +75 added lines, -75 removed lines

@@ -7,90 +7,90 @@
 class WeeklySchedule extends Collection
 {
 
-    public static function mergeFromTimeSlots(Collection $timeSlots)
-    {
-        $scheduledShows = new Collection();
-        $timeSlots = $timeSlots->reduce(function($scheduledShows, $timeslot) {
-            $scheduledShow = $scheduledShows->last();
-            if (static::showContinuesIntoCurrentTimeslot($scheduledShow, $timeslot))
-            {
-                $scheduledShow->extendShowByHour();
-            } 
-            else
-            {
-                $show = ScheduledShow::fromShowAndDJ($timeslot->showForTimeslot, $timeslot->djForTimeslot);
-                $show->setId($timeslot->id);
-                $show->startsAt($timeslot->hour);
-                $show->airsDayOfWeek($timeslot->day);
-                $scheduledShows->push($show);
-            }
-            return $scheduledShows;
-        }, $scheduledShows);
-        $weeklySchedule = new WeeklySchedule($timeSlots);
+	public static function mergeFromTimeSlots(Collection $timeSlots)
+	{
+		$scheduledShows = new Collection();
+		$timeSlots = $timeSlots->reduce(function($scheduledShows, $timeslot) {
+			$scheduledShow = $scheduledShows->last();
+			if (static::showContinuesIntoCurrentTimeslot($scheduledShow, $timeslot))
+			{
+				$scheduledShow->extendShowByHour();
+			} 
+			else
+			{
+				$show = ScheduledShow::fromShowAndDJ($timeslot->showForTimeslot, $timeslot->djForTimeslot);
+				$show->setId($timeslot->id);
+				$show->startsAt($timeslot->hour);
+				$show->airsDayOfWeek($timeslot->day);
+				$scheduledShows->push($show);
+			}
+			return $scheduledShows;
+		}, $scheduledShows);
+		$weeklySchedule = new WeeklySchedule($timeSlots);
 
-        return $weeklySchedule;
-    }
+		return $weeklySchedule;
+	}
 
-    public static function fromTimeSlots(Collection $timeSlots)
-    {
-        $timeSlots = $timeSlots->map(function($timeslot) {
-            $show = ScheduledShow::fromShowAndDJ($timeslot->showForTimeslot, $timeslot->djForTimeslot);
-            $show->setId($timeslot->id);
-            $show->startsAt($timeslot->hour);
-            $show->airsDayOfWeek($timeslot->day);
-            return $show;
-        });
+	public static function fromTimeSlots(Collection $timeSlots)
+	{
+		$timeSlots = $timeSlots->map(function($timeslot) {
+			$show = ScheduledShow::fromShowAndDJ($timeslot->showForTimeslot, $timeslot->djForTimeslot);
+			$show->setId($timeslot->id);
+			$show->startsAt($timeslot->hour);
+			$show->airsDayOfWeek($timeslot->day);
+			return $show;
+		});
 
-        return new WeeklySchedule($timeSlots);
-    }
+		return new WeeklySchedule($timeSlots);
+	}
 
-    private static function showContinuesIntoCurrentTimeslot($scheduledShow, $timeslot)
-    {
-        return $scheduledShow != null 
-            && $scheduledShow->djId() == $timeslot->djForTimeslot->id
-            && $scheduledShow->showId() == $timeslot->showForTimeslot->id
-            && $scheduledShow->airDayOfWeek() == $timeslot->day;
-    }
+	private static function showContinuesIntoCurrentTimeslot($scheduledShow, $timeslot)
+	{
+		return $scheduledShow != null 
+			&& $scheduledShow->djId() == $timeslot->djForTimeslot->id
+			&& $scheduledShow->showId() == $timeslot->showForTimeslot->id
+			&& $scheduledShow->airDayOfWeek() == $timeslot->day;
+	}
 
-    public function scheduleFor($weekday)
-    {
-        return $this->filter(function($timeslot) use ($weekday) {
-            return $timeslot->airDayOfWeek() == $weekday;
-        });
-    }
+	public function scheduleFor($weekday)
+	{
+		return $this->filter(function($timeslot) use ($weekday) {
+			return $timeslot->airDayOfWeek() == $weekday;
+		});
+	}
 
-    public function getShowsForSlideshow()
-    {
-        $shows = new Collection();
-        $sortedShows = $this->getShowsInPlayOrder();
-        $shows->push($sortedShows->shift());
-        $nonPulseShows = $sortedShows->filter(function ($show) {
-            return strtolower($show->show()) != 'the pulse of music';
-        });
+	public function getShowsForSlideshow()
+	{
+		$shows = new Collection();
+		$sortedShows = $this->getShowsInPlayOrder();
+		$shows->push($sortedShows->shift());
+		$nonPulseShows = $sortedShows->filter(function ($show) {
+			return strtolower($show->show()) != 'the pulse of music';
+		});
 
-        $shows = $shows->merge($nonPulseShows->take(2));
+		$shows = $shows->merge($nonPulseShows->take(2));
 
-        do
-        {
-            $random = $nonPulseShows->random();
-            $exists = $shows->filter(function($show) use($random) {
-                return $show->showId() == $random->showId();
-            });
-        } while(!$exists->isEmpty());
+		do
+		{
+			$random = $nonPulseShows->random();
+			$exists = $shows->filter(function($show) use($random) {
+				return $show->showId() == $random->showId();
+			});
+		} while(!$exists->isEmpty());
 
-        $shows->push($random);
+		$shows->push($random);
 
-        return $shows;
-    }
+		return $shows;
+	}
 
-    public function getShowsInPlayOrder()
-    {
-        $first = $this->first(function ($key, $show) {
-            return $show->nowPlaying();
-        });
-        $firstKey = $this->search($first);
-        $sorted = $this->slice($firstKey);
-        $firstHalfSorted = $this->slice(0, $firstKey);
-        return $sorted->merge($firstHalfSorted);
-    }
+	public function getShowsInPlayOrder()
+	{
+		$first = $this->first(function ($key, $show) {
+			return $show->nowPlaying();
+		});
+		$firstKey = $this->search($first);
+		$sorted = $this->slice($firstKey);
+		$firstHalfSorted = $this->slice(0, $firstKey);
+		return $sorted->merge($firstHalfSorted);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
         $shows = new Collection();
         $sortedShows = $this->getShowsInPlayOrder();
         $shows->push($sortedShows->shift());
-        $nonPulseShows = $sortedShows->filter(function ($show) {
+        $nonPulseShows = $sortedShows->filter(function($show) {
             return strtolower($show->show()) != 'the pulse of music';
         });
 
@@ -76,7 +76,7 @@ 
             $exists = $shows->filter(function($show) use($random) {
                 return $show->showId() == $random->showId();
             });
-        } while(!$exists->isEmpty());
+        } while (!$exists->isEmpty());
 
         $shows->push($random);
 
@@ -85,7 +85,7 @@ 
 
     public function getShowsInPlayOrder()
     {
-        $first = $this->first(function ($key, $show) {
+        $first = $this->first(function($key, $show) {
             return $show->nowPlaying();
         });
         $firstKey = $this->search($first);

Braces +1 added lines, -2 removed lines

@@ -15,8 +15,7 @@
             if (static::showContinuesIntoCurrentTimeslot($scheduledShow, $timeslot))
             {
                 $scheduledShow->extendShowByHour();
-            } 
-            else
+            } else
             {
                 $show = ScheduledShow::fromShowAndDJ($timeslot->showForTimeslot, $timeslot->djForTimeslot);
                 $show->setId($timeslot->id);

app/Services/IcecastListeners.php

Indentation +17 added lines, -17 removed lines

@@ -7,27 +7,27 @@
 class IcecastListeners extends Collection
 {
 
-    protected $mounts;
+	protected $mounts;
 
-    public static function forMounts($mounts)
-    {
-        $listeners = new IcecastListeners();
+	public static function forMounts($mounts)
+	{
+		$listeners = new IcecastListeners();
 
-        $listeners->mounts = $mounts;
+		$listeners->mounts = $mounts;
 
-        return $listeners;
-    }
+		return $listeners;
+	}
 
-    public function getMounts()
-    {
-        return $this->mounts;
-    }
+	public function getMounts()
+	{
+		return $this->mounts;
+	}
 
-    public function forMount($mount)
-    {
-        return $this->filter(function($listener) use($mount) {
-            return $listener->mount == $mount;
-        });
-    }
+	public function forMount($mount)
+	{
+		return $this->filter(function($listener) use($mount) {
+			return $listener->mount == $mount;
+		});
+	}
 
 }

app/Slideshow/Slide.php

Indentation +99 added lines, -99 removed lines

@@ -4,104 +4,104 @@
 
 class Slide
 {
-    protected $show;
-    protected $type;
-    protected $playOrder;
-    protected $index;
-
-    public static function fromScheduledShow($show)
-    {
-        $slide = new Slide();
-
-        $slide->type = 'SHOW';
-        $slide->show = $show;
-
-        return $slide;
-    }
-
-    public static function fromEvent($event)
-    {
-        $slide = new Slide();
-
-        $slide->type = 'EVENT';
-        $slide->event = $event;
-
-        return $slide;
-    }
-
-    public function playOrder($playOrder)
-    {
-        $this->playOrder = $playOrder;
-    }
-
-    public function displayText()
-    {
-        if ($this->type == 'EVENT')
-        {
-            return;
-        }
-
-        if ($this->playOrder == 0)
-        {
-            return '► Now Playing';
-        }
-
-        if ($this->playOrder == 1)
-        {
-            return 'Up Next:';
-        }
-
-        return $this->show->getRelativeAirDate() . ' ' . $this->show->timespan();
-    }
-
-    public function image()
-    {
-        if ($this->type == 'EVENT')
-        {
-            return $this->event->picture;
-        }
-
-        return $this->show->sliderPicture();
-    }
-
-    public function textStyle()
-    {
-        if ($this->type != 'SHOW')
-        {
-            return;
-        }
+	protected $show;
+	protected $type;
+	protected $playOrder;
+	protected $index;
+
+	public static function fromScheduledShow($show)
+	{
+		$slide = new Slide();
+
+		$slide->type = 'SHOW';
+		$slide->show = $show;
+
+		return $slide;
+	}
+
+	public static function fromEvent($event)
+	{
+		$slide = new Slide();
+
+		$slide->type = 'EVENT';
+		$slide->event = $event;
+
+		return $slide;
+	}
+
+	public function playOrder($playOrder)
+	{
+		$this->playOrder = $playOrder;
+	}
+
+	public function displayText()
+	{
+		if ($this->type == 'EVENT')
+		{
+			return;
+		}
+
+		if ($this->playOrder == 0)
+		{
+			return '► Now Playing';
+		}
+
+		if ($this->playOrder == 1)
+		{
+			return 'Up Next:';
+		}
+
+		return $this->show->getRelativeAirDate() . ' ' . $this->show->timespan();
+	}
+
+	public function image()
+	{
+		if ($this->type == 'EVENT')
+		{
+			return $this->event->picture;
+		}
+
+		return $this->show->sliderPicture();
+	}
+
+	public function textStyle()
+	{
+		if ($this->type != 'SHOW')
+		{
+			return;
+		}
         
-        return $this->show->sliderStyle();
-    }
-
-    public function url()
-    {
-        if ($this->type != 'EVENT')
-        {
-            return;
-        }
-
-        return $this->event->url;
-    }
-
-    public function type()
-    {
-        return $this->type;
-    }
-
-    public function index($index)
-    {
-        $this->index = $index;
-    }
-
-    public function displayIndex()
-    {
-        $display = [
-            0 => 'first',
-            1 => 'second',
-            2 => 'third',
-            3 => 'fourth',
-        ];
-        return $display[$this->index];
-    }
+		return $this->show->sliderStyle();
+	}
+
+	public function url()
+	{
+		if ($this->type != 'EVENT')
+		{
+			return;
+		}
+
+		return $this->event->url;
+	}
+
+	public function type()
+	{
+		return $this->type;
+	}
+
+	public function index($index)
+	{
+		$this->index = $index;
+	}
+
+	public function displayIndex()
+	{
+		$display = [
+			0 => 'first',
+			1 => 'second',
+			2 => 'third',
+			3 => 'fourth',
+		];
+		return $display[$this->index];
+	}
 }

app/Slideshow/Slides.php

Indentation +20 added lines, -20 removed lines

@@ -7,27 +7,27 @@
 class Slides extends Collection
 {
 
-    public static function forShows($shows)
-    {
-        $slides = new Slides();
+	public static function forShows($shows)
+	{
+		$slides = new Slides();
 
-        foreach ($shows as $key => $show) {
-            $slide = Slide::fromScheduledShow($show);
-            $slide->playOrder($key);
-            $slide->index($key);
-            $slides->push($slide);
-        }
+		foreach ($shows as $key => $show) {
+			$slide = Slide::fromScheduledShow($show);
+			$slide->playOrder($key);
+			$slide->index($key);
+			$slides->push($slide);
+		}
 
-        return $slides;
-    }
+		return $slides;
+	}
 
-    public function addEvent($event)
-    {
-        $this->pop();
-        $this->prepend(Slide::fromEvent($event));
-        $index = 0;
-        foreach ($this as $value) {
-            $value->index($index++);
-        }
-    }
+	public function addEvent($event)
+	{
+		$this->pop();
+		$this->prepend(Slide::fromEvent($event));
+		$index = 0;
+		foreach ($this as $value) {
+			$value->index($index++);
+		}
+	}
 }

app/Video.php

Indentation +3 added lines, -3 removed lines

@@ -21,12 +21,12 @@
 	public $timestamps = false;
 
 	public function setUrlTagAttribute($value)
-    {
-    	parse_str( parse_url( $value, PHP_URL_QUERY ), $params );
+	{
+		parse_str( parse_url( $value, PHP_URL_QUERY ), $params );
 		if (isset($params['v']) || array_key_exists('v', $params)) {
 			$this->attributes['url_tag'] = $params['v'];
 		} else {
 			$this->attributes['url_tag'] = $value;
 		}	
-    }
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
 	public function setUrlTagAttribute($value)
     {
-    	parse_str( parse_url( $value, PHP_URL_QUERY ), $params );
+    	parse_str(parse_url($value, PHP_URL_QUERY), $params);
 		if (isset($params['v']) || array_key_exists('v', $params)) {
 			$this->attributes['url_tag'] = $params['v'];
 		} else {

app/ViewComposers/DJsViewComposer.php

Indentation +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
 
 class DJsViewComposer {
 
-    protected $djs;
+	protected $djs;
 
 	/**
 	 * Bind data to the view.
@@ -16,10 +16,10 @@ 
 	 * @return void
 	 */
 	public function compose(View $view)
-    {
-        if ($this->djs == null) {
-            $this->djs = DJ::orderBy('name', 'asc')->get();
-        }
+	{
+		if ($this->djs == null) {
+			$this->djs = DJ::orderBy('name', 'asc')->get();
+		}
 		$view->with('djs', $this->djs);
 	}
 }

app/ViewComposers/NowPlayingViewComposer.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 	 */
 	public function compose(View $view)
 	{
-        $client = new Client();
-        try {
+		$client = new Client();
+		try {
 			$response = $client->get('http://logger.witr.rit.edu/latest.json', [
 				'timeout' => 1,
 			]);