From 90f1d111b61e6514b34d82c42bab9c906eedd7ac Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 17 Oct 2020 10:24:09 +0100
Subject: [PATCH] StyleCI fixes

---
 .../Controllers/Admin/PlacesController.php    | 20 +++++++++----------
 app/Http/Controllers/MicropubController.php   |  1 -
 app/Models/Place.php                          |  3 ++-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Admin/PlacesController.php b/app/Http/Controllers/Admin/PlacesController.php
index 52442201..e72a1272 100644
--- a/app/Http/Controllers/Admin/PlacesController.php
+++ b/app/Http/Controllers/Admin/PlacesController.php
@@ -8,13 +8,11 @@ use App\Http\Controllers\Controller;
 use App\Models\Place;
 use App\Services\PlaceService;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
 use Illuminate\View\View;
-use MStaack\LaravelPostgis\Geometries\Point;
 
 class PlacesController extends Controller
 {
-    protected $placeService;
+    protected PlaceService $placeService;
 
     public function __construct(PlaceService $placeService)
     {
@@ -24,7 +22,7 @@ class PlacesController extends Controller
     /**
      * List the places that can be edited.
      *
-     * @return \Illuminate\View\View
+     * @return View
      */
     public function index(): View
     {
@@ -36,7 +34,7 @@ class PlacesController extends Controller
     /**
      * Show the form to make a new place.
      *
-     * @return \Illuminate\View\View
+     * @return View
      */
     public function create(): View
     {
@@ -46,7 +44,7 @@ class PlacesController extends Controller
     /**
      * Process a request to make a new place.
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return RedirectResponse
      */
     public function store(): RedirectResponse
     {
@@ -60,7 +58,7 @@ class PlacesController extends Controller
      * Display the form to edit a specific place.
      *
      * @param  int  $placeId
-     * @return \Illuminate\View\View
+     * @return View
      */
     public function edit(int $placeId): View
     {
@@ -73,7 +71,7 @@ class PlacesController extends Controller
      * Process a request to edit a place.
      *
      * @param  int  $placeId
-     * @return \Illuminate\Http\RedirectResponse
+     * @return RedirectResponse
      */
     public function update(int $placeId): RedirectResponse
     {
@@ -92,7 +90,7 @@ class PlacesController extends Controller
      * List the places we can merge with the current place.
      *
      * @param  int  $placeId
-     * @return \Illuminate\View\View
+     * @return View
      */
     public function mergeIndex(int $placeId): View
     {
@@ -113,7 +111,7 @@ class PlacesController extends Controller
      *
      * @param  int  $placeId1
      * @param  int  $placeId2
-     * @return \Illuminate\View\View
+     * @return View
      */
     public function mergeEdit(int $placeId1, int $placeId2): View
     {
@@ -126,7 +124,7 @@ class PlacesController extends Controller
     /**
      * Process the request to merge two places.
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return RedirectResponse
      */
     public function mergeStore(): RedirectResponse
     {
diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 67ead1e1..1f6ea4d4 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -12,7 +12,6 @@ use App\Services\TokenService;
 use Illuminate\Http\JsonResponse;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use MStaack\LaravelPostgis\Geometries\Point;
 
 class MicropubController extends Controller
 {
diff --git a/app/Models/Place.php b/app/Models/Place.php
index 0dd09ddc..6bb39976 100644
--- a/app/Models/Place.php
+++ b/app/Models/Place.php
@@ -12,7 +12,7 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 
 /**
- * App\Models\Place
+ * App\Models\Place.
  *
  * @property int $id
  * @property string $name
@@ -121,6 +121,7 @@ class Place extends Model
                      - radians($location->longitude))
                      + sin(radians($location->latitude))
                      * sin(radians(places.latitude))))";
+
         return $query
             ->select() //pick the columns you want here.
             ->selectRaw("{$haversine} AS distance")