Merge pull request #105 from jonnybarnes/release/0.20

Release v0.20: Update Laravel to 5.8
This commit is contained in:
Jonny Barnes 2019-03-17 15:23:07 +00:00 • committed by GitHub
commit 6a4620c18a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 761 additions and 1071 deletions

1
.gitignore vendored
View file

@ -9,6 +9,7 @@ Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
/.idea
# Custom paths in /public
/public/coverage
/public/files

View file

@ -67,4 +67,4 @@ script:
- php vendor/bin/phpunit
- php phpcs.phar
#- php artisan dusk
- php vendor/bin/security-checker security:check --end-point=http://security.sensiolabs.org/check_lock
- php vendor/bin/security-checker security:check

View file

@ -48,7 +48,8 @@ class TokenEndpointController extends Controller
request()->input('code'),
request()->input('me'),
request()->input('redirect_uri'),
request()->input('client_id')
request()->input('client_id'),
null // code_verifier
);
if (array_key_exists('me', $auth)) {
$scope = $auth['scope'] ?? '';

View file

@ -355,7 +355,7 @@ class Note extends Model
} catch (\Exception $e) {
return null;
}
Cache::put($tweetId, $oEmbed, ($oEmbed->cache_age / 60));
Cache::put($tweetId, $oEmbed, ($oEmbed->cache_age));
return $oEmbed;
}

View file

