Merge branch 'feature/dusk' into develop

.env.dusk.testing

@@ -0,0 +1,14 @@
+APP_ENV=testing
+APP_DEBUG=true
+APP_KEY=base64:6DJhvZLVjE6dD4Cqrteh+6Z5vZlG+v/soCKcDHLOAH0=
+APP_URL=http://localhost:8000
+APP_LONGURL=localhost
+APP_SHORTURL=local
+
+DB_CONNECTION=travis
+
+CACHE_DRIVER=array
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+SCOUT_DRIVER=pgsql

.env.travis

@@ -1,5 +1,6 @@
 APP_ENV=testing
-APP_KEY=
+APP_DEBUG=true
+APP_KEY=base64:6DJhvZLVjE6dD4Cqrteh+6Z5vZlG+v/soCKcDHLOAH0=
 APP_URL=http://localhost:8000
 APP_LONGURL=localhost
 APP_SHORTURL=local

.gitignore

@@ -10,3 +10,4 @@ Homestead.json
 /public/files
 /public/keybase.txt
 /coverage
+/LegacyTests

.travis.yml

@@ -3,8 +3,22 @@ language: php
 sudo: false
 dist: trusty
 
+cache:
+  - apt
+
 addons:
-  postgresql: "9.5"
+  postgresql: "9.6"
+  apt:
+    sources:
+      - sourceline: 'deb http://ppa.launchpad.net/nginx/development/ubuntu trusty main'
+    packages:
+      - nginx
+      - realpath
+  artifacts:
+    s3_region: "eu-west-1"
+    paths:
+      - $(ls tests/Browser/screenshots/*.png | tr "\n" ":")
+      - $(ls /tmp/*.log | tr "\n" ":")
 
 services:
   - postgresql
@@ -22,6 +36,10 @@ matrix:
     - php: nightly
 
 before_install:
+  - mkdir travis-phantomjs
+  - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
   - phpenv config-rm xdebug.ini || echo "xdebug already absent"
   - travis_retry composer self-update --preview
 
@@ -29,6 +47,7 @@ install:
   - if [[ $setup = 'basic' ]];  then travis_retry composer install --no-interaction --prefer-dist; fi
   - if [[ $setup = 'stable' ]]; then travis_retry composer update --no-interaction --prefer-dist --prefer-stable; fi
   - if [[ $setup = 'lowest' ]]; then travis_retry composer update --no-interaction --prefer-dist --prefer-lowest --prefer-stable; fi
+  - travis/install-nginx.sh
 
 before_script:
   - psql -U travis -c 'create database travis_ci_test'
@@ -37,10 +56,10 @@ before_script:
   - php artisan key:generate
   - php artisan migrate
   - php artisan db:seed
-  - php artisan token:generate
+  - phantomjs --webdriver=127.0.0.1:9515 --webdriver-loglevel=DEBUG &
-  - php artisan serve &
   - sleep 5 # Give artisan some time to start serving
 
 script:
   - phpdbg -qrr vendor/bin/phpunit --coverage-text
+  - php artisan dusk --filter syndication
   - php artisan security:check

Makefile

@@ -3,7 +3,8 @@
 .PHONY: sass frontend js compress lint-sass lint-js
 jsfiles := $(wildcard resources/assets/js/*.js)
 sassfiles := $(wildcard resources/assets/sass/*.scss)
-yarnfiles:= node_modules/mapbox-gl/dist/mapbox-gl.css
+yarnfiles:= node_modules/mapbox-gl/dist/mapbox-gl.css \
+node_modules/alertify.js/dist/css/alertify.css
 assets := public/assets/css/app.css \
 public/assets/prism/prism.css public/assets/prism/prism.js \
 $(wildcard public/assets/js/*.js) \

app/Console/Commands/GenerateToken.php

@@ -48,7 +48,7 @@ class GenerateToken extends Command
     {
         $data = [
             'me' => config('app.url'),
-            'client_id' => config('app.url') . '/notes/new',
+            'client_id' => route('micropub-client'),
             'scope' => 'post',
         ];
         $token = $tokenService->getNewToken($data);

app/Http/Controllers/Admin/AdminController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+
+class AdminController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Admin Controller
+    |--------------------------------------------------------------------------
+    |
+    | Here we have the logic for the admin cp
+    |
+     */
+
+    /**
+     * Set variables.
+     *
+     * @var string
+     */
+    public function __construct()
+    {
+        $this->username = config('admin.user');
+    }
+
+    /**
+     * Show the main admin CP page.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function showWelcome()
+    {
+        return view('admin.welcome', ['name' => $this->username]);
+    }
+}

app/Http/Controllers/Admin/ArticlesAdminController.php

@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Article;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class ArticlesAdminController extends Controller
+{
+    /**
+     * List the articles that can be edited.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function index()
+    {
+        $posts = Article::select('id', 'title', 'published')->orderBy('id', 'desc')->get();
+
+        return view('admin.listarticles', ['posts' => $posts]);
+    }
+
+    /**
+     * Show the new article form.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function create()
+    {
+        $message = session('message');
+
+        return view('admin.newarticle', ['message' => $message]);
+    }
+
+    /**
+     * Process an incoming request for a new article and save it.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\View\Factory view
+     */
+    public function store(Request $request)
+    {
+        $published = $request->input('published');
+        if ($published == null) {
+            $published = '0';
+        }
+        //if a `.md` is attached use that for the main content.
+        $content = null; //set default value
+        if ($request->hasFile('article')) {
+            $file = $request->file('article')->openFile();
+            $content = $file->fread($file->getSize());
+        }
+        $main = $content ?? $request->input('main');
+        try {
+            $article = Article::create(
+                [
+                    'url' => $request->input('url'),
+                    'title' => $request->input('title'),
+                    'main' => $main,
+                    'published' => $published,
+                ]
+            );
+        } catch (Exception $e) {
+            $msg = $e->getMessage();
+            $unique = strpos($msg, '1062');
+            if ($unique !== false) {
+                //We've checked for error 1062, i.e. duplicate titleurl
+                return redirect('admin/blog/new')->withInput()->with('message', 'Duplicate title, please change');
+            }
+            //this isn't the error you're looking for
+            throw $e;
+        }
+
+        return view('admin.newarticlesuccess', ['id' => $article->id, 'title' => $article->title]);
+    }
+
+    /**
+     * Show the edit form for an existing article.
+     *
+     * @param  string  The article id
+     * @return \Illuminate\View\Factory view
+     */
+    public function edit($articleId)
+    {
+        $post = Article::select(
+            'title',
+            'main',
+            'url',
+            'published'
+        )->where('id', $articleId)->get();
+
+        return view('admin.editarticle', ['id' => $articleId, 'post' => $post]);
+    }
+
+    /**
+     * Process an incoming request to edit an article.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  string
+     * @return \Illuminate|View\Factory view
+     */
+    public function update(Request $request, $articleId)
+    {
+        $published = $request->input('published');
+        if ($published == null) {
+            $published = '0';
+        }
+        $article = Article::find($articleId);
+        $article->title = $request->input('title');
+        $article->url = $request->input('url');
+        $article->main = $request->input('main');
+        $article->published = $published;
+        $article->save();
+
+        return view('admin.editarticlesuccess', ['id' => $articleId]);
+    }
+
+    /**
+     * Show the delete confirmation form for an article.
+     *
+     * @param  string  The article id
+     * @return \Illuminate\View\Factory view
+     */
+    public function delete($articleId)
+    {
+        return view('admin.deletearticle', ['id' => $articleId]);
+    }
+
+    /**
+     * Process a request to delete an aricle.
+     *
+     * @param  string The article id
+     * @return \Illuminate\View\Factory view
+     */
+    public function destroy($articleId)
+    {
+        Article::where('id', $articleId)->delete();
+
+        return view('admin.deletearticlesuccess', ['id' => $articleId]);
+    }
+}

