Merge branch 'release/0.5.28'

This commit is contained in:
Jonny Barnes 2017-08-20 22:21:20 +01:00
commit e57d872055
61 changed files with 1036 additions and 613 deletions

View file

@ -1,10 +1,8 @@
APP_NAME=Laravel
APP_ENV=production
APP_KEY=SomeRandomString # Leave this
APP_DEBUG=false
APP_LOG_LEVEL=warning
APP_TIMEZONE=UTC
APP_LANG=en
APP_LOG=daily
DB_CONNECTION=pgsql
DB_HOST=127.0.0.1
@ -13,6 +11,7 @@ DB_DATABASE=
DB_USERNAME=
DB_PASSWORD=
BROADCAST_DRIVER=log
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync
@ -27,8 +26,10 @@ MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAILGUN_DOMAIN=null
MAILGUN_SECRET=null
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
AWS_S3_KEY=your-key
AWS_S3_SECRET=your-secret
@ -54,3 +55,8 @@ SCOUT_DRIVER=pgsql
PIWIK=false
PIWIK_ID=1
PIWIK_URL=https://analytics.jmb.lv/piwik.php
APP_TIMEZONE=UTC
APP_LANG=en
APP_LOG=daily
SECURE_SESSION_COOKIE=true

1
.gitattributes vendored
View file

@ -2,3 +2,4 @@
*.css linguist-vendored
*.scss linguist-vendored
*.js linguist-vendored
CHANGELOG.md export-ignore

5
.gitignore vendored
View file

@ -1,11 +1,14 @@
/node_modules
/public/storage
/public/hot
/public/storage
/storage/*.key
/vendor
/.idea
/.vagrant
Homestead.yaml
Homestead.json
.npm-debug.log
yarn-error.log
.env
/public/files
/public/keybase.txt

View file

@ -29,7 +29,7 @@ class ArticlesController extends Controller
*/
public function show($year, $month, $slug)
{
$article = Article::where('titleurl', $slug)->first();
$article = Article::where('titleurl', $slug)->firstOrFail();
if ($article->updated_at->year != $year || $article->updated_at->month != $month) {
throw new \Exception;
}

View file

@ -21,7 +21,7 @@ class LoginController extends Controller
use AuthenticatesUsers;
/**
* Where to redirect users after login / registration.
* Where to redirect users after login.
*
* @var string
*/
@ -34,6 +34,6 @@ class LoginController extends Controller
*/
public function __construct()
{
$this->middleware('guest', ['except' => 'logout']);
$this->middleware('guest')->except('logout');
}
}

View file

@ -23,7 +23,7 @@ class RegisterController extends Controller
use RegistersUsers;
/**
* Where to redirect users after login / registration.
* Where to redirect users after registration.
*
* @var string
*/
@ -48,9 +48,9 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6|confirmed',
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]);
}

View file

