Merge pull request #103 from jonnybarnes/feature/laravel-5.8

Laravel 5.8

app/Http/Controllers/TokenEndpointController.php

@@ -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'] ?? '';

app/Models/Note.php

@@ -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;
     }

app/Providers/AuthServiceProvider.php

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

composer.json

@@ -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,12 +40,12 @@
     "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",
+        "nunomaduro/collision": "^3.0",
         "phpunit/phpunit": "~7.0",
         "symfony/thanks": "~1.0"
     },

config/app.php

@@ -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,

config/database.php

@@ -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' => [

tests/Browser/ExampleTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Browser;
+
+use Tests\DuskTestCase;
+use Laravel\Dusk\Browser;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+
+class ExampleTest extends DuskTestCase
+{
+    /**
+     * A basic browser test example.
+     *
+     * @return void
+     */
+    public function testBasicExample()
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit('/')
+                    ->assertSee('Laravel');
+        });
+    }
+}

tests/Feature/Admin/ContactsTest.php

@@ -15,7 +15,7 @@ class ContactsTest extends TestCase
 {
     use DatabaseTransactions;
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         if (file_exists(public_path() . '/assets/profile-images/tantek.com/image')) {
             unlink(public_path() . '/assets/profile-images/tantek.com/image');

tests/Feature/ParseCachedWebMentionsTest.php

@@ -12,7 +12,7 @@ class ParseCachedWebMentionsTest extends TestCase
 {
     use DatabaseTransactions;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -43,7 +43,7 @@ class ParseCachedWebMentionsTest extends TestCase
         $this->assertTrue($webmentionTantek->updated_at->gt($webmentionTantek->created_at));
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         $fs = new FileSystem();
         if ($fs->exists(storage_path() . '/HTML/https')) {

tests/Unit/Jobs/DownloadWebMentionJobTest.php

@@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class DownloadWebMentionJobTest extends TestCase
 {
-    public function tearDown()
+    protected function tearDown(): void
     {
         $fs = new FileSystem();
         if ($fs->exists(storage_path() . '/HTML/https')) {

tests/Unit/Jobs/ProcessWebMentionJobTest.php

@@ -20,7 +20,7 @@ class ProcessWebMentionJobTest extends TestCase
 {
     use DatabaseTransactions;
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         $fs = new FileSystem();
         if ($fs->exists(storage_path() . '/HTML/https')) {

tests/Unit/Jobs/SaveProfileImageJobTest.php

@@ -14,7 +14,7 @@ use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException;
 
 class SaveProfileImageJobTest extends TestCase
 {
-    public function tearDown()
+    protected function tearDown(): void
     {
         if (file_exists(public_path() . '/assets/profile-images/example.org/image')) {
             unlink(public_path() . '/assets/profile-images/example.org/image');