app/Http/Controllers/Admin/ClientsAdminController.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\MicropubClient;
+use App\Http\Controllers\Controller;
+
+class ClientsAdminController extends Controller
+{
+    /**
+     * Show a list of known clients.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function index()
+    {
+        $clients = MicropubClient::all();
+
+        return view('admin.listclients', ['clients' => $clients]);
+    }
+
+    /**
+     * Show form to add a client name.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function create()
+    {
+        return view('admin.newclient');
+    }
+
+    /**
+     * Show a form to edit a client name.
+     *
+     * @param  string The client id
+     * @return \Illuminate\View\Factory view
+     */
+    public function edit($clientId)
+    {
+        $client = MicropubClient::findOrFail($clientId);
+
+        return view('admin.editclient', [
+            'id' => $clientId,
+            'client_url' => $client->client_url,
+            'client_name' => $client->client_name,
+        ]);
+    }
+
+    /**
+     * Process the request to adda new client name.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\View\Factory view
+     */
+    public function store(Request $request)
+    {
+        MicropubClient::create([
+            'client_url' => $request->input('client_url'),
+            'client_name' => $request->input('client_name'),
+        ]);
+
+        return view('admin.newclientsuccess');
+    }
+
+    /**
+     * Process the request to edit a client name.
+     *
+     * @param  string  The client id
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\View\Factory view
+     */
+    public function update($clientId, Request $request)
+    {
+        $client = MicropubClient::findOrFail($clientId);
+        if ($request->input('edit')) {
+            $client->client_url = $request->input('client_url');
+            $client->client_name = $request->input('client_name');
+            $client->save();
+
+            return view('admin.editclientsuccess');
+        }
+        if ($request->input('delete')) {
+            $client->delete();
+
+            return view('admin.deleteclientsuccess');
+        }
+    }
+}

