Updated to laravel 5.5

Closes #590

diff --git a/.gitignore b/.gitignore
index e7e0535059c31e403a6062119d67c350003b0df2..be86e5a039260cdbfa6aa32f667e5c1db286d201 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,10 @@
 /node_modules
 Homestead.yaml
 .env
 /node_modules
 Homestead.yaml
 .env

-/public/dist

 .idea
 .idea

+npm-debug.log
+yarn-error.log
+/public/dist

 /public/plugins
 /public/css
 /public/js
 /public/plugins
 /public/css
 /public/js


@@ -18,5 +20,4 @@ yarn.lock
 nbproject
 .buildpath
 .project
 nbproject
 .buildpath
 .project

-.settings/org.eclipse.wst.common.project.facet.core.xml
-.settings/org.eclipse.php.core.prefs
+.settings/

diff --git a/.travis.yml b/.travis.yml
index 29f9fb7a55b60fd81172a3ba0819bdfcf0eefece..d51dd6d4f0fd35fd709be0fd38622f1fd692843b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: false
 language: php
 php:
   - 7.0.7
 language: php
 php:
   - 7.0.7

+  - 7.1.9

 
 cache:
   directories:
 
 cache:
   directories:

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index af9f5fd4617e6a765251a066aeb4552721863ed9..e75d93801632b972df5787dafe8094cea2fbc943 100644 (file)
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -11,12 +11,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
      * @var array
      */
     protected $commands = [

-        Commands\ClearViews::class,
-        Commands\ClearActivity::class,
-        Commands\ClearRevisions::class,
-        Commands\RegeneratePermissions::class,
-        Commands\RegenerateSearch::class,
-        Commands\UpgradeDatabaseEncoding::class
+        //

     ];
 
     /**
     ];
 
     /**


@@ -29,4 +24,14 @@ class Kernel extends ConsoleKernel
     {
         //
     }
     {
         //
     }

+
+    /**
+     * Register the commands for the application.
+     *
+     * @return void
+     */
+    protected function commands()
+    {
+        $this->load(__DIR__.'/Commands');
+    }

 }
 }

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 5260eb6cd88b95a5b75380eaa500ad7a33483e28..1dc5094e30fe1e6f350c2d37e058477d49cbf7ab 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -103,4 +103,16 @@ class Handler extends ExceptionHandler
 
         return redirect()->guest('login');
     }
 
         return redirect()->guest('login');
     }

+
+    /**
+     * Convert a validation exception into a JSON response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Validation\ValidationException  $exception
+     * @return \Illuminate\Http\JsonResponse
+     */
+    protected function invalidJson($request, ValidationException $exception)
+    {
+        return response()->json($exception->errors(), $exception->status);
+    }

 }
 }

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index e7eeb9bc1629d2ed94441458f6435e0b22ff8982..782cfd0ae866136d5ae577d0353bc0052c89e9a2 100644 (file)
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -72,13 +72,13 @@ class LoginController extends Controller
         // Explicitly log them out for now if they do no exist.
         if (!$user->exists) auth()->logout($user);
 
         // Explicitly log them out for now if they do no exist.
         if (!$user->exists) auth()->logout($user);
 

-        if (!$user->exists && $user->email === null && !$request->has('email')) {
+        if (!$user->exists && $user->email === null && !$request->filled('email')) {

             $request->flash();
             session()->flash('request-email', true);
             return redirect('/login');
         }
 
             $request->flash();
             session()->flash('request-email', true);
             return redirect('/login');
         }
 

-        if (!$user->exists && $user->email === null && $request->has('email')) {
+        if (!$user->exists && $user->email === null && $request->filled('email')) {

             $user->email = $request->get('email');
         }
 
             $user->email = $request->get('email');
         }
 

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 5342ece6bafbc60be02d6053b1b4cbd36c14ee9f..7e4b3fd81f80f4a001c368c3f061e972f0e6f5dc 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -183,7 +183,7 @@ class BookController extends Controller
         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent
         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent

