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

Struct Types

Browse source 
Squashed commit of the following:

commit 74ed84617fcbecf661695763323e50d049a88db7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:46:29 2018 +0000

    Test passes so remove the dump statement

commit a7d3323be02da64f76e8ec88713e3de84a13ded7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:40:35 2018 +0000

    Values with spaces need to be quoted

commit 58a120bb238f14346793c388b948b7351d3b51fd
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:37:23 2018 +0000

    We need a diplay name for the tests to work now we are using strict type checking

commit b46f177053bd697db9a4835d073f2f37e088b26f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:31:29 2018 +0000

    Get travis to show more info about failing test

commit 60323f3ce5a0561329a1721ee94821571cdcc86a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:23:27 2018 +0000

    Remove un-used namnepsace imports

commit 096d3505920bc94ff8677c77430eca0aae0be58a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:21:55 2018 +0000

    we need php7.2 for object type-hint

commit bb818bc19c73d02d510af9f002199f5718a54608
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:15:48 2018 +0000

    Added lots of strict_types
This commit is contained in:
Jonny Barnes 2018-01-15 14:02:13 +00:00
parent 053e19a457
commit e4fe2ecde3
64 changed files with 911 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

56
app/Models/Place.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Models;
use Illuminate\Support\Facades\DB;
@ -36,7 +38,7 @@ class Place extends Model
*
* @return array
*/
public function sluggable()
public function sluggable(): array
{
return [
'slug' => [
@ -49,7 +51,7 @@ class Place extends Model
/**
* Define the relationship with Notes.
*
* @var array
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function notes()
{
@ -59,12 +61,12 @@ class Place extends Model
/**
* Select places near a given location.
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param Point $point
* @param int Distance
* @param \Illuminate\Database\Eloquent\Builder $query
* @param \Phaza\LaravelPostgis\Geometries\Point $point
* @param int $distance
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeNear(Builder $query, Point $point, $distance = 1000)
public function scopeNear(Builder $query, Point $point, $distance = 1000): Builder
{
$field = DB::raw(
sprintf(
@ -77,7 +79,14 @@ class Place extends Model
return $query->where($field, '<=', $distance)->orderBy($field);
}
public function scopeWhereExternalURL(Builder $query, string $url)
/**
* Select places based on a URL.
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $url
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeWhereExternalURL(Builder $query, string $url): Builder
{
return $query->where('external_urls', '@>', json_encode([
$this->getType($url) => $url,
@ -87,21 +96,21 @@ class Place extends Model
/**
* Get the latitude from the `location` property.
*
* @return string latitude
* @return float
*/
public function getLatitudeAttribute()
public function getLatitudeAttribute(): float
{
return explode(' ', $this->location)[1];
return $this->location->getLat();
}
/**
* Get the longitude from the `location` property.
*
* @return string longitude
* @return float
*/
public function getLongitudeAttribute()
public function getLongitudeAttribute(): float
{
return explode(' ', $this->location)[0];
return $this->location->getLng();
}
/**
@ -109,7 +118,7 @@ class Place extends Model
*
* @return string
*/
public function getLongurlAttribute()
public function getLongurlAttribute(): string
{
return config('app.url') . '/places/' . $this->slug;
}
@ -119,7 +128,7 @@ class Place extends Model
*
* @return string
*/
public function getShorturlAttribute()
public function getShorturlAttribute(): string
{
return config('app.shorturl') . '/places/' . $this->slug;
}
@ -129,12 +138,17 @@ class Place extends Model
*
* @return string
*/
public function getUriAttribute()
public function getUriAttribute(): string
{
return $this->longurl;
}
public function setExternalUrlsAttribute($url)
/**
* Dealing with a jsonb column, so we check input first.
*
* @param string|null $url
*/
public function setExternalUrlsAttribute(?string $url)
{
if ($url === null) {
return;
@ -148,7 +162,13 @@ class Place extends Model
$this->attributes['external_urls'] = json_encode($already);
}
private function getType(string $url): ?string
/**
* Given a URL, see if it is one of our known types.
*
* @param string $url
* @return string
*/
private function getType(string $url): string
{
$host = parse_url($url, PHP_URL_HOST);
if (ends_with($host, 'foursquare.com') === true) {