app/Http/Controllers/Admin/ContactsAdminController.php

@@ -0,0 +1,169 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Contact;
+use GuzzleHttp\Client;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Illuminate\Filesystem\Filesystem;
+
+class ContactsAdminController extends Controller
+{
+    /**
+     * List the currect contacts that can be edited.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function index()
+    {
+        $contacts = Contact::all();
+
+        return view('admin.listcontacts', ['contacts' => $contacts]);
+    }
+
+    /**
+     * Display the form to add a new contact.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function create()
+    {
+        return view('admin.newcontact');
+    }
+
+    /**
+     * Show the form to edit an existing contact.
+     *
+     * @param  string  The contact id
+     * @return \Illuminate\View\Factory view
+     */
+    public function edit($contactId)
+    {
+        $contact = Contact::findOrFail($contactId);
+
+        return view('admin.editcontact', ['contact' => $contact]);
+    }
+
+    /**
+     * Show the form to confirm deleting a contact.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function delete($contactId)
+    {
+        return view('admin.deletecontact', ['id' => $contactId]);
+    }
+
+    /**
+     * Process the request to add a new contact.
+     *
+     * @param  \Illuminate\Http|request $request
+     * @return \Illuminate\View\Factory view
+     */
+    public function store(Request $request)
+    {
+        $contact = new Contact();
+        $contact->name = $request->input('name');
+        $contact->nick = $request->input('nick');
+        $contact->homepage = $request->input('homepage');
+        $contact->twitter = $request->input('twitter');
+        $contact->facebook = $request->input('facebook');
+        $contact->save();
+
+        return view('admin.newcontactsuccess', ['id' => $contact->id]);
+    }
+
+    /**
+     * Process the request to edit a contact.
+     *
+     * @todo   Allow saving profile pictures for people without homepages
+     *
+     * @param  string  The contact id
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\View\Factory view
+     */
+    public function update($contactId, Request $request)
+    {
+        $contact = Contact::findOrFail($contactId);
+        $contact->name = $request->input('name');
+        $contact->nick = $request->input('nick');
+        $contact->homepage = $request->input('homepage');
+        $contact->twitter = $request->input('twitter');
+        $contact->facebook = $request->input('facebook');
+        $contact->save();
+
+        if ($request->hasFile('avatar')) {
+            if ($request->input('homepage') != '') {
+                $dir = parse_url($request->input('homepage'))['host'];
+                $destination = public_path() . '/assets/profile-images/' . $dir;
+                $filesystem = new Filesystem();
+                if ($filesystem->isDirectory($destination) === false) {
+                    $filesystem->makeDirectory($destination);
+                }
+                $request->file('avatar')->move($destination, 'image');
+            }
+        }
+
+        return view('admin.editcontactsuccess');
+    }
+
+    /**
+     * Process the request to delete a contact.
+     *
+     * @param  string  The contact id
+     * @return \Illuminate\View\Factory view
+     */
+    public function destroy($contactId)
+    {
+        $contact = Contact::findOrFail($contactId);
+        $contact->delete();
+
+        return view('admin.deletecontactsuccess');
+    }
+
+    /**
+     * Download the avatar for a contact.
+     *
+     * This method attempts to find the microformat marked-up profile image
+     * from a given homepage and save it accordingly
+     *
+     * @param  string  The contact id
+     * @return \Illuminate\View\Factory view
+     */
+    public function getAvatar($contactId)
+    {
+        $contact = Contact::findOrFail($contactId);
+        $homepage = $contact->homepage;
+        if (($homepage !== null) && ($homepage !== '')) {
+            $client = new Client();
+            try {
+                $response = $client->get($homepage);
+                $html = (string) $response->getBody();
+                $mf2 = \Mf2\parse($html, $homepage);
+            } catch (\GuzzleHttp\Exception\BadResponseException $e) {
+                return "Bad Response from $homepage";
+            }
+            $avatarURL = null; // Initialising
+            foreach ($mf2['items'] as $microformat) {
+                if ($microformat['type'][0] == 'h-card') {
+                    $avatarURL = $microformat['properties']['photo'][0];
+                    break;
+                }
+            }
+            try {
+                $avatar = $client->get($avatarURL);
+            } catch (\GuzzleHttp\Exception\BadResponseException $e) {
+                return "Unable to get $avatarURL";
+            }
+            $directory = public_path() . '/assets/profile-images/' . parse_url($homepage)['host'];
+            $filesystem = new Filesystem();
+            if ($filesystem->isDirectory($directory) === false) {
+                $filesystem->makeDirectory($directory);
+            }
+            $filesystem->put($directory . '/image', $avatar->getBody());
+
+            return view('admin.getavatarsuccess', ['homepage' => parse_url($homepage)['host']]);
+        }
+    }
+}