-        if (!$request->has('sort-tree')) {
+        if (!$request->filled('sort-tree')) {

             return redirect($book->getUrl());
         }
 
             return redirect($book->getUrl());
         }
 

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 77c320e07db7989203f87284914ba39e68803672..d40f8825574cef758fb096bf474c419ee9c67fab 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -107,7 +107,7 @@ class ImageController extends Controller
         $imageUpload = $request->file('file');
 
         try {
         $imageUpload = $request->file('file');
 
         try {

-            $uploadedTo = $request->has('uploaded_to') ? $request->get('uploaded_to') : 0;
+            $uploadedTo = $request->filled('uploaded_to') ? $request->get('uploaded_to') : 0;

             $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
             $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);


@@ -162,7 +162,7 @@ class ImageController extends Controller
         $this->checkOwnablePermission('image-delete', $image);
 
         // Check if this image is used on any pages
         $this->checkOwnablePermission('image-delete', $image);
 
         // Check if this image is used on any pages

-        $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
+        $isForced = in_array($request->get('force', ''), [true, 'true']);

         if (!$isForced) {
             $pageSearch = $entityRepo->searchForImage($image->url);
             if ($pageSearch !== false) {
         if (!$isForced) {
             $pageSearch = $entityRepo->searchForImage($image->url);
             if ($pageSearch !== false) {

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index bf8165afe6f45db2d8db507249f4fee3cb58f425..0faeb0decfe35cb500013bd6756a1b12dd42af5e 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -36,7 +36,7 @@ class SearchController extends Controller
         $searchTerm = $request->get('term');
         $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
 
         $searchTerm = $request->get('term');
         $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
 

-        $page = $request->has('page') && is_int(intval($request->get('page'))) ? intval($request->get('page')) : 1;
+        $page = intval($request->get('page', '0')) ?: 1;

         $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
         $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);


@@ -88,8 +88,8 @@ class SearchController extends Controller
      */
     public function searchEntitiesAjax(Request $request)
     {
      */
     public function searchEntitiesAjax(Request $request)
     {

-        $entityTypes = $request->has('types') ? collect(explode(',', $request->get('types'))) : collect(['page', 'chapter', 'book']);
-        $searchTerm = ($request->has('term') && trim($request->get('term')) !== '') ? $request->get('term') : false;
+        $entityTypes = $request->filled('types') ? collect(explode(',', $request->get('types'))) : collect(['page', 'chapter', 'book']);
+        $searchTerm =  $request->get('term', false);

 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {
 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {

diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 24bdcdb1c1af2e173684215806c1fef5138b10b6..5cf7a0f8ffd8a092a4013a3e69ed4d862ab6828a 100644 (file)
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -37,7 +37,7 @@ class TagController extends Controller
      */
     public function getNameSuggestions(Request $request)
     {
      */
     public function getNameSuggestions(Request $request)
     {

-        $searchTerm = $request->has('search') ? $request->get('search') : false;
+        $searchTerm = $request->get('search', false);

         $suggestions = $this->tagRepo->getNameSuggestions($searchTerm);
         return response()->json($suggestions);
     }
         $suggestions = $this->tagRepo->getNameSuggestions($searchTerm);
         return response()->json($suggestions);
     }


@@ -49,8 +49,8 @@ class TagController extends Controller
      */
     public function getValueSuggestions(Request $request)
     {
      */
     public function getValueSuggestions(Request $request)
     {

-        $searchTerm = $request->has('search') ? $request->get('search') : false;
-        $tagName = $request->has('name') ? $request->get('name') : false;
+        $searchTerm = $request->get('search', false);
+        $tagName = $request->get('name', false);

         $suggestions = $this->tagRepo->getValueSuggestions($searchTerm, $tagName);
         return response()->json($suggestions);
     }
         $suggestions = $this->tagRepo->getValueSuggestions($searchTerm, $tagName);
         return response()->json($suggestions);
     }

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index c98d5f87eab71ebbf4383b8f77efe43fe17774f0..fe5c7a243b6c4e7899cf5730da9755225268f371 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -34,9 +34,9 @@ class UserController extends Controller
     {
         $this->checkPermission('users-manage');
         $listDetails = [
     {
         $this->checkPermission('users-manage');
         $listDetails = [

-            'order' => $request->has('order') ? $request->get('order') : 'asc',
-            'search' => $request->has('search') ? $request->get('search') : '',
-            'sort' => $request->has('sort') ? $request->get('sort') : 'name',
+            'order' => $request->get('order', 'asc'),
+            'search' => $request->get('search', ''),
+            'sort' => $request->get('sort', 'name'),

         ];
         $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
         $this->setPageTitle(trans('settings.users'));
         ];
         $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
         $this->setPageTitle(trans('settings.users'));


@@ -88,7 +88,7 @@ class UserController extends Controller
 
         $user->save();
 
 
         $user->save();
 

-        if ($request->has('roles')) {
+        if ($request->filled('roles')) {

             $roles = $request->get('roles');
             $user->roles()->sync($roles);
         }
             $roles = $request->get('roles');
             $user->roles()->sync($roles);
         }


@@ -155,24 +155,24 @@ class UserController extends Controller
         $user->fill($request->all());
 
         // Role updates
         $user->fill($request->all());
 
         // Role updates

-        if (userCan('users-manage') && $request->has('roles')) {
+        if (userCan('users-manage') && $request->filled('roles')) {

             $roles = $request->get('roles');
             $user->roles()->sync($roles);
         }
 
         // Password updates
             $roles = $request->get('roles');
             $user->roles()->sync($roles);
         }
 
         // Password updates

-        if ($request->has('password') && $request->get('password') != '') {
+        if ($request->filled('password')) {

             $password = $request->get('password');
             $user->password = bcrypt($password);
         }
 
         // External auth id updates
             $password = $request->get('password');
             $user->password = bcrypt($password);
         }
 
         // External auth id updates

-        if ($this->currentUser->can('users-manage') && $request->has('external_auth_id')) {
+        if ($this->currentUser->can('users-manage') && $request->filled('external_auth_id')) {

             $user->external_auth_id = $request->get('external_auth_id');
         }
 
         // Save an user-specific settings
             $user->external_auth_id = $request->get('external_auth_id');
         }
 
         // Save an user-specific settings

-        if ($request->has('setting')) {
+        if ($request->filled('setting')) {

             foreach ($request->get('setting') as $key => $value) {
                 setting()->putUser($user, $key, $value);
             }
             foreach ($request->get('setting') as $key => $value) {
                 setting()->putUser($user, $key, $value);
             }

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 830b6011772aaf0358f7eea9fffaff90fec444af..cd894de95340471f87e73c876cac8e2a4e49a657 100644 (file)
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -15,6 +15,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \BookStack\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \BookStack\Http\Middleware\TrimStrings::class,

+        \BookStack\Http\Middleware\TrustProxies::class,

     ];
 
     /**
     ];
 
     /**


@@ -44,10 +45,11 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
      * @var array
      */
     protected $routeMiddleware = [

-        'can'        => \Illuminate\Auth\Middleware\Authorize::class,

         'auth'       => \BookStack\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'auth'       => \BookStack\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

+        'can'        => \Illuminate\Auth\Middleware\Authorize::class,

         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,
         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,

+        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

         'perm'       => \BookStack\Http\Middleware\PermissionMiddleware::class
     ];
 }
         'perm'       => \BookStack\Http\Middleware\PermissionMiddleware::class
     ];
 }

diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index 2d14a85f3d283c56818acde34c1b2240c1ddf7b9..484c15ae87eb8407ab6767c8d82f3ad149b10cb7 100644 (file)
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Http\Middleware;
 
 
 namespace BookStack\Http\Middleware;
 

-use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
+use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;

 
 

-class EncryptCookies extends BaseEncrypter
+class EncryptCookies extends Middleware

 {
     /**
      * The names of the cookies that should not be encrypted.
 {
     /**
      * The names of the cookies that should not be encrypted.

diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
index c9d371fee55d457c48d77d7d56f4f0b4bb91c104..cbdc88fb9b703465a90a6b55d75caa660a7cd9c9 100644 (file)
--- a/app/Http/Middleware/TrimStrings.php
+++ b/app/Http/Middleware/TrimStrings.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Http\Middleware;
 
 
 namespace BookStack\Http\Middleware;
 

-use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
+use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;

 
 

-class TrimStrings extends BaseTrimmer
+class TrimStrings extends Middleware

 {
     /**
      * The names of the attributes that should not be trimmed.
 {
     /**
      * The names of the attributes that should not be trimmed.

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
new file mode 100644 (file)
index 0000000..69fcbe9
--- /dev/null
+++ b/app/Http/Middleware/TrustProxies.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BookStack\Http\Middleware;
+
+use Illuminate\Http\Request;
+use Fideloper\Proxy\TrustProxies as Middleware;
+
+class TrustProxies extends Middleware
+{
+    /**
+     * The trusted proxies for this application.
+     *
+     * @var array
+     */
+    protected $proxies;
+
+    /**
+     * The current proxy header mappings.
+     *
+     * @var array
+     */
+    protected $headers = [
+        Request::HEADER_FORWARDED => 'FORWARDED',
+        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
+        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
+        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
+        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
+    ];
+}

diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index 356d466a26fcce60a4306dff2cc0c3079d3ba41b..291b8326f36d4657e46197117e6d61bfc84762a6 100644 (file)
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Http\Middleware;
 
 
 namespace BookStack\Http\Middleware;
 

-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;

 
 

-class VerifyCsrfToken extends BaseVerifier
+class VerifyCsrfToken extends Middleware

 {
     /**
      * The URIs that should be excluded from CSRF verification.
 {
     /**
      * The URIs that should be excluded from CSRF verification.

diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php
index d390f3e99a0975e841297f72729375a1c2909db9..c31ddfefe46dbee7d6957cfb230458e622bfa6d9 100644 (file)
--- a/app/Repos/EntityRepo.php
+++ b/app/Repos/EntityRepo.php
@@ -442,9 +442,10 @@ class EntityRepo
      */
     public function updateEntityPermissionsFromRequest($request, Entity $entity)
     {
      */
     public function updateEntityPermissionsFromRequest($request, Entity $entity)
     {

-        $entity->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
+        $entity->restricted = $request->get('restricted', '') === 'true';

         $entity->permissions()->delete();
         $entity->permissions()->delete();

-        if ($request->has('restrictions')) {
+
+        if ($request->filled('restrictions')) {

             foreach ($request->get('restrictions') as $roleId => $restrictions) {
                 foreach ($restrictions as $action => $value) {
                     $entity->permissions()->create([
             foreach ($request->get('restrictions') as $roleId => $restrictions) {
                 foreach ($restrictions as $action => $value) {
                     $entity->permissions()->create([


@@ -454,6 +455,7 @@ class EntityRepo
                 }
             }
         }
                 }
             }
         }

+

         $entity->save();
         $this->permissionService->buildJointPermissionsForEntity($entity);
     }
         $entity->save();
         $this->permissionService->buildJointPermissionsForEntity($entity);
     }

diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php
index 93787a3e589ba9e6a1d82d2be5030af6ded82c13..4f8b4e0f9d0fe2b1003b89fa4e7483730b4b9b88 100644 (file)
--- a/app/Services/PermissionService.php
+++ b/app/Services/PermissionService.php
@@ -205,12 +205,17 @@ class PermissionService
         }
 
         $entities[] = $entity->book;
         }
 
         $entities[] = $entity->book;

-        if ($entity->isA('page') && $entity->chapter_id) $entities[] = $entity->chapter;
+
+        if ($entity->isA('page') && $entity->chapter_id) {
+            $entities[] = $entity->chapter;
+        }
+

         if ($entity->isA('chapter')) {
             foreach ($entity->pages as $page) {
                 $entities[] = $page;
             }
         }
         if ($entity->isA('chapter')) {
             foreach ($entity->pages as $page) {
                 $entities[] = $page;
             }
         }

+

         $this->deleteManyJointPermissionsForEntities($entities);
         $this->buildJointPermissionsForEntities(collect($entities));
     }
         $this->deleteManyJointPermissionsForEntities($entities);
         $this->buildJointPermissionsForEntities(collect($entities));
     }

diff --git a/composer.json b/composer.json
index 6d86057bca843cd3f0cf83a28093716c117905a1..5db7033d64670a4fb0a39441cfbbdec45d9f44bb 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -1,32 +1,34 @@
 {
 {

-    "name": "ssddanbrown/bookstack",
+    "name": "bookstackapp/bookstack",

     "description": "BookStack documentation platform",
     "keywords": ["BookStack", "Documentation"],
     "license": "MIT",
     "type": "project",
     "require": {
     "description": "BookStack documentation platform",
     "keywords": ["BookStack", "Documentation"],
     "license": "MIT",
     "type": "project",
     "require": {

-        "php": ">=5.6.4",
-        "laravel/framework": "5.4.*",
+        "php": ">=7.0.0",
+        "laravel/framework": "5.5.*",
+        "fideloper/proxy": "~3.3",

         "ext-tidy": "*",
         "ext-tidy": "*",

-        "intervention/image": "^2.3",
+        "intervention/image": "^2.4",

         "laravel/socialite": "^3.0",
         "laravel/socialite": "^3.0",

-        "barryvdh/laravel-ide-helper": "^2.2.3",
-        "barryvdh/laravel-debugbar": "^2.3.2",

         "league/flysystem-aws-s3-v3": "^1.0",
         "league/flysystem-aws-s3-v3": "^1.0",

-        "barryvdh/laravel-dompdf": "^0.8",
+        "barryvdh/laravel-dompdf": "^0.8.1",

         "predis/predis": "^1.1",
         "gathercontent/htmldiff": "^0.2.1",
         "predis/predis": "^1.1",
         "gathercontent/htmldiff": "^0.2.1",

-        "barryvdh/laravel-snappy": "^0.3.1",
-        "laravel/browser-kit-testing": "^1.0",
+        "barryvdh/laravel-snappy": "^0.4.0",

         "socialiteproviders/slack": "^3.0",
         "socialiteproviders/microsoft-azure": "^3.0"
     },
     "require-dev": {
         "socialiteproviders/slack": "^3.0",
         "socialiteproviders/microsoft-azure": "^3.0"
     },
     "require-dev": {

+        "filp/whoops": "~2.0",

         "fzaninotto/faker": "~1.4",
         "fzaninotto/faker": "~1.4",

-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.0",
+        "mockery/mockery": "~1.0",
+        "phpunit/phpunit": "~6.0",

         "symfony/css-selector": "3.1.*",
         "symfony/css-selector": "3.1.*",

-        "symfony/dom-crawler": "3.1.*"
+        "symfony/dom-crawler": "3.1.*",
+        "laravel/browser-kit-testing": "^2.0",
+        "barryvdh/laravel-ide-helper": "^2.4.1",
+        "barryvdh/laravel-debugbar": "^3.1.0"

     },
     "autoload": {
         "classmap": [
     },
     "autoload": {
         "classmap": [


@@ -58,13 +60,15 @@
         ],
         "post-install-cmd": [
             "Illuminate\\Foundation\\ComposerScripts::postInstall",
         ],
         "post-install-cmd": [
             "Illuminate\\Foundation\\ComposerScripts::postInstall",

-            "php artisan optimize",

             "php artisan cache:clear",
             "php artisan view:clear"
         ],
         "post-update-cmd": [
             "php artisan cache:clear",
             "php artisan view:clear"
         ],
         "post-update-cmd": [

-            "Illuminate\\Foundation\\ComposerScripts::postUpdate",
-            "php artisan optimize"
+            "Illuminate\\Foundation\\ComposerScripts::postUpdate"
+        ],
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover"

         ],
         "refresh-test-database": [
             "php artisan migrate:refresh --database=mysql_testing",
         ],
         "refresh-test-database": [
             "php artisan migrate:refresh --database=mysql_testing",


@@ -72,6 +76,7 @@
         ]
     },
     "config": {
         ]
     },
     "config": {

-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "php": "7.0"

     }
 }
     }
 }

diff --git a/composer.lock b/composer.lock
index bad47199c540be24fc1cacc4293a1e4091cb73c8..7472d083a7d28a3ff25ea88bc29de0bf55a3046a 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,27 +4,30 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],

-    "hash": "aa5f3333b909857a179e6aa9c30ab9ab",
-    "content-hash": "dc4c98aa8942f27fde6a9faa440e1a74",
+    "content-hash": "7aa47303355cad47ffc59a24bcce2b1a",

     "packages": [
         {
             "name": "aws/aws-sdk-php",
     "packages": [
         {
             "name": "aws/aws-sdk-php",

-            "version": "3.22.11",
+            "version": "3.38.5",

             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",

-                "reference": "277939bd789204b314f3aaca06976cf3ddf78f07"
+                "reference": "13ffa481127c08e04244f116ae85a64b4172479c"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/277939bd789204b314f3aaca06976cf3ddf78f07",
-                "reference": "277939bd789204b314f3aaca06976cf3ddf78f07",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/13ffa481127c08e04244f116ae85a64b4172479c",
+                "reference": "13ffa481127c08e04244f116ae85a64b4172479c",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-simplexml": "*",
+                "ext-spl": "*",

                 "guzzlehttp/guzzle": "^5.3.1|^6.2.1",
                 "guzzlehttp/promises": "~1.0",
                 "guzzlehttp/guzzle": "^5.3.1|^6.2.1",
                 "guzzlehttp/promises": "~1.0",

-                "guzzlehttp/psr7": "~1.3.1",
+                "guzzlehttp/psr7": "^1.4.1",

                 "mtdowling/jmespath.php": "~2.2",
                 "php": ">=5.5"
             },
                 "mtdowling/jmespath.php": "~2.2",
                 "php": ">=5.5"
             },


@@ -34,13 +37,9 @@
                 "behat/behat": "~3.0",
                 "doctrine/cache": "~1.4",
                 "ext-dom": "*",
                 "behat/behat": "~3.0",
                 "doctrine/cache": "~1.4",
                 "ext-dom": "*",

-                "ext-json": "*",

                 "ext-openssl": "*",
                 "ext-openssl": "*",

-                "ext-pcre": "*",
-                "ext-simplexml": "*",
-                "ext-spl": "*",

                 "nette/neon": "^2.3",
                 "nette/neon": "^2.3",

-                "phpunit/phpunit": "~4.0|~5.0",
+                "phpunit/phpunit": "^4.8.35|^5.4.0",

                 "psr/cache": "^1.0"
             },
             "suggest": {
                 "psr/cache": "^1.0"
             },
             "suggest": {


@@ -85,85 +84,39 @@
                 "s3",
                 "sdk"
             ],
                 "s3",
                 "sdk"
             ],

-            "time": "2017-02-24 21:47:48"
-        },
-        {
-            "name": "barryvdh/laravel-debugbar",
-            "version": "v2.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "24e4f0261e352d3fd86d0447791b56ae49398674"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/24e4f0261e352d3fd86d0447791b56ae49398674",
-                "reference": "24e4f0261e352d3fd86d0447791b56ae49398674",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*",
-                "maximebf/debugbar": "~1.13.0",
-                "php": ">=5.5.9",
-                "symfony/finder": "~2.7|~3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Barryvdh\\Debugbar\\": "src/"
-                },
-                "files": [
-                    "src/helpers.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "PHP Debugbar integration for Laravel",
-            "keywords": [
-                "debug",
-                "debugbar",
-                "laravel",
-                "profiler",
-                "webprofiler"
-            ],
-            "time": "2017-01-19 08:19:49"
+            "time": "2017-11-17T22:08:25+00:00"

         },
         {
             "name": "barryvdh/laravel-dompdf",
         },
         {
             "name": "barryvdh/laravel-dompdf",

-            "version": "v0.8.0",
+            "version": "v0.8.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-dompdf.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-dompdf.git",

-                "reference": "22ee9cb8e0ac0d5f11633d1194280ab40b2bba1f"
+                "reference": "3b2235e589616331d68482d61b7763789a2600fe"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/22ee9cb8e0ac0d5f11633d1194280ab40b2bba1f",
-                "reference": "22ee9cb8e0ac0d5f11633d1194280ab40b2bba1f",
+                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/3b2235e589616331d68482d61b7763789a2600fe",
+                "reference": "3b2235e589616331d68482d61b7763789a2600fe",

                 "shasum": ""
             },
             "require": {
                 "dompdf/dompdf": "^0.8",
                 "shasum": ""
             },
             "require": {
                 "dompdf/dompdf": "^0.8",

-                "illuminate/support": "5.1.x|5.2.x|5.3.x|5.4.x",
+                "illuminate/support": "5.1.x|5.2.x|5.3.x|5.4.x|5.5.x",

                 "php": ">=5.5.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "0.8-dev"
                 "php": ">=5.5.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "0.8-dev"

+                },
+                "laravel": {
+                    "providers": [
+                        "Barryvdh\\DomPDF\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "PDF": "Barryvdh\\DomPDF\\Facade"
+                    }

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -187,91 +140,25 @@
                 "laravel",
                 "pdf"
             ],
                 "laravel",
                 "pdf"
             ],

-            "time": "2017-02-19 06:45:54"
-        },
-        {
-            "name": "barryvdh/laravel-ide-helper",
-            "version": "v2.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "e82de98cef0d6597b1b686be0b5813a3a4bb53c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/e82de98cef0d6597b1b686be0b5813a3a4bb53c5",
-                "reference": "e82de98cef0d6597b1b686be0b5813a3a4bb53c5",
-                "shasum": ""
-            },
-            "require": {
-                "barryvdh/reflection-docblock": "^2.0.4",
-                "illuminate/console": "^5.0,<5.5",
-                "illuminate/filesystem": "^5.0,<5.5",
-                "illuminate/support": "^5.0,<5.5",
-                "php": ">=5.4.0",
-                "symfony/class-loader": "^2.3|^3.0"
-            },
-            "require-dev": {
-                "doctrine/dbal": "~2.3",
-                "phpunit/phpunit": "4.*",
-                "scrutinizer/ocular": "~1.1",
-                "squizlabs/php_codesniffer": "~2.3"
-            },
-            "suggest": {
-                "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Barryvdh\\LaravelIdeHelper\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.",
-            "keywords": [
-                "autocomplete",
-                "codeintel",
-                "helper",
-                "ide",
-                "laravel",
-                "netbeans",
-                "phpdoc",
-                "phpstorm",
-                "sublime"
-            ],
-            "time": "2017-02-22 12:27:33"
+            "time": "2017-07-29T19:01:17+00:00"

         },
         {
             "name": "barryvdh/laravel-snappy",
         },
         {
             "name": "barryvdh/laravel-snappy",

-            "version": "v0.3.3",
+            "version": "v0.4.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-snappy.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-snappy.git",

-                "reference": "dea728426bd867652c2f3a307a9cbea3f1ed7dff"
+                "reference": "f08c7e5b4ddea585bfcd48ab4f40f920e58dd1cf"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/dea728426bd867652c2f3a307a9cbea3f1ed7dff",
-                "reference": "dea728426bd867652c2f3a307a9cbea3f1ed7dff",
+                "url": "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/f08c7e5b4ddea585bfcd48ab4f40f920e58dd1cf",
+                "reference": "f08c7e5b4ddea585bfcd48ab4f40f920e58dd1cf",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "illuminate/filesystem": "5.0.x|5.1.x|5.2.x|5.3.x|5.4.x",
-                "illuminate/support": "5.0.x|5.1.x|5.2.x|5.3.x|5.4.x",
+                "illuminate/filesystem": "5.0.x|5.1.x|5.2.x|5.3.x|5.4.x|5.5.x",
+                "illuminate/support": "5.0.x|5.1.x|5.2.x|5.3.x|5.4.x|5.5.x",

                 "knplabs/knp-snappy": "*",
                 "php": ">=5.4.0"
             },
                 "knplabs/knp-snappy": "*",
                 "php": ">=5.4.0"
             },


@@ -279,6 +166,15 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "0.3-dev"
             "extra": {
                 "branch-alias": {
                     "dev-master": "0.3-dev"

+                },
+                "laravel": {
+                    "providers": [
+                        "Barryvdh\\Snappy\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "PDF": "Barryvdh\\Snappy\\Facades\\SnappyPdf",
+                        "SnappyImage": "Barryvdh\\Snappy\\Facades\\SnappyImage"
+                    }

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -305,56 +201,7 @@
                 "wkhtmltoimage",
                 "wkhtmltopdf"
             ],
                 "wkhtmltoimage",
                 "wkhtmltopdf"
             ],

-            "time": "2017-02-09 23:18:54"
-        },
-        {
-            "name": "barryvdh/reflection-docblock",
-            "version": "v2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
-                "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/3dcbd98b5d9384a5357266efba8fd29884458e5c",
-                "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0,<4.5"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Barryvdh": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "[email protected]"
-                }
-            ],
-            "time": "2016-06-13 19:28:20"
+            "time": "2017-08-14T06:48:50+00:00"

         },
         {
             "name": "cogpowered/finediff",
         },
         {
             "name": "cogpowered/finediff",


@@ -405,37 +252,37 @@
                 "string",
                 "text"
             ],
                 "string",
                 "text"
             ],

-            "time": "2014-05-19 10:25:02"
+            "time": "2014-05-19T10:25:02+00:00"

         },
         {
             "name": "doctrine/inflector",
         },
         {
             "name": "doctrine/inflector",

-            "version": "v1.1.0",
+            "version": "v1.2.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",

-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+                "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462",
+                "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.2"
+                "php": "^7.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "4.*"
+                "phpunit/phpunit": "^6.2"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.2.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {

-                "psr-0": {
-                    "Doctrine\\Common\\Inflector\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"

                 }
             },
             "notification-url": "https://packagist.org/downloads/",
                 }
             },
             "notification-url": "https://packagist.org/downloads/",


@@ -472,20 +319,74 @@
                 "singularize",
                 "string"
             ],
                 "singularize",
                 "string"
             ],

-            "time": "2015-11-06 14:35:42"
+            "time": "2017-07-22T12:18:28+00:00"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Lexer\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "lexer",
+                "parser"
+            ],
+            "time": "2014-09-09T13:34:57+00:00"

         },
         {
             "name": "dompdf/dompdf",
         },
         {
             "name": "dompdf/dompdf",

-            "version": "v0.8.0",
+            "version": "v0.8.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",

-                "reference": "0f418c6b58fdeafc2a0e80eb1fa5e644e185089c"
+                "reference": "9ea852c4bdc74fac5def165e6cd52353f7ca3b3f"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/0f418c6b58fdeafc2a0e80eb1fa5e644e185089c",
-                "reference": "0f418c6b58fdeafc2a0e80eb1fa5e644e185089c",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/9ea852c4bdc74fac5def165e6cd52353f7ca3b3f",
+                "reference": "9ea852c4bdc74fac5def165e6cd52353f7ca3b3f",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -493,7 +394,7 @@
                 "ext-gd": "*",
                 "ext-mbstring": "*",
                 "phenx/php-font-lib": "0.5.*",
                 "ext-gd": "*",
                 "ext-mbstring": "*",
                 "phenx/php-font-lib": "0.5.*",

-                "phenx/php-svg-lib": "0.2.*",
+                "phenx/php-svg-lib": "0.3.*",

                 "php": ">=5.3.0"
             },
             "require-dev": {
                 "php": ">=5.3.0"
             },
             "require-dev": {


@@ -534,29 +435,43 @@
             ],
             "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
             "homepage": "https://github.com/dompdf/dompdf",
             ],
             "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
             "homepage": "https://github.com/dompdf/dompdf",

-            "time": "2017-02-16 02:40:40"
+            "time": "2017-09-14T01:36:24+00:00"

         },
         {
         },
         {

-            "name": "erusev/parsedown",
-            "version": "1.6.1",
+            "name": "egulias/email-validator",
+            "version": "2.1.3",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/erusev/parsedown.git",
-                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb"
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb",
-                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1bec00a10039b823cc94eef4eddd47dcd3b2ca04",
+                "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.0"
+                "doctrine/lexer": "^1.0.1",
+                "php": ">= 5.5"
+            },
+            "require-dev": {
+                "dominicsayers/isemail": "dev-master",
+                "phpunit/phpunit": "^4.8.35",
+                "satooshi/php-coveralls": "^1.0.1"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"

             },
             "type": "library",
             },
             "type": "library",

