JPBetley / pulse

app/Http/Controllers/AskDestlerController.php

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 use Illuminate\Contracts\Mail\Mailer;
 use WITR\SystemSetting;
 
-use Illuminate\Http\Request;
-
 class AskDestlerController extends Controller {
 
 	public function index()

app/Http/Controllers/Auth/AuthController.php

Doc Comments +3 added lines, -4 removed lines

@@ -18,7 +18,6 @@ 
 	 * Create a new authentication controller instance.
 	 *
 	 * @param  \Illuminate\Contracts\Auth\Guard  $auth
-	 * @param  \Illuminate\Contracts\Auth\Registrar  $registrar
 	 * @return void
 	 */
 	public function __construct(Guard $auth)
@@ -31,7 +30,7 @@ 
 	/**
 	 * Show the application login form.
 	 *
-	 * @return \Illuminate\Http\Response
+	 * @return \Illuminate\View\View
 	 */
 	public function login()
 	{
@@ -42,7 +41,7 @@ 
 	 * Handle a login request to the application.
 	 *
 	 * @param  \Illuminate\Http\Request  $request
-	 * @return \Illuminate\Http\Response
+	 * @return \Illuminate\Http\RedirectResponse
 	 */
 	public function authenticate(Request $request)
 	{
@@ -67,7 +66,7 @@ 
 	/**
 	 * Log the user out of the application.
 	 *
-	 * @return \Illuminate\Http\Response
+	 * @return \Illuminate\Http\RedirectResponse
 	 */
 	public function logout()
 	{

app/Http/Controllers/DJController.php

Unused Use Statements -3 removed lines

@@ -1,6 +1,5 @@ 
 <?php namespace WITR\Http\Controllers;
 
-use WITR\Http\Requests;
 use WITR\Http\Requests\DJ\TicketRequest;
 use WITR\Http\Controllers\Controller;
 use WITR\Services\IcecastReader;
@@ -9,8 +8,6 @@ 
 use Illuminate\Contracts\Mail\Mailer;
 use WITR\SystemSetting;
 
-use Illuminate\Http\Request;
-
 class DJController extends Controller {
 
 	public function __construct()

app/Http/Controllers/ShowController.php

Unused Use Statements -4 removed lines

@@ -1,10 +1,6 @@
 <?php namespace WITR\Http\Controllers;
 
-use WITR\Http\Requests;
 use WITR\Http\Controllers\Controller;
-
-use Illuminate\Http\Request;
-
 use WITR\TimeSlot;
 use WITR\Schedule\WeeklySchedule;
 

app/Http/Controllers/WelcomeController.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	/**
 	 * Show the application welcome screen to the user.
 	 *
-	 * @return Response
+	 * @return \Illuminate\View\View
 	 */
 	public function index()
 	{

app/Schedule/ScheduledShow.php

Unused Use Statements -4 removed lines

@@ -2,10 +2,6 @@
 
 namespace WITR\Schedule;
 
-use WITR\Show;
-use WITR\User;
-use Carbon\Carbon;
-
 class ScheduledShow
 {
 

Indentation +159 added lines, -159 removed lines

@@ -9,163 +9,163 @@
 class ScheduledShow
 {
 
-    protected $show;
-    protected $dj;
-    protected $startingHour;
-    protected $endingHour;
-    protected $id;
-    protected $dayOfWeek;
-
-    public static function fromShowAndDJ($show, $dj)
-    {
-        $scheduledShow = new ScheduledShow();
-
-        $scheduledShow->show = $show;
-        $scheduledShow->dj = $dj;
-
-        return $scheduledShow;
-    }
-
-    public function dj()
-    {
-        return $this->dj->name;
-    }
-
-    public function djId()
-    {
-        return $this->dj->id;
-    }
-
-    public function show()
-    {
-        return $this->show->name;
-    }
-
-    public function showId()
-    {
-        return $this->show->id;
-    }
-
-    public function djPicture()
-    {
-        return $this->dj->picture;
-    }
-
-    public function showPicture()
-    {
-        return $this->show->show_picture;
-    }
-
-    public function sliderPicture()
-    {
-        return $this->show->slider_picture;
-    }
-
-    public function sliderStyle()
-    {
-        return $this->show->style;
-    }
-
-    public function startsAt($startingHour)
-    {
-        $this->startingHour = $startingHour;
-        $this->endingHour = $startingHour;
-        $this->extendShowByHour();
-    }
-
-    public function start()
-    {
-        return $this->startingHour;
-    }
-
-    public function end()
-    {
-        return $this->endingHour;
-    }
-
-    public function extendShowByHour()
-    {
-        $this->endingHour++;
-    }
-
-    public function timespan()
-    {
-        $suffix = $this->endingHour < 12 || $this->endingHour > 24 ? 'AM' : 'PM';
-        $endingHour = $this->hourAdjusted($this->endingHour);
-        $startingHour = $this->hourAdjusted($this->startingHour);
-        return $startingHour . ' - ' . $endingHour . ' ' . $suffix;
-    }
-
-    private function hourAdjusted($hour)
-    {
-        while ($hour > 12) {
-            $hour -= 12;
-        }
-        return $hour;
-    }
-
-    public function airsDayOfWeek($airsDayOfWeek)
-    {
-        $this->dayOfWeek = $airsDayOfWeek;
-    }
-
-    public function getAirDate()
-    {
-        return Weekday::display($this->dayOfWeek);
-    }
-
-    public function getRelativeAirDate()
-    {
-        $now = ScheduleTime::now();
-        if ($this->dayOfWeek == $now->dayOfWeek)
-        {
-            return 'Today';
-        }
-        else if ($this->dayOfWeek == $now->addDay()->dayOfWeek)
-        {
-            return 'Tomorrow';
-        }
-        else 
-        {
-            return $this->getAirDate();
-        }
-    }
-
-
-    public function airDayOfWeek()
-    {
-        return $this->dayOfWeek;
-    }
-
-    public function showDescription()
-    {
-        return $this->show->description;
-    }
-
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-
-    public function id()
-    {
-        return $this->id;
-    }
-
-    public function nowPlaying()
-    {
-        $today = ScheduleTime::now();
-
-        if ($this->airDayOfWeek() != $today->dayOfWeek())
-        {
-            return false;
-        }
-
-        if ($this->startingHour > $today->hour() || $this->endingHour <= $today->hour())
-        {
-            return false;
-        }
-
-        return true;
-    }
+	protected $show;
+	protected $dj;
+	protected $startingHour;
+	protected $endingHour;
+	protected $id;
+	protected $dayOfWeek;
+
+	public static function fromShowAndDJ($show, $dj)
+	{
+		$scheduledShow = new ScheduledShow();
+
+		$scheduledShow->show = $show;
+		$scheduledShow->dj = $dj;
+
+		return $scheduledShow;
+	}
+
+	public function dj()
+	{
+		return $this->dj->name;
+	}
+
+	public function djId()
+	{
+		return $this->dj->id;
+	}
+
+	public function show()
+	{
+		return $this->show->name;
+	}
+
+	public function showId()
+	{
+		return $this->show->id;
+	}
+
+	public function djPicture()
+	{
+		return $this->dj->picture;
+	}
+
+	public function showPicture()
+	{
+		return $this->show->show_picture;
+	}
+
+	public function sliderPicture()
+	{
+		return $this->show->slider_picture;
+	}
+
+	public function sliderStyle()
+	{
+		return $this->show->style;
+	}
+
+	public function startsAt($startingHour)
+	{
+		$this->startingHour = $startingHour;
+		$this->endingHour = $startingHour;
+		$this->extendShowByHour();
+	}
+
+	public function start()
+	{
+		return $this->startingHour;
+	}
+
+	public function end()
+	{
+		return $this->endingHour;
+	}
+
+	public function extendShowByHour()
+	{
+		$this->endingHour++;
+	}
+
+	public function timespan()
+	{
+		$suffix = $this->endingHour < 12 || $this->endingHour > 24 ? 'AM' : 'PM';
+		$endingHour = $this->hourAdjusted($this->endingHour);
+		$startingHour = $this->hourAdjusted($this->startingHour);
+		return $startingHour . ' - ' . $endingHour . ' ' . $suffix;
+	}
+
+	private function hourAdjusted($hour)
+	{
+		while ($hour > 12) {
+			$hour -= 12;
+		}
+		return $hour;
+	}
+
+	public function airsDayOfWeek($airsDayOfWeek)
+	{
+		$this->dayOfWeek = $airsDayOfWeek;
+	}
+
+	public function getAirDate()
+	{
+		return Weekday::display($this->dayOfWeek);
+	}
+
+	public function getRelativeAirDate()
+	{
+		$now = ScheduleTime::now();
+		if ($this->dayOfWeek == $now->dayOfWeek)
+		{
+			return 'Today';
+		}
+		else if ($this->dayOfWeek == $now->addDay()->dayOfWeek)
+		{
+			return 'Tomorrow';
+		}
+		else 
+		{
+			return $this->getAirDate();
+		}
+	}
+
+
+	public function airDayOfWeek()
+	{
+		return $this->dayOfWeek;
+	}
+
+	public function showDescription()
+	{
+		return $this->show->description;
+	}
+
+	public function setId($id)
+	{
+		$this->id = $id;
+	}
+
+	public function id()
+	{
+		return $this->id;
+	}
+
+	public function nowPlaying()
+	{
+		$today = ScheduleTime::now();
+
+		if ($this->airDayOfWeek() != $today->dayOfWeek())
+		{
+			return false;
+		}
+
+		if ($this->startingHour > $today->hour() || $this->endingHour <= $today->hour())
+		{
+			return false;
+		}
+
+		return true;
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -120,12 +120,10 @@
         if ($this->dayOfWeek == $now->dayOfWeek)
         {
             return 'Today';
-        }
-        else if ($this->dayOfWeek == $now->addDay()->dayOfWeek)
+        } else if ($this->dayOfWeek == $now->addDay()->dayOfWeek)
         {
             return 'Tomorrow';
-        }
-        else 
+        } else 
         {
             return $this->getAirDate();
         }

app/Services/IcecastReader.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
         return $this->mounts;
     }
 
+    /**
+     * @param string $studio
+     */
     public function get($studio)
     {
         $results = new Collection;

Indentation +41 added lines, -41 removed lines

@@ -9,46 +9,46 @@
 class IcecastReader
 {
 
-    protected $hostname;
-    protected $credentials;
-    protected $mounts;
-
-    public function __construct($hostname, $credentials, $mounts)
-    {
-        $this->hostname = $hostname;
-        $this->credentials = $credentials;
-        $this->mounts = $mounts;
-    }
-
-    public function getMounts()
-    {
-        return $this->mounts;
-    }
-
-    public function get($studio)
-    {
-        $results = new Collection;
-
-        $client = new Client();
+	protected $hostname;
+	protected $credentials;
+	protected $mounts;
+
+	public function __construct($hostname, $credentials, $mounts)
+	{
+		$this->hostname = $hostname;
+		$this->credentials = $credentials;
+		$this->mounts = $mounts;
+	}
+
+	public function getMounts()
+	{
+		return $this->mounts;
+	}
+
+	public function get($studio)
+	{
+		$results = new Collection;
+
+		$client = new Client();
         
-        $listeners = IcecastListeners::forMounts($this->mounts[$studio]);
-        foreach ($this->mounts[$studio] as $mount)
-        {
-            $response = $client->get($this->hostname . '/admin/listclients?mount=/'. $mount, [
-                'auth' => $this->credentials
-            ]);
-            $xml = simplexml_load_string($response->getBody())->source->listener;
-            foreach ($xml as $node)
-            {
-                $listener = new stdClass;
-                $listener->hostname = gethostbyaddr($node->IP);
-                $listener->minutesConnected = round($node->Connected / 60);
-                $listener->userAgent = $node->UserAgent;
-                $listener->mount = $mount;
-                $listeners->push($listener);
-            }
-        }
-
-        return $listeners;
-    }
+		$listeners = IcecastListeners::forMounts($this->mounts[$studio]);
+		foreach ($this->mounts[$studio] as $mount)
+		{
+			$response = $client->get($this->hostname . '/admin/listclients?mount=/'. $mount, [
+				'auth' => $this->credentials
+			]);
+			$xml = simplexml_load_string($response->getBody())->source->listener;
+			foreach ($xml as $node)
+			{
+				$listener = new stdClass;
+				$listener->hostname = gethostbyaddr($node->IP);
+				$listener->minutesConnected = round($node->Connected / 60);
+				$listener->userAgent = $node->UserAgent;
+				$listener->mount = $mount;
+				$listeners->push($listener);
+			}
+		}
+
+		return $listeners;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         $listeners = IcecastListeners::forMounts($this->mounts[$studio]);
         foreach ($this->mounts[$studio] as $mount)
         {
-            $response = $client->get($this->hostname . '/admin/listclients?mount=/'. $mount, [
+            $response = $client->get($this->hostname . '/admin/listclients?mount=/' . $mount, [
                 'auth' => $this->credentials
             ]);
             $xml = simplexml_load_string($response->getBody())->source->listener;

app/Services/Whitelist.php

Doc Comments +1 added lines, -3 removed lines

@@ -11,7 +11,6 @@ 
 	/**
 	 * Create a new filter instance.
 	 *
-	 * @param  Guard  $auth
 	 * @return void
 	 */
 	public function __construct($fromIp, $toIp)
@@ -24,8 +23,7 @@ 
 	 * Handle an incoming request.
 	 *
 	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Closure  $next
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function inRange($request)
 	{

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	public function inRange($request)
 	{
 		$ip = $request->getClientIp();
-		if( (ip2long($this->fromIp) <= ip2long($ip)) && (ip2long($ip) <= ip2long($this->toIp))) {
+		if ((ip2long($this->fromIp) <= ip2long($ip)) && (ip2long($ip) <= ip2long($this->toIp))) {
 			return true;
 		} else {
 			return false;

app/User.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public $timestamps = false;
 
 	/**
-     * @return mixed
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function role()
     {

Indentation +18 added lines, -18 removed lines

@@ -31,24 +31,24 @@
 	 */
 	protected $hidden = ['password', 'remember_token'];
 
-    public $timestamps = false;
+	public $timestamps = false;
 
 	/**
-     * @return mixed
-     */
-    public function role()
-    {
-        return $this->belongsTo('WITR\Role',  'user_role', 'id');
-    }
-
-    /**
-     * Does the user have a particular role?
-     *
-     * @param $name
-     * @return bool
-     */
-    public function hasRole($name)
-    {
-        return $this->role->name == $name;
-    }
+	 * @return mixed
+	 */
+	public function role()
+	{
+		return $this->belongsTo('WITR\Role',  'user_role', 'id');
+	}
+
+	/**
+	 * Does the user have a particular role?
+	 *
+	 * @param $name
+	 * @return bool
+	 */
+	public function hasRole($name)
+	{
+		return $this->role->name == $name;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      */
     public function role()
     {
-        return $this->belongsTo('WITR\Role',  'user_role', 'id');
+        return $this->belongsTo('WITR\Role', 'user_role', 'id');
     }
 
     /**