app/Http/Controllers/Admin/NotesAdminController.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Note;
+use Validator;
+use Illuminate\Http\Request;
+use App\Jobs\SendWebMentions;
+use App\Services\NoteService;
+use App\Http\Controllers\Controller;
+
+class NotesAdminController extends Controller
+{
+    protected $noteService;
+
+    public function __construct(NoteService $noteService = null)
+    {
+        $this->noteService = $noteService ?? new NoteService();
+    }
+
+    /**
+     * List the notes that can be edited.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function index()
+    {
+        $notes = Note::select('id', 'note')->orderBy('id', 'desc')->get();
+        foreach ($notes as $note) {
+            $note->originalNote = $note->getOriginal('note');
+        }
+
+        return view('admin.listnotes', ['notes' => $notes]);
+    }
+
+    /**
+     * Show the form to make a new note.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function create()
+    {
+        return view('admin.newnote');
+    }
+
+    /**
+     * Display the form to edit a specific note.
+     *
+     * @param  string The note id
+     * @return \Illuminate\View\Factory view
+     */
+    public function edit($noteId)
+    {
+        $note = Note::find($noteId);
+        $note->originalNote = $note->getOriginal('note');
+
+        return view('admin.editnote', ['id' => $noteId, 'note' => $note]);
+    }
+
+    /**
+     * The delete note page.
+     *
+     * @param  int id
+     * @return view
+     */
+    public function delete($noteId)
+    {
+        return view('admin.deletenote', ['id' => $id]);
+    }
+
+    /**
+     * Process a request to make a new note.
+     *
+     * @param Illuminate\Http\Request $request
+     * @todo  Sort this mess out
+     */
+    public function store(Request $request)
+    {
+        $validator = Validator::make(
+            $request->all(),
+            ['photo' => 'photosize'],
+            ['photosize' => 'At least one uploaded file exceeds size limit of 5MB']
+        );
+        if ($validator->fails()) {
+            return redirect('/admin/note/new')
+                ->withErrors($validator)
+                ->withInput();
+        }
+
+        $note = $this->noteService->createNote($request);
+
+        return view('admin.newnotesuccess', [
+            'id' => $note->id,
+            'shorturl' => $note->shorturl,
+        ]);
+    }
+
+    /**
+     * Process a request to edit a note. Easy since this can only be done
+     * from the admin CP.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\View\Factory view
+     */
+    public function update($noteId, Request $request)
+    {
+        //update note data
+        $note = Note::findOrFail($noteId);
+        $note->note = $request->input('content');
+        $note->in_reply_to = $request->input('in-reply-to');
+        $note->save();
+
+        if ($request->input('webmentions')) {
+            dispatch(new SendWebMentions($note));
+        }
+
+        return view('admin.editnotesuccess', ['id' => $noteId]);
+    }
+
+    /**
+     * Delete the note.
+     *
+     * @param  int id
+     * @return view
+     */
+    public function destroy($id)
+    {
+        $note = Note::findOrFail($id);
+        $note->delete();
+
+        return view('admin.deletenotesuccess');
+    }
+}