+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },

             "autoload": {
             "autoload": {

-                "psr-0": {
-                    "Parsedown": ""
+                "psr-4": {
+                    "Egulias\\EmailValidator\\": "EmailValidator"

                 }
             },
             "notification-url": "https://packagist.org/downloads/",
                 }
             },
             "notification-url": "https://packagist.org/downloads/",


@@ -565,45 +480,44 @@
             ],
             "authors": [
                 {
             ],
             "authors": [
                 {

-                    "name": "Emanuil Rusev",
-                    "email": "[email protected]",
-                    "homepage": "http://erusev.com"
+                    "name": "Eduardo Gulias Davis"

                 }
             ],
                 }
             ],

-            "description": "Parser for Markdown.",
-            "homepage": "http://parsedown.org",
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",

             "keywords": [
             "keywords": [

-                "markdown",
-                "parser"
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"

             ],
             ],

-            "time": "2016-11-02 15:56:58"
+            "time": "2017-11-15T23:40:40+00:00"

         },
         {
         },
         {

-            "name": "gathercontent/htmldiff",
-            "version": "0.2.1",
+            "name": "erusev/parsedown",
+            "version": "1.6.4",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/gathercontent/htmldiff.git",
-                "reference": "24674a62315f64330134b4a4c5b01a7b59193c93"
+                "url": "https://github.com/erusev/parsedown.git",
+                "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/gathercontent/htmldiff/zipball/24674a62315f64330134b4a4c5b01a7b59193c93",
-                "reference": "24674a62315f64330134b4a4c5b01a7b59193c93",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/fbe3fe878f4fe69048bb8a52783a09802004f548",
+                "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "cogpowered/finediff": "0.3.1",
-                "ext-tidy": "*"
+                "php": ">=5.3.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "4.*",
-                "squizlabs/php_codesniffer": "1.*"
+                "phpunit/phpunit": "^4.8.35"

             },
             "type": "library",
             "autoload": {
                 "psr-0": {
             },
             "type": "library",
             "autoload": {
                 "psr-0": {

-                    "GatherContent\\Htmldiff": "src/"
+                    "Parsedown": ""

                 }
             },
             "notification-url": "https://packagist.org/downloads/",
                 }
             },
             "notification-url": "https://packagist.org/downloads/",


@@ -612,45 +526,152 @@
             ],
             "authors": [
                 {
             ],
             "authors": [
                 {

-                    "name": "Andrew Cairns",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Mathew Chapman",
-                    "email": "[email protected]"
-                },
+                    "name": "Emanuil Rusev",
+                    "email": "[email protected]",
+                    "homepage": "http://erusev.com"
+                }
+            ],
+            "description": "Parser for Markdown.",
+            "homepage": "http://parsedown.org",
+            "keywords": [
+                "markdown",
+                "parser"
+            ],
+            "time": "2017-11-14T20:44:03+00:00"
+        },
+        {
+            "name": "fideloper/proxy",
+            "version": "3.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fideloper/TrustedProxy.git",
+                "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9cdf6f118af58d89764249bbcc7bb260c132924f",
+                "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "~5.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "illuminate/http": "~5.0",
+                "mockery/mockery": "~0.9.3",
+                "phpunit/phpunit": "^5.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Fideloper\\Proxy\\TrustedProxyServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fideloper\\Proxy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Fidao",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Set trusted proxies for Laravel",
+            "keywords": [
+                "load balancing",
+                "proxy",
+                "trusted proxy"
+            ],
+            "time": "2017-06-15T17:19:42+00:00"
+        },
+        {
+            "name": "gathercontent/htmldiff",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/gathercontent/htmldiff.git",
+                "reference": "24674a62315f64330134b4a4c5b01a7b59193c93"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/gathercontent/htmldiff/zipball/24674a62315f64330134b4a4c5b01a7b59193c93",
+                "reference": "24674a62315f64330134b4a4c5b01a7b59193c93",
+                "shasum": ""
+            },
+            "require": {
+                "cogpowered/finediff": "0.3.1",
+                "ext-tidy": "*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*",
+                "squizlabs/php_codesniffer": "1.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "GatherContent\\Htmldiff": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andrew Cairns",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Mathew Chapman",
+                    "email": "[email protected]"
+                },

                 {
                     "name": "Peter Legierski",
                     "email": "[email protected]"
                 }
             ],
             "description": "Compare two HTML strings",
                 {
                     "name": "Peter Legierski",
                     "email": "[email protected]"
                 }
             ],
             "description": "Compare two HTML strings",

-            "time": "2015-04-15 15:39:46"
+            "time": "2015-04-15T15:39:46+00:00"

         },
         {
             "name": "guzzlehttp/guzzle",
         },
         {
             "name": "guzzlehttp/guzzle",

-            "version": "6.2.2",
+            "version": "6.3.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",

-                "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60"
+                "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
-                "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
+                "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",

                 "shasum": ""
             },
             "require": {
                 "guzzlehttp/promises": "^1.0",
                 "shasum": ""
             },
             "require": {
                 "guzzlehttp/promises": "^1.0",

-                "guzzlehttp/psr7": "^1.3.1",
+                "guzzlehttp/psr7": "^1.4",

                 "php": ">=5.5"
             },
             "require-dev": {
                 "ext-curl": "*",
                 "php": ">=5.5"
             },
             "require-dev": {
                 "ext-curl": "*",

-                "phpunit/phpunit": "^4.0",
+                "phpunit/phpunit": "^4.0 || ^5.0",

                 "psr/log": "^1.0"
             },
                 "psr/log": "^1.0"
             },

+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },

             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {


@@ -687,7 +708,7 @@
                 "rest",
                 "web service"
             ],
                 "rest",
                 "web service"
             ],

-            "time": "2016-10-08 15:01:37"
+            "time": "2017-06-22T18:50:49+00:00"

         },
         {
             "name": "guzzlehttp/promises",
         },
         {
             "name": "guzzlehttp/promises",


@@ -738,20 +759,20 @@
             "keywords": [
                 "promise"
             ],
             "keywords": [
                 "promise"
             ],

-            "time": "2016-12-20 10:07:11"
+            "time": "2016-12-20T10:07:11+00:00"

         },
         {
             "name": "guzzlehttp/psr7",
         },
         {
             "name": "guzzlehttp/psr7",

-            "version": "1.3.1",
+            "version": "1.4.2",

             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",

-                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
-                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -787,29 +808,36 @@
                     "name": "Michael Dowling",
                     "email": "[email protected]",
                     "homepage": "https://github.com/mtdowling"
                     "name": "Michael Dowling",
                     "email": "[email protected]",
                     "homepage": "https://github.com/mtdowling"

+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"

                 }
             ],
                 }
             ],

-            "description": "PSR-7 message implementation",
+            "description": "PSR-7 message implementation that also provides common utility methods",

             "keywords": [
                 "http",
                 "message",
             "keywords": [
                 "http",
                 "message",

+                "request",
+                "response",

                 "stream",
                 "stream",

-                "uri"
+                "uri",
+                "url"

             ],
             ],

-            "time": "2016-06-24 23:00:38"
+            "time": "2017-03-20T17:10:46+00:00"

         },
         {
             "name": "intervention/image",
         },
         {
             "name": "intervention/image",

-            "version": "2.3.11",
+            "version": "2.4.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",

-                "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1"
+                "reference": "3603dbcc9a17d307533473246a6c58c31cf17919"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/Intervention/image/zipball/e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
-                "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/3603dbcc9a17d307533473246a6c58c31cf17919",
+                "reference": "3603dbcc9a17d307533473246a6c58c31cf17919",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -819,7 +847,7 @@
             },
             "require-dev": {
                 "mockery/mockery": "~0.9.2",
             },
             "require-dev": {
                 "mockery/mockery": "~0.9.2",

-                "phpunit/phpunit": "3.*"
+                "phpunit/phpunit": "^4.8 || ^5.7"

             },
             "suggest": {
                 "ext-gd": "to use GD library based image processing.",
             },
             "suggest": {
                 "ext-gd": "to use GD library based image processing.",


@@ -830,6 +858,14 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.3-dev"
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.3-dev"

+                },
+                "laravel": {
+                    "providers": [
+                        "Intervention\\Image\\ImageServiceProvider"
+                    ],
+                    "aliases": {
+                        "Image": "Intervention\\Image\\Facades\\Image"
+                    }

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -844,8 +880,8 @@
             "authors": [
                 {
                     "name": "Oliver Vogel",
             "authors": [
                 {
                     "name": "Oliver Vogel",

-                    "email": "oliver@olivervogel.net",
-                    "homepage": "http://olivervogel.net/"
+                    "email": "oliver@olivervogel.com",
+                    "homepage": "http://olivervogel.com/"

                 }
             ],
             "description": "Image handling and manipulation library with support for Laravel integration",
                 }
             ],
             "description": "Image handling and manipulation library with support for Laravel integration",


@@ -858,24 +894,25 @@
                 "thumbnail",
                 "watermark"
             ],
                 "thumbnail",
                 "watermark"
             ],

-            "time": "2017-02-04 10:37:19"
+            "time": "2017-09-21T16:29:17+00:00"

         },
         {
             "name": "knplabs/knp-snappy",
         },
         {
             "name": "knplabs/knp-snappy",

-            "version": "0.4.3",
+            "version": "v1.0.2",

             "source": {
                 "type": "git",
                 "url": "https://github.com/KnpLabs/snappy.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/KnpLabs/snappy.git",

-                "reference": "44f7a9b37d5686fd7db4c1e9569a802a5d16923f"
+                "reference": "e6a29846ca759ea268a1bca4455b8a14815a3976"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/44f7a9b37d5686fd7db4c1e9569a802a5d16923f",
-                "reference": "44f7a9b37d5686fd7db4c1e9569a802a5d16923f",
+                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/e6a29846ca759ea268a1bca4455b8a14815a3976",
+                "reference": "e6a29846ca759ea268a1bca4455b8a14815a3976",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.3",
+                "php": ">=5.6",
+                "psr/log": "^1.0",

                 "symfony/process": "~2.3|~3.0"
             },
             "require-dev": {
                 "symfony/process": "~2.3|~3.0"
             },
             "require-dev": {


@@ -891,12 +928,12 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "0.5.x-dev"
+                    "dev-master": "1.0.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {

-                "psr-0": {
-                    "Knp\\Snappy": "src/"
+                "psr-4": {
+                    "Knp\\Snappy\\": "src/Knp/Snappy"

                 }
             },
             "notification-url": "https://packagist.org/downloads/",
                 }
             },
             "notification-url": "https://packagist.org/downloads/",


@@ -905,7 +942,7 @@
             ],
             "authors": [
                 {
             ],
             "authors": [
                 {

-                    "name": "KNPLabs Team",
+                    "name": "KnpLabs Team",

                     "homepage": "http://knplabs.com"
                 },
                 {
                     "homepage": "http://knplabs.com"
                 },
                 {


@@ -923,90 +960,44 @@
                 "thumbnail",
                 "wkhtmltopdf"
             ],
                 "thumbnail",
                 "wkhtmltopdf"
             ],

-            "time": "2015-11-17 13:16:27"
-        },
-        {
-            "name": "laravel/browser-kit-testing",
-            "version": "v1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laravel/browser-kit-testing.git",
-                "reference": "0adfb725147815bff5516d157577f375a6e66ebd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/0adfb725147815bff5516d157577f375a6e66ebd",
-                "reference": "0adfb725147815bff5516d157577f375a6e66ebd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/css-selector": "~3.1",
-                "symfony/dom-crawler": "~3.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laravel\\BrowserKitTesting\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Taylor Otwell",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Provides backwards compatibility for BrowserKit testing in Laravel 5.4.",
-            "keywords": [
-                "laravel",
-                "testing"
-            ],
-            "time": "2017-02-08 22:32:37"
+            "time": "2017-10-04T19:39:41+00:00"

         },
         {
             "name": "laravel/framework",
         },
         {
             "name": "laravel/framework",

-            "version": "v5.4.13",
+            "version": "v5.5.21",

             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",

-                "reference": "3eebfaa759156e06144892b00bb95304aa5a71c1"
+                "reference": "6321069a75723d88103526903d3192f0b231544a"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/laravel/framework/zipball/3eebfaa759156e06144892b00bb95304aa5a71c1",
-                "reference": "3eebfaa759156e06144892b00bb95304aa5a71c1",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/6321069a75723d88103526903d3192f0b231544a",
+                "reference": "6321069a75723d88103526903d3192f0b231544a",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "doctrine/inflector": "~1.0",
+                "doctrine/inflector": "~1.1",

                 "erusev/parsedown": "~1.6",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
                 "league/flysystem": "~1.0",
                 "erusev/parsedown": "~1.6",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
                 "league/flysystem": "~1.0",

-                "monolog/monolog": "~1.11",
+                "monolog/monolog": "~1.12",

                 "mtdowling/cron-expression": "~1.0",
                 "nesbot/carbon": "~1.20",
                 "mtdowling/cron-expression": "~1.0",
                 "nesbot/carbon": "~1.20",

-                "paragonie/random_compat": "~1.4|~2.0",
-                "php": ">=5.6.4",
+                "php": ">=7.0",
+                "psr/container": "~1.0",
+                "psr/simple-cache": "^1.0",

                 "ramsey/uuid": "~3.0",
                 "ramsey/uuid": "~3.0",

-                "swiftmailer/swiftmailer": "~5.4",
-                "symfony/console": "~3.2",
-                "symfony/debug": "~3.2",
-                "symfony/finder": "~3.2",
-                "symfony/http-foundation": "~3.2",
-                "symfony/http-kernel": "~3.2",
-                "symfony/process": "~3.2",
-                "symfony/routing": "~3.2",
-                "symfony/var-dumper": "~3.2",
+                "swiftmailer/swiftmailer": "~6.0",
+                "symfony/console": "~3.3",
+                "symfony/debug": "~3.3",
+                "symfony/finder": "~3.3",
+                "symfony/http-foundation": "~3.3",
+                "symfony/http-kernel": "~3.3",
+                "symfony/process": "~3.3",
+                "symfony/routing": "~3.3",
+                "symfony/var-dumper": "~3.3",

                 "tijsverkoyen/css-to-inline-styles": "~2.2",
                 "vlucas/phpdotenv": "~2.2"
             },
                 "tijsverkoyen/css-to-inline-styles": "~2.2",
                 "vlucas/phpdotenv": "~2.2"
             },


@@ -1023,7 +1014,6 @@
                 "illuminate/database": "self.version",
                 "illuminate/encryption": "self.version",
                 "illuminate/events": "self.version",
                 "illuminate/database": "self.version",
                 "illuminate/encryption": "self.version",
                 "illuminate/events": "self.version",

-                "illuminate/exception": "self.version",

                 "illuminate/filesystem": "self.version",
                 "illuminate/hashing": "self.version",
                 "illuminate/http": "self.version",
                 "illuminate/filesystem": "self.version",
                 "illuminate/hashing": "self.version",
                 "illuminate/http": "self.version",