@ -269,7 +269,7 @@ class MicropubClientController extends Controller
];
if ($request->session()->has('me')) {
$data['me'] = normalize_url($request->session()->get('me'));
$user = IndieWebUser::where('me', $request->session()->get('me'))->first();
$user = IndieWebUser::where('me', $request->session()->get('me'))->firstOrFail();
$data['token'] = $user->token ?? 'none defined';
$data['syndication'] = $user->syndication ?? 'none defined';
$data['media-endpoint'] = $user->mediaEndpoint ?? 'none defined';

View file

@ -9,6 +9,7 @@ use Monolog\Handler\StreamHandler;
use Illuminate\Http\{Request, Response};
use App\Exceptions\InvalidTokenException;
use Phaza\LaravelPostgis\Geometries\Point;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
use App\Services\{NoteService, PlaceService, TokenService};
@ -214,8 +215,8 @@ class MicropubController extends Controller
//is it a note we are updating?
if (mb_substr($urlPath, 1, 5) === 'notes') {
try {
$note = Note::nb60(basename($urlPath))->first();
} catch (\Exception $exception) {
$note = Note::nb60(basename($urlPath))->firstOrFail();
} catch (ModelNotFoundException $exception) {
return response()->json([
'error' => 'invalid_request',
'error_description' => 'No known note with given ID',

View file

@ -35,7 +35,7 @@ class NotesController extends Controller
*/
public function show($urlId)
{
$note = Note::nb60($urlId)->with('webmentions')->first();
$note = Note::nb60($urlId)->with('webmentions')->firstOrFail();
return view('notes.show', compact('note'));
}

View file

@ -30,6 +30,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
@ -57,8 +58,8 @@ class Kernel extends HttpKernel
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'myauth' => \App\Http\Middleware\MyAuthMiddleware::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'micropub.token' => \App\Http\Middleware\VerifyMicropubToken::class,
'myauth' => \App\Http\Middleware\MyAuthMiddleware::class,
];
}

View file

@ -18,7 +18,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/');
return redirect('/home');
}
return $next($request);

View file

@ -104,6 +104,9 @@ class SendWebMentions implements ShouldQueue
*/
public function getLinks($html)
{
if ($html == '' || is_null($html)) {
return [];
}
$urls = [];
$dom = new \DOMDocument();
$dom->loadHTML($html);

View file

@ -23,6 +23,13 @@ class Note extends Model
use Searchable;
use SoftDeletes;
/**
* The reges for matching lone usernames.
*
* @var string
*/
private const USERNAMES_REGEX = '/\[.*?\](*SKIP)(*F)|@(\w+)/';
/**
* The database table used by the model.
*
@ -132,12 +139,9 @@ class Note extends Model
*/
public function getNoteAttribute($value)
{
$environment = Environment::createCommonMarkEnvironment();
$environment->addExtension(new LinkifyExtension());
$converter = new Converter(new DocParser($environment), new HtmlRenderer($environment));
$emoji = new EmojiModifier();
$html = $converter->convertToHtml($value);
$html = $this->convertMarkdown($value);
$hcards = $this->makeHCards($html);
$hashtags = $this->autoLinkHashtag($hcards);
$modified = $emoji->makeEmojiAccessible($hashtags);
@ -288,6 +292,93 @@ class Note extends Model
return $oEmbed;
}
/**
* Show a specific form of the note for twitter.
*/
public function getTwitterContentAttribute()
{
// find @mentions
preg_match_all(self::USERNAMES_REGEX, $this->getOriginal('note'), $matches);
if (count($matches[1]) === 0) {
return;
}
// check if any @mentions have a contact associated with them
$count = 0;
foreach ($matches[1] as $match) {
$contact = Contact::where('nick', '=', mb_strtolower($match))->first();
if ($contact) {
$count++;
}
}
if ($count === 0) {
return;
}
// swap in twitter usernames
$swapped = preg_replace_callback(
self::USERNAMES_REGEX,
function ($matches) {
try {
$contact = Contact::where('nick', '=', mb_strtolower($matches[1]))->firstOrFail();
} catch (ModelNotFoundException $e) {
//assume its an actual twitter handle
return $matches[0];
}
if ($contact->twitter) {
return '@' . $contact->twitter;
}
return $contact->name;
},
$this->getOriginal('note')
);
return $this->convertMarkdown($swapped);
}
public function getFacebookContentAttribute()
{
// find @mentions
preg_match_all(self::USERNAMES_REGEX, $this->getOriginal('note'), $matches);
if (count($matches[1]) === 0) {
return;
}
// check if any @mentions have a contact associated with them
$count = 0;
foreach ($matches[1] as $match) {
$contact = Contact::where('nick', '=', mb_strtolower($match))->first();
if ($contact) {
$count++;
}
}
if ($count === 0) {
return;
}
// swap in facebook usernames
$swapped = preg_replace_callback(
self::USERNAMES_REGEX,
function ($matches) {
try {
$contact = Contact::where('nick', '=', mb_strtolower($matches[1]))->firstOrFail();
} catch (ModelNotFoundException $e) {
//assume its an actual twitter handle
return $matches[0];
}
if ($contact->facebook) {
return '<a class="u-category h-card" href="https://facebook.com/' . $contact->facebook . '">' . $contact->name . '</a>';
}
return $contact->name;
},
$this->getOriginal('note')
);
return $this->convertMarkdown($swapped);
}
/**
* Scope a query to select a note via a NewBase60 id.
*
@ -313,9 +404,8 @@ class Note extends Model
*/
private function makeHCards($text)
{
$regex = '/\[.*?\](*SKIP)(*F)|@(\w+)/'; //match @alice but not [@bob](...)
$hcards = preg_replace_callback(
$regex,
self::USERNAMES_REGEX,
function ($matches) {
try {
$contact = Contact::where('nick', '=', mb_strtolower($matches[1]))->firstOrFail();
@ -372,6 +462,15 @@ class Note extends Model
return $text;
}
private function convertMarkdown($text)
{
$environment = Environment::createCommonMarkEnvironment();
$environment->addExtension(new LinkifyExtension());
$converter = new Converter(new DocParser($environment), new HtmlRenderer($environment));
return $converter->convertToHtml($text);
}
/**
* Do a reverse geocode lookup of a `lat,lng` value.
*

View file

@ -19,7 +19,7 @@ class EventServiceProvider extends ServiceProvider
];
/**
* Register any other events for your application.
* Register any events for your application.
*
* @return void
*/

View file

@ -19,7 +19,6 @@ class RouteServiceProvider extends ServiceProvider
/**
* Define your route model bindings, pattern filters, etc.
*
* @param \Illuminate\Routing\Router $router
* @return void
*/
public function boot()

View file

@ -20,7 +20,7 @@ class NoteService
//check the input
if (array_key_exists('content', $data) === false) {
throw new \Exception('No content defined'); //we can’t fudge the data
$data['content'] = null;
}
if (array_key_exists('in-reply-to', $data) === false) {
$data['in-reply-to'] = null;
@ -64,6 +64,9 @@ class NoteService
if ($place !== null) {
$note->place()->associate($place);
$note->swarm_url = $data['swarm-url'];
if ($note->note === null || $note->note == '') {
$note->note = 'I’ve just checked in with Swarm';
}
}
}

View file

@ -40,7 +40,7 @@ $status = $kernel->handle(
| Shutdown The Application
|--------------------------------------------------------------------------
|
| Once Artisan has finished running. We will fire off the shutdown events
| Once Artisan has finished running, we will fire off the shutdown events
| so that any final work may be done by the application before we shut
| down the process. This is the last thing to happen to the request.
|

View file

@ -9,8 +9,8 @@ define('LARAVEL_START', microtime(true));
|
| Composer provides a convenient, automatically generated class loader
| for our application. We just need to utilize it! We'll require it
| into the script here so that we do not have to worry about the
| loading of any our classes "manually". Feels great to relax.
| into the script here so we do not have to manually load any of
| our application's PHP classes. It just feels great to relax.
|
*/

View file

@ -1,5 +1,11 @@
# Changelog
## Version 0.5.28 (2017-08-20)
- Improve Swarm checkin code to allow checkins without text
+ this required a change in the notes table schema
- Improve code by bringing in latest changes in laravel/laravel
- Improve POSSE compatability with bridgy and silos
## Version 0.5.27 (2017-07-24)
- Just a bump in dependency versions used

262
composer.lock generated
View file

@ -8,16 +8,16 @@
"packages": [
{
"name": "aws/aws-sdk-php",
"version": "3.31.8",
"version": "3.33.3",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "9829a8183016df800110148b467179d67c434f90"
"reference": "2820644f411fa261f126727c1c00de15227b9520"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9829a8183016df800110148b467179d67c434f90",
"reference": "9829a8183016df800110148b467179d67c434f90",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2820644f411fa261f126727c1c00de15227b9520",
"reference": "2820644f411fa261f126727c1c00de15227b9520",
"shasum": ""
},
"require": {
@ -84,7 +84,7 @@
"s3",
"sdk"
],
"time": "2017-07-20T22:22:05+00:00"
"time": "2017-08-18T18:04:40+00:00"
},
{
"name": "barnabywalters/mf-cleaner",
@ -679,16 +679,16 @@
},
{
"name": "doctrine/dbal",
"version": "v2.6.0",
"version": "v2.6.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "498760e55195ccaf08076cb9100a2972ba74c001"
"reference": "1a086f853425b1f5349775ce57e45a772d2d2ba5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/498760e55195ccaf08076cb9100a2972ba74c001",
"reference": "498760e55195ccaf08076cb9100a2972ba74c001",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/1a086f853425b1f5349775ce57e45a772d2d2ba5",
"reference": "1a086f853425b1f5349775ce57e45a772d2d2ba5",
"shasum": ""
},
"require": {
@ -748,7 +748,7 @@
"persistence",
"queryobject"
],
"time": "2017-07-23T01:02:22+00:00"
"time": "2017-07-28T10:40:18+00:00"
},
{
"name": "doctrine/inflector",
@ -1641,20 +1641,20 @@
},
{
"name": "laravel/framework",
"version": "v5.4.30",
"version": "v5.4.33",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "b9a64955f4278f45ac348a6e000b5ecc85da167a"
"reference": "e53a81a2bf406f501cdf818ad949f8d6c8dabfc0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/b9a64955f4278f45ac348a6e000b5ecc85da167a",
"reference": "b9a64955f4278f45ac348a6e000b5ecc85da167a",
"url": "https://api.github.com/repos/laravel/framework/zipball/e53a81a2bf406f501cdf818ad949f8d6c8dabfc0",
"reference": "e53a81a2bf406f501cdf818ad949f8d6c8dabfc0",
"shasum": ""
},
"require": {
"doctrine/inflector": "~1.0",
"doctrine/inflector": "~1.1",
"erusev/parsedown": "~1.6",
"ext-mbstring": "*",
"ext-openssl": "*",
@ -1766,7 +1766,7 @@
"framework",
"laravel"
],
"time": "2017-07-19T19:26:19+00:00"
"time": "2017-08-14T20:17:41+00:00"
},
{
"name": "laravel/scout",
@ -1956,16 +1956,16 @@
},
{
"name": "league/commonmark",
"version": "0.15.4",
"version": "0.15.6",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "c4c8e6bf99e62d9568875d9fc3ef473fe3e18e0c"
"reference": "91742543c25fecedc84a4883d2919213e04a73b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c4c8e6bf99e62d9568875d9fc3ef473fe3e18e0c",
"reference": "c4c8e6bf99e62d9568875d9fc3ef473fe3e18e0c",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91742543c25fecedc84a4883d2919213e04a73b7",
"reference": "91742543c25fecedc84a4883d2919213e04a73b7",
"shasum": ""
},
"require": {
@ -1978,7 +1978,7 @@
"require-dev": {
"cebe/markdown": "~1.0",
"erusev/parsedown": "~1.0",
"jgm/commonmark": "0.27",
"jgm/commonmark": "0.28",
"michelf/php-markdown": "~1.4",
"mikehaertl/php-shellcommand": "~1.2.0",
"phpunit/phpunit": "~4.3|~5.0",
@ -2021,20 +2021,20 @@
"markdown",
"parser"
],
"time": "2017-05-09T12:47:53+00:00"
"time": "2017-08-08T11:47:33+00:00"
},
{
"name": "league/flysystem",
"version": "1.0.40",
"version": "1.0.41",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61"
"reference": "f400aa98912c561ba625ea4065031b7a41e5a155"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3828f0b24e2c1918bb362d57a53205d6dc8fde61",
"reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f400aa98912c561ba625ea4065031b7a41e5a155",
"reference": "f400aa98912c561ba625ea4065031b7a41e5a155",
"shasum": ""
},
"require": {
@ -2055,13 +2055,13 @@
"league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
"league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
"league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
"league/flysystem-copy": "Allows you to use Copy.com storage",
"league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
"league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
"league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
"league/flysystem-webdav": "Allows you to use WebDAV storage",
"league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
"spatie/flysystem-dropbox": "Allows you to use Dropbox storage"
"spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
"srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
},
"type": "library",
"extra": {
@ -2104,7 +2104,7 @@
"sftp",
"storage"
],
"time": "2017-04-28T10:15:08+00:00"
"time": "2017-08-06T17:41:04+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
@ -2440,16 +2440,16 @@
},
{
"name": "nikic/php-parser",
"version": "v3.0.6",
"version": "v3.1.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "0808939f81c1347a3c8a82a5925385a08074b0f1"
"reference": "4d4896e553f2094e657fe493506dc37c509d4e2b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0808939f81c1347a3c8a82a5925385a08074b0f1",
"reference": "0808939f81c1347a3c8a82a5925385a08074b0f1",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4d4896e553f2094e657fe493506dc37c509d4e2b",
"reference": "4d4896e553f2094e657fe493506dc37c509d4e2b",
"shasum": ""
},
"require": {
@ -2487,7 +2487,7 @@
"parser",
"php"
],
"time": "2017-06-28T20:53:48+00:00"
"time": "2017-07-28T14:45:09+00:00"
},
{
"name": "paragonie/random_compat",
@ -2791,16 +2791,16 @@
},
{
"name": "psy/psysh",
"version": "v0.8.10",
"version": "v0.8.11",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "7ab97e5a32202585309f3ee35a0c08d2a8e588b1"
"reference": "b193cd020e8c6b66cea6457826ae005e94e6d2c0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/7ab97e5a32202585309f3ee35a0c08d2a8e588b1",
"reference": "7ab97e5a32202585309f3ee35a0c08d2a8e588b1",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/b193cd020e8c6b66cea6457826ae005e94e6d2c0",
"reference": "b193cd020e8c6b66cea6457826ae005e94e6d2c0",
"shasum": ""
},
"require": {
@ -2860,20 +2860,20 @@
"interactive",
"shell"
],
"time": "2017-07-22T15:14:19+00:00"
"time": "2017-07-29T19:30:02+00:00"
},
{
"name": "ramsey/uuid",
"version": "3.6.1",
"version": "3.7.0",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
"reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
"reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/0ef23d1b10cf1bc576e9d865a7e9c47982c5715e",
"reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e",
"shasum": ""
},
"require": {
@ -2942,20 +2942,20 @@
"identifier",
"uuid"
],
"time": "2017-03-26T20:37:53+00:00"
"time": "2017-08-04T13:39:04+00:00"
},
{
"name": "sensiolabs/security-checker",
"version": "v4.0.5",
"version": "v4.1.4",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/security-checker.git",
"reference": "6a3b0c3b42e41c777b1ad75032d8177863fdc5e1"
"reference": "72f4238707071459a6680854c8c74a0ebb999549"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/6a3b0c3b42e41c777b1ad75032d8177863fdc5e1",
"reference": "6a3b0c3b42e41c777b1ad75032d8177863fdc5e1",
"url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/72f4238707071459a6680854c8c74a0ebb999549",
"reference": "72f4238707071459a6680854c8c74a0ebb999549",
"shasum": ""
},
"require": {
@ -2968,7 +2968,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"autoload": {
@ -2987,20 +2987,20 @@
}
],
"description": "A security checker for your composer.lock",
"time": "2017-07-24T11:42:56+00:00"
"time": "2017-08-14T18:42:49+00:00"
},
{
"name": "spatie/laravel-tinker-tools",
"version": "1.0.0",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-tinker-tools.git",
"reference": "4674f9a3d874c8ad488e25ffb7cd936bb7348e43"
"reference": "130b5a029fcf6608c462d9fd2e7429e45436a5e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-tinker-tools/zipball/4674f9a3d874c8ad488e25ffb7cd936bb7348e43",
"reference": "4674f9a3d874c8ad488e25ffb7cd936bb7348e43",
"url": "https://api.github.com/repos/spatie/laravel-tinker-tools/zipball/130b5a029fcf6608c462d9fd2e7429e45436a5e5",
"reference": "130b5a029fcf6608c462d9fd2e7429e45436a5e5",
"shasum": ""
},
"require": {
@ -3028,7 +3028,7 @@
"role": "Developer"
}
],
"description": "Flysystem Adapter for the Dropbox v2 API",
"description": "Use short class names in an Artisan tinker session",
"homepage": "https://github.com/spatie/laravel-tinker-tools",
"keywords": [
"Flysystem",
@ -3038,7 +3038,7 @@
"spatie",
"v2"
],
"time": "2017-05-22T11:30:34+00:00"
"time": "2017-07-29T03:41:36+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@ -3096,16 +3096,16 @@
},
{
"name": "symfony/console",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "a97e45d98c59510f085fa05225a1acb74dfe0546"
"reference": "b0878233cb5c4391347e5495089c7af11b8e6201"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/a97e45d98c59510f085fa05225a1acb74dfe0546",
"reference": "a97e45d98c59510f085fa05225a1acb74dfe0546",
"url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201",
"reference": "b0878233cb5c4391347e5495089c7af11b8e6201",
"shasum": ""
},
"require": {
@ -3161,11 +3161,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2017-07-03T13:19:36+00:00"
"time": "2017-07-29T21:27:59+00:00"
},
{
"name": "symfony/css-selector",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@ -3218,16 +3218,16 @@
},
{
"name": "symfony/debug",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "63b85a968486d95ff9542228dc2e4247f16f9743"
"reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/63b85a968486d95ff9542228dc2e4247f16f9743",
"reference": "63b85a968486d95ff9542228dc2e4247f16f9743",
"url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13",
"reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13",
"shasum": ""
},
"require": {
@ -3270,11 +3270,11 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2017-07-05T13:02:37+00:00"
"time": "2017-07-28T15:27:31+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@ -3337,7 +3337,7 @@
},
{
"name": "symfony/finder",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@ -3386,16 +3386,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "e307abe4b79ccbbfdced9b91c132fd128f456bc5"
"reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/e307abe4b79ccbbfdced9b91c132fd128f456bc5",
"reference": "e307abe4b79ccbbfdced9b91c132fd128f456bc5",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/49e8cd2d59a7aa9bfab19e46de680c76e500a031",
"reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031",
"shasum": ""
},
"require": {
@ -3435,20 +3435,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2017-07-17T14:07:10+00:00"
"time": "2017-07-21T11:04:46+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "16ceea64d23abddf58797a782ae96a5242282cd8"
"reference": "db10d05f1d95e4168e638db7a81c79616f568ea5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/16ceea64d23abddf58797a782ae96a5242282cd8",
"reference": "16ceea64d23abddf58797a782ae96a5242282cd8",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/db10d05f1d95e4168e638db7a81c79616f568ea5",
"reference": "db10d05f1d95e4168e638db7a81c79616f568ea5",
"shasum": ""
},
"require": {
@ -3521,20 +3521,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2017-07-17T19:08:23+00:00"
"time": "2017-08-01T10:25:59+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.4.0",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "f29dca382a6485c3cbe6379f0c61230167681937"
"reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937",
"reference": "f29dca382a6485c3cbe6379f0c61230167681937",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
"reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
"shasum": ""
},
"require": {
@ -3546,7 +3546,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
"dev-master": "1.5-dev"
}
},
"autoload": {
@ -3580,11 +3580,11 @@
"portable",
"shim"
],
"time": "2017-06-09T14:24:12+00:00"
"time": "2017-06-14T15:44:48+00:00"
},
{
"name": "symfony/process",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@ -3633,16 +3633,16 @@
},
{
"name": "symfony/routing",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "dc70bbd0ca7b19259f63cdacc8af370bc32a4728"
"reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/dc70bbd0ca7b19259f63cdacc8af370bc32a4728",
"reference": "dc70bbd0ca7b19259f63cdacc8af370bc32a4728",
"url": "https://api.github.com/repos/symfony/routing/zipball/4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26",
"reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26",
"shasum": ""
},
"require": {
@ -3707,11 +3707,11 @@
"uri",
"url"
],
"time": "2017-06-24T09:29:48+00:00"
"time": "2017-07-21T17:43:13+00:00"
},
{
"name": "symfony/translation",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
@ -3776,16 +3776,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "0f32b62d21991700250fed5109b092949007c5b3"
"reference": "b2623bccb969ad595c2090f9be498b74670d0663"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/0f32b62d21991700250fed5109b092949007c5b3",
"reference": "0f32b62d21991700250fed5109b092949007c5b3",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2623bccb969ad595c2090f9be498b74670d0663",
"reference": "b2623bccb969ad595c2090f9be498b74670d0663",
"shasum": ""
},
"require": {
@ -3840,7 +3840,7 @@
"debug",
"dump"
],
"time": "2017-07-10T14:18:27+00:00"
"time": "2017-07-28T06:06:09+00:00"
},
{
"name": "themattharris/tmhoauth",
@ -4184,29 +4184,31 @@
},
{
"name": "fzaninotto/faker",
"version": "v1.6.0",
"version": "v1.7.1",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
"reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
"reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
"reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
"reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
"shasum": ""
},
"require": {
"php": "^5.3.3|^7.0"
"php": "^5.3.3 || ^7.0"
},
"require-dev": {
"ext-intl": "*",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5"
"phpunit/phpunit": "^4.0 || ^5.0",
"squizlabs/php_codesniffer": "^1.5"
},
"type": "library",
"extra": {
"branch-alias": []
"branch-alias": {
"dev-master": "1.8-dev"
}
},
"autoload": {
"psr-4": {
@ -4228,7 +4230,7 @@
"faker",
"fixtures"
],
"time": "2016-04-29T12:21:54+00:00"
"time": "2017-08-15T16:48:10+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@ -4602,22 +4604,22 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "3.2.0",
"version": "3.2.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "46f7e8bb075036c92695b15a1ddb6971c751e585"
"reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/46f7e8bb075036c92695b15a1ddb6971c751e585",
"reference": "46f7e8bb075036c92695b15a1ddb6971c751e585",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157",
"reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157",
"shasum": ""
},
"require": {
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0@dev",
"phpdocumentor/type-resolver": "^0.4.0",
"phpdocumentor/type-resolver": "^0.3.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
@ -4643,20 +4645,20 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2017-07-15T11:38:20+00:00"
"time": "2017-08-08T06:39:58+00:00"
},
{
"name": "phpdocumentor/type-resolver",
"version": "0.4.0",
"version": "0.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
"reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773",
"reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773",
"shasum": ""
},
"require": {
@ -4690,7 +4692,7 @@
"email": "me@mikevanriel.com"
}
],
"time": "2017-07-14T14:27:02+00:00"
"time": "2017-06-03T08:32:36+00:00"
},
{
"name": "phpspec/prophecy",
@ -4957,29 +4959,29 @@
},
{
"name": "phpunit/php-token-stream",
"version": "1.4.11",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
"reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
"reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0",
"reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
"php": ">=5.3.3"
"php": "^7.0"
},
"require-dev": {
"phpunit/phpunit": "~4.2"
"phpunit/phpunit": "^6.2.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
"dev-master": "2.0-dev"
}
},
"autoload": {
@ -5002,7 +5004,7 @@
"keywords": [
"tokenizer"
],
"time": "2017-02-27T10:12:30+00:00"
"time": "2017-08-20T05:47:52+00:00"
},
{
"name": "phpunit/phpunit",
@ -5749,16 +5751,16 @@
},
{
"name": "symfony/yaml",
"version": "v3.3.5",
"version": "v3.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "1f93a8d19b8241617f5074a123e282575b821df8"
"reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/1f93a8d19b8241617f5074a123e282575b821df8",
"reference": "1f93a8d19b8241617f5074a123e282575b821df8",
"url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed",
"reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed",
"shasum": ""
},
"require": {
@ -5800,7 +5802,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2017-06-15T12:58:50+00:00"
"time": "2017-07-23T12:43:26+00:00"
},
{
"name": "theseer/fdomdocument",

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