app/Http/Controllers/Admin/PlacesAdminController.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Place;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Phaza\LaravelPostgis\Geometries\Point;
+
+class PlacesAdminController extends Controller
+{
+    /**
+     * List the places that can be edited.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function index()
+    {
+        $places = Place::all();
+
+        return view('admin.listplaces', ['places' => $places]);
+    }
+
+    /**
+     * Show the form to make a new place.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function create()
+    {
+        return view('admin.newplace');
+    }
+
+    /**
+     * Display the form to edit a specific place.
+     *
+     * @param  string The place id
+     * @return \Illuminate\View\Factory view
+     */
+    public function edit($placeId)
+    {
+        $place = Place::findOrFail($placeId);
+
+        $latitude = $place->getLatitude();
+        $longitude = $place->getLongitude();
+
+        return view('admin.editplace', [
+            'id' => $placeId,
+            'name' => $place->name,
+            'description' => $place->description,
+            'latitude' => $latitude,
+            'longitude' => $longitude,
+        ]);
+    }
+
+    /**
+     * Process a request to make a new place.
+     *
+     * @param  Illuminate\Http\Request $request
+     * @return Illuminate\View\Factory view
+     */
+    public function store(Request $request)
+    {
+        $this->placeService->createPlace($request);
+
+        return view('admin.newplacesuccess');
+    }
+
+    /**
+     * Process a request to edit a place.
+     *
+     * @param string The place id
+     * @param Illuminate\Http\Request $request
+     * @return Illuminate\View\Factory view
+     */
+    public function update($placeId, Request $request)
+    {
+        $place = Place::findOrFail($placeId);
+        $place->name = $request->name;
+        $place->description = $request->description;
+        $place->location = new Point((float) $request->latitude, (float) $request->longitude);
+        $place->save();
+
+        return view('admin.editplacesuccess');
+    }
+}

app/Http/Controllers/ContactsController.php

@@ -39,11 +39,11 @@ class ContactsController extends Controller
         $contact = Contact::where('nick', '=', $nick)->firstOrFail();
         $contact->homepageHost = parse_url($contact->homepage, PHP_URL_HOST);
         $file = public_path() . '/assets/profile-images/' . $contact->homepageHost . '/image';
-        $contact->image = ($filesystem->exists($file)) ?
+        $image = ($filesystem->exists($file)) ?
             '/assets/profile-images/' . $contact->homepageHost . '/image'
         :
             '/assets/profile-images/default-image';
 
-        return view('contacts.show', ['contact' => $contact]);
+        return view('contacts.show', compact('contact', 'image'));
     }
 }

app/Http/Controllers/MicropubClientController.php

@@ -62,7 +62,7 @@ class MicropubClientController extends Controller
             $this->indieClient
         );
         if (! $micropubEndpoint) {
-            return redirect(route('micropub-client'))->withErrors('Unable to determine micropub API endpoint', 'endpoint');
+            return redirect(route('micropub-client'))->with('error', 'Unable to determine micropub API endpoint');
         }
 
         $response = $this->postNoteRequest($request, $micropubEndpoint, $token);
@@ -76,7 +76,7 @@ class MicropubClientController extends Controller
             return redirect($location);
         }
 
-        return redirect(route('micropub-client'))->withErrors('Endpoint didn’t create the note.', 'endpoint');
+        return redirect(route('micropub-client'))->with('error', 'Endpoint didn’t create the note.');
     }
 
     /**
@@ -87,8 +87,6 @@ class MicropubClientController extends Controller
      *       and syndicate-to
      *
      * @param  \Illuminate\Http\Request $request
-     * @param  \IndieAuth\Client $indieClient
-     * @param  \GuzzleHttp\Client $guzzleClient
      * @return \Illuminate\Routing\Redirector redirect
      */
     public function refreshSyndicationTargets(Request $request)
@@ -97,7 +95,7 @@ class MicropubClientController extends Controller
         $token = $request->session()->get('token');
         $micropubEndpoint = $this->indieAuthService->discoverMicropubEndpoint($domain, $this->indieClient);
         if (! $micropubEndpoint) {
-            return redirect(route('micropub-client'))->withErrors('Unable to determine micropub API endpoint', 'endpoint');
+            return redirect(route('micropub-client'))->with('error', 'Unable to determine micropub API endpoint');
         }
 
         try {
@@ -106,7 +104,7 @@ class MicropubClientController extends Controller
                 'query' => ['q' => 'syndicate-to'],
             ]);
         } catch (\GuzzleHttp\Exception\BadResponseException $e) {
-            return redirect(route('micropub-client'))->withErrors('Bad response when refreshing syndication targets', 'endpoint');
+            return redirect(route('micropub-client'))->with('error', 'Bad response when refreshing syndication targets');
         }
         $body = (string) $response->getBody();
         $syndication = $this->parseSyndicationTargets($body);
@@ -180,8 +178,7 @@ class MicropubClientController extends Controller
                 'headers' => $headers,
             ]);
         } catch (\GuzzleHttp\Exception\BadResponseException $e) {
-            return redirect(route('micropub-client'))
+            return redirect(route('micropub-client'))->with('error', 'There was a bad response from the micropub endpoint.');
-                ->withErrors('There was a bad response from the micropub endpoint.', 'endpoint');
         }
 
         return $response;
