jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

StyleCI fixes

Browse source
This commit is contained in:
Jonny Barnes 2020-10-17 10:24:09 +01:00
parent 3c3ad3e29d
commit 90f1d111b6
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/Http/Controllers/Admin/PlacesController.php
View file

@ -8,13 +8,11 @@ use App\Http\Controllers\Controller;
use App\Models\Place; use App\Models\Place;
use App\Services\PlaceService; use App\Services\PlaceService;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View; use Illuminate\View\View;
use MStaack\LaravelPostgis\Geometries\Point;
class PlacesController extends Controller class PlacesController extends Controller
{ {
protected $placeService; protected PlaceService $placeService;
public function __construct(PlaceService $placeService) public function __construct(PlaceService $placeService)
{ {
@ -24,7 +22,7 @@ class PlacesController extends Controller
/** /**
* List the places that can be edited. * List the places that can be edited.
* *
* @return \Illuminate\View\View * @return View
*/ */
public function index(): View public function index(): View
{ {
@ -36,7 +34,7 @@ class PlacesController extends Controller
/** /**
* Show the form to make a new place. * Show the form to make a new place.
* *
* @return \Illuminate\View\View * @return View
*/ */
public function create(): View public function create(): View
{ {
@ -46,7 +44,7 @@ class PlacesController extends Controller
/** /**
* Process a request to make a new place. * Process a request to make a new place.
* *
* @return \Illuminate\Http\RedirectResponse * @return RedirectResponse
*/ */
public function store(): RedirectResponse public function store(): RedirectResponse
{ {
@ -60,7 +58,7 @@ class PlacesController extends Controller
* Display the form to edit a specific place. * Display the form to edit a specific place.
* *
* @param int $placeId * @param int $placeId
* @return \Illuminate\View\View * @return View
*/ */
public function edit(int $placeId): View public function edit(int $placeId): View
{ {
@ -73,7 +71,7 @@ class PlacesController extends Controller
* Process a request to edit a place. * Process a request to edit a place.
* *
* @param int $placeId * @param int $placeId
* @return \Illuminate\Http\RedirectResponse * @return RedirectResponse
*/ */
public function update(int $placeId): 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. * List the places we can merge with the current place.
* *
* @param int $placeId * @param int $placeId
* @return \Illuminate\View\View * @return View
*/ */
public function mergeIndex(int $placeId): View public function mergeIndex(int $placeId): View
{ {
@ -113,7 +111,7 @@ class PlacesController extends Controller
* *
* @param int $placeId1 * @param int $placeId1
* @param int $placeId2 * @param int $placeId2
* @return \Illuminate\View\View * @return View
*/ */
public function mergeEdit(int $placeId1, int $placeId2): View public function mergeEdit(int $placeId1, int $placeId2): View
{ {
@ -126,7 +124,7 @@ class PlacesController extends Controller
/** /**
* Process the request to merge two places. * Process the request to merge two places.
* *
* @return \Illuminate\Http\RedirectResponse * @return RedirectResponse
*/ */
public function mergeStore(): RedirectResponse public function mergeStore(): RedirectResponse
{ {

1
app/Http/Controllers/MicropubController.php
View file

@ -12,7 +12,6 @@ use App\Services\TokenService;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Monolog\Handler\StreamHandler; use Monolog\Handler\StreamHandler;
use Monolog\Logger; use Monolog\Logger;
use MStaack\LaravelPostgis\Geometries\Point;
class MicropubController extends Controller class MicropubController extends Controller
{ {

3
app/Models/Place.php
View file

@ -12,7 +12,7 @@ use Illuminate\Support\Carbon;
use Illuminate\Support\Str; use Illuminate\Support\Str;
/** /**
* App\Models\Place * App\Models\Place.
* *
* @property int $id * @property int $id
* @property string $name * @property string $name
@ -121,6 +121,7 @@ class Place extends Model
- radians($location->longitude)) - radians($location->longitude))
+ sin(radians($location->latitude)) + sin(radians($location->latitude))
* sin(radians(places.latitude))))"; * sin(radians(places.latitude))))";
return $query return $query
->select() //pick the columns you want here. ->select() //pick the columns you want here.
->selectRaw("{$haversine} AS distance") ->selectRaw("{$haversine} AS distance")