jonny/jonnybarnes.uk
Watch
1
0
Fork
You've already forked jonnybarnes.uk
 0
Code Issues 9 Pull requests Projects Releases 35 Packages Wiki Activity Actions

Merge branch 'release/0.0.18'

Browse source
This commit is contained in:
Jonny Barnes 2016-12-08 15:39:55 +00:00
commit 12526c5ec6
70 changed files with 586 additions and 1963 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.env.example
View file

@ -48,6 +48,4 @@ TWITTER_CONSUMER_SECRET=
TWITTER_ACCESS_TOKEN=
TWITTER_ACCESS_TOKEN_SECRET=
SCOUT_DRIVER=algolia
ALGOLIA_APP_ID=
ALGOLIA_SECRET=
SCOUT_DRIVER=pgsql

2
.env.travis
View file

@ -10,4 +10,4 @@ CACHE_DRIVER=array
SESSION_DRIVER=array
QUEUE_DRIVER=sync
SCOUT_DRIVER='null'
SCOUT_DRIVER=pgsql

2
.travis.yml
View file

@ -14,6 +14,7 @@ env:
php:
- 7.0
- 7.1
- nightly
matrix:
allow_failures:
@ -35,6 +36,7 @@ before_script:
- php artisan key:generate
- php artisan migrate
- php artisan db:seed
- php artisan token:generate
- php artisan serve &
- sleep 5 # Give artisan some time to start serving

36
Makefile Normal file
View file

@ -0,0 +1,36 @@
# A Makefile to run various tasks
.PHONY: sass js compress
jsfiles := $(wildcard resources/assets/js/*.js)
sassfiles := $(wildcard resources/assets/sass/*.scss)
yarnfiles:= node_modules/whatwg-fetch/fetch.js \
node_modules/alertify.js/dist/js/alertify.js \
node_modules/store2/dist/store2.min.js \
node_modules/autolinker/dist/Autolinker.min.js \
node_modules/marked/marked.min.js
assets := public/assets/css/app.css \
public/assets/prism/prism.css public/assets/prism/prism.js \
$(wildcard public/assets/js/*.js) \
$(wildcard pubilc/assets/frontend/*.css) \
$(wildcard public/assets/frontend/*.js)
sass: public/assets/css/app.css
public/assets/css/app.css: $(sassfiles)
sassc --style compressed --sourcemap resources/assets/sass/app.scss public/assets/css/app.css
frontend: $(yarnfiles)
for f in $^; do \
cp $$f public/assets/frontend/`basename $$f`; \
done;
js: $(jsfiles)
for f in $^; do \
uglifyjs $$f --screw-ie8 --compress --mangle --source-map public/assets/js/`basename $$f`.map --output public/assets/js/`basename $$f`; \
done;
compress: $(assets)
for f in $^; do \
zopfli $$f; \
bro --force --quality 11 --input $$f --output $$f.br; \
done;

1
app/Article.php
View file

@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
class Article extends Model
{
use SoftDeletes;
/*
* We want to turn the titles into slugs
*/

59
app/Console/Commands/GenerateToken.php Normal file
View file

@ -0,0 +1,59 @@
<?php
namespace App\Console\Commands;
use App\Services\TokenService;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Storage;
class GenerateToken extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'token:generate';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Generate a token that can be used for testing purposes';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* The token service class.
*
* @var TokenService
*/
protected $tokenService;
/**
* Execute the console command.
*
* @return mixed
*/
public function handle(TokenService $tokenService)
{
$data = [
'me' => env('APP_URL'),
'client_id' => env('APP_URL') . '/notes/new',
'scope' => 'post',
];
$token = $tokenService->getNewToken($data);
Storage::disk('local')->put('dev-token', $token);
$this->info('Set token');
}
}

1
app/Console/Kernel.php
View file