@@ -335,6 +332,8 @@ class MicropubClientController extends Controller
                     'name' => $syn['name'],
                 ];
             }
+        } else {
+            $syndicateTo[] = ['target' => 'http://example.org', 'name' => 'Joe Bloggs on Example'];
         }
         if (count($syndicateTo) > 0) {
             return $syndicateTo;

app/Http/Controllers/PlacesController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Place;
-use Illuminate\Http\Request;
 
 class PlacesController extends Controller
 {
@@ -19,27 +18,6 @@ class PlacesController extends Controller
         return view('allplaces', ['places' => $places]);
     }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
     /**
      * Display the specified resource.
      *
@@ -48,42 +26,8 @@ class PlacesController extends Controller
      */
     public function show($slug)
     {
-        $place = Place::where('slug', '=', $slug)->first();
+        $place = Place::where('slug', '=', $slug)->firstOrFail();
 
         return view('singleplace', ['place' => $place]);
     }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
 }

app/Http/Middleware/DevTokenMiddleware.php

@@ -20,6 +20,14 @@ class DevTokenMiddleware
             session(['me' => config('app.url')]);
             if (Storage::exists('dev-token')) {
                 session(['token' => Storage::get('dev-token')]);
+            } else {
+                $data = [
+                    'me' => config('app.url'),
+                    'client_id' => route('micropub-client'),
+                    'scope' => 'post',
+                ];
+                $tokenService = new \App\Services\TokenService();
+                session(['token' => $tokenService->getNewToken($data)]);
             }
         }
 

app/Providers/AppServiceProvider.php

@@ -5,6 +5,7 @@ namespace App\Providers;
 use App\Tag;
 use App\Note;
 use Validator;
+use Laravel\Dusk\DuskServiceProvider;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -54,6 +55,8 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        //
+        if ($this->app->environment('local', 'testing')) {
+            $this->app->register(DuskServiceProvider::class);
+        }
     }
 }

composer.json