@ -12,7 +12,7 @@ class AuthServiceProvider extends ServiceProvider
* @var array
*/
protected $policies = [
'App\Model' => 'App\Policies\ModelPolicy',
// 'App\Model' => 'App\Policies\ModelPolicy',
];
/**

View file

@ -19,16 +19,16 @@
"jonnybarnes/emoji-a11y": "^0.3",
"jonnybarnes/indieweb": "dev-master",
"jonnybarnes/webmentions-parser": "0.4.*",
"laravel/framework": "5.7.*",
"laravel/framework": "5.8.*",
"laravel/horizon": "^1.0",
"laravel/scout": "^5.0",
"laravel/scout": "^7.0",
"laravel/tinker": "^1.0",
"lcobucci/jwt": "^3.1",
"league/commonmark": "^0.18.0",
"league/flysystem-aws-s3-v3": "^1.0",
"mf2/mf2": "~0.3",
"phaza/laravel-postgis": "~3.1",
"pmatseykanets/laravel-scout-postgres": "~3.0",
"pmatseykanets/laravel-scout-postgres": "~5.0",
"predis/predis": "~1.0",
"ramsey/uuid": "^3.5",
"sensiolabs/security-checker": "^5.0",
@ -40,13 +40,13 @@
"require-dev": {
"beyondcode/laravel-dump-server": "^1.0",
"barryvdh/laravel-debugbar": "~3.0",
"codedungeon/phpunit-result-printer": "^0.24.0",
"codedungeon/phpunit-result-printer": "^0.26.0",
"filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4",
"laravel/dusk": "^4.0",
"laravel/dusk": "^5.0",
"mockery/mockery": "~1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "~7.0",
"nunomaduro/collision": "^3.0",
"phpunit/phpunit": "~8.0",
"symfony/thanks": "~1.0"
},
"config": {

1127
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -226,6 +226,7 @@ return [
'aliases' => [
'App' => Illuminate\Support\Facades\App::class,
'Arr' => Illuminate\Support\Arr::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
@ -254,6 +255,7 @@ return [
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'Str' => Illuminate\Support\Str::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,

View file

@ -54,6 +54,9 @@ return [
'prefix_indexes' => true,
'strict' => true,
'engine' => null,
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
],
'pgsql' => [

View file

@ -2,6 +2,7 @@
use App\Models\Contact;
use Illuminate\Database\Seeder;
use Illuminate\FileSystem\FileSystem;
class ContactsTableSeeder extends Seeder
{
@ -24,5 +25,13 @@ class ContactsTableSeeder extends Seeder
'homepage' => 'https://aaronparecki.com',
'facebook' => '123456',
]);
$fs = new FileSystem();
if (!$fs->exists(public_path('assets/profile-images/aaronparecki.com'))) {
$fs->makeDirectory(public_path('assets/profile-images/aaronparecki.com'));
}
$fs->copy(
base_path('tests/aaron.png'),
public_path('assets/profile-images/aaronparecki.com/image')
);
}
}

File diff suppressed because one or more lines are too long

View file

@ -1 +1 @@
{"version":3,"sources":["../../../resources/sass/_border-box.scss","../../../resources/sass/_base-font.scss","../../../resources/sass/_header.scss","../../../resources/sass/_variables.scss","../../../resources/sass/_main.scss","../../../resources/sass/_articles.scss","../../../resources/sass/_hovercard.scss","../../../resources/sass/_notes.scss","../../../resources/sass/_pagination.scss","../../../resources/sass/_contacts-page.scss","../../../resources/sass/_projects.scss","../../../resources/sass/_footer.scss","../../../resources/sass/_admin-form.scss","../../../resources/sass/_form.scss","../../../resources/sass/_likes.scss","../../../resources/sass/_bridgy-links.scss","../../../resources/sass/_emoji.scss","../../../resources/sass/_mapbox.scss","../../../resources/sass/_colors.scss","../../../resources/sass/_styles.scss","../../../resources/sass/_tags.scss"],"names":[],"mappings":"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","file":"app.css"}
{"version":3,"sources":["../../../resources/sass/_base.scss","../../../resources/sass/_site-header.scss","../../../resources/sass/_main.scss","../../../resources/sass/_pagination.scss","../../../resources/sass/_bio.scss","../../../resources/sass/_articles.scss","../../../resources/sass/_notes.scss","../../../resources/sass/_footer.scss","../../../resources/sass/_mapbox.scss","../../../resources/sass/_syndication.scss","../../../resources/sass/_emoji.scss"],"names":[],"mappings":"AAGA,KACI,kCAAmC,CACnC,eAAgB,CAChB,iBAAkB,CAClB,cAAe,CAClB,GAGG,kCAAmC,CACnC,eAAgB,CAChB,iBAAkB,CACrB,KAGG,sCAAuC,CAC1C,WCfG,YAAa,CACb,WAAY,CACZ,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CALlC,aAQQ,kBAAmB,CACnB,oBAAqB,CAT7B,cAaQ,YAAa,CACb,gBAAiB,CACjB,cAAe,CAfvB,eAmBQ,mBAAoB,CACpB,gBAAiB,CACpB,KCpBD,YAAa,CACb,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CAC9B,kBAAmB,CALvB,OAQQ,iBAAkB,CAClB,oBAAqB,CAT7B,cAaQ,aAAc,CACjB,YCbD,YAAa,CACb,kBAAmB,CACnB,kBAAmB,CACnB,4BAA6B,CAC7B,oBAAqB,CACrB,WHaa,CGZhB,cCNG,WJkBa,CIjBhB,gBCDG,WLkBa,CKjBhB,eCDG,WNkBa,CMjBhB,qCAGG,eACI,UAAW,CADf,8BAKY,UAAW,CACd,CCXb,OACI,YAAa,CACb,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CAC9B,kBAAmB,CALvB,SAQQ,iBAAkB,CAClB,oBAAqB,CAT7B,wBAaQ,kBAAmB,CAb3B,SAiBQ,eAAgB,CACnB,KCjBD,YAAa,CAChB,eCDG,YAAa,CACb,kBAAmB,CACnB,6BAA8B,CAHlC,6BAMQ,kBAAmB,CAN3B,iCASY,UAAW,CACX,UAAW,CACd,2BCRL,iBAAkB,CACrB,gFAIG,iBAAkB,CAClB,aAAc,CACd,SAAU,CACV,YAAa,CACb,MAAO,CACP,oBAAqB,CACrB,wBAA2C,CAC3C,mBAAoB,CACpB,mCAAgD,CAChD,wBAAyB,CACzB,iCAAqC,CACrC,UAA6B,CAC7B,aAAc,CACd,yCAAW,CAAX,iCAAkC,CACrC,2BAGG,KACI,YAAa,CACb,8BAAkC,CAClC,uCAA2C,CAC3C,yBAA6B,CAC7B,qBAAkC,CAGtC,GACI,YAAa,CACb,iCAAqC,CACrC,wBAA2C,CAC3C,UAA6B,CAC7B,mCAAgD,CAAA,CAhBvD,mBAGG,KACI,YAAa,CACb,8BAAkC,CAClC,uCAA2C,CAC3C,yBAA6B,CAC7B,qBAAkC,CAGtC,GACI,YAAa,CACb,iCAAqC,CACrC,wBAA2C,CAC3C,UAA6B,CAC7B,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC","file":"app.css"}

66
public/assets/img/iwc.svg Normal file
View file

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
width="487px" height="231.5px"
viewBox="0 0 487 231.5" xml:space="preserve">
<style type="text/css">
.st0{fill:#FF5C00;}
.st1{fill:#FFB100;}
.st2{fill:#666666;}
.st3{fill:#444444;}
.st4{fill:none;}
</style>
<g>
<g>
<g>
<polygon class="st0" points="163.8,33 222.9,159.2 241.5,119.3 201.3,33 "/>
<polygon class="st0" points="332.9,33 282,33 214.9,33 253.7,116.2 273.8,159.2 "/>
</g>
<g>
<g>
<defs>
<rect id="SVGID_1_" x="33" y="33" width="117.8" height="33"/>
</defs>
<use xlink:href="#SVGID_1_" style="overflow:visible;fill:#FF0000;"/>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
</clipPath>
</g>
<g>
<defs>
<rect id="SVGID_3_" x="33" y="78" width="117.8" height="71.8"/>
</defs>
<use xlink:href="#SVGID_3_" style="overflow:visible;fill:#FF0000;"/>
<clipPath id="SVGID_4_">
<use xlink:href="#SVGID_3_" style="overflow:visible;"/>
</clipPath>
</g>
</g>
<path class="st1" d="M453.1,97.9c-3.1,32.4-30.3,57.8-63.5,57.8c-35.2,0-63.8-28.6-63.8-63.8S354.3,28,389.6,28
c33.1,0,60.3,25.2,63.5,57.5h-63.5c-3.4,0-6.2,2.8-6.2,6.2c0,3.4,2.8,6.2,6.2,6.2H453.1z"/>
<g>
<path class="st2" d="M37.7,198.5h-4.3v-24.2h4.3V198.5z"/>
<path class="st2" d="M59,174.1l15.3,15v-14.8h4.3v24.3l-0.2,0.1l-15.3-14.9v14.7h-4.3v-24.3L59,174.1z"/>
<path class="st2" d="M96.9,198.5v-24.2h8.5c9.2,0,12,7,12,12.1c0,5.2-2.7,12.1-12,12.1H96.9z M105.4,194.7c6.7,0,7.7-6.2,7.7-8.3
c0-2.1-1-8.3-7.7-8.3h-4.3v16.6H105.4z"/>
<path class="st2" d="M139.9,198.5h-4.3v-24.2h4.3V198.5z"/>
<path class="st2" d="M164.6,188.4v6.2h12v3.8h-16.2v-24.2h16.2v3.8h-12v6.6h9.4v3.8H164.6z"/>
<path class="st3" d="M211.9,183.6l-6.7,15h-0.3l-11.1-24.4h4.7l6.5,15.4l6.6-15.8h0.3l6.7,15.8l6.5-15.4h4.7l-11.1,24.4h-0.3
L211.9,183.6z"/>
<path class="st3" d="M248.7,188.4v6.2h12v3.8h-16.2v-24.2h16.2v3.8h-12v6.6h9.4v3.8H248.7z"/>
<path class="st3" d="M295,186.3c2,0.8,3,3.2,3,5.1c0,2.9-2,7-8.5,7h-9.1v-24.2h9.1c6.5,0,8.5,4.1,8.5,7.1
C298,183.3,297,185.5,295,186.3z M289.9,184.6c3.2-0.1,3.7-2.3,3.7-3.3c0-0.8-0.6-3.3-3.9-3.3h-5.2v6.6H289.9z M289.8,194.7
c3.3,0,3.9-2.4,3.9-3.2c0-1.1-0.6-2.9-3.7-3h-5.4v6.2H289.8z"/>
<path class="st2" d="M334.7,180.8c-1.3-1.6-3.9-3-6.4-3c-6.7,0-7.7,6.4-7.7,8.5s1,8.5,7.7,8.5c2.6,0,5.1-1.5,6.7-3l2.5,3.1
c-2.4,2.4-5.2,3.8-9.1,3.8c-9.3,0-12-7.3-12-12.5c0-5.1,2.8-12.4,12-12.4c4.2,0,6.9,1.7,9.2,4.2L334.7,180.8z"/>
<path class="st2" d="M372.4,198.5h-4.7l-2.6-6.2h-7.9l-2.6,6.2H350l11.1-24.4h0.3L372.4,198.5z M358.7,188.8h5l-2.5-6.1
L358.7,188.8z"/>
<path class="st2" d="M398.6,198.8l-7-14.3l-4.6,14h-4.5L391,174h0.3l7.5,16.5l7.5-16.5h0.3l8.6,24.5h-4.5l-4.6-14l-7,14.3H398.6z
"/>
<path class="st2" d="M434.7,198.5h-4.3v-24.2h9.1c6.5,0,8.5,4.6,8.5,7.7c0,4.7-4.2,7.8-8.1,7.8h-5.4V198.5z M439.8,185.9
c3.2-0.1,4-2.7,4-3.9c0-1.3-0.7-3.9-4.1-3.9h-5.1v7.9H439.8z"/>
</g>
</g>
<rect class="st4" width="487" height="231.5"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

@ -1,6 +0,0 @@
//admin-form.scss
.admin-form {
margin-top: 2rem;
margin-bottom: 2rem;
}

View file

@ -1,6 +1,5 @@
//articles.scss
.h-entry pre code {
padding: 1.5rem 2rem;
border-radius: 4px;
article.h-entry {
width: $mainWidth;
}

View file

@ -1,10 +0,0 @@
//base-font.scss
html {
font-size: 10px;
font-family: "filson-soft", serif;
}
a.u-syndication {
text-decoration: none;
}

22
resources/sass/_base.scss vendored Normal file
View file

@ -0,0 +1,22 @@
// _base.scss
// Fonts
html {
font-family: montserrat, sans-serif;
font-weight: 300;
font-style: normal;
font-size: 20px;
}
h1 {
font-family: bebas-neue, sans-serif;
font-weight: 400;
font-style: normal;
}
code {
font-family: "Operator Mono", monospace;
}
// Variables
$mainWidth: 40rem;

5
resources/sass/_bio.scss vendored Normal file
View file

@ -0,0 +1,5 @@
// bio.scss
.personal-bio {
width: $mainWidth;
}

View file

@ -1,14 +0,0 @@
//border-box.scss
//use universal box sizing with inheritance
//from https://css-tricks.com/box-sizing/
html {
box-sizing: border-box;
}
*,
*::before,
*::after {
box-sizing: inherit;
}

View file

@ -1,6 +0,0 @@
// bridgy-links.scss
.p-bridgy-twitter-content,
.p-bridgy-facebook-content {
display: none;
}

Some files were not shown because too many files have changed in this diff Show more