@ -16,6 +16,7 @@ class Kernel extends ConsoleKernel
Commands\SecurityCheck::class,
Commands\ParseCachedWebMentions::class,
Commands\ReDownloadWebMentions::class,
Commands\GenerateToken::class,
];
/**

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

@ -4,10 +4,10 @@ namespace App\Http\Controllers;
use App\Place;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Services\NoteService;
use App\Services\TokenService;
use Illuminate\Http\Response;
use App\Services\PlaceService;
use App\Services\TokenService;
class MicropubController extends Controller
{
@ -124,35 +124,7 @@ class MicropubController extends Controller
//we have a valid token, is `syndicate-to` set?
if ($request->input('q') === 'syndicate-to') {
return response()->json([
'syndicate-to' => [
[
'uid' => 'https://twitter.com/jonnybarnes',
'name' => 'jonnybarnes on Twitter',
'service' => [
'name' => 'Twitter',
'url' => 'https://twitter.com',
'photo' => 'https://upload.wikimedia.org/wikipedia/en/9/9f/Twitter_bird_logo_2012.svg',
],
'user' => [
'name' => 'jonnybarnes',
'url' => 'https://twitter.com/jonnybarnes',
'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg',
],
],
[
'uid' => 'https://facebook.com/jonnybarnes',
'name' => 'jonnybarnes on Facebook',
'service' => [
'name' => 'Facebook',
'url' => 'https://facebook.com',
'photo' => 'https://en.facebookbrand.com/wp-content/uploads/2016/05/FB-fLogo-Blue-broadcast-2.png',
],
'user' => [
'name' => 'jonnybarnes',
'url' => 'https://facebook.com/jonnybarnes',
],
],
],
'syndicate-to' => config('syndication.targets'),
]);
}
//nope, how about a geo URL?
@ -176,35 +148,7 @@ class MicropubController extends Controller
//nope, ho about a config query?
if ($request->input('q') == 'config') {
return response()->json([
'syndicate-to' => [
[
'uid' => 'https://twitter.com/jonnybarnes',
'name' => 'jonnybarnes on Twitter',
'service' => [
'name' => 'Twitter',
'url' => 'https://twitter.com',
'photo' => 'https://upload.wikimedia.org/wikipedia/en/9/9f/Twitter_bird_logo_2012.svg',
],
'user' => [
'name' => 'jonnybarnes',
'url' => 'https://twitter.com/jonnybarnes',
'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg',
],
],
[
'uid' => 'https://facebook.com/jonnybarnes',
'name' => 'jonnybarnes on Facebook',
'service' => [
'name' => 'Facebook',
'url' => 'https://facebook.com',
'photo' => 'https://en.facebookbrand.com/wp-content/uploads/2016/05/FB-fLogo-Blue-broadcast-2.png',
],
'user' => [
'name' => 'jonnybarnes',
'url' => 'https://facebook.com/jonnybarnes',
],
],
],
'syndicate-to' => config('syndication.targets'),
]);
}

2
app/Http/Controllers/NotesAdminController.php
View file

@ -5,8 +5,8 @@ namespace App\Http\Controllers;
use App\Note;
use Validator;
use Illuminate\Http\Request;
use App\Services\NoteService;
use App\Jobs\SendWebMentions;
use App\Services\NoteService;
class NotesAdminController extends Controller
{

2
app/Http/Controllers/NotesController.php
View file

@ -2,8 +2,8 @@
namespace App\Http\Controllers;
use Twitter;
use App\Tag;
use Twitter;
use App\Note;
use HTMLPurifier;
use GuzzleHttp\Client;

19
app/Note.php
View file

@ -62,6 +62,13 @@ class Note extends Model implements HasMedia
*/
protected $guarded = ['id'];
/**
* Hide the column used with Laravel Scout.
*
* @var array
*/
protected $hidden = ['searchable'];
/**
* The attributes that should be mutated to dates.
*
@ -69,6 +76,18 @@ class Note extends Model implements HasMedia
*/
protected $dates = ['deleted_at'];
/**
* Set the attributes to be indexed for searching with Scout.
*
* @return array
*/
public function toSearchableArray()
{
return [
'note' => $this->note,
];
}
/**
* A mutator to ensure that in-reply-to is always non-empty or null.
*

1
app/Place.php
View file

@ -10,7 +10,6 @@ use Phaza\LaravelPostgis\Eloquent\PostgisTrait;
class Place extends Model
{
use PostgisTrait;
/*
* We want to turn the names into slugs.
*/

