Merge branch 'release/0.17'

changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.17
+  - Update the underlying Laravel framework to release 5.7
+
 ## Version 0.16.6
   - Improve micropub media endpoint by inlining the initial upload to S3 so the returned URL will never 404
 

composer.json

@@ -12,33 +12,33 @@
         "guzzlehttp/guzzle": "~6.0",
         "indieauth/client": "~0.1",
         "intervention/image": "^2.4",
-        "jonnybarnes/commonmark-linkify": "^0.4",
+        "jonnybarnes/commonmark-linkify": "^0.5",
         "jonnybarnes/emoji-a11y": "^0.3",
         "jonnybarnes/indieweb": "dev-master",
         "jonnybarnes/webmentions-parser": "0.4.*",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "5.7.*",
         "laravel/horizon": "^1.0",
-        "laravel/scout": "^4.0",
+        "laravel/scout": "^5.0",
         "laravel/tinker": "^1.0",
         "lcobucci/jwt": "^3.1",
-        "league/commonmark": "^0.17.0",
+        "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": "~2.0",
+        "pmatseykanets/laravel-scout-postgres": "~3.0",
         "predis/predis": "~1.0",
         "ramsey/uuid": "^3.5",
-        "sensiolabs/security-checker": "^4.0",
+        "sensiolabs/security-checker": "^5.0",
         "spatie/browsershot": "~3.0",
         "thujohn/twitter": "~2.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "~3.0",
-        "codedungeon/phpunit-result-printer": "^0.16.0",
+        "codedungeon/phpunit-result-printer": "^0.22.0",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "jakub-onderka/php-parallel-lint": "^1.0.0",
-        "laravel/dusk": "^3.0",
+        "laravel/dusk": "^4.0",
         "mockery/mockery": "~1.0",
         "nunomaduro/collision": "^2.0",
         "phpunit/phpunit": "~7.0",

database/seeds/NotesTableSeeder.php

@@ -105,17 +105,6 @@ class NotesTableSeeder extends Seeder
         $noteWithOnlyImage->save();
         $noteWithOnlyImage->media()->save($media);
         sleep(1);
-        $noteFromInstagram = Note::create([
-            'note' => 'Lovely #wedding #weddingfavour',
-        ]);
-        $noteFromInstagram->instagram_url = 'https://www.instagram.com/p/Bbo22MHhE_0';
-        $noteFromInstagram->save();
-        $mediaInstagram = new Media();
-        $mediaInstagram->path = 'https://scontent-lhr3-1.cdninstagram.com/t51.2885-15/e35/23734479_149605352435937_400133507076063232_n.jpg';
-        $mediaInstagram->type = 'image';
-        $mediaInstagram->save();
-        $noteFromInstagram->media()->save($mediaInstagram);
-        sleep(1);
         $noteCapitalHashtag = Note::create([
             'note' => 'A #TwoWord hashtag',
         ]);

package.json

@@ -9,7 +9,8 @@
         "alertify.js": "^1.0.12",
         "mapbox-gl": "^0.44.2",
         "marked": "^0.3.19",
-        "normalize.css": "^8.0.0"
+        "normalize.css": "^8.0.0",
+        "puppeteer": "^1.5.0"
     },
     "devDependencies": {
         "@babel/core": "^7.0.0-beta.44",

tests/Feature/SearchControllerTest.php

@@ -9,7 +9,7 @@ class SearchControllerTest extends TestCase
 {
     public function test_search()
     {
-        $response = $this->get('/search?terms=wedding');
+        $response = $this->get('/search?terms=love');
-        $response->assertSee('#weddingfavour');
+        $response->assertSee('duckduckgo.com');
     }
 }