@@ -29,14 +29,12 @@
         "laravel/tinker": "^1.0"
     },
     "require-dev": {
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.7",
-        "symfony/css-selector": "3.1.*",
-        "symfony/dom-crawler": "3.1.*",
         "barryvdh/laravel-debugbar": "~2.0",
+        "fzaninotto/faker": "~1.4",
         "jakub-onderka/php-parallel-lint": "^0.9.2",
-        "laravel/browser-kit-testing": "^1.0"
+        "laravel/dusk": "^1.0",
+        "mockery/mockery": "0.9.*",
+        "phpunit/phpunit": "~5.7"
     },
     "autoload": {
         "classmap": [
@@ -47,10 +45,9 @@
         }
     },
     "autoload-dev": {
-        "classmap": [
+        "psr-4": {
-            "tests/TestCase.php",
+            "Tests\\": "tests"
-            "tests/BrowserKitTest.php"
+        }
-        ]
     },
     "scripts": {
         "post-root-package-install": [

composer.lock

@@ -4,7 +4,7 @@
         "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": "16af842252275cac279c7f118ad6e6d4",
+    "content-hash": "e4236aef74a9e56de4a85dc50bf32dcf",
     "packages": [
         {
             "name": "anahkiasen/underscore-php",
@@ -58,16 +58,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.22.4",
+            "version": "3.22.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "916f708c1a643f86f74eacd3c5be787b40d814f8"
+                "reference": "eea83aaac2b6c86f72a5c85c54d1839b70d4fd21"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/916f708c1a643f86f74eacd3c5be787b40d814f8",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eea83aaac2b6c86f72a5c85c54d1839b70d4fd21",
-                "reference": "916f708c1a643f86f74eacd3c5be787b40d814f8",
+                "reference": "eea83aaac2b6c86f72a5c85c54d1839b70d4fd21",
                 "shasum": ""
             },
             "require": {
@@ -134,7 +134,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2017-02-14T21:23:54+00:00"
+            "time": "2017-02-17T20:09:40+00:00"
         },
         {
             "name": "barnabywalters/mf-cleaner",
@@ -2965,16 +2965,16 @@
         },
         {
             "name": "sensiolabs/security-checker",
-            "version": "v4.0.0",
+            "version": "v4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/security-checker.git",
-                "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c"
+                "reference": "f2ce0035fc512287978510ca1740cd111d60f89f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/116027b57b568ed61b7b1c80eeb4f6ee9e8c599c",
+                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/f2ce0035fc512287978510ca1740cd111d60f89f",
-                "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c",
+                "reference": "f2ce0035fc512287978510ca1740cd111d60f89f",
                 "shasum": ""
             },
             "require": {
@@ -3005,7 +3005,7 @@
                 }
             ],
             "description": "A security checker for your composer.lock",
-            "time": "2016-09-23T18:09:57+00:00"
+            "time": "2017-02-18T17:53:25+00:00"
         },
         {
             "name": "spatie/laravel-glide",
@@ -3280,16 +3280,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936"
+                "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/7a8405a9fc175f87fed8a3c40856b0d866d61936",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
-                "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936",
+                "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
                 "shasum": ""
             },
             "require": {
@@ -3339,20 +3339,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-06T12:04:21+00:00"
+            "time": "2017-02-16T14:07:22+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.1.10",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d"
+                "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
-                "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d",
+                "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
                 "shasum": ""
             },
             "require": {
@@ -3361,7 +3361,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -3392,20 +3392,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:31:54+00:00"
+            "time": "2017-01-02T20:32:22+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477"
+                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/b4d9818f127c60ce21ed62c395da7df868dc8477",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
-                "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477",
+                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
                 "shasum": ""
             },
             "require": {
@@ -3449,11 +3449,11 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-28T02:37:08+00:00"
+            "time": "2017-02-16T16:34:18+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -3513,7 +3513,7 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -3562,16 +3562,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0"
+                "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e192b04de44aa1ed0e39d6793f7e06f5e0b672a0",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a90da6dd679605d88c9803a57a6fc1fb7a19a6e0",
-                "reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0",
+                "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0",
                 "shasum": ""
             },
             "require": {
@@ -3611,20 +3611,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-02T13:47:35+00:00"
+            "time": "2017-02-16T22:46:52+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "96443239baf674b143604fb87cb27cb01672ab77"
+                "reference": "4cd0d4bc31819095c6ef13573069f621eb321081"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96443239baf674b143604fb87cb27cb01672ab77",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4cd0d4bc31819095c6ef13573069f621eb321081",
-                "reference": "96443239baf674b143604fb87cb27cb01672ab77",
+                "reference": "4cd0d4bc31819095c6ef13573069f621eb321081",
                 "shasum": ""
             },
             "require": {
@@ -3693,7 +3693,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-06T13:15:19+00:00"
+            "time": "2017-02-16T23:59:56+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -3756,16 +3756,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "32646a7cf53f3956c76dcb5c82555224ae321858"
+                "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/32646a7cf53f3956c76dcb5c82555224ae321858",
+                "url": "https://api.github.com/repos/symfony/process/zipball/0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
-                "reference": "32646a7cf53f3956c76dcb5c82555224ae321858",
+                "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
                 "shasum": ""
             },
             "require": {
@@ -3801,11 +3801,11 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-03T12:11:38+00:00"
+            "time": "2017-02-16T14:07:22+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
@@ -3880,16 +3880,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5"
+                "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/ca032cc56976d88b85e7386b17020bc6dc95dbc5",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/d6825c6bb2f1da13f564678f9f236fe8242c0029",
-                "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5",
+                "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029",
                 "shasum": ""
             },
             "require": {
@@ -3940,20 +3940,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-21T17:06:35+00:00"
+            "time": "2017-02-16T22:46:52+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511"
+                "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5bb4435a03a4f05c211f4a9a8ee2756965924511",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cb50260b674ee1c2d4ab49f2395a42e0b4681e20",
-                "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511",
+                "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20",
                 "shasum": ""
             },
             "require": {
@@ -4003,7 +4003,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2017-01-24T12:58:58+00:00"
+            "time": "2017-02-16T22:46:52+00:00"
         },
         {
             "name": "themattharris/tmhoauth",
@@ -4298,6 +4298,55 @@
             ],
             "time": "2015-06-14T21:17:01+00:00"
         },