@@ -1045,16 +1035,20 @@
             "require-dev": {
                 "aws/aws-sdk-php": "~3.0",
                 "doctrine/dbal": "~2.5",
             "require-dev": {
                 "aws/aws-sdk-php": "~3.0",
                 "doctrine/dbal": "~2.5",

-                "mockery/mockery": "~0.9.4",
+                "filp/whoops": "^2.1.4",
+                "mockery/mockery": "~1.0",
+                "orchestra/testbench-core": "3.5.*",

                 "pda/pheanstalk": "~3.0",
                 "pda/pheanstalk": "~3.0",

-                "phpunit/phpunit": "~5.7",
-                "predis/predis": "~1.0",
-                "symfony/css-selector": "~3.2",
-                "symfony/dom-crawler": "~3.2"
+                "phpunit/phpunit": "~6.0",
+                "predis/predis": "^1.1.1",
+                "symfony/css-selector": "~3.3",
+                "symfony/dom-crawler": "~3.3"

             },
             "suggest": {
                 "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
                 "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).",
             },
             "suggest": {
                 "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
                 "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).",

+                "ext-pcntl": "Required to use all features of the queue worker.",
+                "ext-posix": "Required to use all features of the queue worker.",

                 "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
                 "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
                 "laravel/tinker": "Required to use the tinker console command (~1.0).",
                 "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
                 "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
                 "laravel/tinker": "Required to use the tinker console command (~1.0).",


@@ -1063,15 +1057,15 @@
                 "nexmo/client": "Required to use the Nexmo transport (~1.0).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
                 "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
                 "nexmo/client": "Required to use the Nexmo transport (~1.0).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
                 "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",

-                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
-                "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.2).",
-                "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.2).",
-                "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
+                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).",
+                "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.3).",
+                "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.3).",
+                "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)."

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "5.4-dev"
+                    "dev-master": "5.5-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -1099,20 +1093,20 @@
                 "framework",
                 "laravel"
             ],
                 "framework",
                 "laravel"
             ],

-            "time": "2017-02-22 16:07:04"
+            "time": "2017-11-14T15:08:13+00:00"

         },
         {
             "name": "laravel/socialite",
         },
         {
             "name": "laravel/socialite",

-            "version": "v3.0.3",
+            "version": "v3.0.9",

             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",

-                "reference": "01588748beef55ad5dd4f172d235548d3a6be79a"
+                "reference": "fc1c8d415699e502f3e61cbc61e3250d5bd942eb"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/laravel/socialite/zipball/01588748beef55ad5dd4f172d235548d3a6be79a",
-                "reference": "01588748beef55ad5dd4f172d235548d3a6be79a",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/fc1c8d415699e502f3e61cbc61e3250d5bd942eb",
+                "reference": "fc1c8d415699e502f3e61cbc61e3250d5bd942eb",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -1131,6 +1125,14 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "3.0-dev"
             "extra": {
                 "branch-alias": {
                     "dev-master": "3.0-dev"

+                },
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Socialite\\SocialiteServiceProvider"
+                    ],
+                    "aliases": {
+                        "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
+                    }

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -1145,7 +1147,7 @@
             "authors": [
                 {
                     "name": "Taylor Otwell",
             "authors": [
                 {
                     "name": "Taylor Otwell",

-                    "email": "taylorotwell@gmail.com"
+                    "email": "taylor@laravel.com"

                 }
             ],
             "description": "Laravel wrapper around OAuth 1 & OAuth 2 libraries.",
                 }
             ],
             "description": "Laravel wrapper around OAuth 1 & OAuth 2 libraries.",


@@ -1153,20 +1155,20 @@
                 "laravel",
                 "oauth"
             ],
                 "laravel",
                 "oauth"
             ],

-            "time": "2017-02-01 13:43:56"
+            "time": "2017-11-06T16:02:48+00:00"

         },
         {
             "name": "league/flysystem",
         },
         {
             "name": "league/flysystem",

-            "version": "1.0.35",
+            "version": "1.0.41",

             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",

-                "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062"
+                "reference": "f400aa98912c561ba625ea4065031b7a41e5a155"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dda7f3ab94158a002d9846a97dc18ebfb7acc062",
-                "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f400aa98912c561ba625ea4065031b7a41e5a155",
+                "reference": "f400aa98912c561ba625ea4065031b7a41e5a155",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -1187,13 +1189,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-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-dropbox": "Allows you to use Dropbox 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-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"
+                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
+                "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": {
             },
             "type": "library",
             "extra": {


@@ -1236,25 +1238,25 @@
                 "sftp",
                 "storage"
             ],
                 "sftp",
                 "storage"
             ],

-            "time": "2017-02-09 11:33:58"
+            "time": "2017-08-06T17:41:04+00:00"

         },
         {
             "name": "league/flysystem-aws-s3-v3",
         },
         {
             "name": "league/flysystem-aws-s3-v3",

-            "version": "1.0.13",
+            "version": "1.0.18",

             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",

-                "reference": "dc56a8faf3aff0841f9eae04b6af94a50657896c"
+                "reference": "dc09b19f455750663b922ed52dcc0ff215bed284"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/dc56a8faf3aff0841f9eae04b6af94a50657896c",
-                "reference": "dc56a8faf3aff0841f9eae04b6af94a50657896c",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/dc09b19f455750663b922ed52dcc0ff215bed284",
+                "reference": "dc09b19f455750663b922ed52dcc0ff215bed284",

                 "shasum": ""
             },
             "require": {
                 "aws/aws-sdk-php": "^3.0.0",
                 "shasum": ""
             },
             "require": {
                 "aws/aws-sdk-php": "^3.0.0",

-                "league/flysystem": "~1.0",
+                "league/flysystem": "^1.0.40",

                 "php": ">=5.5.0"
             },
             "require-dev": {
                 "php": ">=5.5.0"
             },
             "require-dev": {


@@ -1283,7 +1285,7 @@
                 }
             ],
             "description": "Flysystem adapter for the AWS S3 SDK v3.x",
                 }
             ],
             "description": "Flysystem adapter for the AWS S3 SDK v3.x",

-            "time": "2016-06-21 21:34:35"
+            "time": "2017-06-30T06:29:25+00:00"

         },
         {
             "name": "league/oauth1-client",
         },
         {
             "name": "league/oauth1-client",


@@ -1346,81 +1348,20 @@
                 "tumblr",
                 "twitter"
             ],
                 "tumblr",
                 "twitter"
             ],

-            "time": "2016-08-17 00:36:58"
-        },
-        {
-            "name": "maximebf/debugbar",
-            "version": "1.13.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "afee79a236348e39a44cb837106b7c5b4897ac2a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/afee79a236348e39a44cb837106b7c5b4897ac2a",
-                "reference": "afee79a236348e39a44cb837106b7c5b4897ac2a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "psr/log": "^1.0",
-                "symfony/var-dumper": "^2.6|^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0|^5.0"
-            },
-            "suggest": {
-                "kriswallsmith/assetic": "The best way to manage assets",
-                "monolog/monolog": "Log using Monolog",
-                "predis/predis": "Redis storage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.13-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "DebugBar\\": "src/DebugBar/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Maxime Bouroumeau-Fuseau",
-                    "email": "[email protected]",
-                    "homepage": "http://maximebf.com"
-                },
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "[email protected]"
-                }
-            ],
-            "description": "Debug bar in the browser for php application",
-            "homepage": "https://github.com/maximebf/php-debugbar",
-            "keywords": [
-                "debug",
-                "debugbar"
-            ],
-            "time": "2017-01-05 08:46:19"
+            "time": "2016-08-17T00:36:58+00:00"

         },
         {
             "name": "monolog/monolog",
         },
         {
             "name": "monolog/monolog",

-            "version": "1.22.0",
+            "version": "1.23.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",

-                "reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
-                "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -1441,7 +1382,7 @@
                 "phpunit/phpunit-mock-objects": "2.3.0",
                 "ruflin/elastica": ">=0.90 <3.0",
                 "sentry/sentry": "^0.13",
                 "phpunit/phpunit-mock-objects": "2.3.0",
                 "ruflin/elastica": ">=0.90 <3.0",
                 "sentry/sentry": "^0.13",

-                "swiftmailer/swiftmailer": "~5.3"
+                "swiftmailer/swiftmailer": "^5.3|^6.0"

             },
             "suggest": {
                 "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
             },
             "suggest": {
                 "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",


@@ -1485,11 +1426,11 @@
                 "logging",
                 "psr-3"
             ],
                 "logging",
                 "psr-3"
             ],

-            "time": "2016-11-26 00:15:39"
+            "time": "2017-06-19T01:22:40+00:00"

         },
         {
             "name": "mtdowling/cron-expression",
         },
         {
             "name": "mtdowling/cron-expression",

-            "version": "v1.2.0",
+            "version": "v1.2.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/mtdowling/cron-expression.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mtdowling/cron-expression.git",


@@ -1529,7 +1470,7 @@
                 "cron",
                 "schedule"
             ],
                 "cron",
                 "schedule"
             ],

-            "time": "2017-01-23 04:29:33"
+            "time": "2017-01-23T04:29:33+00:00"

         },
         {
             "name": "mtdowling/jmespath.php",
         },
         {
             "name": "mtdowling/jmespath.php",


@@ -1584,7 +1525,7 @@
                 "json",
                 "jsonpath"
             ],
                 "json",
                 "jsonpath"
             ],

-            "time": "2016-12-03 22:08:25"
+            "time": "2016-12-03T22:08:25+00:00"

         },
         {
             "name": "nesbot/carbon",
         },
         {
             "name": "nesbot/carbon",


@@ -1637,20 +1578,20 @@
                 "datetime",
                 "time"
             ],
                 "datetime",
                 "time"
             ],

-            "time": "2017-01-16 07:55:07"
+            "time": "2017-01-16T07:55:07+00:00"

         },
         {
             "name": "paragonie/random_compat",
         },
         {
             "name": "paragonie/random_compat",

-            "version": "v2.0.4",
+            "version": "v2.0.11",

             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",

-                "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e"
+                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
-                "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
+                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -1685,20 +1626,20 @@
                 "pseudorandom",
                 "random"
             ],
                 "pseudorandom",
                 "random"
             ],

-            "time": "2016-11-07 23:38:38"
+            "time": "2017-09-27T21:40:39+00:00"

         },
         {
             "name": "phenx/php-font-lib",
         },
         {
             "name": "phenx/php-font-lib",

-            "version": "0.5",
+            "version": "0.5.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/PhenX/php-font-lib.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PhenX/php-font-lib.git",

-                "reference": "19ad2bebc35be028fcc0221025fcbf3d436a3962"
+                "reference": "760148820110a1ae0936e5cc35851e25a938bc97"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/19ad2bebc35be028fcc0221025fcbf3d436a3962",
-                "reference": "19ad2bebc35be028fcc0221025fcbf3d436a3962",
+                "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/760148820110a1ae0936e5cc35851e25a938bc97",
+                "reference": "760148820110a1ae0936e5cc35851e25a938bc97",

                 "shasum": ""
             },
             "require-dev": {
                 "shasum": ""
             },
             "require-dev": {


@@ -1722,24 +1663,27 @@
             ],
             "description": "A library to read, parse, export and make subsets of different types of font files.",
             "homepage": "https://github.com/PhenX/php-font-lib",
             ],
             "description": "A library to read, parse, export and make subsets of different types of font files.",
             "homepage": "https://github.com/PhenX/php-font-lib",

-            "time": "2017-02-11 10:58:43"
+            "time": "2017-09-13T16:14:37+00:00"

         },
         {
             "name": "phenx/php-svg-lib",
         },
         {
             "name": "phenx/php-svg-lib",

-            "version": "v0.2",
+            "version": "v0.3",

             "source": {
                 "type": "git",
                 "url": "https://github.com/PhenX/php-svg-lib.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PhenX/php-svg-lib.git",

-                "reference": "de291bec8449b89acfe85691b5c71434797959dc"
+                "reference": "a85f7fe9fe08d093a4a8583cdd306b553ff918aa"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/de291bec8449b89acfe85691b5c71434797959dc",
-                "reference": "de291bec8449b89acfe85691b5c71434797959dc",
+                "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/a85f7fe9fe08d093a4a8583cdd306b553ff918aa",
+                "reference": "a85f7fe9fe08d093a4a8583cdd306b553ff918aa",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "sabberworm/php-css-parser": "6.0.*"
+                "sabberworm/php-css-parser": "8.1.*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5.0"

             },
             "type": "library",
             "autoload": {
             },
             "type": "library",
             "autoload": {


@@ -1759,7 +1703,7 @@
             ],
             "description": "A library to read, parse and export to PDF SVG files.",
             "homepage": "https://github.com/PhenX/php-svg-lib",
             ],
             "description": "A library to read, parse and export to PDF SVG files.",
             "homepage": "https://github.com/PhenX/php-svg-lib",

-            "time": "2016-12-13 20:25:45"
+            "time": "2017-05-24T10:07:27+00:00"

         },
         {
             "name": "predis/predis",
         },
         {
             "name": "predis/predis",


@@ -1809,7 +1753,56 @@
                 "predis",
                 "redis"
             ],
                 "predis",
                 "redis"
             ],

-            "time": "2016-06-16 16:22:20"
+            "time": "2016-06-16T16:22:20+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "time": "2017-02-14T16:28:37+00:00"

         },
         {
             "name": "psr/http-message",
         },
         {
             "name": "psr/http-message",


@@ -1859,7 +1852,7 @@
                 "request",
                 "response"
             ],
                 "request",
                 "response"
             ],

-            "time": "2016-08-06 14:39:51"
+            "time": "2016-08-06T14:39:51+00:00"

         },
         {
             "name": "psr/log",
         },
         {
             "name": "psr/log",


@@ -1906,34 +1899,82 @@
                 "psr",
                 "psr-3"
             ],
                 "psr",
                 "psr-3"
             ],

-            "time": "2016-10-10 12:19:37"
+            "time": "2016-10-10T12:19:37+00:00"

         },
         {
         },
         {

-            "name": "ramsey/uuid",
-            "version": "3.5.2",
+            "name": "psr/simple-cache",
+            "version": "1.0.0",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954"
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/5677cfe02397dd6b58c861870dfaa5d9007d3954",
-                "reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24",
+                "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "paragonie/random_compat": "^1.0|^2.0",
-                "php": ">=5.4"
+                "php": ">=5.3.0"

             },
             },

-            "replace": {
-                "rhumsaa/uuid": "self.version"
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }

             },
             },

-            "require-dev": {
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "time": "2017-01-02T13:31:39+00:00"
+        },
+        {
+            "name": "ramsey/uuid",
+            "version": "3.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ramsey/uuid.git",
+                "reference": "45cffe822057a09e05f7bd09ec5fb88eeecd2334"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/45cffe822057a09e05f7bd09ec5fb88eeecd2334",
+                "reference": "45cffe822057a09e05f7bd09ec5fb88eeecd2334",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "^1.0|^2.0",
+                "php": "^5.4 || ^7.0"
+            },
+            "replace": {
+                "rhumsaa/uuid": "self.version"
+            },
+            "require-dev": {

                 "apigen/apigen": "^4.1",
                 "apigen/apigen": "^4.1",

-                "codeception/aspect-mock": "1.0.0",
+                "codeception/aspect-mock": "^1.0 | ^2.0",

                 "doctrine/annotations": "~1.2.0",
                 "doctrine/annotations": "~1.2.0",

-                "goaop/framework": "1.0.0-alpha.2",
+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",

                 "ircmaxell/random-lib": "^1.1",
                 "jakub-onderka/php-parallel-lint": "^0.9.0",
                 "mockery/mockery": "^0.9.4",
                 "ircmaxell/random-lib": "^1.1",
                 "jakub-onderka/php-parallel-lint": "^0.9.0",
                 "mockery/mockery": "^0.9.4",


@@ -1988,25 +2029,28 @@
                 "identifier",
                 "uuid"
             ],
                 "identifier",
                 "uuid"
             ],

-            "time": "2016-11-22 19:21:44"
+            "time": "2017-09-22T20:46:04+00:00"

         },
         {
             "name": "sabberworm/php-css-parser",
         },
         {
             "name": "sabberworm/php-css-parser",

-            "version": "6.0.1",
+            "version": "8.1.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",

-                "reference": "9ea4b00c569b19f731d0c2e0e802055877ff40c2"
+                "reference": "850cbbcbe7fbb155387a151ea562897a67e242ef"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/9ea4b00c569b19f731d0c2e0e802055877ff40c2",
-                "reference": "9ea4b00c569b19f731d0c2e0e802055877ff40c2",
+                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/850cbbcbe7fbb155387a151ea562897a67e242ef",
+                "reference": "850cbbcbe7fbb155387a151ea562897a67e242ef",

                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },

+            "require-dev": {
+                "phpunit/phpunit": "*"
+            },

             "type": "library",
             "autoload": {
                 "psr-0": {
             "type": "library",
             "autoload": {
                 "psr-0": {


@@ -2029,20 +2073,20 @@
                 "parser",
                 "stylesheet"
             ],
                 "parser",
                 "stylesheet"
             ],

-            "time": "2015-08-24 08:48:52"
+            "time": "2016-07-19T19:14:21+00:00"

         },
         {
             "name": "socialiteproviders/manager",
         },
         {
             "name": "socialiteproviders/manager",

-            "version": "v3.0.4",
+            "version": "v3.3.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Manager.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Manager.git",

-                "reference": "f57877e96c46f0f9157fcd8fa68a547f6d344ed5"
+                "reference": "ac108bce073135a55dfebf28ceaf1459669348e8"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/f57877e96c46f0f9157fcd8fa68a547f6d344ed5",
-                "reference": "f57877e96c46f0f9157fcd8fa68a547f6d344ed5",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/ac108bce073135a55dfebf28ceaf1459669348e8",
+                "reference": "ac108bce073135a55dfebf28ceaf1459669348e8",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -2054,6 +2098,13 @@
                 "phpunit/phpunit": "^5.0"
             },
             "type": "library",
                 "phpunit/phpunit": "^5.0"
             },
             "type": "library",

+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "SocialiteProviders\\Manager\\ServiceProvider"
+                    ]
+                }
+            },

             "autoload": {
                 "psr-4": {
                     "SocialiteProviders\\Manager\\": "src/",
             "autoload": {
                 "psr-4": {
                     "SocialiteProviders\\Manager\\": "src/",


@@ -2071,7 +2122,7 @@
                 }
             ],
             "description": "Easily add new or override built-in providers in Laravel Socialite.",
                 }
             ],
             "description": "Easily add new or override built-in providers in Laravel Socialite.",

-            "time": "2017-02-07 07:26:42"
+            "time": "2017-09-21T07:21:55+00:00"

         },
         {
             "name": "socialiteproviders/microsoft-azure",
         },
         {
             "name": "socialiteproviders/microsoft-azure",


@@ -2108,25 +2159,25 @@
                 }
             ],
             "description": "Microsoft Azure OAuth2 Provider for Laravel Socialite",
                 }
             ],
             "description": "Microsoft Azure OAuth2 Provider for Laravel Socialite",

-            "time": "2017-01-25 09:48:29"
+            "time": "2017-01-25T09:48:29+00:00"

         },
         {
             "name": "socialiteproviders/slack",
         },
         {
             "name": "socialiteproviders/slack",

-            "version": "v3.0.1",
+            "version": "v3.0.3",

             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Slack.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Slack.git",

-                "reference": "6f8f0599cd80ecea4958ad37ed729805c4100c8c"
+                "reference": "8d5d0c0c916adf2af6b406679130441db0afc387"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/SocialiteProviders/Slack/zipball/6f8f0599cd80ecea4958ad37ed729805c4100c8c",
-                "reference": "6f8f0599cd80ecea4958ad37ed729805c4100c8c",
+                "url": "https://api.github.com/repos/SocialiteProviders/Slack/zipball/8d5d0c0c916adf2af6b406679130441db0afc387",
+                "reference": "8d5d0c0c916adf2af6b406679130441db0afc387",

                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",

-                "socialiteproviders/manager": "~3.0"
+                "socialiteproviders/manager": "~2.0 || ~3.0"

             },
             "type": "library",
             "autoload": {
             },
             "type": "library",
             "autoload": {


@@ -2145,33 +2196,34 @@
                 }
             ],
             "description": "Slack OAuth2 Provider for Laravel Socialite",
                 }
             ],
             "description": "Slack OAuth2 Provider for Laravel Socialite",

-            "time": "2017-02-20 04:42:11"
+            "time": "2017-04-10T05:10:48+00:00"

         },
         {
             "name": "swiftmailer/swiftmailer",
         },
         {
             "name": "swiftmailer/swiftmailer",

-            "version": "v5.4.6",
+            "version": "v6.0.2",

             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",

-                "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
+                "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
-                "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc",
+                "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.3"
+                "egulias/email-validator": "~2.0",
+                "php": ">=7.0.0"

             },
             "require-dev": {
                 "mockery/mockery": "~0.9.1",
             },
             "require-dev": {
                 "mockery/mockery": "~0.9.1",

-                "symfony/phpunit-bridge": "~3.2"
+                "symfony/phpunit-bridge": "~3.3@dev"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "5.4-dev"
+                    "dev-master": "6.0-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2193,91 +2245,40 @@
                 }
             ],
             "description": "Swiftmailer, free feature-rich PHP mailer",
                 }
             ],
             "description": "Swiftmailer, free feature-rich PHP mailer",

-            "homepage": "http://swiftmailer.org",
+            "homepage": "http://swiftmailer.symfony.com",

             "keywords": [
                 "email",
                 "mail",
                 "mailer"
             ],
             "keywords": [
                 "email",
                 "mail",
                 "mailer"
             ],

-            "time": "2017-02-13 07:52:53"
-        },
-        {
-            "name": "symfony/class-loader",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/class-loader.git",
-                "reference": "2847d56f518ad5721bf85aa9174b3aa3fd12aa03"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/2847d56f518ad5721bf85aa9174b3aa3fd12aa03",
-                "reference": "2847d56f518ad5721bf85aa9174b3aa3fd12aa03",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "require-dev": {
-                "symfony/finder": "~2.8|~3.0",
-                "symfony/polyfill-apcu": "~1.1"
-            },
-            "suggest": {
-                "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\ClassLoader\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony ClassLoader Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-21 17:06:35"
+            "time": "2017-09-30T22:39:41+00:00"

         },
         {
             "name": "symfony/console",
         },
         {
             "name": "symfony/console",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",

-                "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870"
+                "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/console/zipball/0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
-                "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
+                "url": "https://api.github.com/repos/symfony/console/zipball/63cd7960a0a522c3537f6326706d7f3b8de65805",
+                "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",

                 "symfony/debug": "~2.8|~3.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
                 "symfony/debug": "~2.8|~3.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },

+            "conflict": {
+                "symfony/dependency-injection": "<3.3"
+            },

             "require-dev": {
                 "psr/log": "~1.0",
             "require-dev": {
                 "psr/log": "~1.0",

+                "symfony/config": "~3.3",
+                "symfony/dependency-injection": "~3.3",

                 "symfony/event-dispatcher": "~2.8|~3.0",
                 "symfony/filesystem": "~2.8|~3.0",
                 "symfony/process": "~2.8|~3.0"
                 "symfony/event-dispatcher": "~2.8|~3.0",
                 "symfony/filesystem": "~2.8|~3.0",
                 "symfony/process": "~2.8|~3.0"


@@ -2291,7 +2292,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2318,7 +2319,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",

-            "time": "2017-02-16 14:07:22"
+            "time": "2017-11-16T15:24:32+00:00"

         },
         {
             "name": "symfony/css-selector",
         },
         {
             "name": "symfony/css-selector",


@@ -2371,37 +2372,36 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",

-            "time": "2017-01-02 20:31:54"
+            "time": "2017-01-02T20:31:54+00:00"

         },
         {
             "name": "symfony/debug",
         },
         {
             "name": "symfony/debug",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",

-                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9"
+                "reference": "74557880e2846b5c84029faa96b834da37e29810"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
-                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/74557880e2846b5c84029faa96b834da37e29810",
+                "reference": "74557880e2846b5c84029faa96b834da37e29810",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",

                 "psr/log": "~1.0"
             },
             "conflict": {
                 "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
             "require-dev": {
                 "psr/log": "~1.0"
             },
             "conflict": {
                 "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
             "require-dev": {

-                "symfony/class-loader": "~2.8|~3.0",

                 "symfony/http-kernel": "~2.8|~3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
                 "symfony/http-kernel": "~2.8|~3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2428,85 +2428,32 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",

-            "time": "2017-02-16 16:34:18"
-        },
-        {
-            "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": "[email protected]"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DomCrawler Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-21 17:13:55"
+            "time": "2017-11-10T16:38:39+00:00"

         },
         {
             "name": "symfony/event-dispatcher",
         },
         {
             "name": "symfony/event-dispatcher",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",

-                "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6"
+                "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6",
-                "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/271d8c27c3ec5ecee6e2ac06016232e249d638d9",
+                "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.3"

             },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~2.8|~3.0",
             },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~2.8|~3.0",

-                "symfony/dependency-injection": "~2.8|~3.0",
+                "symfony/dependency-injection": "~3.3",

                 "symfony/expression-language": "~2.8|~3.0",
                 "symfony/stopwatch": "~2.8|~3.0"
             },
                 "symfony/expression-language": "~2.8|~3.0",
                 "symfony/stopwatch": "~2.8|~3.0"
             },


@@ -2517,7 +2464,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2544,29 +2491,29 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",

-            "time": "2017-01-02 20:32:22"
+            "time": "2017-11-05T15:47:03+00:00"

         },
         {
             "name": "symfony/finder",
         },
         {
             "name": "symfony/finder",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",

-                "reference": "8c71141cae8e2957946b403cc71a67213c0380d6"
+                "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6",
-                "reference": "8c71141cae8e2957946b403cc71a67213c0380d6",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
+                "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2593,24 +2540,24 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",

-            "time": "2017-01-02 20:32:22"
+            "time": "2017-11-05T15:47:03+00:00"

         },
         {
             "name": "symfony/http-foundation",
         },
         {
             "name": "symfony/http-foundation",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",

-                "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0"
+                "reference": "5943f0f19817a7e05992d20a90729b0dc93faf36"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a90da6dd679605d88c9803a57a6fc1fb7a19a6e0",
-                "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5943f0f19817a7e05992d20a90729b0dc93faf36",
+                "reference": "5943f0f19817a7e05992d20a90729b0dc93faf36",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",

                 "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
                 "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {


@@ -2619,7 +2566,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2646,39 +2593,43 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",

-            "time": "2017-02-16 22:46:52"
+            "time": "2017-11-13T18:13:16+00:00"

         },
         {
             "name": "symfony/http-kernel",
         },
         {
             "name": "symfony/http-kernel",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",

-                "reference": "4cd0d4bc31819095c6ef13573069f621eb321081"
+                "reference": "a2a942172b742217ab2ccd9399494af2aa17c766"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4cd0d4bc31819095c6ef13573069f621eb321081",
-                "reference": "4cd0d4bc31819095c6ef13573069f621eb321081",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a2a942172b742217ab2ccd9399494af2aa17c766",
+                "reference": "a2a942172b742217ab2ccd9399494af2aa17c766",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",

                 "psr/log": "~1.0",
                 "symfony/debug": "~2.8|~3.0",
                 "symfony/event-dispatcher": "~2.8|~3.0",
                 "psr/log": "~1.0",
                 "symfony/debug": "~2.8|~3.0",
                 "symfony/event-dispatcher": "~2.8|~3.0",

-                "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2"
+                "symfony/http-foundation": "^3.3.11"

             },
             "conflict": {
             },
             "conflict": {

-                "symfony/config": "<2.8"
+                "symfony/config": "<2.8",
+                "symfony/dependency-injection": "<3.3",
+                "symfony/var-dumper": "<3.3",
+                "twig/twig": "<1.34|<2.4,>=2"

             },
             "require-dev": {
             },
             "require-dev": {

+                "psr/cache": "~1.0",

                 "symfony/browser-kit": "~2.8|~3.0",
                 "symfony/class-loader": "~2.8|~3.0",
                 "symfony/config": "~2.8|~3.0",
                 "symfony/console": "~2.8|~3.0",
                 "symfony/css-selector": "~2.8|~3.0",
                 "symfony/browser-kit": "~2.8|~3.0",
                 "symfony/class-loader": "~2.8|~3.0",
                 "symfony/config": "~2.8|~3.0",
                 "symfony/console": "~2.8|~3.0",
                 "symfony/css-selector": "~2.8|~3.0",

-                "symfony/dependency-injection": "~2.8|~3.0",
+                "symfony/dependency-injection": "~3.3",

                 "symfony/dom-crawler": "~2.8|~3.0",
                 "symfony/expression-language": "~2.8|~3.0",
                 "symfony/finder": "~2.8|~3.0",
                 "symfony/dom-crawler": "~2.8|~3.0",
                 "symfony/expression-language": "~2.8|~3.0",
                 "symfony/finder": "~2.8|~3.0",


@@ -2687,7 +2638,7 @@
                 "symfony/stopwatch": "~2.8|~3.0",
                 "symfony/templating": "~2.8|~3.0",
                 "symfony/translation": "~2.8|~3.0",
                 "symfony/stopwatch": "~2.8|~3.0",
                 "symfony/templating": "~2.8|~3.0",
                 "symfony/translation": "~2.8|~3.0",

-                "symfony/var-dumper": "~3.2"
+                "symfony/var-dumper": "~3.3"

             },
             "suggest": {
                 "symfony/browser-kit": "",
             },
             "suggest": {
                 "symfony/browser-kit": "",


@@ -2701,7 +2652,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2728,20 +2679,20 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",

-            "time": "2017-02-16 23:59:56"
+            "time": "2017-11-16T18:14:43+00:00"

         },
         {
             "name": "symfony/polyfill-mbstring",
         },
         {
             "name": "symfony/polyfill-mbstring",

-            "version": "v1.3.0",
+            "version": "v1.6.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",

-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -2753,7 +2704,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.6-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2787,29 +2738,29 @@
                 "portable",
                 "shim"
             ],
                 "portable",
                 "shim"
             ],

-            "time": "2016-11-14 01:06:16"
+            "time": "2017-10-11T12:05:26+00:00"

         },
         {
             "name": "symfony/process",
         },
         {
             "name": "symfony/process",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",

-                "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856"
+                "reference": "a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/process/zipball/0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
-                "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
+                "url": "https://api.github.com/repos/symfony/process/zipball/a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d",
+                "reference": "a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2836,36 +2787,39 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",

-            "time": "2017-02-16 14:07:22"
+            "time": "2017-11-13T15:31:11+00:00"

         },
         {
             "name": "symfony/routing",
         },
         {
             "name": "symfony/routing",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",

-                "reference": "af464432c177dbcdbb32295113b7627500331f2d"
+                "reference": "cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/routing/zipball/af464432c177dbcdbb32295113b7627500331f2d",
-                "reference": "af464432c177dbcdbb32295113b7627500331f2d",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95",
+                "reference": "cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"

             },
             "conflict": {
             },
             "conflict": {

-                "symfony/config": "<2.8"
+                "symfony/config": "<2.8",
+                "symfony/dependency-injection": "<3.3",
+                "symfony/yaml": "<3.3"

             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
                 "symfony/config": "~2.8|~3.0",
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
                 "symfony/config": "~2.8|~3.0",

+                "symfony/dependency-injection": "~3.3",

                 "symfony/expression-language": "~2.8|~3.0",
                 "symfony/http-foundation": "~2.8|~3.0",
                 "symfony/expression-language": "~2.8|~3.0",
                 "symfony/http-foundation": "~2.8|~3.0",

-                "symfony/yaml": "~2.8|~3.0"
+                "symfony/yaml": "~3.3"

             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation loader",
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation loader",


@@ -2878,7 +2832,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2911,34 +2865,35 @@
                 "uri",
                 "url"
             ],
                 "uri",
                 "url"
             ],

-            "time": "2017-01-28 02:37:08"
+            "time": "2017-11-07T14:16:22+00:00"

         },
         {
             "name": "symfony/translation",
         },
         {
             "name": "symfony/translation",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",

-                "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029"
+                "reference": "373e553477e55cd08f8b86b74db766c75b987fdb"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/translation/zipball/d6825c6bb2f1da13f564678f9f236fe8242c0029",
-                "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/373e553477e55cd08f8b86b74db766c75b987fdb",
+                "reference": "373e553477e55cd08f8b86b74db766c75b987fdb",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",

                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {

-                "symfony/config": "<2.8"
+                "symfony/config": "<2.8",
+                "symfony/yaml": "<3.3"

             },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~2.8|~3.0",
             },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~2.8|~3.0",