7
app/Providers/AppServiceProvider.php
View file

@ -5,6 +5,7 @@ namespace App\Providers;
use App\Tag;
use App\Note;
use Validator;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\ServiceProvider;
class AppServiceProvider extends ServiceProvider
@ -48,8 +49,10 @@ class AppServiceProvider extends ServiceProvider
//allow micropub use in development
if (env('APP_DEBUG') == true) {
session(['me' => 'https://jonnybarnes.localhost']);
session(['token' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJtZSI6Imh0dHBzOlwvXC9qb25ueWJhcm5lcy5sb2NhbGhvc3QiLCJjbGllbnRfaWQiOiJodHRwczpcL1wvam9ubnliYXJuZXMubG9jYWxob3N0XC9ub3Rlc1wvbmV3Iiwic2NvcGUiOiJwb3N0IiwiZGF0ZV9pc3N1ZWQiOjE0Nzk3NzM1NDIsIm5vbmNlIjoiNzU1MTdmMjc0MjBkYjJiZCJ9.2Px--_L-n2E15I3P4tS98C-eAKrmLOLExXgBiwZuYHI']);
session(['me' => env('APP_URL')]);
if (Storage::exists('dev-token')) {
session(['token' => Storage::get('dev-token')]);
}
}
}

8
changelog.md
View file

@ -1,5 +1,13 @@
# Changelog
## Version 0.0.18 (2016-12-08)
- Some minor style tweaks
- Fix some validation issues
- Switch to Makefile for front-end build tasks
- Switch to Postgres based search
- Update travis to use aforementioned search and php 7.1
- Move syndication targets into a config file (issue#27)
## Version 0.0.17 (2016-11-25)
- Add a basic search feature using Laravel Scout and Algolia (issue#38)
- Get CI testing working with algolia

2
composer.json
View file

@ -24,7 +24,7 @@
"lcobucci/jwt": "^3.1",
"sensiolabs/security-checker": "^4.0",
"laravel/scout": "^1.1",
"algolia/algoliasearch-client-php": "^1.11"
"pmatseykanets/laravel-scout-postgres": "^0.2.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",

286
composer.lock generated
View file

@ -4,59 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "f9c5f3db6efad2ea0d257e1240b1370a",
"content-hash": "1c3fcc062b9b6e27bea438f835985c6b",
"packages": [
{
"name": "algolia/algoliasearch-client-php",
"version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/algolia/algoliasearch-client-php.git",
"reference": "d4f29a1fe82f3d6361a516276849bd98dd014cc0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/d4f29a1fe82f3d6361a516276849bd98dd014cc0",
"reference": "d4f29a1fe82f3d6361a516276849bd98dd014cc0",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=5.3"
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0",
"satooshi/php-coveralls": "0.6.*"
},
"type": "library",
"autoload": {
"psr-0": {
"AlgoliaSearch": "src/",
"AlgoliaSearch\\Tests": "tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Algolia Team",
"email": "contact@algolia.com"
},
{
"name": "Ryan T. Catlin",
"email": "ryan.catlin@gmail.com"
},
{
"name": "Jonathan H. Wage",
"email": "jonwage@gmail.com"
}
],
"description": "Algolia Search API Client for PHP",
"homepage": "https://github.com/algolia/algoliasearch-client-php",
"time": "2016-10-20T11:25:18+00:00"
},
{
"name": "anahkiasen/underscore-php",
"version": "2.0.0",
@ -109,16 +58,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.19.32",
"version": "3.20.1",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "4c3093e320c4a34e30327043d24099787b702665"
"reference": "c83afe188b2f462840a5ab12d43f2e83f356f3f0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4c3093e320c4a34e30327043d24099787b702665",
"reference": "4c3093e320c4a34e30327043d24099787b702665",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c83afe188b2f462840a5ab12d43f2e83f356f3f0",
"reference": "c83afe188b2f462840a5ab12d43f2e83f356f3f0",
"shasum": ""
},
"require": {
@ -185,7 +134,7 @@
"s3",
"sdk"
],
"time": "2016-11-22T23:10:38+00:00"
"time": "2016-12-01T19:25:12+00:00"
},
{
"name": "barnabywalters/mf-cleaner",
@ -283,20 +232,20 @@
},
{
"name": "classpreloader/classpreloader",
"version": "3.0.0",
"version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/ClassPreloader/ClassPreloader.git",
"reference": "9b10b913c2bdf90c3d2e0d726b454fb7f77c552a"
"reference": "bc7206aa892b5a33f4680421b69b191efd32b096"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/9b10b913c2bdf90c3d2e0d726b454fb7f77c552a",
"reference": "9b10b913c2bdf90c3d2e0d726b454fb7f77c552a",
"url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/bc7206aa892b5a33f4680421b69b191efd32b096",
"reference": "bc7206aa892b5a33f4680421b69b191efd32b096",
"shasum": ""
},
"require": {
"nikic/php-parser": "^1.0|^2.0",
"nikic/php-parser": "^1.0|^2.0|^3.0",
"php": ">=5.5.9"
},
"require-dev": {
@ -305,7 +254,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
"dev-master": "3.1-dev"
}
},
"autoload": {
@ -333,7 +282,7 @@
"class",
"preload"
],
"time": "2015-11-09T22:51:51+00:00"
"time": "2016-09-16T12:50:15+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
@ -574,16 +523,16 @@
},
{
"name": "doctrine/common",
"version": "v2.6.1",
"version": "v2.6.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
"reference": "a579557bc689580c19fee4e27487a67fe60defc0"
"reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0",
"reference": "a579557bc689580c19fee4e27487a67fe60defc0",
"url": "https://api.github.com/repos/doctrine/common/zipball/7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
"reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
"shasum": ""
},
"require": {
@ -643,7 +592,7 @@
"persistence",
"spl"
],
"time": "2015-12-25T13:18:31+00:00"
"time": "2016-11-30T16:50:46+00:00"
},
{
"name": "doctrine/dbal",
@ -1583,16 +1532,16 @@
},
{
"name": "laravel/framework",
"version": "v5.3.24",
"version": "v5.3.26",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "b603b7cf77ff083c2248f7baa23f3add34c3ff84"
"reference": "609bcffd2ce2006925f8304e022288b3da5d23a4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/b603b7cf77ff083c2248f7baa23f3add34c3ff84",
"reference": "b603b7cf77ff083c2248f7baa23f3add34c3ff84",
"url": "https://api.github.com/repos/laravel/framework/zipball/609bcffd2ce2006925f8304e022288b3da5d23a4",
"reference": "609bcffd2ce2006925f8304e022288b3da5d23a4",
"shasum": ""
},
"require": {
@ -1707,7 +1656,7 @@
"framework",
"laravel"
],
"time": "2016-11-21T14:14:16+00:00"
"time": "2016-11-30T14:58:38+00:00"
},
{
"name": "laravel/scout",
@ -2187,16 +2136,16 @@
},
{
"name": "monolog/monolog",
"version": "1.21.0",
"version": "1.22.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952",
"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
"shasum": ""
},
"require": {
@ -2207,7 +2156,7 @@
"psr/log-implementation": "1.0.0"
},
"require-dev": {
"aws/aws-sdk-php": "^2.4.9",
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9",
@ -2261,7 +2210,7 @@
"logging",
"psr-3"
],
"time": "2016-07-29T03:23:52+00:00"
"time": "2016-11-26T00:15:39+00:00"
},
{
"name": "mtdowling/cron-expression",
@ -2309,16 +2258,16 @@
},
{
"name": "mtdowling/jmespath.php",
"version": "2.3.0",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/jmespath/jmespath.php.git",
"reference": "192f93e43c2c97acde7694993ab171b3de284093"
"reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/192f93e43c2c97acde7694993ab171b3de284093",
"reference": "192f93e43c2c97acde7694993ab171b3de284093",
"url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
"reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
"shasum": ""
},
"require": {
@ -2360,7 +2309,7 @@
"json",
"jsonpath"
],
"time": "2016-01-05T18:25:05+00:00"
"time": "2016-12-03T22:08:25+00:00"
},
{
"name": "nesbot/carbon",
@ -2617,6 +2566,61 @@
"description": "Postgis extensions for laravel. Aims to make it easy to work with geometries from laravel models",
"time": "2016-05-21T08:00:18+00:00"
},
{
"name": "pmatseykanets/laravel-scout-postgres",
"version": "v0.2.0",
"source": {
"type": "git",
"url": "https://github.com/pmatseykanets/laravel-scout-postgres.git",
"reference": "f45230853a367f522bb0551d1641e7e133011ee4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmatseykanets/laravel-scout-postgres/zipball/f45230853a367f522bb0551d1641e7e133011ee4",
"reference": "f45230853a367f522bb0551d1641e7e133011ee4",
"shasum": ""
},
"require": {
"illuminate/contracts": "~5.3",
"illuminate/database": "~5.3",
"illuminate/support": "~5.3",
"laravel/scout": "^1.0",
"php": ">=5.6.4"
},
"require-dev": {
"mockery/mockery": "^0.9.5",
"phpunit/phpunit": "5.*"
},
"type": "library",
"autoload": {
"psr-4": {
"ScoutEngines\\Postgres\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Peter Matseykanets",
"email": "pmatseykanets@gmail.com",
"homepage": "https://github.com/pmatseykanets",
"role": "Developer"
}
],
"description": "PostgreSQL Full Text Search Driver for Laravel Scout",
"homepage": "https://github.com/pmatseykanets/laravel-scout-postgres",
"keywords": [
"fts",
"full text search",
"laravel",
"laravel scout",
"postgresql",
"search"
],
"time": "2016-10-07T18:54:49+00:00"
},
{
"name": "predis/predis",
"version": "v1.1.1",
@ -3124,16 +3128,16 @@
},
{
"name": "spatie/string",
"version": "2.2.0",
"version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/string.git",
"reference": "42b433803942494ee96dabd8f763f5b455e8de1a"
"reference": "5435f8095a6c2f4ac67cbc9a1fbc116197863144"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/string/zipball/42b433803942494ee96dabd8f763f5b455e8de1a",
"reference": "42b433803942494ee96dabd8f763f5b455e8de1a",
"url": "https://api.github.com/repos/spatie/string/zipball/5435f8095a6c2f4ac67cbc9a1fbc116197863144",
"reference": "5435f8095a6c2f4ac67cbc9a1fbc116197863144",
"shasum": ""
},
"require": {
@ -3173,7 +3177,7 @@
"spatie",
"string"
],
"time": "2016-10-04T15:31:55+00:00"
"time": "2016-12-01T13:46:28+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@ -3348,16 +3352,16 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v3.1.7",
"version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "28b0832b2553ffb80cabef6a7a812ff1e670c0bc"
"reference": "e8f47a327c2f0fd5aa04fa60af2b693006ed7283"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/28b0832b2553ffb80cabef6a7a812ff1e670c0bc",
"reference": "28b0832b2553ffb80cabef6a7a812ff1e670c0bc",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e8f47a327c2f0fd5aa04fa60af2b693006ed7283",
"reference": "e8f47a327c2f0fd5aa04fa60af2b693006ed7283",
"shasum": ""
},
"require": {
@ -3377,7 +3381,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.1-dev"
"dev-master": "3.2-dev"
}
},
"autoload": {
@ -3404,7 +3408,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2016-10-13T06:28:43+00:00"
"time": "2016-10-13T06:29:04+00:00"
},
{
"name": "symfony/finder",
@ -4726,16 +4730,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "4.0.2",
"version": "4.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "6cba06ff75a1a63a71033e1a01b89056f3af1e8d"
"reference": "903fd6318d0a90b4770a009ff73e4a4e9c437929"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6cba06ff75a1a63a71033e1a01b89056f3af1e8d",
"reference": "6cba06ff75a1a63a71033e1a01b89056f3af1e8d",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/903fd6318d0a90b4770a009ff73e4a4e9c437929",
"reference": "903fd6318d0a90b4770a009ff73e4a4e9c437929",
"shasum": ""
},
"require": {
@ -4785,20 +4789,20 @@
"testing",
"xunit"
],
"time": "2016-11-01T05:06:24+00:00"
"time": "2016-11-28T16:00:31+00:00"
},
{
"name": "phpunit/php-file-iterator",
"version": "1.4.1",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
"reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
"reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"shasum": ""
},
"require": {
@ -4832,7 +4836,7 @@
"filesystem",
"iterator"
],
"time": "2015-06-21T13:08:43+00:00"
"time": "2016-10-03T07:40:28+00:00"
},
{
"name": "phpunit/php-text-template",
@ -4970,16 +4974,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.6.5",
"version": "5.7.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "875145fabfa261fa9c1aea663dd29ddce92dca8f"
"reference": "336aff0ac52e306c98e7455bc3e8d7b0bf777a5e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/875145fabfa261fa9c1aea663dd29ddce92dca8f",
"reference": "875145fabfa261fa9c1aea663dd29ddce92dca8f",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/336aff0ac52e306c98e7455bc3e8d7b0bf777a5e",
"reference": "336aff0ac52e306c98e7455bc3e8d7b0bf777a5e",
"shasum": ""
},
"require": {
@ -4991,14 +4995,14 @@
"myclabs/deep-copy": "~1.3",
"php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1",
"phpunit/php-code-coverage": "^4.0.1",
"phpunit/php-code-coverage": "^4.0.3",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "~1.2.2",
"sebastian/diff": "~1.2",
"sebastian/environment": "^1.3 || ^2.0",
"sebastian/environment": "^1.3.4 || ^2.0",
"sebastian/exporter": "~2.0",
"sebastian/global-state": "~1.0",
"sebastian/object-enumerator": "~2.0",
@ -5022,7 +5026,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.6.x-dev"
"dev-master": "5.7.x-dev"
}
},
"autoload": {
@ -5048,20 +5052,20 @@
"testing",
"xunit"
],
"time": "2016-11-21T15:23:34+00:00"
"time": "2016-12-03T08:33:00+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
"version": "3.4.1",
"version": "3.4.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "45026c8383187ad1dcb14fbfec77dced265b9cfc"
"reference": "90a08f5deed5f7ac35463c161f2e8fa0e5652faf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/45026c8383187ad1dcb14fbfec77dced265b9cfc",
"reference": "45026c8383187ad1dcb14fbfec77dced265b9cfc",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/90a08f5deed5f7ac35463c161f2e8fa0e5652faf",
"reference": "90a08f5deed5f7ac35463c161f2e8fa0e5652faf",
"shasum": ""
},
"require": {
@ -5107,7 +5111,7 @@
"mock",
"xunit"
],
"time": "2016-11-19T09:07:46+00:00"
"time": "2016-11-27T07:52:03+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@ -5272,28 +5276,28 @@
},
{
"name": "sebastian/environment",
"version": "1.3.8",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
"reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
"reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
"reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0"
"php": "^5.6 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0"
"phpunit/phpunit": "^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
"dev-master": "2.0.x-dev"
}
},
"autoload": {
@ -5318,7 +5322,7 @@
"environment",
"hhvm"
],
"time": "2016-08-18T05:49:44+00:00"
"time": "2016-11-26T07:53:53+00:00"
},
{
"name": "sebastian/exporter",
@ -5581,16 +5585,16 @@
},
{
"name": "sebastian/version",
"version": "2.0.0",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
"reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5"
"reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
"reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
"reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
"shasum": ""
},
"require": {
@ -5620,7 +5624,7 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-02-04T12:56:52+00:00"
"time": "2016-10-03T07:35:21+00:00"
},
{
"name": "symfony/css-selector",
@ -5733,25 +5737,31 @@
},
{
"name": "symfony/yaml",
"version": "v3.1.7",
"version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "9da375317228e54f4ea1b013b30fa47417e84943"
"reference": "f2300ba8fbb002c028710b92e1906e7457410693"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/9da375317228e54f4ea1b013b30fa47417e84943",
"reference": "9da375317228e54f4ea1b013b30fa47417e84943",
"url": "https://api.github.com/repos/symfony/yaml/zipball/f2300ba8fbb002c028710b92e1906e7457410693",
"reference": "f2300ba8fbb002c028710b92e1906e7457410693",
"shasum": ""
},
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/console": "~2.8|~3.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.1-dev"
"dev-master": "3.2-dev"
}
},
"autoload": {
@ -5778,7 +5788,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-11-18T21:05:29+00:00"
"time": "2016-11-18T21:17:59+00:00"
},
{
"name": "webmozart/assert",

5
config/app.php
View file

@ -208,6 +208,11 @@ return [
*/
Laravel\Scout\ScoutServiceProvider::class,
/*
* Postgres Engine for Scout
*/
ScoutEngines\Postgres\PostgresEngineServiceProvider::class,
],
/*

9
config/scout.php
View file

@ -15,7 +15,7 @@ return [
|
*/
'driver' => env('SCOUT_DRIVER') ?? 'null',
'driver' => env('SCOUT_DRIVER'),
/*
|--------------------------------------------------------------------------
@ -80,4 +80,11 @@ return [
],
],
'pgsql' => [
'connection' => env('DB_CONNECTION', 'pgsql'),
// You may want to update index documents directly in PostgreSQL (i.e. via triggers).
// In this case you can set this value to false.
'maintain_index' => true,
],
];

38
config/syndication.php Normal file
View file

@ -0,0 +1,38 @@
<?php
/*
* Here we define the syndication targets to be
* returned by the micropub endpoint.
*/
return [
'targets' => [
[
'uid' => 'https://twitter.com/jonnybarnes',
'name' => 'jonnybarnes on Twitter',
'service' => [
'name' => 'Twitter',
'url' => 'https://twitter.com',
'photo' => 'https://upload.wikimedia.org/wikipedia/en/9/9f/Twitter_bird_logo_2012.svg',
],
'user' => [
'name' => 'jonnybarnes',
'url' => 'https://twitter.com/jonnybarnes',
'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg',
],
],
[
'uid' => 'https://facebook.com/jonnybarnes',
'name' => 'jonnybarnes on Facebook',
'service' => [
'name' => 'Facebook',
'url' => 'https://facebook.com',
'photo' => 'https://en.facebookbrand.com/wp-content/uploads/2016/05/FB-fLogo-Blue-broadcast-2.png',
],
'user' => [
'name' => 'jonnybarnes',
'url' => 'https://facebook.com/jonnybarnes',
],
]
]
];

33
database/migrations/2016_12_05_204035_add_search_to_notes.php Normal file
View file

@ -0,0 +1,33 @@
<?php
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddSearchToNotes extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('notes', function (Blueprint $table) {
DB::statement('ALTER TABLE notes ADD searchable tsvector NULL');
DB::statement('CREATE INDEX notes_searchable_index ON notes USING GIN (searchable)');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
DB::statement('DROP INDEX IF EXISTS notes_searchable_index');
DB::statement('ALTER TABLE notes DROP searchable');
}
}

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