strebl / pi.strebl.ch

app/Http/Controllers/Api/DeviceController.php

Indentation +134 added lines, -134 removed lines

@@ -10,138 +10,138 @@
 
 class DeviceController extends ApiController
 {
-    /**
-     * @var DeviceTransformer
-     */
-    private $transformer;
-
-    public function __construct(DeviceTransformer $transformer)
-    {
-        $this->middleware('auth.basic', ['except' => ['index', 'poke', 'show']]);
-
-        $this->transformer = $transformer;
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param null $group
-     *
-     * @return Response
-     */
-    public function index($group = null)
-    {
-        $devices = $group ? Device::where('group', $group)->get() : Device::onHomePage()->get();
-
-        return $this->respond([
-            'data'        => $this->transformer->transformCollection($devices->all()),
-            'server_time' => Carbon::now()->toIso8601String(),
-        ]);
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param StoreComputerRequest $request
-     *
-     * @return Response
-     */
-    public function store(StoreComputerRequest $request)
-    {
-        $device = Device::create($request->all());
-
-        $device->public = $request->get('public', 'auto');
-
-        return $this->respondCreated($this->transformer->transform($device), $device->id);
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param int $id
-     *
-     * @return Response
-     */
-    public function show($id)
-    {
-        $device = Device::find($id);
-
-        if (! $device) {
-            return $this->respondNotFound('Did not find the device you are looking for!');
-        }
-
-        return $this->respond([
-            'data' => $this->transformer->transform($device),
-        ]);
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param StoreComputerRequest $request
-     * @param int                  $id
-     *
-     * @return Response
-     */
-    public function update(StoreComputerRequest $request, $id)
-    {
-        $device = Device::find($id);
-
-        if (! $device) {
-            return $this->respondNotFound('Did not find the device you are looking for!');
-        }
-
-        $device = $device->fill($request->all());
-
-        $device->save();
-
-        return $this->respond([
-            'data' => $this->transformer->transform($device),
-        ]);
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param int $id
-     *
-     * @return Response
-     */
-    public function destroy($id)
-    {
-        $device = Device::find($id);
-
-        if (! $device) {
-            return $this->respondNotFound('Did not find the device you are looking for!');
-        }
-
-        $device->delete();
-
-        return $this->respondNoContent();
-    }
-
-    /**
-     * Handle device pokes.
-     *
-     * @param StoreComputerRequest $request
-     *
-     * @throws \Exception
-     *
-     * @return Response
-     */
-    public function poke(StoreComputerRequest $request)
-    {
-        $device = Device::firstOrNew(['mac' => $request->mac]);
-
-        $device->fill($request->all());
-
-        $device->group = $request->get('group', null);
-        $device->public = $request->get('public', 'auto');
-
-        $device->touch();
-
-        event(new ServerWasPoked(array_add($device, 'server_time', Carbon::now()->toDateTimeString())));
-
-        return $this->respondPoked($this->transformer->transform($device), $device->id);
-    }
+	/**
+	 * @var DeviceTransformer
+	 */
+	private $transformer;
+
+	public function __construct(DeviceTransformer $transformer)
+	{
+		$this->middleware('auth.basic', ['except' => ['index', 'poke', 'show']]);
+
+		$this->transformer = $transformer;
+	}
+
+	/**
+	 * Display a listing of the resource.
+	 *
+	 * @param null $group
+	 *
+	 * @return Response
+	 */
+	public function index($group = null)
+	{
+		$devices = $group ? Device::where('group', $group)->get() : Device::onHomePage()->get();
+
+		return $this->respond([
+			'data'        => $this->transformer->transformCollection($devices->all()),
+			'server_time' => Carbon::now()->toIso8601String(),
+		]);
+	}
+
+	/**
+	 * Store a newly created resource in storage.
+	 *
+	 * @param StoreComputerRequest $request
+	 *
+	 * @return Response
+	 */
+	public function store(StoreComputerRequest $request)
+	{
+		$device = Device::create($request->all());
+
+		$device->public = $request->get('public', 'auto');
+
+		return $this->respondCreated($this->transformer->transform($device), $device->id);
+	}
+
+	/**
+	 * Display the specified resource.
+	 *
+	 * @param int $id
+	 *
+	 * @return Response
+	 */
+	public function show($id)
+	{
+		$device = Device::find($id);
+
+		if (! $device) {
+			return $this->respondNotFound('Did not find the device you are looking for!');
+		}
+
+		return $this->respond([
+			'data' => $this->transformer->transform($device),
+		]);
+	}
+
+	/**
+	 * Update the specified resource in storage.
+	 *
+	 * @param StoreComputerRequest $request
+	 * @param int                  $id
+	 *
+	 * @return Response
+	 */
+	public function update(StoreComputerRequest $request, $id)
+	{
+		$device = Device::find($id);
+
+		if (! $device) {
+			return $this->respondNotFound('Did not find the device you are looking for!');
+		}
+
+		$device = $device->fill($request->all());
+
+		$device->save();
+
+		return $this->respond([
+			'data' => $this->transformer->transform($device),
+		]);
+	}
+
+	/**
+	 * Remove the specified resource from storage.
+	 *
+	 * @param int $id
+	 *
+	 * @return Response
+	 */
+	public function destroy($id)
+	{
+		$device = Device::find($id);
+
+		if (! $device) {
+			return $this->respondNotFound('Did not find the device you are looking for!');
+		}
+
+		$device->delete();
+
+		return $this->respondNoContent();
+	}
+
+	/**
+	 * Handle device pokes.
+	 *
+	 * @param StoreComputerRequest $request
+	 *
+	 * @throws \Exception
+	 *
+	 * @return Response
+	 */
+	public function poke(StoreComputerRequest $request)
+	{
+		$device = Device::firstOrNew(['mac' => $request->mac]);
+
+		$device->fill($request->all());
+
+		$device->group = $request->get('group', null);
+		$device->public = $request->get('public', 'auto');
+
+		$device->touch();
+
+		event(new ServerWasPoked(array_add($device, 'server_time', Carbon::now()->toDateTimeString())));
+
+		return $this->respondPoked($this->transformer->transform($device), $device->id);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
     {
         $device = Device::find($id);
 
-        if (! $device) {
+        if (!$device) {
             return $this->respondNotFound('Did not find the device you are looking for!');
         }
 
@@ -87,7 +87,7 @@ 
     {
         $device = Device::find($id);
 
-        if (! $device) {
+        if (!$device) {
             return $this->respondNotFound('Did not find the device you are looking for!');
         }
 
@@ -111,7 +111,7 @@ 
     {
         $device = Device::find($id);
 
-        if (! $device) {
+        if (!$device) {
             return $this->respondNotFound('Did not find the device you are looking for!');
         }
 

app/Http/Kernel.php

Indentation +48 added lines, -48 removed lines

@@ -6,55 +6,55 @@
 
 class Kernel extends HttpKernel
 {
-    /**
-     * The application's global HTTP middleware stack.
-     *
-     * These middleware are run during every request to your application.
-     *
-     * @var array
-     */
-    protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \PiFinder\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-    ];
+	/**
+	 * The application's global HTTP middleware stack.
+	 *
+	 * These middleware are run during every request to your application.
+	 *
+	 * @var array
+	 */
+	protected $middleware = [
+		\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+		\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+		\PiFinder\Http\Middleware\TrimStrings::class,
+		\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+	];
 
-    /**
-     * The application's route middleware groups.
-     *
-     * @var array
-     */
-    protected $middlewareGroups = [
-        'web' => [
-            \PiFinder\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \PiFinder\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        ],
+	/**
+	 * The application's route middleware groups.
+	 *
+	 * @var array
+	 */
+	protected $middlewareGroups = [
+		'web' => [
+			\PiFinder\Http\Middleware\EncryptCookies::class,
+			\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+			\Illuminate\Session\Middleware\StartSession::class,
+			// \Illuminate\Session\Middleware\AuthenticateSession::class,
+			\Illuminate\View\Middleware\ShareErrorsFromSession::class,
+			\PiFinder\Http\Middleware\VerifyCsrfToken::class,
+			\Illuminate\Routing\Middleware\SubstituteBindings::class,
+		],
 
-        'api' => [
-            'throttle:60,1',
-            'bindings',
-        ],
-    ];
+		'api' => [
+			'throttle:60,1',
+			'bindings',
+		],
+	];
 
-    /**
-     * The application's route middleware.
-     *
-     * These middleware may be assigned to groups or used individually.
-     *
-     * @var array
-     */
-    protected $routeMiddleware = [
-        'auth'       => \Illuminate\Auth\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings'   => \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        'can'        => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest'      => \PiFinder\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle'   => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-    ];
+	/**
+	 * The application's route middleware.
+	 *
+	 * These middleware may be assigned to groups or used individually.
+	 *
+	 * @var array
+	 */
+	protected $routeMiddleware = [
+		'auth'       => \Illuminate\Auth\Middleware\Authenticate::class,
+		'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+		'bindings'   => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+		'can'        => \Illuminate\Auth\Middleware\Authorize::class,
+		'guest'      => \PiFinder\Http\Middleware\RedirectIfAuthenticated::class,
+		'throttle'   => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+	];
 }

app/Http/Middleware/TrimStrings.php

Indentation +9 added lines, -9 removed lines

@@ -6,13 +6,13 @@
 
 class TrimStrings extends BaseTrimmer
 {
-    /**
-     * The names of the attributes that should not be trimmed.
-     *
-     * @var array
-     */
-    protected $except = [
-        'password',
-        'password_confirmation',
-    ];
+	/**
+	 * The names of the attributes that should not be trimmed.
+	 *
+	 * @var array
+	 */
+	protected $except = [
+		'password',
+		'password_confirmation',
+	];
 }

app/Providers/AppServiceProvider.php

Indentation +17 added lines, -17 removed lines

@@ -7,22 +7,22 @@
 
 class AppServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap any application services.
-     */
-    public function boot()
-    {
-        //
-    }
+	/**
+	 * Bootstrap any application services.
+	 */
+	public function boot()
+	{
+		//
+	}
 
-    /**
-     * Register any application services.
-     */
-    public function register()
-    {
-        $this->app->bind(
-            \Illuminate\Contracts\Auth\Registrar::class,
-            Registrar::class
-        );
-    }
+	/**
+	 * Register any application services.
+	 */
+	public function register()
+	{
+		$this->app->bind(
+			\Illuminate\Contracts\Auth\Registrar::class,
+			Registrar::class
+		);
+	}
 }

app/Providers/ObserverServiceProvider.php

Indentation +18 added lines, -18 removed lines

@@ -7,23 +7,23 @@
 
 class ObserverServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        Device::observe(app(\PiFinder\Observers\DeviceObserver::class));
-    }
+	/**
+	 * Bootstrap the application services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		Device::observe(app(\PiFinder\Observers\DeviceObserver::class));
+	}
 
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+	/**
+	 * Register the application services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
 }

app/Handlers/Events/NotifyUsersAboutPoke.php

Indentation +48 added lines, -48 removed lines

@@ -8,52 +8,52 @@
 
 class NotifyUsersAboutPoke
 {
-    /**
-     * The Pusher instance.
-     *
-     * @var PusherManager
-     */
-    protected $pusher;
-
-    /**
-     * @var DeviceTransformer
-     */
-    private $transformer;
-
-    /**
-     * Create the event handler.
-     *
-     * @param PusherManager     $pusher
-     * @param DeviceTransformer $transformer
-     */
-    public function __construct(PusherManager $pusher, DeviceTransformer $transformer)
-    {
-        $this->pusher = $pusher;
-        $this->transformer = $transformer;
-    }
-
-    /**
-     * Handle the server was poked event.
-     *
-     * @param ServerWasPoked $event
-     *
-     * @return void
-     */
-    public function handle(ServerWasPoked $event)
-    {
-        $channel = config('broadcasting.connections.pusher.channel');
-        $device = $event->getDevice();
-
-        if ($device->isPublic()) {
-            $this->pusher->trigger($channel, 'ServerWasPoked', [
-                'device' => $this->transformer->transform($device),
-            ]);
-        } else {
-            $channel = $channel.'-'.$device->group;
-
-            $this->pusher->trigger($channel, 'ServerWasPoked', [
-                'device' => $this->transformer->transform($device),
-            ]);
-        }
-    }
+	/**
+	 * The Pusher instance.
+	 *
+	 * @var PusherManager
+	 */
+	protected $pusher;
+
+	/**
+	 * @var DeviceTransformer
+	 */
+	private $transformer;
+
+	/**
+	 * Create the event handler.
+	 *
+	 * @param PusherManager     $pusher
+	 * @param DeviceTransformer $transformer
+	 */
+	public function __construct(PusherManager $pusher, DeviceTransformer $transformer)
+	{
+		$this->pusher = $pusher;
+		$this->transformer = $transformer;
+	}
+
+	/**
+	 * Handle the server was poked event.
+	 *
+	 * @param ServerWasPoked $event
+	 *
+	 * @return void
+	 */
+	public function handle(ServerWasPoked $event)
+	{
+		$channel = config('broadcasting.connections.pusher.channel');
+		$device = $event->getDevice();
+
+		if ($device->isPublic()) {
+			$this->pusher->trigger($channel, 'ServerWasPoked', [
+				'device' => $this->transformer->transform($device),
+			]);
+		} else {
+			$channel = $channel.'-'.$device->group;
+
+			$this->pusher->trigger($channel, 'ServerWasPoked', [
+				'device' => $this->transformer->transform($device),
+			]);
+		}
+	}
 }

app/Providers/BroadcastServiceProvider.php

Indentation +10 added lines, -10 removed lines

@@ -7,15 +7,15 @@
 
 class BroadcastServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap any application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        Broadcast::routes();
+	/**
+	 * Bootstrap any application services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		Broadcast::routes();
 
-        require base_path('routes/channels.php');
-    }
+		require base_path('routes/channels.php');
+	}
 }

app/Console/Kernel.php

Indentation +29 added lines, -29 removed lines

@@ -7,35 +7,35 @@
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        \PiFinder\Console\Commands\FlushOldDevices::class,
-        \PiFinder\Console\Commands\UserCreate::class,
-        \PiFinder\Console\Commands\UserDelete::class,
-    ];
+	/**
+	 * The Artisan commands provided by your application.
+	 *
+	 * @var array
+	 */
+	protected $commands = [
+		\PiFinder\Console\Commands\FlushOldDevices::class,
+		\PiFinder\Console\Commands\UserCreate::class,
+		\PiFinder\Console\Commands\UserDelete::class,
+	];
 
-    /**
-     * Define the application's command schedule.
-     *
-     * @param \Illuminate\Console\Scheduling\Schedule $schedule
-     */
-    protected function schedule(Schedule $schedule)
-    {
-        $schedule->command('pi:flush')
-                 ->everyFiveMinutes();
-    }
+	/**
+	 * Define the application's command schedule.
+	 *
+	 * @param \Illuminate\Console\Scheduling\Schedule $schedule
+	 */
+	protected function schedule(Schedule $schedule)
+	{
+		$schedule->command('pi:flush')
+				 ->everyFiveMinutes();
+	}
 
-    /**
-     * Register the Closure based commands for the application.
-     *
-     * @return void
-     */
-    protected function commands()
-    {
-        require base_path('routes/console.php');
-    }
+	/**
+	 * Register the Closure based commands for the application.
+	 *
+	 * @return void
+	 */
+	protected function commands()
+	{
+		require base_path('routes/console.php');
+	}
 }

app/Observers/DeviceObserver.php

Indentation +25 added lines, -25 removed lines

@@ -7,32 +7,32 @@
 
 class DeviceObserver
 {
-    /**
-     * @var PusherManager
-     */
-    protected $pusher;
+	/**
+	 * @var PusherManager
+	 */
+	protected $pusher;
 
-    /**
-     * @var DeviceTransformer
-     */
-    private $transformer;
+	/**
+	 * @var DeviceTransformer
+	 */
+	private $transformer;
 
-    /**
-     * DeviceObserver constructor.
-     *
-     * @param PusherManager     $pusher
-     * @param DeviceTransformer $transformer
-     */
-    public function __construct(PusherManager $pusher, DeviceTransformer $transformer)
-    {
-        $this->pusher = $pusher;
-        $this->transformer = $transformer;
-    }
+	/**
+	 * DeviceObserver constructor.
+	 *
+	 * @param PusherManager     $pusher
+	 * @param DeviceTransformer $transformer
+	 */
+	public function __construct(PusherManager $pusher, DeviceTransformer $transformer)
+	{
+		$this->pusher = $pusher;
+		$this->transformer = $transformer;
+	}
 
-    public function deleted($device)
-    {
-        $this->pusher->trigger(config('broadcasting.connections.pusher.channel'), 'DeviceWasDeleted', [
-            'device' => $this->transformer->transform($device),
-        ]);
-    }
+	public function deleted($device)
+	{
+		$this->pusher->trigger(config('broadcasting.connections.pusher.channel'), 'DeviceWasDeleted', [
+			'device' => $this->transformer->transform($device),
+		]);
+	}
 }