-                "symfony/intl": "~2.8|~3.0",
-                "symfony/yaml": "~2.8|~3.0"
+                "symfony/intl": "^2.8.18|^3.2.5",
+                "symfony/yaml": "~3.3"

             },
             "suggest": {
                 "psr/log": "To use logging capability in translator",
             },
             "suggest": {
                 "psr/log": "To use logging capability in translator",


@@ -2948,7 +2903,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -2975,36 +2930,41 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",

-            "time": "2017-02-16 22:46:52"
+            "time": "2017-11-07T14:12:55+00:00"

         },
         {
             "name": "symfony/var-dumper",
         },
         {
             "name": "symfony/var-dumper",

-            "version": "v3.2.4",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",

-                "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20"
+                "reference": "805de6bd6869073e60610df1b14ab7d969c61b01"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cb50260b674ee1c2d4ab49f2395a42e0b4681e20",
-                "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/805de6bd6869073e60610df1b14ab7d969c61b01",
+                "reference": "805de6bd6869073e60610df1b14ab7d969c61b01",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",

                 "symfony/polyfill-mbstring": "~1.0"
             },
                 "symfony/polyfill-mbstring": "~1.0"
             },

+            "conflict": {
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+            },

             "require-dev": {
             "require-dev": {

-                "twig/twig": "~1.20|~2.0"
+                "ext-iconv": "*",
+                "twig/twig": "~1.34|~2.4"

             },
             "suggest": {
             },
             "suggest": {

+                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",

                 "ext-symfony_debug": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
                 "ext-symfony_debug": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -3038,7 +2998,7 @@
                 "debug",
                 "dump"
             ],
                 "debug",
                 "dump"
             ],

-            "time": "2017-02-16 22:46:52"
+            "time": "2017-11-07T14:16:22+00:00"

         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",


@@ -3085,7 +3045,7 @@
             ],
             "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
             ],
             "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",

-            "time": "2016-09-20 12:50:39"
+            "time": "2016-09-20T12:50:39+00:00"

         },
         {
             "name": "vlucas/phpdotenv",
         },
         {
             "name": "vlucas/phpdotenv",


@@ -3135,44 +3095,57 @@
                 "env",
                 "environment"
             ],
                 "env",
                 "environment"
             ],

-            "time": "2016-09-01 10:05:43"
+            "time": "2016-09-01T10:05:43+00:00"

         }
     ],
     "packages-dev": [
         {
         }
     ],
     "packages-dev": [
         {

-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "name": "barryvdh/laravel-debugbar",
+            "version": "v3.1.0",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "url": "https://github.com/barryvdh/laravel-debugbar.git",
+                "reference": "01a859752094e00aa8548832312366753272f8af"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/01a859752094e00aa8548832312366753272f8af",
+                "reference": "01a859752094e00aa8548832312366753272f8af",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3,<8.0-DEV"
+                "illuminate/routing": "5.5.x",
+                "illuminate/session": "5.5.x",
+                "illuminate/support": "5.5.x",
+                "maximebf/debugbar": "~1.14.0",
+                "php": ">=7.0",
+                "symfony/debug": "^3",
+                "symfony/finder": "^3"

             },
             "require-dev": {
             },
             "require-dev": {

-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "illuminate/framework": "5.5.x"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "3.0-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Barryvdh\\Debugbar\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "Debugbar": "Barryvdh\\Debugbar\\Facade"
+                    }

                 }
             },
             "autoload": {
                 "psr-4": {
                 }
             },
             "autoload": {
                 "psr-4": {

-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
+                    "Barryvdh\\Debugbar\\": "src/"
+                },
+                "files": [
+                    "src/helpers.php"
+                ]

             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [


@@ -3180,48 +3153,67 @@
             ],
             "authors": [
                 {
             ],
             "authors": [
                 {

-                    "name": "Marco Pivetta",
-                    "email": "[email protected]",
-                    "homepage": "http://ocramius.github.com/"
+                    "name": "Barry vd. Heuvel",
+                    "email": "[email protected]"

                 }
             ],
                 }
             ],

-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "description": "PHP Debugbar integration for Laravel",

             "keywords": [
             "keywords": [

-                "constructor",
-                "instantiate"
+                "debug",
+                "debugbar",
+                "laravel",
+                "profiler",
+                "webprofiler"

             ],
             ],

-            "time": "2015-06-14 21:17:01"
+            "time": "2017-09-18T13:32:46+00:00"

         },
         {
         },
         {

-            "name": "fzaninotto/faker",
-            "version": "v1.6.0",
+            "name": "barryvdh/laravel-ide-helper",
+            "version": "v2.4.1",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
+                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
+                "reference": "2b1273c45e2f8df7a625563e2283a17c14f02ae8"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
-                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/2b1273c45e2f8df7a625563e2283a17c14f02ae8",
+                "reference": "2b1273c45e2f8df7a625563e2283a17c14f02ae8",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": "^5.3.3|^7.0"
+                "barryvdh/reflection-docblock": "^2.0.4",
+                "illuminate/console": "^5.0,<5.6",
+                "illuminate/filesystem": "^5.0,<5.6",
+                "illuminate/support": "^5.0,<5.6",
+                "php": ">=5.4.0",
+                "symfony/class-loader": "^2.3|^3.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "ext-intl": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~1.5"
+                "doctrine/dbal": "~2.3",
+                "illuminate/config": "^5.0,<5.6",
+                "illuminate/view": "^5.0,<5.6",
+                "phpunit/phpunit": "4.*",
+                "scrutinizer/ocular": "~1.1",
+                "squizlabs/php_codesniffer": "~2.3"
+            },
+            "suggest": {
+                "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)"

             },
             "type": "library",
             "extra": {
             },
             "type": "library",
             "extra": {

-                "branch-alias": []
+                "branch-alias": {
+                    "dev-master": "2.3-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider"
+                    ]
+                }

             },
             "autoload": {
                 "psr-4": {
             },
             "autoload": {
                 "psr-4": {

-                    "Faker\\": "src/Faker/"
+                    "Barryvdh\\LaravelIdeHelper\\": "src"

                 }
             },
             "notification-url": "https://packagist.org/downloads/",
                 }
             },
             "notification-url": "https://packagist.org/downloads/",


@@ -3230,50 +3222,274 @@
             ],
             "authors": [
                 {
             ],
             "authors": [
                 {

-                    "name": "François Zaninotto"
+                    "name": "Barry vd. Heuvel",
+                    "email": "[email protected]"

                 }
             ],
                 }
             ],

-            "description": "Faker is a PHP library that generates fake data for you.",
+            "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.",

             "keywords": [
             "keywords": [

-                "data",
-                "faker",
-                "fixtures"
+                "autocomplete",
+                "codeintel",
+                "helper",
+                "ide",
+                "laravel",
+                "netbeans",
+                "phpdoc",
+                "phpstorm",
+                "sublime"

             ],
             ],

-            "time": "2016-04-29 12:21:54"
+            "time": "2017-07-16T00:24:12+00:00"

         },
         {
         },
         {

-            "name": "hamcrest/hamcrest-php",
-            "version": "v1.2.2",
+            "name": "barryvdh/reflection-docblock",
+            "version": "v2.0.4",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/hamcrest/hamcrest-php.git",
-                "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c"
+                "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
+                "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/b37020aa976fa52d3de9aa904aa2522dc518f79c",
-                "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c",
+                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/3dcbd98b5d9384a5357266efba8fd29884458e5c",
+                "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.2"
+                "php": ">=5.3.3"

             },
             },

-            "replace": {
-                "cordoval/hamcrest-php": "*",
-                "davedevelopment/hamcrest-php": "*",
+            "require-dev": {
+                "phpunit/phpunit": "~4.0,<4.5"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Barryvdh": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "[email protected]"
+                }
+            ],
+            "time": "2016-06-13T19:28:20+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "[email protected]",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-07-22T11:58:36+00:00"
+        },
+        {
+            "name": "filp/whoops",
+            "version": "2.1.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/filp/whoops.git",
+                "reference": "9f640a4f129e57d3537887f840380109a4dd182b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/9f640a4f129e57d3537887f840380109a4dd182b",
+                "reference": "9f640a4f129e57d3537887f840380109a4dd182b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9 || ^7.0",
+                "psr/log": "^1.0.1"
+            },
+            "require-dev": {
+                "mockery/mockery": "0.9.*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
+                "symfony/var-dumper": "^2.6 || ^3.0"
+            },
+            "suggest": {
+                "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
+                "whoops/soap": "Formats errors as SOAP responses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Whoops\\": "src/Whoops/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Filipe Dobreira",
+                    "homepage": "https://github.com/filp",
+                    "role": "Developer"
+                }
+            ],
+            "description": "php error handling for cool kids",
+            "homepage": "https://filp.github.io/whoops/",
+            "keywords": [
+                "error",
+                "exception",
+                "handling",
+                "library",
+                "throwable",
+                "whoops"
+            ],
+            "time": "2017-11-17T08:15:51+00:00"
+        },
+        {
+            "name": "fzaninotto/faker",
+            "version": "v1.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fzaninotto/Faker.git",
+                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "ext-intl": "*",
+                "phpunit/phpunit": "^4.0 || ^5.0",
+                "squizlabs/php_codesniffer": "^1.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "time": "2017-08-15T16:48:10+00:00"
+        },
+        {
+            "name": "hamcrest/hamcrest-php",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hamcrest/hamcrest-php.git",
+                "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad",
+                "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3|^7.0"
+            },
+            "replace": {
+                "cordoval/hamcrest-php": "*",
+                "davedevelopment/hamcrest-php": "*",

                 "kodova/hamcrest-php": "*"
             },
             "require-dev": {
                 "phpunit/php-file-iterator": "1.3.3",
                 "kodova/hamcrest-php": "*"
             },
             "require-dev": {
                 "phpunit/php-file-iterator": "1.3.3",

-                "satooshi/php-coveralls": "dev-master"
+                "phpunit/phpunit": "~4.0",
+                "satooshi/php-coveralls": "^1.0"

             },
             "type": "library",
             },
             "type": "library",

+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },

             "autoload": {
                 "classmap": [
                     "hamcrest"
             "autoload": {
                 "classmap": [
                     "hamcrest"

-                ],
-                "files": [
-                    "hamcrest/Hamcrest.php"

                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",


@@ -3284,40 +3500,257 @@
             "keywords": [
                 "test"
             ],
             "keywords": [
                 "test"
             ],

-            "time": "2015-05-11 14:41:42"
+            "time": "2016-01-20T08:20:44+00:00"
+        },
+        {
+            "name": "laravel/browser-kit-testing",
+            "version": "v2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/browser-kit-testing.git",
+                "reference": "f0bb9f200ec35f9d876ded6eacfbc60868d311b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/f0bb9f200ec35f9d876ded6eacfbc60868d311b9",
+                "reference": "f0bb9f200ec35f9d876ded6eacfbc60868d311b9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "phpunit/phpunit": "~6.0",
+                "symfony/css-selector": "~3.1",
+                "symfony/dom-crawler": "~3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\BrowserKitTesting\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Provides backwards compatibility for BrowserKit testing in Laravel 5.4.",
+            "keywords": [
+                "laravel",
+                "testing"
+            ],
+            "time": "2017-06-21T11:44:53+00:00"
+        },
+        {
+            "name": "maximebf/debugbar",
+            "version": "v1.14.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maximebf/php-debugbar.git",
+                "reference": "64251a392344e3d22f3d21c3b7c531ba96eb01d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/64251a392344e3d22f3d21c3b7c531ba96eb01d2",
+                "reference": "64251a392344e3d22f3d21c3b7c531ba96eb01d2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/log": "^1.0",
+                "symfony/var-dumper": "^2.6|^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0|^5.0"
+            },
+            "suggest": {
+                "kriswallsmith/assetic": "The best way to manage assets",
+                "monolog/monolog": "Log using Monolog",
+                "predis/predis": "Redis storage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.14-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DebugBar\\": "src/DebugBar/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maxime Bouroumeau-Fuseau",
+                    "email": "[email protected]",
+                    "homepage": "http://maximebf.com"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Debug bar in the browser for php application",
+            "homepage": "https://github.com/maximebf/php-debugbar",
+            "keywords": [
+                "debug",
+                "debugbar"
+            ],
+            "time": "2017-09-13T12:19:36+00:00"
+        },
+        {
+            "name": "mockery/mockery",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mockery/mockery.git",
+                "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38",
+                "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38",
+                "shasum": ""
+            },
+            "require": {
+                "hamcrest/hamcrest-php": "~2.0",
+                "lib-pcre": ">=7.0",
+                "php": ">=5.6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5.7|~6.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Mockery": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Pádraic Brady",
+                    "email": "[email protected]",
+                    "homepage": "http://blog.astrumfutura.com"
+                },
+                {
+                    "name": "Dave Marshall",
+                    "email": "[email protected]",
+                    "homepage": "http://davedevelopment.co.uk"
+                }
+            ],
+            "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
+            "homepage": "http://github.com/mockery/mockery",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "library",
+                "mock",
+                "mock objects",
+                "mockery",
+                "stub",
+                "test",
+                "test double",
+                "testing"
+            ],
+            "time": "2017-10-06T16:20:43+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-10-19T19:58:43+00:00"

         },
         {
         },
         {

-            "name": "mockery/mockery",
-            "version": "0.9.8",
+            "name": "phar-io/manifest",
+            "version": "1.0.1",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/padraic/mockery.git",
-                "reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855"
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/padraic/mockery/zipball/1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855",
-                "reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "hamcrest/hamcrest-php": "~1.1",
-                "lib-pcre": ">=7.0",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "phar-io/version": "^1.0.1",
+                "php": "^5.6 || ^7.0"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "0.9.x-dev"
+                    "dev-master": "1.0.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {

-                "psr-0": {
-                    "Mockery": "library/"
-                }
+                "classmap": [
+                    "src/"
+                ]

             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [


@@ -3325,86 +3758,83 @@
             ],
             "authors": [
                 {
             ],
             "authors": [
                 {

-                    "name": "Pádraic Brady",
-                    "email": "[email protected]",
-                    "homepage": "http://blog.astrumfutura.com"
+                    "name": "Arne Blankerts",
+                    "email": "[email protected]",
+                    "role": "Developer"

                 },
                 {
                 },
                 {

-                    "name": "Dave Marshall",
-                    "email": "[email protected]",
-                    "homepage": "http://davedevelopment.co.uk"
+                    "name": "Sebastian Heuer",
+                    "email": "[email protected]",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "Developer"

                 }
             ],
                 }
             ],

-            "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
-            "homepage": "http://github.com/padraic/mockery",
-            "keywords": [
-                "BDD",
-                "TDD",
-                "library",
-                "mock",
-                "mock objects",
-                "mockery",
-                "stub",
-                "test",
-                "test double",
-                "testing"
-            ],
-            "time": "2017-02-09 13:29:38"
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "time": "2017-03-05T18:14:27+00:00"

         },
         {
         },
         {

-            "name": "myclabs/deep-copy",
-            "version": "1.6.0",
+            "name": "phar-io/version",
+            "version": "1.0.1",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "doctrine/collections": "1.*",
-                "phpunit/phpunit": "~4.1"
+                "php": "^5.6 || ^7.0"

             },
             "type": "library",
             "autoload": {
             },
             "type": "library",
             "autoload": {

-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                }
+                "classmap": [
+                    "src/"
+                ]

             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [

-                "MIT"
+                "BSD-3-Clause"

             ],
             ],

-            "description": "Create deep copies (clones) of your objects",
-            "homepage": "https://github.com/myclabs/DeepCopy",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "[email protected]",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "[email protected]",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "Developer"
+                }

             ],
             ],