+        {
+            "name": "facebook/webdriver",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/php-webdriver.git",
+                "reference": "77300c4ab2025d4316635f592ec849ca7323bd8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/77300c4ab2025d4316635f592ec849ca7323bd8c",
+                "reference": "77300c4ab2025d4316635f592ec849ca7323bd8c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": "^5.5 || ~7.0",
+                "symfony/process": "^2.8 || ^3.1"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^1.11",
+                "php-mock/php-mock-phpunit": "^1.1",
+                "phpunit/phpunit": "4.6.* || ~5.0",
+                "satooshi/php-coveralls": "^1.0",
+                "squizlabs/php_codesniffer": "^2.6"
+            },
+            "suggest": {
+                "phpdocumentor/phpdocumentor": "2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Facebook\\WebDriver\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "A PHP client for WebDriver",
+            "homepage": "https://github.com/facebook/php-webdriver",
+            "keywords": [
+                "facebook",
+                "php",
+                "selenium",
+                "webdriver"
+            ],
+            "time": "2017-01-13T15:48:08+00:00"
+        },
         {
             "name": "fzaninotto/faker",
             "version": "v1.6.0",
@@ -4439,23 +4488,30 @@
             "time": "2015-12-15T10:42:16+00:00"
         },
         {
-            "name": "laravel/browser-kit-testing",
+            "name": "laravel/dusk",
-            "version": "v1.0.3",
+            "version": "v1.0.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laravel/browser-kit-testing.git",
+                "url": "https://github.com/laravel/dusk.git",
-                "reference": "0adfb725147815bff5516d157577f375a6e66ebd"
+                "reference": "804bf2ef20de7d86caac1aff433c761399b55e56"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/0adfb725147815bff5516d157577f375a6e66ebd",
+                "url": "https://api.github.com/repos/laravel/dusk/zipball/804bf2ef20de7d86caac1aff433c761399b55e56",
-                "reference": "0adfb725147815bff5516d157577f375a6e66ebd",
+                "reference": "804bf2ef20de7d86caac1aff433c761399b55e56",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "facebook/webdriver": "~1.0",
-                "symfony/css-selector": "~3.1",
+                "illuminate/support": "~5.3",
-                "symfony/dom-crawler": "~3.1"
+                "nesbot/carbon": "~1.20",
+                "php": ">=5.6.4",
+                "symfony/console": "~3.2",
+                "symfony/process": "~3.2"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.6",
+                "phpunit/phpunit": "^5.7"
             },
             "type": "library",
             "extra": {
@@ -4465,7 +4521,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Laravel\\BrowserKitTesting\\": "src/"
+                    "Laravel\\Dusk\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4478,12 +4534,13 @@
                     "email": "taylor@laravel.com"
                 }
             ],
-            "description": "Provides backwards compatibility for BrowserKit testing in Laravel 5.4.",
+            "description": "Laravel Dusk provides simple end-to-end testing and browser automation.",
             "keywords": [
                 "laravel",
-                "testing"
+                "testing",
+                "webdriver"
             ],
-            "time": "2017-02-08T22:32:37+00:00"
+            "time": "2017-02-15T20:21:39+00:00"
         },
         {
             "name": "maximebf/debugbar",
@@ -5108,16 +5165,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.7.13",
+            "version": "5.7.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34"
+                "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60ebeed87a35ea46fd7f7d8029df2d6f013ebb34",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4906b8faf23e42612182fd212eb6f4c0f2954b57",
-                "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34",
+                "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57",
                 "shasum": ""
             },
             "require": {
@@ -5141,7 +5198,7 @@
                 "sebastian/global-state": "^1.1",
                 "sebastian/object-enumerator": "~2.0",
                 "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "~1.0|~2.0",
+                "sebastian/version": "~1.0.3|~2.0",
                 "symfony/yaml": "~2.1|~3.0"
             },
             "conflict": {
@@ -5186,7 +5243,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-02-10T09:05:10+00:00"
+            "time": "2017-02-19T07:22:16+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -5578,16 +5635,16 @@
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35"
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
-                "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
                 "shasum": ""
             },
             "require": {
@@ -5620,7 +5677,7 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2016-11-19T07:35:10+00:00"
+            "time": "2017-02-18T15:18:39+00:00"
         },
         {
             "name": "sebastian/recursion-context",
@@ -5760,74 +5817,18 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "time": "2016-10-03T07:35:21+00:00"
         },
-        {
-            "name": "symfony/dom-crawler",
-            "version": "v3.1.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "7eede2a901a19928494194f7d1815a77b9a473a0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7eede2a901a19928494194f7d1815a77b9a473a0",
-                "reference": "7eede2a901a19928494194f7d1815a77b9a473a0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/css-selector": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DomCrawler\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DomCrawler Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-21T17:13:55+00:00"
-        },
         {
             "name": "symfony/yaml",
-            "version": "v3.2.3",
+            "version": "v3.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b"
+                "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/e1718c6bf57e1efbb8793ada951584b2ab27775b",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
-                "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b",
+                "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
                 "shasum": ""
             },
             "require": {
@@ -5869,7 +5870,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-21T17:06:35+00:00"
+            "time": "2017-02-16T22:46:52+00:00"
         },
         {
             "name": "webmozart/assert",

config/admin.php

@@ -10,7 +10,7 @@ return [
     | The username of the admin account.
     */
 
-    'name' => env('ADMIN_NAME'),
+    'user' => env('ADMIN_USER'),
 
     /*
     |--------------------------------------------------------------------------