-            "time": "2017-01-26 22:05:40"
+            "description": "Library for handling version information and constraints",
+            "time": "2017-03-05T17:38:23+00:00"

         },
         {
             "name": "phpdocumentor/reflection-common",
         },
         {
             "name": "phpdocumentor/reflection-common",

-            "version": "1.0",
+            "version": "1.0.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",

-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -3445,26 +3875,26 @@
                 "reflection",
                 "static analysis"
             ],
                 "reflection",
                 "static analysis"
             ],

-            "time": "2015-12-27 11:43:31"
+            "time": "2017-09-11T18:02:19+00:00"

         },
         {
             "name": "phpdocumentor/reflection-docblock",
         },
         {
             "name": "phpdocumentor/reflection-docblock",

-            "version": "3.1.1",
+            "version": "4.1.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",

-                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
-                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
+                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5",
+                "php": "^7.0",

                 "phpdocumentor/reflection-common": "^1.0@dev",
                 "phpdocumentor/reflection-common": "^1.0@dev",

-                "phpdocumentor/type-resolver": "^0.2.0",
+                "phpdocumentor/type-resolver": "^0.4.0",

                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {


@@ -3490,24 +3920,24 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",

-            "time": "2016-09-30 07:12:33"
+            "time": "2017-08-30T18:51:59+00:00"

         },
         {
             "name": "phpdocumentor/type-resolver",
         },
         {
             "name": "phpdocumentor/type-resolver",

-            "version": "0.2.1",
+            "version": "0.4.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",

-                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
-                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5",
+                "php": "^5.5 || ^7.0",

                 "phpdocumentor/reflection-common": "^1.0"
             },
             "require-dev": {
                 "phpdocumentor/reflection-common": "^1.0"
             },
             "require-dev": {


@@ -3537,37 +3967,37 @@
                     "email": "[email protected]"
                 }
             ],
                     "email": "[email protected]"
                 }
             ],

-            "time": "2016-11-25 06:54:22"
+            "time": "2017-07-14T14:27:02+00:00"

         },
         {
             "name": "phpspec/prophecy",
         },
         {
             "name": "phpspec/prophecy",

-            "version": "v1.6.2",
+            "version": "v1.7.2",

             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",

-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
+                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",

                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",

-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
-                "sebastian/recursion-context": "^1.0|^2.0"
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpspec/phpspec": "^2.0",
+                "phpspec/phpspec": "^2.5|^3.2",

                 "phpunit/phpunit": "^4.8 || ^5.6.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
                 "phpunit/phpunit": "^4.8 || ^5.6.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "1.6.x-dev"
+                    "dev-master": "1.7.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -3600,44 +4030,45 @@
                 "spy",
                 "stub"
             ],
                 "spy",
                 "stub"
             ],

-            "time": "2016-11-21 14:58:47"
+            "time": "2017-09-04T11:05:03+00:00"

         },
         {
             "name": "phpunit/php-code-coverage",
         },
         {
             "name": "phpunit/php-code-coverage",

-            "version": "4.0.6",
+            "version": "5.2.3",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",

-                "reference": "ca060f645beeddebedb1885c97bf163e93264c35"
+                "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca060f645beeddebedb1885c97bf163e93264c35",
-                "reference": "ca060f645beeddebedb1885c97bf163e93264c35",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
+                "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": "^5.6 || ^7.0",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
-                "sebastian/code-unit-reverse-lookup": "~1.0",
-                "sebastian/environment": "^1.3.2 || ^2.0",
-                "sebastian/version": "~1.0|~2.0"
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0",
+                "phpunit/php-file-iterator": "^1.4.2",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-token-stream": "^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
+                "sebastian/environment": "^3.0",
+                "sebastian/version": "^2.0.1",
+                "theseer/tokenizer": "^1.1"

             },
             "require-dev": {
             },
             "require-dev": {

-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "^5.4"
+                "ext-xdebug": "^2.5",
+                "phpunit/phpunit": "^6.0"

             },
             "suggest": {
             },
             "suggest": {

-                "ext-dom": "*",
-                "ext-xdebug": ">=2.4.0",
-                "ext-xmlwriter": "*"
+                "ext-xdebug": "^2.5.5"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "5.2.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -3663,7 +4094,7 @@
                 "testing",
                 "xunit"
             ],
                 "testing",
                 "xunit"
             ],

-            "time": "2017-02-23 07:38:02"
+            "time": "2017-11-03T13:47:33+00:00"

         },
         {
             "name": "phpunit/php-file-iterator",
         },
         {
             "name": "phpunit/php-file-iterator",


@@ -3710,7 +4141,7 @@
                 "filesystem",
                 "iterator"
             ],
                 "filesystem",
                 "iterator"
             ],

-            "time": "2016-10-03 07:40:28"
+            "time": "2016-10-03T07:40:28+00:00"

         },
         {
             "name": "phpunit/php-text-template",
         },
         {
             "name": "phpunit/php-text-template",


@@ -3751,29 +4182,34 @@
             "keywords": [
                 "template"
             ],
             "keywords": [
                 "template"
             ],

-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"

         },
         {
             "name": "phpunit/php-timer",
         },
         {
             "name": "phpunit/php-timer",

-            "version": "1.0.8",
+            "version": "1.0.9",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",

-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "~4|~5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"

             },
             "type": "library",
             },
             "type": "library",

+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },

             "autoload": {
                 "classmap": [
                     "src/"
             "autoload": {
                 "classmap": [
                     "src/"


@@ -3795,33 +4231,33 @@
             "keywords": [
                 "timer"
             ],
             "keywords": [
                 "timer"
             ],

-            "time": "2016-05-12 18:03:57"
+            "time": "2017-02-26T11:10:40+00:00"

         },
         {
             "name": "phpunit/php-token-stream",
         },
         {
             "name": "phpunit/php-token-stream",

-            "version": "1.4.10",
+            "version": "2.0.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",

-                "reference": "284fb0679dd25fb5ffb56dad92c72860c0a22f1b"
+                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/284fb0679dd25fb5ffb56dad92c72860c0a22f1b",
-                "reference": "284fb0679dd25fb5ffb56dad92c72860c0a22f1b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0",
+                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0",

                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",

-                "php": ">=5.3.3"
+                "php": "^7.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "~4.2"
+                "phpunit/phpunit": "^6.2.4"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "1.4-dev"
+                    "dev-master": "2.0-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -3844,20 +4280,20 @@
             "keywords": [
                 "tokenizer"
             ],
             "keywords": [
                 "tokenizer"
             ],

-            "time": "2017-02-23 06:14:45"
+            "time": "2017-08-20T05:47:52+00:00"

         },
         {
             "name": "phpunit/phpunit",
         },
         {
             "name": "phpunit/phpunit",

-            "version": "5.7.14",
+            "version": "6.4.4",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",

-                "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57"
+                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4906b8faf23e42612182fd212eb6f4c0f2954b57",
-                "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932",
+                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -3866,33 +4302,35 @@
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",

-                "myclabs/deep-copy": "~1.3",
-                "php": "^5.6 || ^7.0",
-                "phpspec/prophecy": "^1.6.2",
-                "phpunit/php-code-coverage": "^4.0.4",
-                "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.4",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "^1.3.4 || ^2.0",
-                "sebastian/exporter": "~2.0",
-                "sebastian/global-state": "^1.1",
-                "sebastian/object-enumerator": "~2.0",
-                "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "~1.0.3|~2.0",
-                "symfony/yaml": "~2.1|~3.0"
+                "myclabs/deep-copy": "^1.6.1",
+                "phar-io/manifest": "^1.0.1",
+                "phar-io/version": "^1.0",
+                "php": "^7.0",
+                "phpspec/prophecy": "^1.7",
+                "phpunit/php-code-coverage": "^5.2.2",
+                "phpunit/php-file-iterator": "^1.4.2",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^1.0.9",
+                "phpunit/phpunit-mock-objects": "^4.0.3",
+                "sebastian/comparator": "^2.0.2",
+                "sebastian/diff": "^2.0",
+                "sebastian/environment": "^3.1",
+                "sebastian/exporter": "^3.1",
+                "sebastian/global-state": "^2.0",
+                "sebastian/object-enumerator": "^3.0.3",
+                "sebastian/resource-operations": "^1.0",
+                "sebastian/version": "^2.0.1"

             },
             "conflict": {
             },
             "conflict": {

-                "phpdocumentor/reflection-docblock": "3.0.2"
+                "phpdocumentor/reflection-docblock": "3.0.2",
+                "phpunit/dbunit": "<3.0"

             },
             "require-dev": {
                 "ext-pdo": "*"
             },
             "suggest": {
                 "ext-xdebug": "*",
             },
             "require-dev": {
                 "ext-pdo": "*"
             },
             "suggest": {
                 "ext-xdebug": "*",

-                "phpunit/php-invoker": "~1.1"
+                "phpunit/php-invoker": "^1.1"

             },
             "bin": [
                 "phpunit"
             },
             "bin": [
                 "phpunit"


@@ -3900,7 +4338,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "5.7.x-dev"
+                    "dev-master": "6.4.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -3926,33 +4364,33 @@
                 "testing",
                 "xunit"
             ],
                 "testing",
                 "xunit"
             ],

-            "time": "2017-02-19 07:22:16"
+            "time": "2017-11-08T11:26:09+00:00"

         },
         {
             "name": "phpunit/phpunit-mock-objects",
         },
         {
             "name": "phpunit/phpunit-mock-objects",

-            "version": "3.4.3",
+            "version": "4.0.4",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",

-                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
+                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
-                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0",
+                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-text-template": "^1.2",
-                "sebastian/exporter": "^1.2 || ^2.0"
+                "doctrine/instantiator": "^1.0.5",
+                "php": "^7.0",
+                "phpunit/php-text-template": "^1.2.1",
+                "sebastian/exporter": "^3.0"

             },
             "conflict": {
             },
             "conflict": {

-                "phpunit/phpunit": "<5.4.0"
+                "phpunit/phpunit": "<6.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "^5.4"
+                "phpunit/phpunit": "^6.0"

             },
             "suggest": {
                 "ext-soap": "*"
             },
             "suggest": {
                 "ext-soap": "*"


@@ -3960,7 +4398,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2.x-dev"
+                    "dev-master": "4.0.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -3985,27 +4423,27 @@
                 "mock",
                 "xunit"
             ],
                 "mock",
                 "xunit"
             ],

-            "time": "2016-12-08 20:27:08"
+            "time": "2017-08-03T14:08:16+00:00"

         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",

-            "version": "1.0.0",
+            "version": "1.0.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",

-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.6"
+                "php": "^5.6 || ^7.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "~5"
+                "phpunit/phpunit": "^5.7 || ^6.0"

             },
             "type": "library",
             "extra": {
             },
             "type": "library",
             "extra": {


@@ -4030,34 +4468,34 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",

-            "time": "2016-02-13 06:45:14"
+            "time": "2017-03-04T06:30:41+00:00"

         },
         {
             "name": "sebastian/comparator",
         },
         {
             "name": "sebastian/comparator",

-            "version": "1.2.4",
+            "version": "2.1.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",

-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+                "reference": "1174d9018191e93cb9d719edec01257fc05f8158"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1174d9018191e93cb9d719edec01257fc05f8158",
+                "reference": "1174d9018191e93cb9d719edec01257fc05f8158",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
+                "php": "^7.0",
+                "sebastian/diff": "^2.0",
+                "sebastian/exporter": "^3.1"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^6.4"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "2.1.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -4088,38 +4526,38 @@
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",

-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "homepage": "https://github.com/sebastianbergmann/comparator",

             "keywords": [
                 "comparator",
                 "compare",
                 "equality"
             ],
             "keywords": [
                 "comparator",
                 "compare",
                 "equality"
             ],

-            "time": "2017-01-29 09:50:25"
+            "time": "2017-11-03T07:16:52+00:00"

         },
         {
             "name": "sebastian/diff",
         },
         {
             "name": "sebastian/diff",

-            "version": "1.4.1",
+            "version": "2.0.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",

-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.3"
+                "php": "^7.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "~4.8"
+                "phpunit/phpunit": "^6.2"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "1.4-dev"
+                    "dev-master": "2.0-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -4146,32 +4584,32 @@
             "keywords": [
                 "diff"
             ],
             "keywords": [
                 "diff"
             ],

-            "time": "2015-12-08 07:14:41"
+            "time": "2017-08-03T08:09:46+00:00"

         },
         {
             "name": "sebastian/environment",
         },
         {
             "name": "sebastian/environment",

-            "version": "2.0.0",
+            "version": "3.1.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",

-                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
-                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": "^5.6 || ^7.0"
+                "php": "^7.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "^5.0"
+                "phpunit/phpunit": "^6.1"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.1.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -4196,34 +4634,34 @@
                 "environment",
                 "hhvm"
             ],
                 "environment",
                 "hhvm"
             ],

-            "time": "2016-11-26 07:53:53"
+            "time": "2017-07-01T08:51:00+00:00"

         },
         {
             "name": "sebastian/exporter",
         },
         {
             "name": "sebastian/exporter",

-            "version": "2.0.0",
+            "version": "3.1.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",

-                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
-                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~2.0"
+                "php": "^7.0",
+                "sebastian/recursion-context": "^3.0"

             },
             "require-dev": {
                 "ext-mbstring": "*",
             },
             "require-dev": {
                 "ext-mbstring": "*",

-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^6.0"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.1.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -4263,27 +4701,27 @@
                 "export",
                 "exporter"
             ],
                 "export",
                 "exporter"
             ],

-            "time": "2016-11-19 08:54:04"
+            "time": "2017-04-03T13:19:02+00:00"

         },
         {
             "name": "sebastian/global-state",
         },
         {
             "name": "sebastian/global-state",

-            "version": "1.1.1",
+            "version": "2.0.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",

-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.3"
+                "php": "^7.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "~4.2"
+                "phpunit/phpunit": "^6.0"

             },
             "suggest": {
                 "ext-uopz": "*"
             },
             "suggest": {
                 "ext-uopz": "*"


@@ -4291,7 +4729,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "1.0-dev"
+                    "dev-master": "2.0-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -4314,33 +4752,34 @@
             "keywords": [
                 "global state"
             ],
             "keywords": [
                 "global state"
             ],

-            "time": "2015-10-12 03:26:01"
+            "time": "2017-04-27T15:39:26+00:00"

         },
         {
             "name": "sebastian/object-enumerator",
         },
         {
             "name": "sebastian/object-enumerator",

-            "version": "2.0.1",
+            "version": "3.0.3",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",

-                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
-                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.6",
-                "sebastian/recursion-context": "~2.0"
+                "php": "^7.0",
+                "sebastian/object-reflector": "^1.1.1",
+                "sebastian/recursion-context": "^3.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "~5"
+                "phpunit/phpunit": "^6.0"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -4360,32 +4799,77 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",

-            "time": "2017-02-18 15:18:39"
+            "time": "2017-08-03T12:35:26+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "773f97c67f28de00d397be301821b06708fca0be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
+                "reference": "773f97c67f28de00d397be301821b06708fca0be",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "time": "2017-03-29T09:07:27+00:00"

         },
         {
             "name": "sebastian/recursion-context",
         },
         {
             "name": "sebastian/recursion-context",

-            "version": "2.0.0",
+            "version": "3.0.0",

             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",

-                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
-                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.3.3"
+                "php": "^7.0"

             },
             "require-dev": {
             },
             "require-dev": {

-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^6.0"

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0.x-dev"

                 }
             },
             "autoload": {
                 }
             },
             "autoload": {


@@ -4413,7 +4897,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",

-            "time": "2016-11-19 07:33:16"
+            "time": "2017-03-03T06:23:57+00:00"

         },
         {
             "name": "sebastian/resource-operations",
         },
         {
             "name": "sebastian/resource-operations",


@@ -4455,7 +4939,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",

-            "time": "2015-07-28 20:34:47"
+            "time": "2015-07-28T20:34:47+00:00"

         },
         {
             "name": "sebastian/version",
         },
         {
             "name": "sebastian/version",


@@ -4498,40 +4982,97 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",

-            "time": "2016-10-03 07:35:21"
+            "time": "2016-10-03T07:35:21+00:00"

         },
         {
         },
         {

-            "name": "symfony/yaml",
-            "version": "v3.2.4",
+            "name": "symfony/class-loader",
+            "version": "v3.3.13",

             "source": {
                 "type": "git",
             "source": {
                 "type": "git",

-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8"
+                "url": "https://github.com/symfony/class-loader.git",
+                "reference": "df173ac2af96ce202bf8bb5a3fc0bec8a4fdd4d1"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/symfony/yaml/zipball/9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
-                "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/df173ac2af96ce202bf8bb5a3fc0bec8a4fdd4d1",
+                "reference": "df173ac2af96ce202bf8bb5a3fc0bec8a4fdd4d1",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {

-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "require-dev": {
+                "symfony/finder": "~2.8|~3.0",
+                "symfony/polyfill-apcu": "~1.1"
+            },
+            "suggest": {
+                "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\ClassLoader\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony ClassLoader Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-11-05T15:47:03+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": {
             },
             "require-dev": {

-                "symfony/console": "~2.8|~3.0"
+                "symfony/css-selector": "~2.8|~3.0"

             },
             "suggest": {
             },
             "suggest": {

-                "symfony/console": "For validating YAML files using the lint command"
+                "symfony/css-selector": ""

             },
             "type": "library",
             "extra": {
                 "branch-alias": {
             },
             "type": "library",
             "extra": {
                 "branch-alias": {

-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.1-dev"

                 }
             },
             "autoload": {
                 "psr-4": {
                 }
             },
             "autoload": {
                 "psr-4": {

-                    "Symfony\\Component\\Yaml\\": ""
+                    "Symfony\\Component\\DomCrawler\\": ""

                 },
                 "exclude-from-classmap": [
                     "/Tests/"
                 },
                 "exclude-from-classmap": [
                     "/Tests/"


@@ -4551,9 +5092,49 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
                     "homepage": "https://symfony.com/contributors"
                 }
             ],

-            "description": "Symfony Yaml Component",
+            "description": "Symfony DomCrawler Component",

             "homepage": "https://symfony.com",
             "homepage": "https://symfony.com",

-            "time": "2017-02-16 22:46:52"
+            "time": "2017-01-21T17:13:55+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "[email protected]",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "time": "2017-04-07T12:08:54+00:00"

         },
         {
             "name": "webmozart/assert",
         },
         {
             "name": "webmozart/assert",


@@ -4603,7 +5184,7 @@
                 "check",
                 "validate"
             ],
                 "check",
                 "validate"
             ],

-            "time": "2016-11-23 20:04:58"
+            "time": "2016-11-23T20:04:58+00:00"

         }
     ],
     "aliases": [],
         }
     ],
     "aliases": [],


@@ -4612,7 +5193,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

-        "php": ">=5.6.4",
+        "php": ">=7.0.0",

         "ext-tidy": "*"
     },
     "platform-dev": []
         "ext-tidy": "*"
     },
     "platform-dev": []

diff --git a/database/seeds/DummyContentSeeder.php b/database/seeds/DummyContentSeeder.php
index d18eb30db54d6b1166f9b96d3e44a8c5944064fc..15cf9b4deb130f0739bcfe93154d7a3062cd4c9a 100644 (file)
--- a/database/seeds/DummyContentSeeder.php
+++ b/database/seeds/DummyContentSeeder.php
@@ -11,25 +11,31 @@ class DummyContentSeeder extends Seeder
      */
     public function run()
     {
      */
     public function run()
     {

-        $user = factory(\BookStack\User::class)->create();
-        $role = \BookStack\Role::getRole('editor');
-        $user->attachRole($role);
+        // Create an editor user
+        $editorUser = factory(\BookStack\User::class)->create();
+        $editorRole = \BookStack\Role::getRole('editor');
+        $editorUser->attachRole($editorRole);

 
 

-        factory(\BookStack\Book::class, 20)->create(['created_by' => $user->id, 'updated_by' => $user->id])
-            ->each(function($book) use ($user) {
-                $chapters = factory(\BookStack\Chapter::class, 5)->create(['created_by' => $user->id, 'updated_by' => $user->id])
-                    ->each(function($chapter) use ($user, $book){
-                        $pages = factory(\BookStack\Page::class, 5)->make(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]);
+        // Create a viewer user
+        $viewerUser = factory(\BookStack\User::class)->create();
+        $role = \BookStack\Role::getRole('viewer');
+        $viewerUser->attachRole($role);
+
+        factory(\BookStack\Book::class, 20)->create(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id])
+            ->each(function($book) use ($editorUser) {
+                $chapters = factory(\BookStack\Chapter::class, 5)->create(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id])
+                    ->each(function($chapter) use ($editorUser, $book){
+                        $pages = factory(\BookStack\Page::class, 5)->make(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id, 'book_id' => $book->id]);

                         $chapter->pages()->saveMany($pages);
                     });
                         $chapter->pages()->saveMany($pages);
                     });

-                $pages = factory(\BookStack\Page::class, 3)->make(['created_by' => $user->id, 'updated_by' => $user->id]);
+                $pages = factory(\BookStack\Page::class, 3)->make(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);

                 $book->chapters()->saveMany($chapters);
                 $book->pages()->saveMany($pages);
             });
 
                 $book->chapters()->saveMany($chapters);
                 $book->pages()->saveMany($pages);
             });
 

-        $largeBook = factory(\BookStack\Book::class)->create(['name' => 'Large book' . str_random(10), 'created_by' => $user->id, 'updated_by' => $user->id]);
-        $pages = factory(\BookStack\Page::class, 200)->make(['created_by' => $user->id, 'updated_by' => $user->id]);
-        $chapters = factory(\BookStack\Chapter::class, 50)->make(['created_by' => $user->id, 'updated_by' => $user->id]);
+        $largeBook = factory(\BookStack\Book::class)->create(['name' => 'Large book' . str_random(10), 'created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);
+        $pages = factory(\BookStack\Page::class, 200)->make(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);
+        $chapters = factory(\BookStack\Chapter::class, 50)->make(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);

         $largeBook->pages()->saveMany($pages);
         $largeBook->chapters()->saveMany($chapters);
         app(\BookStack\Services\PermissionService::class)->buildJointPermissions();
         $largeBook->pages()->saveMany($pages);
         $largeBook->chapters()->saveMany($chapters);
         app(\BookStack\Services\PermissionService::class)->buildJointPermissions();

diff --git a/tests/BrowserKitTest.php b/tests/BrowserKitTest.php
index 98259dea94b587a7792da7bea8b8c7231ce575d6..1eabc74170ab75067e1ff95c57057cc0d9e156d6 100644 (file)
--- a/tests/BrowserKitTest.php
+++ b/tests/BrowserKitTest.php
@@ -3,6 +3,7 @@
 use BookStack\Entity;
 use BookStack\Role;
 use BookStack\Services\PermissionService;
 use BookStack\Entity;
 use BookStack\Role;
 use BookStack\Services\PermissionService;

+use BookStack\User;

 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Laravel\BrowserKitTesting\TestCase;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Laravel\BrowserKitTesting\TestCase;


@@ -129,15 +130,25 @@ abstract class BrowserKitTest extends TestCase
     }
 
     /**
     }
 
     /**

-     * Quick way to create a new user
+     * Get an instance of a user with 'editor' permissions

      * @param array $attributes
      * @return mixed
      */
     protected function getEditor($attributes = [])
     {
      * @param array $attributes
      * @return mixed
      */
     protected function getEditor($attributes = [])
     {

-        $user = factory(\BookStack\User::class)->create($attributes);
-        $role = Role::getRole('editor');
-        $user->attachRole($role);;
+        $user = \BookStack\Role::getRole('editor')->users()->first();
+        if (!empty($attributes)) $user->forceFill($attributes)->save();
+        return $user;
+    }
+
+    /**
+     * Get an instance of a user with 'viewer' permissions
+     * @return mixed
+     */
+    protected function getViewer()
+    {
+        $user = \BookStack\Role::getRole('viewer')->users()->first();
+        if (!empty($attributes)) $user->forceFill($attributes)->save();

         return $user;
     }
 
         return $user;
     }
 

diff --git a/tests/Permissions/RestrictionsTest.php b/tests/Permissions/RestrictionsTest.php
index faceab92c7322dd7c00f662e70673a2ceb8eae9a..218b7a0d8175925ecd9d270d175a6604ceb31e90 100644 (file)
--- a/tests/Permissions/RestrictionsTest.php
+++ b/tests/Permissions/RestrictionsTest.php
@@ -1,25 +1,33 @@
 <?php namespace Tests;
 
 <?php namespace Tests;
 

+use BookStack\Book;
+use BookStack\Services\PermissionService;
+use BookStack\User;
+

 class RestrictionsTest extends BrowserKitTest
 {
 class RestrictionsTest extends BrowserKitTest
 {

+
+    /**
+     * @var User
+     */

     protected $user;
     protected $user;

+
+    /**
+     * @var User
+     */

     protected $viewer;
     protected $viewer;

-    protected $restrictionService;
+
+    /**
+     * @var PermissionService
+     */
+    protected $permissionService;

 
     public function setUp()
     {
         parent::setUp();
         $this->user = $this->getEditor();
         $this->viewer = $this->getViewer();
 
     public function setUp()
     {
         parent::setUp();
         $this->user = $this->getEditor();
         $this->viewer = $this->getViewer();

-        $this->restrictionService = $this->app[\BookStack\Services\PermissionService::class];
-    }
-
-    protected function getViewer()
-    {
-        $role = \BookStack\Role::getRole('viewer');
-        $viewer = $this->getNewBlankUser();
-        $viewer->attachRole($role);;
-        return $viewer;
+        $this->permissionService = $this->app[PermissionService::class];

     }
 
     /**
     }
 
     /**


@@ -31,27 +39,32 @@ class RestrictionsTest extends BrowserKitTest
     {
         $entity->restricted = true;
         $entity->permissions()->delete();
     {
         $entity->restricted = true;
         $entity->permissions()->delete();

+

         $role = $this->user->roles->first();
         $viewerRole = $this->viewer->roles->first();
         $role = $this->user->roles->first();
         $viewerRole = $this->viewer->roles->first();

+
+        $permissions = [];

         foreach ($actions as $action) {
         foreach ($actions as $action) {

-            $entity->permissions()->create([
+            $permissions[] = [

                 'role_id' => $role->id,
                 'action' => strtolower($action)
                 'role_id' => $role->id,
                 'action' => strtolower($action)

-            ]);
-            $entity->permissions()->create([
+            ];
+            $permissions[] = [

                 'role_id' => $viewerRole->id,
                 'action' => strtolower($action)
                 'role_id' => $viewerRole->id,
                 'action' => strtolower($action)

-            ]);
+            ];

         }
         }

+        $entity->permissions()->createMany($permissions);
+

         $entity->save();
         $entity->load('permissions');
         $entity->save();
         $entity->load('permissions');

-        $this->restrictionService->buildJointPermissionsForEntity($entity);
+        $this->permissionService->buildJointPermissionsForEntity($entity);

         $entity->load('jointPermissions');
     }
 
     public function test_book_view_restriction()
     {
         $entity->load('jointPermissions');
     }
 
     public function test_book_view_restriction()
     {

-        $book = \BookStack\Book::first();
+        $book = Book::first();

         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 
         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 


@@ -81,7 +94,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_book_create_restriction()
     {
 
     public function test_book_create_restriction()
     {

-        $book = \BookStack\Book::first();
+        $book = Book::first();

 
         $bookUrl = $book->getUrl();
         $this->actingAs($this->viewer)
 
         $bookUrl = $book->getUrl();
         $this->actingAs($this->viewer)


@@ -120,7 +133,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_book_update_restriction()
     {
 
     public function test_book_update_restriction()
     {

-        $book = \BookStack\Book::first();
+        $book = Book::first();

         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 
         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 


@@ -150,7 +163,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_book_delete_restriction()
     {
 
     public function test_book_delete_restriction()
     {

-        $book = \BookStack\Book::first();
+        $book = Book::first();

         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 
         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 


@@ -342,7 +355,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_book_restriction_form()
     {
 
     public function test_book_restriction_form()
     {

-        $book = \BookStack\Book::first();
+        $book = Book::first();

         $this->asAdmin()->visit($book->getUrl() . '/permissions')
             ->see('Book Permissions')
             ->check('restricted')
         $this->asAdmin()->visit($book->getUrl() . '/permissions')
             ->see('Book Permissions')
             ->check('restricted')


@@ -430,7 +443,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_book_create_restriction_override()
     {
 
     public function test_book_create_restriction_override()
     {

-        $book = \BookStack\Book::first();
+        $book = Book::first();

 
         $bookUrl = $book->getUrl();
         $this->actingAs($this->viewer)
 
         $bookUrl = $book->getUrl();
         $this->actingAs($this->viewer)


@@ -465,7 +478,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_book_update_restriction_override()
     {
 
     public function test_book_update_restriction_override()
     {

-        $book = \BookStack\Book::first();
+        $book = Book::first();

         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 
         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 


@@ -495,7 +508,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_book_delete_restriction_override()
     {
 
     public function test_book_delete_restriction_override()
     {

-        $book = \BookStack\Book::first();
+        $book = Book::first();

         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 
         $bookPage = $book->pages->first();
         $bookChapter = $book->chapters->first();
 


@@ -525,11 +538,12 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_page_visible_if_has_permissions_when_book_not_visible()
     {
 
     public function test_page_visible_if_has_permissions_when_book_not_visible()
     {

-        $book = \BookStack\Book::first();
-        $bookChapter = $book->chapters->first();
-        $bookPage = $bookChapter->pages->first();
+        $book = Book::first();

 
         $this->setEntityRestrictions($book, []);
 
         $this->setEntityRestrictions($book, []);

+
+        $bookChapter = $book->chapters->first();
+        $bookPage = $bookChapter->pages->first();

         $this->setEntityRestrictions($bookPage, ['view']);
 
         $this->actingAs($this->viewer);
         $this->setEntityRestrictions($bookPage, ['view']);
 
         $this->actingAs($this->viewer);

diff --git a/tests/UserProfileTest.php b/tests/UserProfileTest.php
index 12f88483f6a6e6e2171fec1034c514ecfb8eda60..54671bbf6257cdc64c561241aa8ee2bc108c0433 100644 (file)
--- a/tests/UserProfileTest.php
+++ b/tests/UserProfileTest.php
@@ -33,7 +33,7 @@ class UserProfileTest extends BrowserKitTest
 
     public function test_profile_page_shows_created_content_counts()
     {
 
     public function test_profile_page_shows_created_content_counts()
     {

-        $newUser = $this->getEditor();
+        $newUser = $this->getNewBlankUser();

 
         $this->asAdmin()->visit('/user/' . $newUser->id)
             ->see($newUser->name)
 
         $this->asAdmin()->visit('/user/' . $newUser->id)
             ->see($newUser->name)


@@ -52,7 +52,7 @@ class UserProfileTest extends BrowserKitTest
 
     public function test_profile_page_shows_recent_activity()
     {
 
     public function test_profile_page_shows_recent_activity()
     {

-        $newUser = $this->getEditor();
+        $newUser = $this->getNewBlankUser();

         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         \Activity::add($entities['book'], 'book_update', $entities['book']->id);
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         \Activity::add($entities['book'], 'book_update', $entities['book']->id);


@@ -66,7 +66,7 @@ class UserProfileTest extends BrowserKitTest
 
     public function test_clicking_user_name_in_activity_leads_to_profile_page()
     {
 
     public function test_clicking_user_name_in_activity_leads_to_profile_page()
     {

-        $newUser = $this->getEditor();
+        $newUser = $this->getNewBlankUser();

         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         \Activity::add($entities['book'], 'book_update', $entities['book']->id);
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         \Activity::add($entities['book'], 'book_update', $entities['book']->id);